From 6571feaff784182fcc0ce203fe3f927ea4d7c1ca Mon Sep 17 00:00:00 2001 From: Avery Date: Sun, 7 Jul 2024 01:33:31 +0200 Subject: [PATCH] Update flake.lock --- flake.lock | 62 ++++++++++++++++++++++---------------------- flake.nix | 75 +++++++++++++++++++++++++----------------------------- 2 files changed, 66 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index 4589dbb..e46bc2b 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -147,11 +147,11 @@ ] }, "locked": { - "lastModified": 1718526747, - "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", + "lastModified": 1719677234, + "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", + "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1718141734, - "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", + "lastModified": 1719588253, + "narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", + "rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1717976995, - "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", + "lastModified": 1719128254, + "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "315aa649ba307704db0b16c92f097a08a65ec955", + "rev": "50581970f37f06a4719001735828519925ef8310", "type": "github" }, "original": { @@ -225,27 +225,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718276662, - "narHash": "sha256-p0KXZc6ekKXwYcMeyS5Hs9uTQKoSDkJW1QDf0gkilLk=", + "lastModified": 1719506693, + "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b17538d34de26bf52626a9caff104a267abd991a", + "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "b17538d34de26bf52626a9caff104a267abd991a", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1718478900, - "narHash": "sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs=", + "lastModified": 1719099622, + "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c884223af91820615a6146af1ae1fea25c107005", + "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", "type": "github" }, "original": { @@ -269,11 +269,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718578900, - "narHash": "sha256-BX0aRxoE3zOrX9vsm6zTcby0cpfc6z3olWkvbmKXi+Q=", + "lastModified": 1719666075, + "narHash": "sha256-65P3TcZi0s+dOc9uG6/+3bO3/IhG71RDjbkF44HjIfs=", "owner": "nix-community", "repo": "nixvim", - "rev": "36b4a39b2bd3bafc0cfd28bf94e1b21f142b6884", + "rev": "049bbc168fe449cca37ddf3b0b56c4f93408052b", "type": "github" }, "original": { @@ -290,11 +290,11 @@ ] }, "locked": { - "lastModified": 1718567165, - "narHash": "sha256-nhg4r4Kn3deooPiNao8oH/K7CcvRotDzBtg00MXiZkU=", + "lastModified": 1719686795, + "narHash": "sha256-tc+gBY/vMUC9uqTN6DYv+uQ/8no9VOotHa5fCUxnAC0=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b906c67581fa12ad2821f295b37b5733fcc76926", + "rev": "1ffcff0d28f77862ab8ae6a578fc49260d47a808", "type": "github" }, "original": { @@ -320,11 +320,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1718506969, - "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=", + "lastModified": 1719268571, + "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251", + "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "type": "github" }, "original": { @@ -356,11 +356,11 @@ ] }, "locked": { - "lastModified": 1718139168, - "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=", + "lastModified": 1719243788, + "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1", + "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 95412d0..8a80b3d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,7 @@ description = "System configurations"; inputs = { - # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs.url = - "github:nixos/nixpkgs/b17538d34de26bf52626a9caff104a267abd991a"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -23,44 +21,41 @@ }; }; - outputs = - { self, nixpkgs, home-manager, nixvim, sops-nix, plasma-manager }@inputs: { - nixosConfigurations = { - totsugeki = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./common/nixos.nix - ./hosts/totsugeki/nixos - ./hosts/greatyamada/services/minecraft - sops-nix.nixosModules.sops - home-manager.nixosModules.home-manager - { - home-manager = { - backupFileExtension = "bak"; - useUserPackages = true; - users.avery = { - imports = [ - nixvim.homeManagerModules.nixvim - plasma-manager.homeManagerModules.plasma-manager - ./common/home.nix - ./common/zsh - ./hosts/totsugeki/home-manager - ]; - }; + outputs = { self, nixpkgs, ... }@inputs: { + nixosConfigurations = { + totsugeki = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./common/nixos.nix + ./hosts/totsugeki/nixos + inputs.sops-nix.nixosModules.sops + inputs.home-manager.nixosModules.home-manager + { + home-manager = { + backupFileExtension = "bak"; + useUserPackages = true; + users.avery = { + imports = [ + inputs.nixvim.homeManagerModules.nixvim + inputs.plasma-manager.homeManagerModules.plasma-manager + ./common/home.nix + ./common/zsh + ./hosts/totsugeki/home-manager + ]; }; - } - ]; - specialArgs = { inherit inputs; }; - }; - greatyamada = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./common/nixos.nix - ./hosts/greatyamada/nixos.nix - ./hosts/greatyamada/services - sops-nix.nixosModules.sops - ]; - }; + }; + } + ]; + }; + greatyamada = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./common/nixos.nix + ./hosts/greatyamada/nixos.nix + ./hosts/greatyamada/services + inputs.sops-nix.nixosModules.sops + ]; }; }; + }; }