diff --git a/flake.lock b/flake.lock index b8b5df8..6dedb2f 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1722462338, - "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1722588653, - "narHash": "sha256-ecdFExRGQchpYG2T4A53GCcCJ+2xIEklcYGIBhpuI+s=", + "lastModified": 1724858880, + "narHash": "sha256-gXLnMy8oAW2IxpmkrB2cp2BnC2hz5Pbsjvwo3cqXVWs=", "owner": "ggerganov", "repo": "llama.cpp", - "rev": "e09a800f9a9b19c73aa78e03b4c4be8ed988f3e6", + "rev": "9fe94ccac92693d4ae1bc283ff0574e8b3f4e765", "type": "github" }, "original": { @@ -98,11 +98,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -126,11 +126,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1722372011, - "narHash": "sha256-B2xRiC3NEJy/82ugtareBkRqEkPGpMyjaLxaR8LBxNs=", + "lastModified": 1724727824, + "narHash": "sha256-0XH9MJk54imJm+RHOLTUJ7e+ponLW00tw5ke4MTVa1Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf05eeada35e122770c5c14add958790fcfcbef5", + "rev": "36bae45077667aff5720e5b3f1a5458f51cf0776", "type": "github" }, "original": { @@ -158,11 +158,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1724479785, + "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", "type": "github" }, "original": { @@ -205,11 +205,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1722114803, - "narHash": "sha256-s6YhI8UHwQvO4cIFLwl1wZ1eS5Cuuw7ld2VzUchdFP0=", + "lastModified": 1723501126, + "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "eb34eb588132d653e4c4925d862f1e5a227cc2ab", + "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 027263c..06c6ed7 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,7 @@ options = { openssh = { enable = true; - port = 2222; + allow-password = true; }; backup = { @@ -75,7 +75,6 @@ gui = { enable = true; protonmail = true; - matrix = true; gtk = false; sway = { @@ -88,12 +87,12 @@ monitor = "DP-2"; resolution = "3440x1440"; refreshRate = 144; - x = 1920; wallpaper = "solar_system.png"; }) (utils.mkMonitor { monitor = "HDMI-A-1"; resolution = "1920x1080"; + x = 3440; refreshRate = 75; }) ]; @@ -180,7 +179,7 @@ pkgs = import nixpkgs { inherit system; - overlays = with overlays; []; + overlays = with overlays; [ printrun ]; config.allowUnfree = true; }; @@ -213,6 +212,7 @@ { networking.hostName = hostname; simmer = config.options; + nix.settings.trusted-users = [ "eesim" ]; } systemConfig (./. + "/hosts/${hostname}/hardware-configuration.nix") diff --git a/hosts/ankaa/system.nix b/hosts/ankaa/system.nix index f0d29d0..29f6d6d 100644 --- a/hosts/ankaa/system.nix +++ b/hosts/ankaa/system.nix @@ -19,6 +19,8 @@ environment.systemPackages = with pkgs; [ localPackages.x86_64-linux.jhelioviewer lemurs + printrun + pciutils ]; services.hardware.openrgb.enable = true; diff --git a/modules/nix/openssh.nix b/modules/nix/openssh.nix index 93f1939..51d4252 100644 --- a/modules/nix/openssh.nix +++ b/modules/nix/openssh.nix @@ -14,7 +14,7 @@ in ports = [ cfg.port ]; settings = { PermitRootLogin = "no"; - PasswordAuthentication = false; + PasswordAuthentication = cfg.allow-password; }; }; }; diff --git a/overlays/default.nix b/overlays/default.nix index a5624cc..8947a21 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,4 +2,5 @@ { gamescope = import ./gamescope-last-working.nix; llama-cpp = import ./llama-cpp.nix { inherit inputs; }; + printrun = import ./printrun.nix { inherit inputs; }; } diff --git a/overlays/printrun.nix b/overlays/printrun.nix new file mode 100644 index 0000000..a06bfae --- /dev/null +++ b/overlays/printrun.nix @@ -0,0 +1,10 @@ +{ inputs, ... }: +let + system = "x86_64-linux"; + pkgs = inputs.nixpkgs-unstable.legacyPackages.${system}; +in +final: prev: { + printrun = prev.printrun.overrideAttrs ( finalAttrs: previousAttrs: { + propagatedBuildInputs = previousAttrs.propagatedBuildInputs ++ [ pkgs.python312Packages.platformdirs ]; + }); +}