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

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;
+}