From 02754f7120616be5b225a957949071fab587b1bc Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Tue, 2 Jul 2024 09:13:53 +0200 Subject: [PATCH] update stable input to get ssh fix --- flake.lock | 6 +++--- flake.nix | 22 +++++++++++++--------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index af04af8..3645329 100644 --- a/flake.lock +++ b/flake.lock @@ -719,11 +719,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719707984, - "narHash": "sha256-RoxIr/fbndtuKqulGvNCcuzC6KdAib85Q8gXnjzA1dw=", + "lastModified": 1719838683, + "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7dca15289a1c2990efbe4680f0923ce14139b042", + "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 439fbcc..df54898 100644 --- a/flake.nix +++ b/flake.nix @@ -40,8 +40,10 @@ inherit (self) outputs; system = "x86_64-linux"; # helper function to create a machine - mkHost = { modules, specialArgs ? { pkgsVersion = nixpkgs-unstable; home-manager-version = home-manager-unstable; } - , system ? "x86_64-linux", minimal ? false }: + mkHost = { modules, specialArgs ? { + pkgsVersion = nixpkgs-unstable; + home-manager-version = home-manager-unstable; + }, system ? "x86_64-linux", minimal ? false }: specialArgs.pkgsVersion.lib.nixosSystem { inherit system; modules = modules ++ [ @@ -62,9 +64,7 @@ stylix.nixosModules.stylix ./modules/graphical/stylix.nix ./modules/graphical/cosmic.nix - ({ outputs, ... }: { - stylix.image = ./yuyukowallpaper.png; - }) + ({ outputs, ... }: { stylix.image = ./yuyukowallpaper.png; }) ] else [ ]); specialArgs = specialArgs // { inherit inputs outputs; }; @@ -132,12 +132,12 @@ pkgsVersion = nixpkgs; home-manager-version = home-manager; }; - modules = [ ./users/anon ./systems/mini-pc-proxmox/configuration.nix ]; + modules = + [ ./users/anon ./systems/mini-pc-proxmox/configuration.nix ]; }; # build vm -> nixos-rebuild build-vm --flake .#vm - "vm" = mkHost { - modules = [ ./users/vm ./systems/vm/configuration.nix ]; - }; + "vm" = + mkHost { modules = [ ./users/vm ./systems/vm/configuration.nix ]; }; "wsl" = mkHost { modules = [ #"${nixpkgs}/nixos/modules/profiles/minimal.nix" @@ -152,6 +152,10 @@ "adam-site" = mkHost { minimal = true; system = "aarch64-linux"; + specialArgs = { + pkgsVersion = nixpkgs; + home-manager-version = home-manager; + }; modules = [ disko.nixosModules.disko ./systems/adam-site/configuration.nix ]; };