diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ce6ac91 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +secrets.nix diff --git a/flake.lock b/flake.lock index 32fa502..ec1bbd8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "agenix": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "systems": "systems" + }, + "locked": { + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "owner": "ryantm", + "repo": "agenix", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -97,6 +118,28 @@ "type": "github" } }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -223,7 +266,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1726560853, @@ -340,6 +383,27 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -359,7 +423,7 @@ "type": "github" } }, - "home-manager_2": { + "home-manager_3": { "inputs": { "nixpkgs": [ "nvim", @@ -383,7 +447,7 @@ }, "hypr-contrib": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1725551787, @@ -436,9 +500,9 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -515,8 +579,8 @@ "inputs": { "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_3", - "systems": "systems_2" + "nixpkgs": "nixpkgs_4", + "systems": "systems_3" }, "locked": { "lastModified": 1727732210, @@ -656,11 +720,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -715,6 +779,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1728018373, "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", @@ -730,7 +810,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1727122398, "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", @@ -746,7 +826,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1728492678, "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", @@ -762,7 +842,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1727348695, "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", @@ -778,7 +858,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1726937504, "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", @@ -800,7 +880,7 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", "nixpkgs": [ "nvim", @@ -849,7 +929,7 @@ "nvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixvim": "nixvim", "pre-commit-hooks": "pre-commit-hooks_2" }, @@ -914,15 +994,16 @@ }, "root": { "inputs": { + "agenix": "agenix", "catppuccin-bat": "catppuccin-bat", "catppuccin-cava": "catppuccin-cava", "catppuccin-starship": "catppuccin-starship", "catppuccin-yazi": "catppuccin-yazi", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "hypr-contrib": "hypr-contrib", "hyprland": "hyprland", "hyprpicker": "hyprpicker", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvim": "nvim", "spicetify-nix": "spicetify-nix", "toilet": "toilet" @@ -936,11 +1017,11 @@ ] }, "locked": { - "lastModified": 1728620224, - "narHash": "sha256-YfiNICuQO/+HheUQ9P9ijFOzQpiC7YmotA0W28fbRbE=", + "lastModified": 1728706579, + "narHash": "sha256-uMa7cC1F2m7DHGOT5yQ1ZoUFVWxsnZDBi9VXwOgnhqw=", "owner": "gerg-l", "repo": "spicetify-nix", - "rev": "b4702ed0b3d634367e28c4d042bd1fd3fb29b692", + "rev": "59aa525938e501bdacad3753034e864a426b66f5", "type": "github" }, "original": { @@ -951,16 +1032,16 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -980,6 +1061,21 @@ } }, "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -996,7 +1092,7 @@ }, "toilet": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1728587838, diff --git a/flake.nix b/flake.nix index 08122ee..a32dc78 100644 --- a/flake.nix +++ b/flake.nix @@ -38,12 +38,14 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + agenix.url = "github:ryantm/agenix"; + #glasshouse-desktop dots nvim.url = "path:/home/pagedmov/sysflakes/glasshouse-desktop/home/nixvim"; toilet.url = "path:/home/pagedmov/sysflakes/glasshouse-desktop/home/toilet"; }; - outputs = { nixpkgs, home-manager, self, nvim, toilet, ... }@inputs: + outputs = { nixpkgs, home-manager, self, agenix, nvim, toilet, ... }@inputs: let system = "x86_64-linux"; username = "pagedmov"; @@ -58,7 +60,10 @@ inherit self inputs allowed-unfree-packages username; }; inherit system; - modules = [ ./glasshouse-desktop/sys ]; + modules = [ + ./glasshouse-desktop/sys + agenix.nixosModules.default + ]; }; }; }; diff --git a/glasshouse-desktop/home/default.nix b/glasshouse-desktop/home/default.nix index b1f7b8c..fd22530 100644 --- a/glasshouse-desktop/home/default.nix +++ b/glasshouse-desktop/home/default.nix @@ -17,5 +17,5 @@ ++ [ (import ./userpkgs.nix) ] ++ [ (import ./waybar) ] ++ [ (import ./eza.nix) ] - ++ [ (import ./zshell.nix) ]; + ++ [ (import ./zshell.nix) ]; } diff --git a/glasshouse-desktop/sys/packages.nix b/glasshouse-desktop/sys/packages.nix index a19b947..aecbf92 100644 --- a/glasshouse-desktop/sys/packages.nix +++ b/glasshouse-desktop/sys/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { environment.systemPackages = with pkgs; [ @@ -67,5 +67,6 @@ wine wl-clipboard xpad + libnotify ]; } diff --git a/glasshouse-desktop/sys/users.nix b/glasshouse-desktop/sys/users.nix index 4284253..60c27e1 100644 --- a/glasshouse-desktop/sys/users.nix +++ b/glasshouse-desktop/sys/users.nix @@ -1,4 +1,4 @@ -{ inputs, pkgs, username, ... }: +{ config, inputs, pkgs, username, ... }: { imports = [ inputs.home-manager.nixosModules.home-manager ];