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
2024-03-27 16:27:20 -04:00
parent 59f88dad0f
commit 7f320b85d4
43 changed files with 120 additions and 107 deletions
--- a/system/hardware/openrgb.nix
+++ b/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;
 }
--- a/system/programs/browser/vivaldi.nix
+++ b/system/programs/browser/vivaldi.nix
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    vivaldi
-  ];
-}
--- a/system/programs/development/default.nix
+++ b/system/programs/development/default.nix
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    ./vscode.nix
-  ];
-}
--- a/system/programs/development/vscode.nix
+++ b/system/programs/development/vscode.nix
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    vscode
-  ];
-}
--- a/system/programs/gaming/compatibility.nix
+++ b/system/programs/gaming/compatibility.nix
@@ -1,8 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    wine
-    protonup-qt
-  ];
-}
--- a/system/programs/gaming/default.nix
+++ b/system/programs/gaming/default.nix
@@ -1,9 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    ./utilities.nix
-    ./launchers.nix
-    ./compatibility.nix
-  ];
-}
--- a/system/programs/gaming/launchers.nix
+++ b/system/programs/gaming/launchers.nix
@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true;
-    gamescopeSession.enable = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    bottles
-    lutris
-    heroic
-    prismlauncher
-  ];
-}
--- a/system/programs/gaming/utilities.nix
+++ b/system/programs/gaming/utilities.nix
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs.gamemode = {
-    enable = true;
-    # settings = {};
-    # enableRenice = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    mangohud
-    goverlay
-    vkbasalt
-  ];
-}
--- a/system/programs/launcher/default.nix
+++ b/system/programs/launcher/default.nix
@@ -1,8 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    ./dmenu.nix
-    ./rofi.nix
-  ];
-}
--- a/system/programs/launcher/dmenu.nix
+++ b/system/programs/launcher/dmenu.nix
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    dmenu
-  ];
-}
--- a/system/programs/launcher/rofi.nix
+++ b/system/programs/launcher/rofi.nix
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    rofi
-  ];
-}
--- a/system/programs/media/creation.nix
+++ b/system/programs/media/creation.nix
@@ -1,8 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    blender
-    obs-studio
-  ];
-}
--- a/system/programs/media/default.nix
+++ b/system/programs/media/default.nix
@@ -1,9 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    ./players.nix
-    ./editors.nix
-    ./creation.nix
-  ];
-}
--- a/system/programs/media/editors.nix
+++ b/system/programs/media/editors.nix
@@ -1,9 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    gimp
-    libsForQt5.kdenlive
-    ffmpeg
-  ];
-}
--- a/system/programs/media/players.nix
+++ b/system/programs/media/players.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    gnome.eog
-    mpv
-    trackma-gtk
-    pocket-casts
-    spotify
-    spicetify-cli
-  ];
-}
--- a/system/programs/productivity/communication.nix
+++ b/system/programs/productivity/communication.nix
@@ -1,10 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    beeper
-    discord
-    signal-desktop
-    zoom-us
-  ];
-}
--- a/system/programs/productivity/default.nix
+++ b/system/programs/productivity/default.nix
@@ -1,10 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    ./office.nix
-    ./finance.nix
-    ./notes.nix
-    ./communication.nix
-  ];
-}
--- a/system/programs/productivity/finance.nix
+++ b/system/programs/productivity/finance.nix
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    gnucash
-  ];
-}
--- a/system/programs/productivity/notes.nix
+++ b/system/programs/productivity/notes.nix
@@ -1,8 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    anytype
-    logseq
-  ];
-}
--- a/system/programs/productivity/office.nix
+++ b/system/programs/productivity/office.nix
@@ -1,10 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    onlyoffice-bin
-    xournalpp
-    zathura
-    libsForQt5.okular
-  ];
-}
--- a/system/programs/terminal/kitty.nix
+++ b/system/programs/terminal/kitty.nix
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    kitty
-  ];
-}
--- a/system/programs/utilities/3d-printing.nix
+++ b/system/programs/utilities/3d-printing.nix
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    prusa-slicer
-  ];
-}
--- a/system/programs/utilities/bootable-media.nix
+++ b/system/programs/utilities/bootable-media.nix
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    ventoy
-  ];
-}
--- a/system/programs/utilities/default.nix
+++ b/system/programs/utilities/default.nix
@@ -1,11 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    ./3d-printing.nix
-    ./bootable-media.nix
-    ./file-syncing.nix
-    ./keyboard-configuration.nix
-    ./passwords.nix
-  ];
-}
--- a/system/programs/utilities/file-syncing.nix
+++ b/system/programs/utilities/file-syncing.nix
@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.syncthing.enable = true;
-}
--- a/system/programs/utilities/keyboard-configuration.nix
+++ b/system/programs/utilities/keyboard-configuration.nix
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    via
-  ];
-}
--- a/system/programs/utilities/passwords.nix
+++ b/system/programs/utilities/passwords.nix
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    bitwarden
-  ];
-}
--- a/system/security/firewall.nix
+++ b/system/security/firewall.nix
@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:

 {
-  environment.systemPackages = [
-    pkgs.firewalld
-    pkgs.firewalld-gui
+  environment.systemPackages = with pkgs; [
+    firewalld
+    firewalld-gui
  ];
  networking.firewall.enable = true;
 }
--- a/system/utilities/dbus.nix
+++ b/system/utilities/dbus.nix
--- a/system/utilities/default.nix
+++ b/system/utilities/default.nix
@@ -4,5 +4,6 @@
  imports = [
    ./dbus.nix
    ./gnome-keyring.nix
+    ./miscellaneous.nix
  ];
 }
--- a/system/utilities/gnome-keyring.nix
+++ b/system/utilities/gnome-keyring.nix
--- a/system/utilities/miscellaneous.nix
+++ b/system/utilities/miscellaneous.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    vim
+    wget
+    curl
+    zsh
+    git
+    rsync
+    cryptsetup
+    home-manager
+  ];
+}