Update README.md

.vscode/settings.json

@@ -0,0 +1,43 @@
+{
+    // Nix settings
+    "nix.enableLanguageServer": true,
+    "nix.serverPath": "nixd",
+    "nix.serverSettings": {
+        "nil": {
+            "formatting": {
+                "command": ["nix fmt"]
+            },
+            "nix": {
+                "flake": {
+                    "maxMemoryMB": 16384,
+                    "autoEvalInputs": true,
+                    "nixpkgsInputName": "nixpkgs"
+                }
+            }
+        },
+        "nixd": {
+            "nixpkgs": {
+                "expr": "import (builtins.getFlake (builtins.toString ./.)).inputs.nixpkgs { }"
+            },
+            "formatting": {
+                "command": [
+                    "nix fmt"
+                ]
+            },
+            "options": {
+                "nixos": {
+                    "expr": "(builtins.getFlake (builtins.toString ./.)).nixosConfigurations.nixos.options"
+                },
+                "nixos-home-manager": {
+                    "expr": "(builtins.getFlake (builtins.toString ./.)).nixosConfigurations.nixos.options.home-manager.users.type.getSubOptions []"
+                },
+                // "home-manager": {
+                //     "expr": "(builtins.getFlake (builtins.toString ./)).homeConfigurations.<name>.options"
+                // }
+            }
+        }
+    },
+    "nixEnvSelector.useFlakes": true,
+    "nixEnvSelector.suggestion": true,
+    "nixEnvSelector.nixFile": "${workspaceFolder}/flake.nix",
+}

README.md

@@ -16,3 +16,16 @@ https://gist.github.com/FlakM/0535b8aa7efec56906c5ab5e32580adf
 
 # Building NixOS ISO
 `nix build .#nixosConfigurations.live.config.system.build.isoImage`
+
+# Misc
+## Garbage collection
+`nix-collect-garbage -d`
+## Fonts
+### Checking installed fonts
+`fc-list`
+### Debugging kitty fonts
+`kitty --debug-font-fallback`
+
+## SDDM virtual keyboard ??ZZ
+- https://unix.stackexchange.com/questions/43976/list-all-valid-kbd-layouts-variants-and-toggle-options-to-use-with-setxkbmap
+- https://github.com/NixOS/nixpkgs/issues/254523

flake.nix

@@ -18,12 +18,20 @@
     };
   };
 
-  outputs = { nixpkgs, home-manager, install-system, ... } @ inputs: let
+  outputs =
+    {
+      nixpkgs,
+      home-manager,
+      install-system,
+      ...
+    }@inputs:
+    let
       system = "x86_64-linux";
       host = "vm";
       profile = "vm";
       username = "josh";
-  in {
+    in
+    {
       nixosConfigurations = {
         nixos = nixpkgs.lib.nixosSystem {
           inherit system;
@@ -66,5 +74,14 @@
           ];
         };
       };
+
+      devShell.${system} = nixpkgs.legacyPackages.${system}.pkgs.mkShell {
+        packages = with nixpkgs.legacyPackages.${system}.pkgs; [
+          nil
+          nixd
+        ];
+      };
+
+      formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-tree;
     };
 }

modules/core/firefox.nix

@@ -14,8 +14,13 @@ in
   };
 
   # Add wayland screensharing support if PipeWire is enabled
-  environment.systemPackages = with pkgs; []
+  environment.systemPackages =
-    ++ (if pipewireCfg.enable
+    with pkgs;
-          then [ (wrapFirefox (firefox-unwrapped.override { pipewireSupport = true; }) {}) ]
+    [ ]
-        else [ firefox ]);
+    ++ (
+      if pipewireCfg.enable then
+        [ (wrapFirefox (firefox-unwrapped.override { pipewireSupport = true; }) { }) ]
+      else
+        [ firefox ]
+    );
 }

modules/core/fonts.nix

@@ -6,13 +6,14 @@
 {
   fonts = {
     fontconfig.enable = true;
-    packages = with pkgs; [
+    packages =
+      with pkgs;
+      [
         font-awesome
         montserrat
         nerd-fonts.jetbrains-mono
         noto-fonts-emoji
-    ] ++ (if config.modules.zsh.enable
+      ]
-            then [ nerd-fonts.meslo-lg ]
+      ++ (if config.modules.zsh.enable then [ nerd-fonts.meslo-lg ] else [ ]);
-          else []);
   };
 }

