refactor(modules): split monolithic system/desktop config

hosts/nanuqsaurus.nix

@@ -1,19 +1,31 @@
-{ config, pkgs, inputs, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
 
 {
   imports = [
     inputs.lix-module.nixosModules.lixFromNixpkgs
     inputs.nix-index-database.nixosModules.nix-index
     inputs.nix-flatpak.nixosModules.nix-flatpak
-    ./nanuqsaurus-hardware.nix
     ../modules/system/flatpak.nix
     ../modules/system/base.nix
     ../modules/system/packages.nix
     ../modules/system/shell.nix
     ../modules/system/home-manager-skel.nix
+    ../modules/desktop/desktop-entries.nix
+    ../modules/desktop/file-manager.nix
     ../modules/desktop/gnome-minimal.nix
     ../modules/users/admin.nix
+  ]
+  ++ lib.optionals (builtins.pathExists ./nanuqsaurus-hardware.nix) [
+    ./nanuqsaurus-hardware.nix
   ];
 
   networking.hostName = "nanuqsaurus";
+
+  system.stateVersion = "25.11";
 }

modules/desktop/desktop-entries.nix

@@ -0,0 +1,48 @@
+{ lib, pkgs, ... }:
+
+let
+  thunarDesktopOverride = pkgs.makeDesktopItem {
+    name = "thunar";
+    desktopName = "Files";
+    genericName = "File Manager";
+    tryExec = "thunar";
+    exec = "thunar %U";
+    icon = "org.xfce.thunar";
+    categories = [
+      "Utility"
+      "FileManager"
+    ];
+    mimeTypes = [ "inode/directory" ];
+    keywords = [
+      "folder"
+      "manager"
+      "explorer"
+      "files"
+    ];
+    startupNotify = true;
+    startupWMClass = "Thunar";
+    terminal = false;
+    comment = "Browse files";
+  };
+
+  ghosttyDesktopOverride = pkgs.makeDesktopItem {
+    name = "com.mitchellh.ghostty";
+    desktopName = "Terminal";
+    genericName = "Terminal Emulator";
+    exec = "ghostty";
+    icon = "com.mitchellh.ghostty";
+    categories = [
+      "System"
+      "TerminalEmulator"
+      "Utility"
+    ];
+    terminal = false;
+    comment = "Fast GPU-accelerated terminal";
+  };
+in
+{
+  environment.systemPackages = lib.mkAfter [
+    (lib.hiPrio thunarDesktopOverride)
+    (lib.hiPrio ghosttyDesktopOverride)
+  ];
+}

modules/desktop/file-manager.nix

@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+
+{
+  services.gvfs.enable = true;
+  services.tumbler.enable = true;
+
+  programs.thunar = {
+    enable = true;
+    plugins = [
+      pkgs.xfce.thunar-archive-plugin
+      pkgs.xfce.thunar-media-tags-plugin
+      pkgs.xfce.thunar-vcs-plugin
+      pkgs.xfce.thunar-volman
+    ];
+  };
+
+  programs.xfconf.enable = true;
+}

modules/desktop/gnome-minimal.nix

@@ -1,19 +1,17 @@
 { pkgs, lib, ... }:
 
 let
-  # Patched Logo Menu extension (same patch as installed system-wide).
   logoMenuExtension = pkgs.gnomeExtensions.logo-menu.overrideAttrs (old: {
-    patches = (old.patches or []) ++ [ ./patches/logo-menu-custom-menu.patch ];
+    version = "38";
+    src = pkgs.fetchzip {
+      url = "https://extensions.gnome.org/extension-data/logomenuaryan_k.v38.shell-extension.zip";
+      hash = "sha256-GdGn7YKfOOEM0kV1Gd9H5c1KKjs/+/4XCsxO2pFdqu4=";
+      stripRoot = false;
+    };
+    patches = (old.patches or [ ]) ++ [ ./patches/logo-menu-custom-menu.patch ];
   });
-
+in
-  # Expose the extension schema in the layout expected by gsettings overrides.
+{
-  logoMenuSchemas = pkgs.runCommand "logo-menu-gsettings-schemas" { } ''
-    schemaSrc="${logoMenuExtension}/share/gnome-shell/extensions/logomenu@aryan_k/schemas";
-    dest=$out/share/gsettings-schemas/logo-menu-gsettings-schemas/glib-2.0/schemas
-    mkdir -p "$dest"
-    cp -a "$schemaSrc"/*.xml "$dest"/
-  '';
-in {
   services.displayManager.gdm.enable = true;
   services.desktopManager.gnome.enable = true;
 
@@ -62,35 +60,51 @@ in {
     ];
   };
 
-  environment.gnome.excludePackages = with pkgs; [
+  environment.systemPackages = lib.mkAfter [
+    pkgs.gnome-browser-connector
+    pkgs.gnome-extension-manager
+    pkgs.mission-center
+    pkgs.papirus-icon-theme
+    pkgs.gnomeExtensions.all-in-one-clipboard
+    pkgs.gnomeExtensions.alphabetical-app-grid
+    pkgs.gnomeExtensions.app-hider
+    pkgs.gnomeExtensions.apps
+    pkgs.gnomeExtensions.blur-my-shell
+    pkgs.gnomeExtensions.caffeine
+    logoMenuExtension
+    pkgs.gnomeExtensions.places-status-indicator
+    pkgs.gnomeExtensions.restart-to
+  ];
+
+  environment.gnome.excludePackages = [
     # comment out to include
-    gnome-tour
+    pkgs.gnome-tour
-    gnome-user-docs
+    pkgs.gnome-user-docs
     # baobab                # disk usage analyzer
-    decibels              # audio player
+    pkgs.decibels # audio player
-    epiphany              # web browser
+    pkgs.epiphany # web browser
-    geary                 # email client
+    pkgs.geary # email client
     # gnome-text-editor     # text editor
     # gnome-backgrounds
-    gnome-calculator
+    pkgs.gnome-calculator
-    gnome-calendar
+    pkgs.gnome-calendar
-    gnome-characters
+    pkgs.gnome-characters
     # gnome-clocks
-    gnome-console
+    pkgs.gnome-console
-    gnome-contacts
+    pkgs.gnome-contacts
     # gnome-font-viewer
     # gnome-logs
-    gnome-maps
+    pkgs.gnome-maps
-    gnome-music
+    pkgs.gnome-music
-    gnome-system-monitor
+    pkgs.gnome-system-monitor
-    gnome-weather
+    pkgs.gnome-weather
-    loupe
+    pkgs.loupe
-    nautilus
+    pkgs.nautilus
-    papers
+    pkgs.papers
     # gnome-connections
-    showtime
+    pkgs.showtime
-    simple-scan
+    pkgs.simple-scan
-    snapshot
+    pkgs.snapshot
-    yelp
+    pkgs.yelp
   ];
 }

modules/system/base.nix

@@ -1,124 +1,13 @@
-{
+{ config, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 {
-  time.timeZone = "UTC";
+  imports = [
-
+    ./locale.nix
-  i18n.defaultLocale = "en_US.UTF-8";
+    ./boot-efi.nix
-  console.keyMap = "us";
+    ./nix-core.nix
-
+    ./services.nix
-  boot.supportedFilesystems = [
+    ./networking.nix
-    "btrfs"
+    ./virtualization.nix
-    "ext4"
+    ./security.nix
-    "vfat"
-    "xfs"
   ];
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-      # Only keep 10 generations maximum
-      configurationLimit = lib.mkDefault 10;
-    };
-    efi.canTouchEfiVariables = true;
-  };
-
-  nix.settings = {
-
-    experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
-
-    # Only allow root and sudoers to run Nix commands
-    allowed-users = [
-      "root"
-      "@wheel"
-    ];
-
-    substituters = lib.mkBefore [
-      "https://cache.lix.systems"
-    ];
-    trusted-public-keys = lib.mkBefore [
-      "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
-    ];
-  };
-
-  services = {
-    openssh.enable = true;
-    gvfs.enable = true;
-    tumbler.enable = true;
-  };
-
-  networking = {
-    useDHCP = lib.mkDefault true;
-    firewall.trustedInterfaces = [ "virbr0" ];
-  };
-
-  nixpkgs.config.allowUnfree = true;
-
-  programs = {
-    nix-index = {
-      enable = lib.mkDefault true;
-      enableBashIntegration = lib.mkDefault true;
-    };
-    nix-index-database.comma.enable = lib.mkDefault true;
-    thunar = {
-      enable = true;
-      plugins = [
-        pkgs.xfce.thunar-archive-plugin
-        pkgs.xfce.thunar-media-tags-plugin
-        pkgs.xfce.thunar-vcs-plugin
-        pkgs.xfce.thunar-volman
-      ];
-    };
-    virt-manager.enable = true;
-    xfconf.enable = true;
-  };
-
-  # Optimise the Nix store once a day
-  nix.optimise = lib.mkDefault {
-    automatic = true;
-    dates = [ "daily" ];
-  };
-
-  # Clean the Nix store once a day
-  nix.gc = lib.mkDefault {
-    automatic = true;
-    dates = "daily";
-    options = "--delete-older-than 30d";
-  };
-
-  system.stateVersion = "25.11";
-
-  virtualisation = {
-    containers.enable = true;
-    # docker.enable = true;
-    podman = {
-      enable = true;
-      dockerCompat = true;
-      # Required for containers under podman-compose to be able to talk to each other.
-      defaultNetwork.settings.dns_enabled = true;
-    };
-    libvirtd.enable = true;
-  };
-
-  security.sudo = {
-    enable = lib.mkDefault true;
-    wheelNeedsPassword = lib.mkForce false;
-  };
-
-  # Locked down root user as a default
-  users.users.root = lib.mkDefault {
-    shell = pkgs.zsh;
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-    ];
-    hashedPassword = lib.mkDefault "!";
-    initialHashedPassword = lib.mkDefault "!";
-  };
 }

modules/system/boot-efi.nix

@@ -0,0 +1,18 @@
+{ lib, ... }:
+
+{
+  boot.supportedFilesystems = [
+    "btrfs"
+    "ext4"
+    "vfat"
+    "xfs"
+  ];
+
+  boot.loader = {
+    systemd-boot = {
+      enable = true;
+      configurationLimit = lib.mkDefault 10;
+    };
+    efi.canTouchEfiVariables = true;
+  };
+}

modules/system/locale.nix

@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  time.timeZone = "UTC";
+
+  i18n.defaultLocale = "en_US.UTF-8";
+  console.keyMap = "us";
+}

modules/system/networking.nix

@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  networking.useDHCP = lib.mkDefault true;
+}

modules/system/nix-core.nix

@@ -0,0 +1,41 @@
+{ lib, ... }:
+
+{
+  nix.settings = {
+    experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
+
+    allowed-users = [
+      "root"
+      "@wheel"
+    ];
+
+    substituters = lib.mkBefore [
+      "https://cache.lix.systems"
+    ];
+    trusted-public-keys = lib.mkBefore [
+      "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
+    ];
+  };
+
+  nixpkgs.config.allowUnfree = true;
+
+  programs.nix-index = {
+    enable = lib.mkDefault true;
+    enableBashIntegration = lib.mkDefault true;
+  };
+  programs.nix-index-database.comma.enable = lib.mkDefault true;
+
+  nix.optimise = lib.mkDefault {
+    automatic = true;
+    dates = [ "daily" ];
+  };
+
+  nix.gc = lib.mkDefault {
+    automatic = true;
+    dates = "daily";
+    options = "--delete-older-than 30d";
+  };
+}

modules/system/packages.nix

@@ -1,39 +1,8 @@
 { lib, pkgs, ... }:
 
-let
+{
-  # Override Thunar desktop entry to show as "Files".
-  thunarDesktopOverride = pkgs.makeDesktopItem {
-    name = "thunar";                     # same filename to shadow upstream entry
-    desktopName = "Files";
-    genericName = "File Manager";
-    tryExec = "thunar";
-    exec = "thunar %U";
-    icon = "org.xfce.thunar";
-    categories = [ "Utility" "FileManager" ];
-    mimeTypes = [ "inode/directory" ];
-    keywords = [ "folder" "manager" "explorer" "files" ];
-    startupNotify = true;
-    startupWMClass = "Thunar";
-    terminal = false;
-    comment = "Browse files";
-  };
-
-  # Override Ghostty desktop entry to show as "Terminal".
-  ghosttyDesktopOverride = pkgs.makeDesktopItem {
-    name = "com.mitchellh.ghostty";
-    desktopName = "Terminal";
-    genericName = "Terminal Emulator";
-    exec = "ghostty";
-    icon = "com.mitchellh.ghostty";
-    categories = [ "System" "TerminalEmulator" "Utility" ];
-    terminal = false;
-    comment = "Fast GPU-accelerated terminal";
-  };
-in {
   # Baseline system tools available everywhere; users run Home Manager standalone.
   config.environment.systemPackages = lib.mkAfter [
-    (lib.hiPrio thunarDesktopOverride)
-    (lib.hiPrio ghosttyDesktopOverride)
     pkgs.distrobox
     pkgs.distroshelf
     pkgs.dnsmasq
@@ -41,34 +10,12 @@ in {
     pkgs.flatpak
     pkgs.ghostty
     pkgs.git
-    pkgs.gnome-browser-connector   # lets users install extensions from GNOME Extensions website
-    pkgs.gnome-extension-manager   # GUI to browse/install GNOME Shell extensions
-    pkgs.gnomeExtensions.all-in-one-clipboard
-    pkgs.gnomeExtensions.alphabetical-app-grid
-    pkgs.gnomeExtensions.app-hider
-    pkgs.gnomeExtensions.apps
-    pkgs.gnomeExtensions.blur-my-shell
-    pkgs.gnomeExtensions.caffeine
-    (pkgs.gnomeExtensions.logo-menu.overrideAttrs (old: {
-      # Pin extension source so our patch stays compatible.
-      version = "38";
-      src = pkgs.fetchzip {
-        url = "https://extensions.gnome.org/extension-data/logomenuaryan_k.v38.shell-extension.zip";
-        hash = "sha256-GdGn7YKfOOEM0kV1Gd9H5c1KKjs/+/4XCsxO2pFdqu4=";
-        stripRoot = false;
-      };
-      patches = (old.patches or []) ++ [ ../desktop/patches/logo-menu-custom-menu.patch ];
-    }))
-    pkgs.gnomeExtensions.places-status-indicator
-    pkgs.gnomeExtensions.restart-to
     pkgs.home-manager
     pkgs.just
     pkgs.libnotify
     pkgs.micro
-    pkgs.mission-center
     pkgs.p7zip
     pkgs.podman-compose
-    pkgs.papirus-icon-theme
     pkgs.xdg-utils
   ];
 }

modules/system/security.nix

@@ -0,0 +1,18 @@
+{ lib, pkgs, ... }:
+
+{
+  security.sudo = {
+    enable = lib.mkDefault true;
+    wheelNeedsPassword = lib.mkForce false;
+  };
+
+  users.users.root = lib.mkDefault {
+    shell = pkgs.zsh;
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+    ];
+    hashedPassword = lib.mkDefault "!";
+    initialHashedPassword = lib.mkDefault "!";
+  };
+}

modules/system/services.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  services.openssh.enable = true;
+}

modules/system/virtualization.nix

@@ -0,0 +1,17 @@
+{ lib, ... }:
+
+{
+  networking.firewall.trustedInterfaces = lib.mkAfter [ "virbr0" ];
+
+  virtualisation = {
+    containers.enable = true;
+    podman = {
+      enable = true;
+      dockerCompat = true;
+      defaultNetwork.settings.dns_enabled = true;
+    };
+    libvirtd.enable = true;
+  };
+
+  programs.virt-manager.enable = true;
+}