Separate System and User packages

- Move user programs out of systems section and int
  user section
- Install user packages with home manager rather than
  system wide

profiles/personal/configuration.nix

@@ -9,16 +9,8 @@
     (../../hosts + "/${systemSettings.hardwareConfiguration}.nix")
     (../../system/gui + "/${userSettings.desktop}.nix")
     ../../system/hardware/default.nix
-    (../../system/programs/browser + "/${userSettings.browser}.nix")
-    ../../system/programs/development/default.nix
-    ../../system/programs/gaming/default.nix
-    ../../system/programs/launcher/default.nix
-    ../../system/programs/media/default.nix
-    ../../system/programs/productivity/default.nix
-    (../../system/programs/terminal + "/${userSettings.term}.nix")
-    ../../system/programs/utilities/default.nix
     ../../system/security/default.nix
-    ../../system/util/default.nix
+    ../../system/utilities/default.nix
   ];
 
   nix = {
@@ -72,15 +64,8 @@
     uid = 1000;
   };
 
-  environment.systemPackages = with pkgs; [
+  # environment.systemPackages = with pkgs; [
-    vim
+  # ];
-    wget
-    zsh
-    git
-    rsync
-    cryptsetup
-    home-manager
-  ];
 
   environment.shells = with pkgs; [ zsh ];
   users.defaultUserShell = pkgs.zsh;

profiles/personal/home.nix

@@ -9,8 +9,19 @@
 
   home.stateVersion = "23.11";
 
-  home.packages = (with pkgs; [
+  imports = [
-  ]);
+    (../../user/browser + "/${userSettings.browser}.nix")
+    ../../user/development/default.nix
+    ../../user/gaming/default.nix
+    ../../user/launcher/default.nix
+    ../../user/media/default.nix
+    ../../user/productivity/default.nix
+    (../../user/terminal + "/${userSettings.term}.nix")
+    ../../user/utilities/default.nix
+  ];
+
+  # home.packages = (with pkgs; [
+  # ]);
 
   xdg.enable = true;
   xdg.userDirs = {

system/hardware/openrgb.nix

@@ -1,6 +1,8 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = [ pkgs.openrgb-with-all-plugins ];
+  environment.systemPackages = with pkgs; [
+    openrgb-with-all-plugins
+  ];
   services.hardware.openrgb.enable = true;
 }

system/programs/browser/vivaldi.nix

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

system/programs/development/vscode.nix

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

system/programs/launcher/dmenu.nix

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

system/programs/launcher/rofi.nix

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

system/programs/productivity/finance.nix

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

system/programs/terminal/kitty.nix

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

system/programs/utilities/bootable-media.nix

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

system/programs/utilities/keyboard-configuration.nix

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

system/programs/utilities/passwords.nix

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

system/security/firewall.nix

@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = [
+  environment.systemPackages = with pkgs; [
-    pkgs.firewalld
+    firewalld
-    pkgs.firewalld-gui
+    firewalld-gui
   ];
   networking.firewall.enable = true;
 }

system/utilities/default.nix

@@ -4,5 +4,6 @@
   imports = [
     ./dbus.nix
     ./gnome-keyring.nix
+    ./miscellaneous.nix
   ];
 }

system/utilities/miscellaneous.nix

@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    vim
+    wget
+    curl
+    zsh
+    git
+    rsync
+    cryptsetup
+    home-manager
+  ];
+}

user/browser/vivaldi.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = (with pkgs; [
+    vivaldi
+  ]);
+}

user/development/vscode.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = (with pkgs; [
+    vscode
+  ]);
+}

user/gaming/compatibility.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  home.packages = (with pkgs; [
     wine
     protonup-qt
-  ];
+  ]);
 }

user/gaming/launchers.nix

@@ -7,10 +7,10 @@
     gamescopeSession.enable = true;
   };
 
-  environment.systemPackages = with pkgs; [
+  home.packages = (with pkgs; [
     bottles
     lutris
     heroic
     prismlauncher
-  ];
+  ]);
 }

user/gaming/utilities.nix

@@ -7,9 +7,9 @@
     # enableRenice = true;
   };
 
-  environment.systemPackages = with pkgs; [
+  home.packages = (with pkgs; [
     mangohud
     goverlay
     vkbasalt
-  ];
+  ]);
 }

user/launcher/dmenu.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = (with pkgs; [
+    dmenu
+  ]);
+}

user/launcher/rofi.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = (with pkgs; [
+    rofi
+  ]);
+}

user/media/creation.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  home.packages = (with pkgs; [
     blender
     obs-studio
-  ];
+  ]);
 }

user/media/editors.nix

@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  home.packages = (with pkgs; [
     gimp
     libsForQt5.kdenlive
     ffmpeg
-  ];
+  ]);
 }

user/media/players.nix

@@ -1,12 +1,12 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  home.packages = (with pkgs; [
     gnome.eog
     mpv
     trackma-gtk
     pocket-casts
     spotify
     spicetify-cli
-  ];
+  ]);
 }

user/productivity/communication.nix

@@ -1,10 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  home.packages = (with pkgs; [
     beeper
     discord
     signal-desktop
     zoom-us
-  ];
+  ]);
 }

user/productivity/finance.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = (with pkgs; [
+    gnucash
+  ]);
+}

user/productivity/notes.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  home.packages = (with pkgs; [
     anytype
     logseq
-  ];
+  ]);
 }

user/productivity/office.nix

@@ -1,10 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  home.packages = (with pkgs; [
     onlyoffice-bin
     xournalpp
     zathura
     libsForQt5.okular
-  ];
+  ]);
 }

user/terminal/kitty.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = (with pkgs; [
+    kitty
+  ]);
+}

user/utilities/3d-printing.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  home.packages = (with pkgs; [
     prusa-slicer
-  ];
+  ]);
 }

user/utilities/bootable-media.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = (with pkgs; [
+    ventoy
+  ]);
+}

user/utilities/keyboard-configuration.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = (with pkgs; [
+    via
+  ]);
+}

user/utilities/passwords.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = (with pkgs; [
+    bitwarden
+  ]);
+}