modules/core/network.nix

@@ -1,5 +1,4 @@
 {
-  config,
   host,
   pkgs,
   ...

modules/core/packages.nix

@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   ...
 }:

modules/core/sddm.nix

@@ -18,6 +18,8 @@ in
     };
 
     # To prevent getting stuck at shutdown
-    systemd.extraConfig = "DefaultTimeoutStopSec=10s";
+    systemd.settings.Manager = {
+      DefaultTimeoutStopSec = "10s";
+    };
   };
 }

modules/core/system.nix

@@ -1,9 +1,7 @@
 {
   config,
-  lib,
   ...
 }:
-with lib;
 let
   cfg = config.system;
 in

modules/core/user.nix

@@ -2,13 +2,11 @@
   config,
   host,
   inputs,
-  lib,
   pkgs,
   profile,
   username,
   ...
 }:
-with lib;
 let
   shellCfg = config.modules.shell;
 in
@@ -18,7 +16,14 @@ in
     useUserPackages = true;
     useGlobalPkgs = false;
     backupFileExtension = "backup";
-    extraSpecialArgs = { inherit host inputs profile username; };
+    extraSpecialArgs = {
+      inherit
+        host
+        inputs
+        profile
+        username
+        ;
+    };
     users.${username} = {
       imports = [ ./../home ];
       home = {
@@ -39,10 +44,13 @@ in
     ];
     shell = pkgs.${shellCfg.defaultShell};
     ignoreShellProgramCheck = true;
+    packages = with pkgs; [
+      fzf
+    ];
   };
 
   # Set /etc/shells so GDM will show our user when ZSH is selected
-  environment.shells = with pkgs; [ pkgs.${shellCfg.defaultShell} ];
+  environment.shells = [ pkgs.${shellCfg.defaultShell} ];
 
   nix.settings.allowed-users = [ "${username}" ];
 }

modules/drivers/vm-guest-services.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib;

modules/home/default.nix

@@ -1,5 +1,4 @@
 {
-  host,
   ...
 }:
 {

modules/home/hyprland/binds.nix

@@ -1,9 +1,7 @@
 {
-  lib,
   osConfig,
   ...
 }:
-with lib;
 let
   cfg = osConfig.modules.hyprland;
 in

modules/home/hyprland/hyprland.nix

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

modules/home/kitty.nix

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

modules/home/xdg.nix

@@ -1,10 +1,8 @@
 {
-  lib,
   osConfig,
   pkgs,
   ...
 }:
-with lib;
 let
   hyprlandCfg = osConfig.modules.hyprland;
   pipewireCfg = osConfig.modules.pipewire;
@@ -17,27 +15,31 @@ in
     mimeApps.enable = true;
     portal = {
       enable = true;
-      extraPortals = []
+      extraPortals =
-        ++ (if hyprlandCfg.enable
+        [ ]
-              then [ pkgs.xdg-desktop-portal-hyprland ]
+        ++ (if hyprlandCfg.enable then [ pkgs.xdg-desktop-portal-hyprland ] else [ ])
-            else [])
+        ++ (
-        ++ (if pipewireCfg.enable
+          if pipewireCfg.enable then
-              then [
+            [
               pkgs.xdg-desktop-portal-wlr
               pkgs.xdg-desktop-portal-gtk
             ]
-            else [])
+          else
-        ++ (if plasmaCfg.enable
+            [ ]
-              then [ pkgs.kdePackages.xdg-desktop-portal-kde ]
+        )
-            else []);
+        ++ (if plasmaCfg.enable then [ pkgs.kdePackages.xdg-desktop-portal-kde ] else [ ]);
-      configPackages = []
+      configPackages =
-        ++ (if hyprlandCfg.enable
+        [ ]
-              then [ pkgs.hyprland ]
+        ++ (if hyprlandCfg.enable then [ pkgs.hyprland ] else [ ])
-            else [])
+        ++ (
-        ++ (if plasmaCfg.enable
+          if
+            plasmaCfg.enable
           # TODO: use the correct packages or config
-              then [ pkgs.kdePackages.kde-gtk-config ]
+          then
-            else []);
+            [ pkgs.kdePackages.kde-gtk-config ]
+          else
+            [ ]
+        );
     };
   };
 }

modules/home/zsh/default.nix

@@ -1,12 +1,9 @@
 {
   config,
-  lib,
   osConfig,
   pkgs,
-  profile,
   ...
 }:
