diff --git a/flake.nix b/flake.nix index f3ae302..b9c08ba 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,18 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; flake-parts.url = "github:hercules-ci/flake-parts"; import-tree.url = "github:vic/import-tree"; + nix-easyroam = { + url = "github:0x5a4/nix-easyroam"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixcord = { + url = "github:4evy/nixcord"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + agenix = { + url = "github:ryantm/agenix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); } diff --git a/modules/default.nix b/modules/default.nix index 60f5108..9808457 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -3,6 +3,7 @@ modules = with self.nixosModules; [ user packages + /etc/nixos/hardware-configuration.nix ]; }; } diff --git a/modules/system/agenix/agenix.nix b/modules/system/agenix/agenix.nix new file mode 100644 index 0000000..562e055 --- /dev/null +++ b/modules/system/agenix/agenix.nix @@ -0,0 +1,17 @@ +{ ... }: { + flake.nixosModules = + { config, ... }: + let + main = "age17hvac3hn79mwttel9snw87a20x4vguh7y7ys43xmvlhrl3mqs3wswuzlt6"; + in + { + "easyroam.age".publicKeys = [ main ]; + age = { + enable = true; + identityPaths = [ "/var/lib/misc/key.age" ]; + secrets = { + easyroam.file = ./easyroam.age; + }; + }; + }; +} diff --git a/modules/system/agenix/easyroam.age b/modules/system/agenix/easyroam.age new file mode 100644 index 0000000..e91d869 Binary files /dev/null and b/modules/system/agenix/easyroam.age differ diff --git a/modules/system/packages.nix b/modules/system/packages.nix index 937dd04..4e2b312 100644 --- a/modules/system/packages.nix +++ b/modules/system/packages.nix @@ -1,5 +1,6 @@ { ... }: { flake.nixosModules.packages = { pkgs, ... }: { + nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ stow ufetch @@ -31,7 +32,7 @@ clang gdb gnumake - libreoffice-stable + libreoffice ripgrep jq nmgui diff --git a/modules/system/user.nix b/modules/system/user.nix index 89a1cef..845c136 100644 --- a/modules/system/user.nix +++ b/modules/system/user.nix @@ -1,9 +1,8 @@ { ... }: { - flake.nixosModule.user = { pkgs, ... }: { + flake.nixosModules.user = { pkgs, ... }: { users.users."lucy" = { isNormalUser = true; description = "lucy"; - shell = pkgs.zsh; extraGroups = [ "networkmanager" "wheel" diff --git a/result b/result new file mode 120000 index 0000000..e523bb5 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/3lkm1mz19agygph7bmav1qf9k3jx97mx-nixos-vm \ No newline at end of file