Add assertion that zsh is installed if we set it as our default shell

build-iso.sh

@@ -3,4 +3,9 @@
 echo "Building ISO ..."
 nix build .#nixosConfigurations.live.config.system.build.isoImage
 
+if [ $? -ne 0 ]; then
+    echo "Failed to build ISO"
+    exit 1
+fi
+
 echo "Done!"

flake.lock

@@ -37,11 +37,11 @@
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1748408240,
-        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
+        "lastModified": 1752979451,
+        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
+        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749398372,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "lastModified": 1751413152,
+        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
         "type": "github"
       },
       "original": {
@@ -123,16 +123,16 @@
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "lastModified": 1744584021,
-        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
+        "lastModified": 1748186689,
+        "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
+        "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
         "type": "github"
       },
       "original": {
         "owner": "GNOME",
-        "ref": "48.1",
+        "ref": "48.2",
         "repo": "gnome-shell",
         "type": "github"
       }
@@ -144,16 +144,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1753479839,
-        "narHash": "sha256-E/rPVh7vyPMJUFl2NAew+zibNGfVbANr8BP8nLRbLkQ=",
+        "lastModified": 1755755322,
+        "narHash": "sha256-spCxkNihCk3uT3LUrUwzdEAjLA/E0EtEgF3KVI05nlM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0b9bf983db4d064764084cd6748efb1ab8297d1e",
+        "rev": "282b4c98de97da6667cb03de4f427371734bc39c",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -176,16 +176,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1753345091,
-        "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
+        "lastModified": 1755615617,
+        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
+        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -199,15 +199,14 @@
         "nixpkgs": [
           "stylix",
           "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
+        ]
       },
       "locked": {
-        "lastModified": 1751320053,
-        "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=",
+        "lastModified": 1751906969,
+        "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670",
+        "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25",
         "type": "github"
       },
       "original": {
@@ -245,16 +244,16 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1753733105,
-        "narHash": "sha256-zxAiwoYqjesNbV46vGZe9ONvazQDPswnHfhsvvzqkU4=",
+        "lastModified": 1755708361,
+        "narHash": "sha256-RmqBx2EamhIk0WVhQSNb8iehaVhilO7D0YAnMoFPqJQ=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "8340949b7cba126b6939ae588e6619f8e23bba9d",
+        "rev": "2355da455d7188228aaf20ac16ea9386e5aa6f0c",
         "type": "github"
       },
       "original": {
         "owner": "danth",
-        "ref": "release-25.05",
+        "ref": "master",
         "repo": "stylix",
         "type": "github"
       }
@@ -354,28 +353,6 @@
         "repo": "base16-zed",
         "type": "github"
       }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -2,13 +2,13 @@
   description = "NixOS configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     stylix = {
-      url = "github:danth/stylix/release-25.05";
+      url = "github:danth/stylix/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

hosts/vm/default.nix

@@ -23,7 +23,7 @@
   modules.displayManager.displayManager = "gdm";
 
   modules.zsh.enable = true;
-  modules.shell.defaultShell = "bash";
+  modules.shell.defaultShell = "zsh";
 
   modules.pipewire.enable = true;
 }

modules/core/fonts.nix

@@ -1,4 +1,5 @@
 {
+  config,
   pkgs,
   ...
 }:
@@ -10,6 +11,8 @@
       montserrat
       nerd-fonts.jetbrains-mono
       noto-fonts-emoji
-    ];
+    ] ++ (if config.modules.zsh.enable
+            then [ nerd-fonts.meslo-lg ]
+          else []);
   };
 }

modules/core/gdm.nix

