reorder

flake.nix

@@ -22,9 +22,15 @@
       pkgs = import nixpkgs { inherit system; };
 
       commonModules = [
-        ./global/system
-        jovian.nixosModules.jovian
         home-manager.nixosModules.home-manager
+        ./modules/system/boot
+        ./modules/system/devices
+        ./modules/system/locale
+        ./modules/system/networking
+        ./modules/system/nixsettings
+        ./modules/system/shell
+        ./modules/system/systemversion
+        ./modules/system/upgrades
       ];
 
       homeManagerConfig = {
@@ -39,7 +45,7 @@
       hosts = {
         computer-mo = {
           user = "mo";
-          extraModules = [ ./hosts/computer-mo/system ];
+          extraModules = [];
           userConfig = {
             isNormalUser = true;
             home = "/home/mo";
@@ -50,7 +56,7 @@
 
         steamdeck = {
           user = "deck";
-          extraModules = [ ./hosts/steamdeck/system ];
+          extraModules = [];
           userConfig = {
             isNormalUser = true;
             home = "/home/deck";
@@ -70,8 +76,6 @@
 
             # Home Manager user imports
             { home-manager.users.${hostConfig.user}.imports = [
-                ./hosts/${hostName}/user
-                ./global/user
               ];
             }
             homeManagerConfig

hosts/computer-mo/default.nix

@@ -0,0 +1,24 @@
+{ ... }:
+{
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+
+    fileSystems."/" =
+    { device = "/dev/disk/by-partlabel/root";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-partlabel/EFI";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ {
+    device = "/var/lib/swapfile";
+    size = 16*1024;
+  }];
+}

hosts/computer-mo/system/default.nix

@@ -1,22 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./pkg-customization.nix
-    ./pkg-desktop.nix
-    ./pkg-dev.nix
-    ./pkg-firefox.nix
-    ./pkg-gaming.nix
-    ./pkg-hardware.nix
-    ./pkg-media.nix
-    ./pkg-misc.nix
-    ./pkg-steam.nix
-    ./pkg-system.nix
-    ./set-boot.nix
-    ./set-controller.nix
-    ./set-desktop.nix
-    ./set-filesystems.nix
-    ./set-hardware.nix
-    ./set-steam.nix
-    ./set-systemd.nix
-  ];
-}

hosts/computer-mo/system/pkg-customization.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages =
-   (with pkgs; [
-    kde-rounded-corners
-    ibm-plex
-    ]);
-}

hosts/computer-mo/system/pkg-desktop.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  services.desktopManager.plasma6.enable = true;
-  services.displayManager.sddm.wayland.enable = true;
-  services.displayManager.sddm.enable = true;
-}

hosts/computer-mo/system/pkg-gaming.nix

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

hosts/computer-mo/system/pkg-media.nix

@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages =
-   (with pkgs; [
-    kdePackages.gwenview
-    kdePackages.okular
-    kdePackages.kdenlive
-    kdePackages.elisa
-    haruna
-    krita
-    ]);
-}
-
-
-
-

hosts/computer-mo/system/pkg-misc.nix

@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages =
-   (with pkgs; [
-    vesktop
-    google-chrome
-    teams-for-linux
-    kdePackages.kcolorchooser
-    xwaylandvideobridge
-    kdePackages.kfind
-    kdePackages.kcalc
-    kdePackages.filelight
-    kdePackages.skanlite
-    ]);
-}

hosts/computer-mo/system/pkg-steam.nix

@@ -1,10 +0,0 @@
-{ ... }:
-{
-  jovian.steam = {
-    enable = true;
-  };
-
-  programs.steam = {
-    enable = true;
-  };
-}

hosts/computer-mo/system/pkg-system.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages =
-   (with pkgs; [
-    kdePackages.ksystemlog
-    kdePackages.partitionmanager
-    ]);
-}

hosts/computer-mo/system/set-boot.nix

@@ -1,10 +0,0 @@
-{ ... }:
-{
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-  boot.extraModprobeConfig = ''
-    options amdgpu ppfeaturemask=0xFFF7FFFF
-'';
-}

hosts/computer-mo/system/set-desktop.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  services.xserver.enable = false;
-  services.displayManager.autoLogin.enable = true;
-  services.displayManager.autoLogin.user = "mo";
-}

hosts/computer-mo/system/set-filesystems.nix

