diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..8aa56c9 --- /dev/null +++ b/.envrc @@ -0,0 +1,5 @@ +use flake + +if [ -f .env ]; then + dotenv .env +fi \ No newline at end of file diff --git a/.gitignore b/.gitignore index 305a9ce..14dd60d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .nobackup +.direnv/ diff --git a/flake.nix b/flake.nix index 81242a0..b71e3a1 100644 --- a/flake.nix +++ b/flake.nix @@ -74,9 +74,7 @@ devShells.${system}.default = pkgs.mkShell { buildInputs = with pkgs; [ - cmake - pkg-config - meson + lazygit agenix.packages.${system}.agenix colmena.packages.${system}.colmena ]; diff --git a/hosts/colmena/default.nix b/hosts/colmena/default.nix index 9618a4f..a40ae2c 100644 --- a/hosts/colmena/default.nix +++ b/hosts/colmena/default.nix @@ -45,6 +45,8 @@ in programs = { + direnv.enable = true; + # For VSCode Remote Development nix-ld.enable = true; diff --git a/hosts/default.nix b/hosts/default.nix index a7f2328..ee00f60 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -67,18 +67,18 @@ in # # specialArgs = { }; # }; - baseLXC = nixpkgs.lib.nixosSystem { - pkgs = pkgs "x86_64-linux"; - modules = [ - nodeBaseModules - proxmoxModule - ./base-lxc.nix - agenix.nixosModules.default - ]; - specialArgs = { - inherit self; - }; - }; + # baseLXC = nixpkgs.lib.nixosSystem { + # pkgs = pkgs "x86_64-linux"; + # modules = [ + # nodeBaseModules + # proxmoxModule + # ./base-lxc.nix + # agenix.nixosModules.default + # ]; + # specialArgs = { + # inherit self; + # }; + # }; arr = nixpkgs.lib.nixosSystem { pkgs = pkgs "x86_64-linux"; @@ -157,7 +157,7 @@ in # specialArgs = { }; }; - authentik = nixpkgs.lib.nixosSystem { + authentik = nixpkgs-unstable.lib.nixosSystem { pkgs = pkgs-unstable "x86_64-linux"; modules = [ nodeBaseModules diff --git a/hosts/deployments.nix b/hosts/deployments.nix index 665d4a7..5de76a4 100644 --- a/hosts/deployments.nix +++ b/hosts/deployments.nix @@ -5,9 +5,11 @@ let in { meta = { + # Configuration used by colmena to build nixpkgs = import inputs.nixpkgs { system = "x86_64-linux"; overlays = [ ]; + config.allowUnfree = true; }; nodeNixpkgs = builtins.mapAttrs (_: v: v.pkgs) inputs.self.nixosConfigurations; nodeSpecialArgs = builtins.mapAttrs (_: v: v._module.specialArgs) inputs.self.nixosConfigurations;