@@ -9,7 +9,7 @@ let
 in
 {
   config = mkIf (cfg.displayManager == "gdm") {
-    services.xserver.displayManager.gdm = {
+    services.displayManager.gdm = {
       enable = true;
       wayland = true;
     };

modules/home/hyprland/hyprland.nix

@@ -1,5 +1,4 @@
 {
-  config,
   host,
   lib,
   osConfig,

modules/home/kitty.nix

@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   osConfig,
   pkgs,
@@ -6,13 +7,18 @@
 }:
 with lib;
 let
-  cfg  = osConfig.modules.hyprland;
+  hyprlandCfg = osConfig.modules.hyprland;
+  zshCfg = osConfig.modules.zsh;
 in
 {
-  config = mkIf (cfg.terminal == "kitty") {
+  config = mkIf (hyprlandCfg.terminal == "kitty") {
     programs.kitty = {
       enable = true;
       package = pkgs.kitty;
+      font = {
+        name = mkIf (zshCfg.enable) (mkForce "MesloLGS Nerd Font");
+        package = mkIf (zshCfg.enable) (mkForce pkgs.nerd-fonts.meslo-lg);
+      };
       settings = {
         scrollback_lines = 10000;
         shell_integration = true;

modules/home/zsh/default.nix

@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   osConfig,
   pkgs,
@@ -8,14 +9,16 @@
 with lib;
 let
   cfg = osConfig.modules.zsh;
+  xdgCfg = config.xdg;
 in
 {
   imports = [
-    ./zshrc-personal.nix
+    ./p10k.nix
   ];
 
   programs.zsh = {
     enable = cfg.enable;
+    dotDir = "${xdgCfg.configHome}/zsh";
     autosuggestion.enable = true;
     syntaxHighlighting = {
       enable = true;
@@ -27,7 +30,6 @@ in
       ];
     };
     historySubstringSearch.enable = true;
-
     history = {
       ignoreDups = false;
       save = 100000;
@@ -35,6 +37,9 @@ in
     };
 
     initContent = ''
+      # p10k
+      source "${xdgCfg.configHome}/zsh/p10k.zsh";
+
       # vi keybindings for menu select
       bindkey -M menuselect 'h' vi-backward-char
       bindkey -M menuselect 'k' vi-up-line-or-history
@@ -55,5 +60,13 @@ in
       gs = "git status";
       ssha = "eval $(ssh-agent) && ssh-add";
     };
+
+    plugins = [
+      {
+        name = "powerlevel10k";
+        src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/";
+        file = "powerlevel10k.zsh-theme";
+      }
+    ];
   };
 }

modules/home/zsh/p10k.nix

@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  osConfig,
+  pkgs,
+  ...
+}:
+with lib;
+let
+  cfg = osConfig.modules.zsh;
+  xdgCfg = config.xdg;
+in
+{
+  config = mkIf cfg.enable {
+    home.file."${xdgCfg.configHome}/zsh/p10k.zsh" = {
+      source = ./p10k.zsh;
+    };
+  };
+}

modules/home/zsh/zshrc-personal.nix

@@ -1,19 +0,0 @@
-{
-  lib,
-  osConfig,
-  pkgs,
-  ...
-}:
-with lib;
-let
-  cfg = osConfig.modules.zsh;
-in
-{
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [ zsh ];
-
-    home.file."./.zshrc-personal".text = ''
-      export EDITOR=vim
-    '';
-  };
-}

modules/options/shell.nix

@@ -6,6 +6,7 @@
 with lib;
 let
   cfg = config.modules.shell;
+  zshCfg = config.modules.zsh;
 in
 {
   options.modules.shell = {
@@ -20,4 +21,12 @@ in
       '';
     };
   };
+
+  config.assertions = []
+    ++ (if cfg.defaultShell == "zsh"
+          then [{
+            assertion = zshCfg.enable;
+            message = "You have selected zsh as the default shell, but you haven't enabled it in your configuration.\n\nPlease enable it by adding `modules.zsh.enable = true`.";
+          }]
+        else []);
 }

modules/options/zsh.nix

@@ -10,7 +10,7 @@ in
 {
   options.modules.zsh = {
     enable = mkEnableOption {
-      description = "Install ZSH";
+      description = "Install Zsh";
       default = true;
     };
   };

rebuild.sh

@@ -6,4 +6,9 @@ rm -f ./vm.qcow2
 echo "Building new VM ..."
 nix build .#nixosConfigurations.nixosvm.config.system.build.vm
 
+if [ $? -ne 0 ]; then
+    echo "Failed to build VM"
+    exit 1
+fi
+
 echo "Done!"