diff --git a/nix/configurations/installer.nix b/nix/configurations/installer.nix index 3c731a47..ae25499f 100644 --- a/nix/configurations/installer.nix +++ b/nix/configurations/installer.nix @@ -1,57 +1,54 @@ -let - self = import ../../default.nix {}; - # - # Note: - # I could've import the wifi configuration and use it here, but I haven't - # figured out an elegant (enough) way to do it while keeping my secrets - # encrypted. - # -in - { - pkgs, - modulesPath, - ... - }: { - imports = [ - ../nixosModules/common/system-nixconf.nix - ../nixosModules/extra/layouts +# +# Note: +# I could've import the wifi configuration and use it here, but I haven't +# figured out an elegant (enough) way to do it while keeping my secrets +# encrypted. +# +{ + pkgs, + modulesPath, + ... +}: { + imports = [ + ../nixosModules/common/system-nixconf.nix + ../nixosModules/extra/layouts - (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") + (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") - # ./installer/tungsten.nix + # ./installer/tungsten.nix + ]; + + nix.settings = { + extra-substituters = ["https://leana8959.cachix.org"]; + extra-trusted-substituters = ["https://leana8959.cachix.org"]; + extra-trusted-public-keys = ["leana8959.cachix.org-1:CxQSAp8lcgMv8Me459of0jdXRW2tcyeYRKTiiUq8z0M="]; + experimental-features = ["nix-command" "flakes"]; + }; + + nixpkgs = { + overlays = map import [ + ../overlays/agenix.nix + ../overlays/disko.nix + ../overlays/nur.nix + ../overlays/nix-tree.nix + + ../packages/overlay.nix ]; + }; - nix.settings = { - extra-substituters = ["https://leana8959.cachix.org"]; - extra-trusted-substituters = ["https://leana8959.cachix.org"]; - extra-trusted-public-keys = ["leana8959.cachix.org-1:CxQSAp8lcgMv8Me459of0jdXRW2tcyeYRKTiiUq8z0M="]; - experimental-features = ["nix-command" "flakes"]; - }; + isoImage.squashfsCompression = "zstd -Xcompression-level 3"; - nixpkgs = { - overlays = map import [ - ../overlays/agenix.nix - ../overlays/disko.nix - ../overlays/nur.nix - ../overlays/nix-tree.nix + environment.systemPackages = [ + pkgs.disko + pkgs.git + pkgs.pastebinit # for sharing cli output & debugging + pkgs.hdparm # to ATA secure wipe disks + pkgs.btop + ]; - ../packages/overlay.nix - ]; - }; + networking.firewall.allowedTCPPorts = [8080]; # in case you wanna nc - isoImage.squashfsCompression = "zstd -Xcompression-level 3"; - - environment.systemPackages = [ - pkgs.disko - pkgs.git - pkgs.pastebinit # for sharing cli output & debugging - pkgs.hdparm # to ATA secure wipe disks - pkgs.btop - ]; - - networking.firewall.allowedTCPPorts = [8080]; # in case you wanna nc - - programs.tmux.enable = true; - users.users.nixos.shell = pkgs.fish; - programs.fish.enable = true; - } + programs.tmux.enable = true; + users.users.nixos.shell = pkgs.fish; + programs.fish.enable = true; +}