@@ -1,18 +0,0 @@
-{ ... }:
-{
-  fileSystems."/" =
-    { device = "/dev/disk/by-partlabel/root";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-partlabel/EFI";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  swapDevices = [ {
-    device = "/var/lib/swapfile";
-    size = 16*1024;
-  }];
-}

hosts/computer-mo/user/default.nix

@@ -1,9 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./pkg-desktop.nix
-    ./set-customization.nix
-    ./set-desktop.nix
-    ./set-dotfiles.nix
-  ];
-}

hosts/computer-mo/user/pkg-desktop.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  programs.plasma = {
-    enable = true;
-    };
-}

hosts/computer-mo/user/set-customization.nix

@@ -1,3 +0,0 @@
-{ ... }:
-{
-}

hosts/computer-mo/user/set-dotfiles.nix

@@ -1,10 +0,0 @@
-{ ... }:
-{
-home.file.".config/haruna/haruna.conf".source = ../dotfiles/haruna.conf;
-home.file.".local/share/color-schemes/BreezeDunkelFarbe.colors".source = ../dotfiles/BreezeDunkelFarbe.colors;
-home.file.".local/share/color-schemes/BreezeHellFarbe.colors".source = ../dotfiles/BreezeHellFarbe.colors;
-home.file.".config/kglobalshortcutsrc".source = ../dotfiles/kglobalshortcutsrc;
-home.file."Bilder/Hintergründe/wallpaper-nix.png".source = ../assets/wallpaper-nix.png;
-home.file.".config/kwinrc".source = ../dotfiles/kwinrc;
-home.file.".config/kwinoutputconfig.json".source = ../dotfiles/kwinoutputconfig.json;
-}

modules/system/apps.misc/default.nix

@@ -2,9 +2,13 @@
 {
   environment.systemPackages =
    (with pkgs; [
+    ibm-plex
+    mangohud
     pciutils
     aha
     lact
-    kdePackages.isoimagewriter
+    vesktop
+    google-chrome
+    teams-for-linux
     ]);
 }

modules/system/apps.shell/default.nix

