.vscode/settings.json

@@ -1,43 +0,0 @@
-{
-    // 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,16 +16,3 @@ 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,20 +18,12 @@
     };
   };
 
-  outputs =
+  outputs = { nixpkgs, home-manager, install-system, ... } @ inputs: let
-    {
-      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;
@@ -74,14 +66,5 @@
         ];
       };
     };
-
-      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,13 +14,8 @@ in
   };
 
   # Add wayland screensharing support if PipeWire is enabled
-  environment.systemPackages =
+  environment.systemPackages = with pkgs; []
-    with pkgs;
+    ++ (if pipewireCfg.enable
-    [ ]
+          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,14 +6,13 @@
 {
   fonts = {
     fontconfig.enable = true;
-    packages =
+    packages = with pkgs; [
-      with pkgs;
-      [
       font-awesome
       montserrat
       nerd-fonts.jetbrains-mono
       noto-fonts-emoji
-      ]
+    ] ++ (if config.modules.zsh.enable
-      ++ (if config.modules.zsh.enable then [ nerd-fonts.meslo-lg ] else [ ]);
+            then [ nerd-fonts.meslo-lg ]
+          else []);
   };
 }

modules/core/network.nix

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

modules/core/packages.nix

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

modules/core/sddm.nix

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

modules/core/system.nix

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

modules/core/user.nix

@@ -2,11 +2,13 @@
   config,
   host,
   inputs,
+  lib,
   pkgs,
   profile,
   username,
   ...
 }:
+with lib;
 let
   shellCfg = config.modules.shell;
 in
@@ -16,14 +18,7 @@ in
     useUserPackages = true;
     useGlobalPkgs = false;
     backupFileExtension = "backup";
-    extraSpecialArgs = {
+    extraSpecialArgs = { inherit host inputs profile username; };
-      inherit
-        host
-        inputs
-        profile
-        username
-        ;
-    };
     users.${username} = {
       imports = [ ./../home ];
       home = {
@@ -44,13 +39,10 @@ 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 = [ pkgs.${shellCfg.defaultShell} ];
+  environment.shells = with pkgs; [ pkgs.${shellCfg.defaultShell} ];
 
   nix.settings.allowed-users = [ "${username}" ];
 }

modules/drivers/vm-guest-services.nix

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

modules/home/default.nix

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

modules/home/hyprland/binds.nix

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

modules/home/hyprland/hyprland.nix

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

modules/home/kitty.nix

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

modules/home/xdg.nix

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

modules/home/zsh/default.nix

@@ -1,9 +1,12 @@
 {
   config,
+  lib,
   osConfig,
   pkgs,
+  profile,
   ...
 }:
+with lib;
 let
   cfg = osConfig.modules.zsh;
   xdgCfg = config.xdg;
@@ -16,8 +19,7 @@ in
   programs.zsh = {
     enable = cfg.enable;
     dotDir = "${xdgCfg.configHome}/zsh";
-    autosuggestion.enable = false;
+    autosuggestion.enable = true;
-    enableCompletion = true;
     syntaxHighlighting = {
       enable = true;
       highlighters = [
@@ -29,13 +31,9 @@ in
     };
     historySubstringSearch.enable = true;
     history = {
-      append = true;
       ignoreDups = false;
-      ignoreSpace = true;
       save = 100000;
-      share = true;
       size = 100000;
-      extended = true;
     };
 
     initContent = ''
@@ -50,16 +48,6 @@ 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,6 +2,7 @@
   config,
   lib,
   osConfig,
+  pkgs,
   ...
 }:
 with lib;

modules/options/displayManager.nix

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

modules/options/hyprland.nix

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

modules/options/pipewire.nix

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

modules/options/plasma.nix

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

modules/options/shell.nix

@@ -22,17 +22,11 @@ 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,8 +1,12 @@
 {
+  config,
   lib,
   ...
 }:
 with lib;
+let
+  cfg = config.system;
+in
 {
   options.system = {
     locale = mkOption {

modules/options/zsh.nix

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

scripts/_template/flake.nix

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

scripts/install-system/flake.nix

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