diff --git a/.github/workflows/nixos.yml b/.github/workflows/nixos.yml index a8f8948..a69769e 100644 --- a/.github/workflows/nixos.yml +++ b/.github/workflows/nixos.yml @@ -19,7 +19,7 @@ jobs: name: 0x76-infra authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - - name: "Check NixOS Flake ❄️" + - name: "Build NixOS ISO ❄️" run: | nix build '.#iso' - uses: actions/upload-artifact@v3 diff --git a/nixos/common/users/default.nix b/nixos/common/users/default.nix index e782347..d004e5f 100644 --- a/nixos/common/users/default.nix +++ b/nixos/common/users/default.nix @@ -47,6 +47,7 @@ helix htop ncdu + psmisc ripgrep rsync zoxide diff --git a/nixos/hosts/olympus/bastion/configuration.nix b/nixos/hosts/olympus/bastion/configuration.nix index c79003f..af23838 100644 --- a/nixos/hosts/olympus/bastion/configuration.nix +++ b/nixos/hosts/olympus/bastion/configuration.nix @@ -34,7 +34,7 @@ in { # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "21.05"; # Did you read the comment? + system.stateVersion = "22.11"; # Did you read the comment? virtualisation.podman = { enable = true; diff --git a/nixos/util.nix b/nixos/util.nix index ed5cbfc..ce8649b 100644 --- a/nixos/util.nix +++ b/nixos/util.nix @@ -10,10 +10,10 @@ let import_cases = { "lxc" = [ "${nixpkgs}/nixos/modules/virtualisation/lxc-container.nix" - ./nixos/common/generic-lxc.nix + ./common/generic-lxc.nix ]; "vm" = [ - ./nixos/common/generic-vm.nix + ./common/generic-vm.nix ]; "local" = [ home-manager.nixosModules.home-manager @@ -23,8 +23,8 @@ let in { hostname, realm, profile ? hostname, type ? "lxc", ... }: [ mailserver.nixosModules.mailserver - ./nixos/common - "${./.}/nixos/hosts/${realm}/${profile}/configuration.nix" + ./common + "${./.}/hosts/${realm}/${profile}/configuration.nix" ] ++ import_cases.${type}; in {