@@ -2,7 +2,6 @@
 {
   environment.systemPackages =
    (with pkgs; [
-    kdePackages.kate
     git
     nil
     yaml-language-server

modules/system/boot/default.nix

@@ -0,0 +1,10 @@
+{ ... }:
+{
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.plymouth.enable = true;
+  boot.plymouth.theme = "bgrt";
+  boot.consoleLogLevel = 0;
+  boot.kernelParams = [ "quiet" "udev.log_level=0" ];
+  boot.initrd.verbose = false;
+}

modules/system/jovian.desktop/default.nix

@@ -1,18 +1,12 @@
 { ... }:
 {
   jovian.steam = {
+    enable = true;
     autoStart = false;
     user = "mo";
     desktopSession = "plasma";
   };
-
   jovian.hardware.has.amd.gpu = true;
   jovian.hardware.amd.gpu.enableEarlyModesetting = true;
   jovian.steamos.enableBluetoothConfig = true;
-
-  programs.steam = {
-    remotePlay.openFirewall = true;
-    dedicatedServer.openFirewall = true;
-    localNetworkGameTransfers.openFirewall = true;
-  };
 }

modules/system/lact/default.nix

@@ -1,5 +1,17 @@
 { pkgs,... }:
 {
+  # Install LACT Package
+  environment.systemPackages =
+   (with pkgs; [
+    lact
+    ]);
+
+  # Enable Modprobe
+  boot.extraModprobeConfig = ''
+    options amdgpu ppfeaturemask=0xFFF7FFFF
+'';
+
+  # Enable Systemd Service
   systemd.services.lact = {
     enable = true;
     description = "AMDGPU Control Daemon";

modules/system/locale/default.nix

@@ -0,0 +1,18 @@
+{ ... }:
+{
+  time.timeZone = "Europe/Berlin";
+  i18n.defaultLocale = "de_DE.UTF-8";
+  console.keyMap = "de";
+  services.xserver.xkb.layout = "de";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "de_DE.UTF-8";
+    LC_IDENTIFICATION = "de_DE.UTF-8";
+    LC_MEASUREMENT = "de_DE.UTF-8";
+    LC_MONETARY = "de_DE.UTF-8";
+    LC_NAME = "de_DE.UTF-8";
+    LC_NUMERIC = "de_DE.UTF-8";
+    LC_PAPER = "de_DE.UTF-8";
+    LC_TELEPHONE = "de_DE.UTF-8";
+    LC_TIME = "de_DE.UTF-8";
+  };
+}

modules/system/networking/default.nix

@@ -0,0 +1,6 @@
+{ lib,  hostName, ... }:
+{
+  networking.hostName = hostName;
+  networking.useDHCP = lib.mkDefault true;
+  networking.networkmanager.enable = true;
+}

modules/system/nixsettings/default.nix

@@ -0,0 +1,7 @@
+{ lib, ... }:
+{
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  nixpkgs.config.allowUnfree = true;
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+}

modules/system/plasma/default.nix

@@ -0,0 +1,30 @@
+{ user, pkgs, ... }:
+{
+  services.desktopManager.plasma6.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
+  services.displayManager.sddm.enable = true;
+  services.xserver.enable = false;
+  services.displayManager.autoLogin.enable = true;
+  services.displayManager.autoLogin.user = user;
+
+  environment.systemPackages =
+   (with pkgs; [
+    kde-rounded-corners
+    kdePackages.kate
+    kdePackages.isoimagewriter
+    kdePackages.gwenview
+    kdePackages.okular
+    kdePackages.kdenlive
+    kdePackages.elisa
+    haruna
+    krita
+    kdePackages.kcolorchooser
+    xwaylandvideobridge
+    kdePackages.kfind
+    kdePackages.kcalc
+    kdePackages.filelight
+    kdePackages.skanlite
+    kdePackages.ksystemlog
+    kdePackages.partitionmanager
+    ]);
+}

modules/system/shell/default.nix

@@ -0,0 +1,8 @@
+{ pkgs,  ... }:
+{
+  programs.zsh.enable = true;
+  programs.zsh.enableCompletion = true;
+  programs.zsh.ohMyZsh.enable = true;
+  programs.zsh.ohMyZsh.theme = "agnoster";
+  users.defaultUserShell = pkgs.zsh;
+}

modules/system/steam/default.nix

@@ -0,0 +1,9 @@
+{ ... }:
+{
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = true;
+    localNetworkGameTransfers.openFirewall = true;
+  };
+}

modules/system/systemversion/default.nix

@@ -0,0 +1,4 @@
+{ lib, ... }:
+{
+  system.stateVersion = "24.05";
+}

modules/system/upgrades/default.nix

@@ -0,0 +1,12 @@
+{ ... }:
+{
+system.autoUpgrade = {
+    enable = true;
+    dates = "04:00";
+    flake = "github:Moe1369/nixos-config";
+    flags = [
+        "--update-input" "nixpkgs" "--commit-lock-file"
+    ];
+    allowReboot = true;
+};
+}

modules/user/git/default.nix

@@ -0,0 +1,11 @@
+{ ... }:
+{
+  programs.git = {
+   enable = true;
+   userName = "Mohamed C.";
+   userEmail = "mohamed@chrayed.de";
+   extraConfig = {
+     init.defaultBranch = "main";
+   };
+  };
+}

modules/user/homeversion/default.nix

@@ -0,0 +1,4 @@
+{ ... }:
+{
+  home.stateVersion = "24.05";
+}

modules/user/plasma/default.nix

@@ -1,7 +1,17 @@
 { ... }:
 {
+  home.file.".config/haruna/haruna.conf".source = ../dotfiles/haruna.conf;
+  home.file.".local/share/color-schemes/BreezeDunkelFarbe.colors".source = ../dotfiles/BreezeDunkelFarbe.colors;
+  home.file.".local/share/color-schemes/BreezeHellFarbe.colors".source = ../dotfiles/BreezeHellFarbe.colors;
+  home.file.".config/kglobalshortcutsrc".source = ../dotfiles/kglobalshortcutsrc;
+  home.file."Bilder/Hintergründe/wallpaper-nix.png".source = ../assets/wallpaper-nix.png;
+  home.file.".config/kwinrc".source = ../dotfiles/kwinrc;
+  home.file.".config/kwinoutputconfig.json".source = ../dotfiles/kwinoutputconfig.json;
+
+
   programs.plasma = {
 
+    enable = true;
     workspace.wallpaper = "/home/mo/Bilder/Hintergründe/wallpaper-nix.png";
     kscreenlocker.appearance.wallpaper = "/home/mo/Bilder/Hintergründe/wallpaper-nix.png";