✨ Split up config files to multiple and added imports. Fixed default values for systemConfigs

flake.nix

@@ -23,10 +23,10 @@
     # ========= Utilities =========
     #
     # Secrets management
-    sops-nix = {
+    # sops-nix = {
-      url = "github:mic92/sops-nix";
+    # url = "github:mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
+    # inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # };
     # Catppuccin theming
     catppuccin = {
       url = "github:catppuccin/nix";
@@ -76,7 +76,7 @@
       lib = nixpkgs.lib.extend customLib;
       libHm = home-manager.lib.extend customLib;
 
-      systems = [
+      systems = builtins.map (config: defaultAttrs // config) [
         {
           hostName = "desktop";
           system = "x86_64-linux";
@@ -94,6 +94,16 @@
         # TODO Homelab config
       ];
 
+      defaultAttrs = {
+        user = {
+          name = common.username;
+          password = "temp";
+        };
+        version = common.system.version;
+        wayland.enable = true;
+        nvidia.enable = false;
+      };
+
     in
     {
       #
@@ -110,18 +120,9 @@
           {
             hostName,
             system,
-            user ? {
+            user,
-              name = common.username;
+            ...
-              password = "temp";
+          }@systemConfig:
-            },
-            version ? common.version,
-            wayland ? {
-              enable = true;
-            },
-            nvidia ? {
-              enable = false;
-            },
-          }@systemConfig: # TODO only pass in systemConfig
 
           {
             name = hostName;

hosts/desktop/default.nix

@@ -1,70 +1,11 @@
 {
-  pkgs,
+  lib,
-  inputs,
-  outputs,
-  common,
   ...
 }:
 
 {
-  imports = [ ./modules ];
+  imports = [
-
+    (lib.custom.relativeToRoot "shared/modules")
-  nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
+    ./hardware-configuration.nix
-
-  # Bootloader.
-  boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
-  };
-
-  # Define a user account. Don't forget to set a password with 'passwd'.
-  users.users.${common.username} = {
-    isNormalUser = true;
-    description = common.username;
-    extraGroups = [
-      "networkmanager"
-      "wheel"
   ];
-  };
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  environment.sessionVariables = {
-    # Tells Electron apps to use Wayland
-    NIXOS_OZONE_WL = "1";
-  };
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    wget
-    xdg-utils
-    xdg-desktop-portal
-    xdg-desktop-portal-gtk
-    unstable.protonmail-desktop
-    stremio
-    fastfetch
-    discord
-    nix-prefetch-github # Cmd to get rev and hash from GitHub
-    gimp
-    vlc
-    vdhcoapp # TODO run "vdhcoapp install" on startup
-    onlyoffice-desktopeditors
-    inputs.grayjay.packages.${system}.grayjay
-  ];
-
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
-
-  programs.kdeconnect.enable = true;
-
-  services = {
-    flatpak.enable = false;
-    xserver.enable = true;
-  };
-
-  system.stateVersion = common.system.version;
 }

hosts/desktop/modules/default.nix

@@ -1,8 +0,0 @@
-{ lib, ... }:
-
-{
-  imports = [
-    (lib.custom.relativeToRoot "shared/modules")
-    ./hardware-configuration.nix
-  ];
-}

hosts/thinkpad/default.nix

@@ -1,72 +1,23 @@
 {
   pkgs,
-  outputs,
+  lib,
-  common,
   ...
 }:
 
 {
-  imports = [ ./modules ];
+  imports = [
-
+    (lib.custom.relativeToRoot "shared/modules")
-  nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
+    ./battery.nix
-
+    ./bluetooth.nix
-  # Bootloader.
+    ./hardware-configuration.nix
-  boot = {
+    ./security.nix
-    kernelPackages = pkgs.linuxPackages_latest;
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-  };
-
-  # Define a user account. Don't forget to set a password with 'passwd'.
-  users.users.${common.username} = {
-    isNormalUser = true;
-    description = common.username;
-    extraGroups = [
-      "networkmanager"
-      "wheel"
   ];
-  };
 
-  # Allow unfree packages
+  boot.kernelPackages = pkgs.linuxPackages_latest;
-  nixpkgs.config.allowUnfree = true;
 
-  environment.sessionVariables = {
-    # Tells Electron apps to use Wayland
-    NIXOS_OZONE_WL = "1";
-  };
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
     brightnessctl
-    wget
+    hyprsunset # Blue light filter
-    xdg-utils
-    xdg-desktop-portal
-    xdg-desktop-portal-gtk
-    unstable.protonmail-desktop
-    stremio
-    fastfetch
-    discord
-    nix-prefetch-github # Cmd to get rev and hash from GitHub
-    gimp
-    vlc
-    vdhcoapp
-    onlyoffice-desktopeditors
   ];
 
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
-
-  programs.kdeconnect.enable = true;
-
-  services = {
-    flatpak.enable = false;
-    xserver.enable = true;
-  };
-
-  system.stateVersion = common.system.version;
 }

hosts/thinkpad/modules/default.nix

@@ -1,15 +0,0 @@
-{ pkgs, lib, ... }:
-
-{
-  imports = [
-    (lib.custom.relativeToRoot "shared/modules")
-    ./battery.nix
-    ./bluetooth.nix
-    ./hardware-configuration.nix
-    ./security.nix
-  ];
-
-  environment.systemPackages = with pkgs; [
-    hyprsunset # Blue light filter
-  ];
-}

shared/modules/boot.nix

@@ -0,0 +1,6 @@
+{
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
+}

shared/modules/default.nix

@@ -1,17 +1,28 @@
 {
   imports = [
+    ./boot.nix
     ./development
+    ./electron.nix
     ./fonts.nix
     ./gaming
     ./gnome
     ./hardware
+    ./kdeconnect.nix
     ./locale.nix
+    ./mail.nix
+    ./media.nix
     ./networking.nix
+    ./nixos.nix
     ./nix-helper.nix
+    ./office.nix
     ./hyprland
     ./sddm.nix
     ./security.nix
     ./shell.nix
+    ./social.nix
+    ./users.nix
     ./qt.nix
+    ./xdg.nix
+    ./xserver.nix
   ];
 }

shared/modules/electron.nix

@@ -0,0 +1,8 @@
+{ lib, systemConfig, ... }:
+
+{
+  environment.sessionVariables = lib.mkIf systemConfig.wayland.enable {
+    # Tells Electron apps to use Wayland
+    NIXOS_OZONE_WL = "1";
+  };
+}

shared/modules/kdeconnect.nix

@@ -0,0 +1,3 @@
+{
+  programs.kdeconnect.enable = true;
+}

shared/modules/mail.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    unstable.protonmail-desktop
+  ];
+}

shared/modules/media.nix

@@ -0,0 +1,11 @@
+{ pkgs, inputs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    stremio
+    gimp
+    vlc
+    vdhcoapp
+    inputs.grayjay.packages.${system}.grayjay
+  ];
+}

shared/modules/networking.nix

@@ -1,6 +1,10 @@
-{ systemConfig, ... }:
+{ pkgs, systemConfig, ... }:
 
 {
+  environment.systemPackages = with pkgs; [
+    wget
+  ];
+
   networking = {
     networkmanager.enable = true;
     hostName = systemConfig.hostName;

shared/modules/nixos.nix

@@ -0,0 +1,25 @@
+{
+  pkgs,
+  outputs,
+  systemConfig,
+  ...
+}:
+
+{
+  environment.systemPackages = with pkgs; [
+    nix-prefetch-github # Cmd to get rev and hash from GitHub
+  ];
+
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+
+  nixpkgs = {
+    # Allow unfree packages
+    config.allowUnfree = true;
+    overlays = [ outputs.overlays.unstable-packages ];
+  };
+
+  system.stateVersion = systemConfig.version;
+}

shared/modules/office.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    onlyoffice-desktopeditors
+  ];
+}

shared/modules/social.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    discord
+  ];
+}

shared/modules/users.nix

@@ -0,0 +1,15 @@
+{ systemConfig, ... }:
+let
+  username = systemConfig.user.name;
+in
+{
+  # Define a user without a password, TODO pass in user.password
+  users.users.${username} = {
+    isNormalUser = true;
+    description = username;
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+    ];
+  };
+}

shared/modules/xdg.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    xdg-utils
+    xdg-desktop-portal
+    xdg-desktop-portal-gtk
+  ];
+}

shared/modules/xserver.nix

@@ -0,0 +1,3 @@
+{
+  services.xserver.enable = true;
+}