-with lib;
 let
   cfg = osConfig.modules.zsh;
   xdgCfg = config.xdg;
@@ -19,7 +16,8 @@ in
   programs.zsh = {
     enable = cfg.enable;
     dotDir = "${xdgCfg.configHome}/zsh";
-    autosuggestion.enable = true;
+    autosuggestion.enable = false;
+    enableCompletion = true;
     syntaxHighlighting = {
       enable = true;
       highlighters = [
@@ -31,9 +29,13 @@ in
     };
     historySubstringSearch.enable = true;
     history = {
+      append = true;
       ignoreDups = false;
+      ignoreSpace = true;
       save = 100000;
+      share = true;
       size = 100000;
+      extended = true;
     };
 
     initContent = ''
@@ -48,6 +50,16 @@ in
 
       # Tab to accept current selection
       bind-key -M menuselect '^I' accept-and-infer-next-history
+
+      # Control arrow keys
+      bindkey '^[[1;5C' forward-word
+      bindkey '^[[1;5D' backward-word
+
+      # Load fzf keybindings
+      if [ -n "''${commands[fzf-share]}" ]; then
+        source "$(fzf-share)/key-bindings.zsh";
+        source "$(fzf-share)/completion.zsh";
+      fi
     '';
 
     shellAliases = {

modules/home/zsh/p10k.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   osConfig,
-  pkgs,
   ...
 }:
 with lib;

modules/options/displayManager.nix

@@ -1,12 +1,8 @@
 {
-  config,
   lib,
   ...
 }:
 with lib;
-let
-  cfg = config.modules.displayManager;
-in
 {
   options.modules.displayManager = {
     displayManager = mkOption {

modules/options/hyprland.nix

@@ -1,12 +1,8 @@
 {
-  config,
   lib,
   ...
 }:
 with lib;
-let
-  cfg = config.modules.hyprland;
-in
 {
   options.modules.hyprland = {
     enable = mkEnableOption {

modules/options/pipewire.nix

@@ -1,12 +1,8 @@
 {
-  config,
   lib,
   ...
 }:
 with lib;
-let
-  cfg = config.modules.pipewire;
-in
 {
   options.modules.pipewire = {
     enable = mkEnableOption {

modules/options/plasma.nix

@@ -1,12 +1,8 @@
 {
-  config,
   lib,
   ...
 }:
 with lib;
-let
-  cfg = config.modules.plasma;
-in
 {
   options.modules.plasma = {
     enable = mkEnableOption {

modules/options/shell.nix

@@ -22,11 +22,17 @@ in
     };
   };
 
-  config.assertions = []
+  config.assertions =
-    ++ (if cfg.defaultShell == "zsh"
+    [ ]
-          then [{
+    ++ (
+      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 []);
+        ]
+      else
+        [ ]
+    );
 }

modules/options/system.nix

@@ -1,12 +1,8 @@
 {
-  config,
   lib,
   ...
 }:
 with lib;
-let
-  cfg = config.system;
-in
 {
   options.system = {
     locale = mkOption {

modules/options/zsh.nix

@@ -1,12 +1,8 @@
 {
-  config,
   lib,
   ...
 }:
 with lib;
-let
-  cfg = config.modules.zsh;
-in
 {
   options.modules.zsh = {
     enable = mkEnableOption {

scripts/_template/flake.nix

@@ -5,7 +5,9 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
   };
 
-  outputs = { self, nixpkgs, ... }: let
+  outputs =
+    { nixpkgs, ... }:
+    let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system}.pkgs;
       name = builtins.baseNameOf (builtins.toString ./.);
@@ -20,7 +22,8 @@
           unixtools.column
         ];
       };
-  in {
+    in
+    {
       packages.${system}.default = shellApplication;
 
       devShells.${system}.default = pkgs.mkShell {

scripts/install-system/flake.nix

@@ -5,7 +5,9 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
   };
 
-  outputs = { self, nixpkgs, ... }: let
+  outputs =
+    { nixpkgs, ... }:
+    let
       pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
       name = builtins.baseNameOf (builtins.toString ./.);
       shellApplication = pkgs.writeShellApplication {
@@ -19,7 +21,8 @@
           unixtools.column
         ];
       };
-  in {
+    in
+    {
       packages.x86_64-linux.default = shellApplication;
 
       devShells.x86_64-linux.default = pkgs.mkShell {