diff --git a/configuration.nix b/configuration.nix index 3ba79b9..e89dee7 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,11 +2,12 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, lib, pkgs, nixos-unstable, ... }: +{ config, lib, pkgs, nixos-unstable, inputs, ... }: { # Bootloader. boot.loader.systemd-boot.enable = true; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.extra-experimental-features = [ "nix-command" "flakes" ]; @@ -35,6 +36,8 @@ LC_TIME = "en_US.UTF-8"; }; + + # Enable the X11 windowing system. services.xserver = { enable = true; @@ -44,7 +47,7 @@ options = "caps_lock:esc"; }; videoDrivers = [ - # "displaylink" # broken + "displaylink" # broken "modesetting" ]; # Enable the GNOME Desktop Environment. diff --git a/fetch-dl-driver.sh b/fetch-dl-driver.sh new file mode 100644 index 0000000..1da8525 --- /dev/null +++ b/fetch-dl-driver.sh @@ -0,0 +1,2 @@ +# this must be run before first bootstrap on new machine. IM SORRY +nix-prefetch-url https://marq42.xyz/displaylink-580.zip diff --git a/flake.lock b/flake.lock index 64db5c6..653d5da 100644 --- a/flake.lock +++ b/flake.lock @@ -22,6 +22,18 @@ "type": "github" } }, + "displaylink": { + "flake": false, + "locked": { + "narHash": "sha256-hR26phh9YMYsOWT4tIKj6/ZeItBygtw3cJ5ezOtGkMM=", + "type": "file", + "url": "https://marq42.xyz/displaylink-580.zip" + }, + "original": { + "type": "file", + "url": "https://marq42.xyz/displaylink-580.zip" + } + }, "emacs-config": { "flake": false, "locked": { @@ -130,6 +142,7 @@ "root": { "inputs": { "apple-silicon": "apple-silicon", + "displaylink": "displaylink", "emacs-config": "emacs-config", "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", diff --git a/flake.nix b/flake.nix index a711246..314a268 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,10 @@ url = "git+https://git.marq42.xyz/mir/emacs?ref=main"; flake = false; }; + displaylink = { + url = "file+https://marq42.xyz/displaylink-580.zip"; + flake = false; + }; }; outputs = inputs@{ self, diff --git a/hardware/displaylink-580.zip b/hardware/displaylink-580.zip new file mode 100644 index 0000000..3e4eca4 Binary files /dev/null and b/hardware/displaylink-580.zip differ diff --git a/home.nix b/home.nix index 3593bfa..e405a6d 100644 --- a/home.nix +++ b/home.nix @@ -135,13 +135,13 @@ with lib.hm.gvariant; programs.gpg = { enable = true; -# package = pkgs.gnupg.overrideAttrs (orig: { - # version = "2.4.0"; - # src = pkgs.fetchurl { - # url = "mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2"; - # hash = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM="; - # }; - # }); + package = pkgs.gnupg.overrideAttrs (orig: { + version = "2.4.0"; + src = pkgs.fetchurl { + url = "mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2"; + hash = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM="; + }; + }); # agent = { # pinentryFlavor = "gnome3"; # };