Fixed conflicts

hosts/desktop/default.nix

@@ -3,21 +3,20 @@
 {
   imports = [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
-#    ../../modules/system/desktop/hyprland.nix
-     ../../modules/system/desktop/plasma.nix
-#    ../../modules/system/desktop/noisetorch.nix
-    ../../modules/system/desktop/nvidia.nix
-#    ../../modules/system/programs/syncthing.nix
-#    ../../modules/system/programs/thunar.nix
-#    ../../modules/system/programs/steam.nix
-#    ../../modules/system/utils/common.nix
-#    ../../modules/system/utils/docker.nix
-#    ../../modules/system/utils/firewall.nix
-    #../../modules/system/utils/fprint.nix
-    ../../modules/system/utils/garbage-collection.nix
-    ../../modules/system/utils/locale.nix
-#    ../../modules/system/utils/printing.nix
-    ../../modules/system/programs/sunshine.nix
+
+    # GUI
+    ../../modules/system/gui/plasma.nix
+    ../../modules/system/gui/steam.nix
+    ../../modules/system/gui/sunshine.nix
+
+    # CLI
+    ../../modules/system/cli/common.nix
+
+    # Hardware
+    ../../modules/system/hardware/firewall.nix
+    ../../modules/system/hardware/garbage-collection.nix
+    ../../modules/system/hardware/locale.nix
+    ../../modules/system/hardware/nvidia.nix
   ];
 
   nix.settings = {

hosts/desktop/home.nix

@@ -2,18 +2,11 @@
 
 {
   imports = [
-#    ../../modules/home/desktop/hyprland
-#    ../../modules/home/programs/barrier.nix
-#    ../../modules/home/programs/common.nix
-#    ../../modules/home/programs/develop.nix
-     ../../modules/home/programs/firefox.nix
-#    ../../modules/home/programs/modrinth.nix
-#    ../../modules/home/programs/neovim
-     ../../modules/home/programs/git.nix
-#    ../../modules/home/programs/ssh.nix
-#    ../../modules/home/theme
-#    ../../modules/home/theme/blueish.nix
-#    ../../modules/home/utils/fonts.nix
+    # GUI
+    ../../modules/home/gui/common
+
+    # CLI
+    ../../modules/home/cli/common
   ];
 
   home = {
@@ -22,22 +15,8 @@
   };
 
   home.packages = with pkgs; [
-   # Desktop Applications
- #   kdenlive
- #   gthumb
-     unstable.bitwarden
      unstable.prismlauncher
- #   blender
-
-#    unstable.surrealist
   ];
 
-#  home.sessionVariables = {
-#    LIBVA_DRIVER_NAME = "nvidia";
-#    XDG_SESSION_TYPE = "wayland";
-#    __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-#    WLR_NO_HARDWARE_CURSORS = 1;
-#  };
-
   home.stateVersion = "24.05";
 }

hosts/laptop/default.nix

@@ -1,20 +1,26 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ # Include the results of the hardware scan.
+  imports = [
     ./hardware-configuration.nix
-    ../../modules/system/desktop/amd.nix
-    ../../modules/system/desktop/hyprland.nix
-    ../../modules/system/desktop/bluetooth.nix
-    ../../modules/system/programs/steam.nix
-    ../../modules/system/programs/syncthing.nix
-    ../../modules/system/programs/thunar.nix
-    ../../modules/system/utils/common.nix
-    ../../modules/system/utils/docker.nix
-#    ../../modules/system/utils/fprint.nix
-    ../../modules/system/utils/garbage-collection.nix
-    ../../modules/system/utils/locale.nix
-    ../../modules/system/utils/printing.nix
+
+    # GUI
+    ../../modules/system/gui/hyprland.nix
+    ../../modules/system/gui/steam.nix
+    ../../modules/system/gui/thunar.nix
+    
+    # CLI
+    ../../modules/system/cli/common.nix
+    ../../modules/system/cli/docker.nix
+
+    # Hardware
+    ../../modules/system/hardware/amd.nix
+    ../../modules/system/hardware/bluetooth.nix
+    ../../modules/system/hardware/firewall.nix
+    ../../modules/system/hardware/garbage-collection.nix
+    ../../modules/system/hardware/laptop.nix
+    ../../modules/system/hardware/locale.nix
+    ../../modules/system/hardware/printing.nix
   ];
 
   nix.settings = {
@@ -41,8 +47,6 @@
     extraGroups = [ "networkmanager" "wheel" "dialout" ];
   };
 
-  services.printing.enable = true;
-
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
   system.stateVersion = "24.05";

hosts/laptop/home.nix

@@ -2,17 +2,15 @@
 
 {
   imports = [
-    ../../modules/home/desktop/hyprland
-#    ../../modules/home/programs/barrier.nix
-    ../../modules/home/programs/common.nix
-    ../../modules/home/programs/firefox.nix
-    ../../modules/home/programs/git.nix
-    ../../modules/home/programs/modrinth.nix
-    ../../modules/home/programs/neovim
-    ../../modules/home/programs/ssh.nix
-    ../../modules/home/theme
-    ../../modules/home/theme/blueish.nix
-    ../../modules/home/utils/fonts.nix
+    # GUI
+    ../../modules/home/gui/common
+    ../../modules/home/gui/hyprland
+    ../../modules/home/gui/nextcloud.nix
+    ../../modules/home/gui/theming.nix
+
+    # CLI
+    ../../modules/home/cli/common
+    ../../modules/home/cli/ssh.nix
   ];
 
   home = {
@@ -23,14 +21,21 @@
   home.packages = with pkgs; [
     # Desktop Applications
     kdenlive
-    gthumb
-    unstable.arduino-ide
     unstable.prismlauncher
     unstable.joplin-desktop
-
     unstable.moonlight-qt
-
     unstable.prusa-slicer
+    signal-desktop
+    unstable.vesktop
+
+    # Office
+    libreoffice
+    onlyoffice-bin
+
+    # Image editing
+    gimp
+    inkscape
+
   ];
 
   home.stateVersion = "24.05";

modules/home/cli/common/default.nix

@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  imports = [
+    ./git.nix
+    ./shell.nix
+    ./helix.nix
+  ];
+}

modules/home/cli/common/shell.nix

@@ -14,11 +14,16 @@
     enable = true;
   };
 
-  programs.zellij = {
+  programs.starship = {
     enable = true;
     enableBashIntegration = true;
   };
 
+  programs.zellij = {
+    enable = true;
+    # enableBashIntegration = true;
+  };
+
   home.file.zellij = {
     target = ".config/zellij/config.kdl";
     text = ''

modules/home/gui/common/default.nix

@@ -0,0 +1,15 @@
+{ pkgs, ...}:
+
+{
+  imports = [
+    ./alacritty.nix
+    ./firefox.nix
+    ./fonts.nix
+  ];
+
+  home.packages = with pkgs; [
+    vlc
+    bitwarden
+    pavucontrol
+  ];
+}

modules/home/gui/theming.nix

@@ -5,6 +5,12 @@ let
   gtkThemeFromScheme;
 in
 {
+  imports = [
+    nix-colors.homeManagerModules.default
+  ];
+
+  colorScheme = nix-colors.colorSchemes.da-one-sea;
+
   gtk = {
     enable = true;
     theme = {

modules/home/programs/common.nix

@@ -1,32 +0,0 @@
-{ pkgs, ...}:
-
-{
-  imports = [
-    ./alacritty.nix
-    ./helix.nix
-    ./librewolf.nix
-    ./shell.nix
-    ./nextcloud.nix
-  ];
-
-  home.packages = with pkgs; [
-    libreoffice
-    onlyoffice-bin
-    vlc
-    signal-desktop
-    unstable.webcord
-    unstable.localsend
-    bitwarden
-    pavucontrol
-    unstable.cubiomes-viewer
-    unstable.yt-dlp
-    unstable.rnote
-
-    # Image editing
-    gimp
-    inkscape
-
-    # CLI tools
-    cloc
-  ];
-}

modules/home/programs/develop.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    unstable.dioxus-cli
-  ];
-}

modules/home/programs/kitty.nix

@@ -1,13 +0,0 @@
-{ pkgs, config, ... }:
-
-{
-  programs.kitty = {
-    enable = true;
-    settings = {
-      foreground = "#${config.colorScheme.palette.base05}";
-      background = "#${config.colorScheme.palette.base00}";
-      background_opacity = "0.6";
-      font_family = "DejaVuSansM Nerd Font Mono";
-    };
-  };
-}

modules/home/programs/librewolf.nix

@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.librewolf = {
-    enable = true;
-    package = pkgs.unstable.librewolf;
-    settings = {
-      "webgl.disabled" = false;
-      "privacy.resistFingerprinting" = false;
-      "privacy.clearOnShutdown.cookies" = false;
-    };
-  };
-}

modules/home/theme/README.md

@@ -1,2 +0,0 @@
-# Base16 themes
-https://tinted-theming.github.io/base16-gallery/

modules/home/theme/blueish.nix

@@ -1,9 +0,0 @@
-{ nix-colors, ... }:
-
-{
-  imports = [
-    nix-colors.homeManagerModules.default
-  ];
-
-  colorScheme = nix-colors.colorSchemes.da-one-sea;
-}

modules/system/cli/common.nix

@@ -2,7 +2,7 @@
 
 {
   environment.systemPackages = with pkgs; [
-    usbutils
+    tree
     neofetch
     btop
     git

modules/system/desktop/keyring.nix

@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-  services.gnome.gnome-keyring.enable = true;
-
-  security.pam.services.greetd.enableGnomeKeyring = true;
-
-  programs.ssh.startAgent = true;
-}

modules/system/gui/hyprland.nix

@@ -1,10 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ./keyring.nix
-  ];
-
   programs.hyprland = {
     enable = true;
     package = pkgs.unstable.hyprland;
@@ -33,6 +29,9 @@
   };
 
   security.polkit.enable = true;
+  services.gnome.gnome-keyring.enable = true;
+  security.pam.services.greetd.enableGnomeKeyring = true;
+  programs.ssh.startAgent = true;
 
   # Configure networking
   networking.networkmanager.enable = true;

modules/system/programs/syncthing.nix

@@ -1,30 +0,0 @@
-{ ... }:
-
-{
-  services.syncthing = {
-    enable = true;
-    user = "xeovalyte";
-    dataDir = "/home/xeovalyte";
-    overrideDevices = true;
-    overrideFolders = true;
-    openDefaultPorts = true;
-    settings = {
-      devices = {
-        "xv-server" = {
-          id = "DYBGKGM-I7JM6NG-EV7EGYY-NZL5WCG-CSDSJCJ-B4Q7AOP-5YVQYAZ-ETLQWA5";
-          addresses = [
-            "dynamic"
-            "tcp://ddns.xeovalyte.com:22000"
-            "quick://ddns.xeovalyte.com:22000"
-          ];
-        };
-      };
-      folders = {
-        "xeovalyte-documents" = {
-          path = "/home/xeovalyte/Documents";
-          devices = [ "xv-server" ];
-        };
-      };
-    };
-  };
-}

modules/system/programs/virtualization.nix

@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-
-{
-  virtualisation.libvirtd.enable = true;
-  programs.virt-manager.enable = true;
-
-  users.users.xeovalyte.extraGroups = [ "libvirtd" ];
-
-  environment.systemPackages = with pkgs; [
-    quickemu
-    quickgui
-  ];
-}