From 7f320b85d419542d5ebc8fc38bc33231cef08c6e Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Wed, 27 Mar 2024 16:27:20 -0400 Subject: [PATCH] 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 | 21 +++---------------- profiles/personal/home.nix | 15 +++++++++++-- system/hardware/openrgb.nix | 4 +++- system/programs/browser/vivaldi.nix | 7 ------- system/programs/development/vscode.nix | 7 ------- system/programs/launcher/dmenu.nix | 7 ------- system/programs/launcher/rofi.nix | 7 ------- system/programs/productivity/finance.nix | 7 ------- system/programs/terminal/kitty.nix | 7 ------- system/programs/utilities/bootable-media.nix | 7 ------- .../utilities/keyboard-configuration.nix | 7 ------- system/programs/utilities/passwords.nix | 7 ------- system/security/firewall.nix | 6 +++--- system/{util => utilities}/dbus.nix | 0 system/{util => utilities}/default.nix | 1 + system/{util => utilities}/gnome-keyring.nix | 0 system/utilities/miscellaneous.nix | 14 +++++++++++++ user/browser/vivaldi.nix | 7 +++++++ .../programs => user}/development/default.nix | 0 user/development/vscode.nix | 7 +++++++ .../gaming/compatibility.nix | 4 ++-- {system/programs => user}/gaming/default.nix | 0 .../programs => user}/gaming/launchers.nix | 4 ++-- .../programs => user}/gaming/utilities.nix | 4 ++-- .../programs => user}/launcher/default.nix | 0 user/launcher/dmenu.nix | 7 +++++++ user/launcher/rofi.nix | 7 +++++++ {system/programs => user}/media/creation.nix | 4 ++-- {system/programs => user}/media/default.nix | 0 {system/programs => user}/media/editors.nix | 4 ++-- {system/programs => user}/media/players.nix | 4 ++-- .../productivity/communication.nix | 4 ++-- .../productivity/default.nix | 0 user/productivity/finance.nix | 7 +++++++ .../programs => user}/productivity/notes.nix | 4 ++-- .../programs => user}/productivity/office.nix | 4 ++-- user/terminal/kitty.nix | 7 +++++++ .../utilities/3d-printing.nix | 4 ++-- user/utilities/bootable-media.nix | 7 +++++++ .../programs => user}/utilities/default.nix | 0 .../utilities/file-syncing.nix | 0 user/utilities/keyboard-configuration.nix | 7 +++++++ user/utilities/passwords.nix | 7 +++++++ 43 files changed, 120 insertions(+), 107 deletions(-) delete mode 100644 system/programs/browser/vivaldi.nix delete mode 100644 system/programs/development/vscode.nix delete mode 100644 system/programs/launcher/dmenu.nix delete mode 100644 system/programs/launcher/rofi.nix delete mode 100644 system/programs/productivity/finance.nix delete mode 100644 system/programs/terminal/kitty.nix delete mode 100644 system/programs/utilities/bootable-media.nix delete mode 100644 system/programs/utilities/keyboard-configuration.nix delete mode 100644 system/programs/utilities/passwords.nix rename system/{util => utilities}/dbus.nix (100%) rename system/{util => utilities}/default.nix (79%) rename system/{util => utilities}/gnome-keyring.nix (100%) create mode 100644 system/utilities/miscellaneous.nix create mode 100644 user/browser/vivaldi.nix rename {system/programs => user}/development/default.nix (100%) create mode 100644 user/development/vscode.nix rename {system/programs => user}/gaming/compatibility.nix (54%) rename {system/programs => user}/gaming/default.nix (100%) rename {system/programs => user}/gaming/launchers.nix (80%) rename {system/programs => user}/gaming/utilities.nix (77%) rename {system/programs => user}/launcher/default.nix (100%) create mode 100644 user/launcher/dmenu.nix create mode 100644 user/launcher/rofi.nix rename {system/programs => user}/media/creation.nix (55%) rename {system/programs => user}/media/default.nix (100%) rename {system/programs => user}/media/editors.nix (61%) rename {system/programs => user}/media/players.nix (70%) rename {system/programs => user}/productivity/communication.nix (63%) rename {system/programs => user}/productivity/default.nix (100%) create mode 100644 user/productivity/finance.nix rename {system/programs => user}/productivity/notes.nix (53%) rename {system/programs => user}/productivity/office.nix (67%) create mode 100644 user/terminal/kitty.nix rename {system/programs => user}/utilities/3d-printing.nix (50%) create mode 100644 user/utilities/bootable-media.nix rename {system/programs => user}/utilities/default.nix (100%) rename {system/programs => user}/utilities/file-syncing.nix (100%) create mode 100644 user/utilities/keyboard-configuration.nix create mode 100644 user/utilities/passwords.nix diff --git a/profiles/personal/configuration.nix b/profiles/personal/configuration.nix index b938d84..91a6f60 100644 --- a/profiles/personal/configuration.nix +++ b/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; [ - vim - wget - zsh - git - rsync - cryptsetup - home-manager - ]; + # environment.systemPackages = with pkgs; [ + # ]; environment.shells = with pkgs; [ zsh ]; users.defaultUserShell = pkgs.zsh; diff --git a/profiles/personal/home.nix b/profiles/personal/home.nix index d9a30dd..f8e5037 100644 --- a/profiles/personal/home.nix +++ b/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 = { diff --git a/system/hardware/openrgb.nix b/system/hardware/openrgb.nix index dabcfc7..2c2cbf2 100644 --- 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; } diff --git a/system/programs/browser/vivaldi.nix b/system/programs/browser/vivaldi.nix deleted file mode 100644 index 8119029..0000000 --- a/system/programs/browser/vivaldi.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - vivaldi - ]; -} diff --git a/system/programs/development/vscode.nix b/system/programs/development/vscode.nix deleted file mode 100644 index 121fe22..0000000 --- a/system/programs/development/vscode.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - vscode - ]; -} diff --git a/system/programs/launcher/dmenu.nix b/system/programs/launcher/dmenu.nix deleted file mode 100644 index c2144a4..0000000 --- a/system/programs/launcher/dmenu.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - dmenu - ]; -} diff --git a/system/programs/launcher/rofi.nix b/system/programs/launcher/rofi.nix deleted file mode 100644 index 631329d..0000000 --- a/system/programs/launcher/rofi.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - rofi - ]; -} diff --git a/system/programs/productivity/finance.nix b/system/programs/productivity/finance.nix deleted file mode 100644 index 33b04bd..0000000 --- a/system/programs/productivity/finance.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - gnucash - ]; -} diff --git a/system/programs/terminal/kitty.nix b/system/programs/terminal/kitty.nix deleted file mode 100644 index d65d85f..0000000 --- a/system/programs/terminal/kitty.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - kitty - ]; -} diff --git a/system/programs/utilities/bootable-media.nix b/system/programs/utilities/bootable-media.nix deleted file mode 100644 index f5a2a88..0000000 --- a/system/programs/utilities/bootable-media.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - ventoy - ]; -} diff --git a/system/programs/utilities/keyboard-configuration.nix b/system/programs/utilities/keyboard-configuration.nix deleted file mode 100644 index afdff06..0000000 --- a/system/programs/utilities/keyboard-configuration.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - via - ]; -} diff --git a/system/programs/utilities/passwords.nix b/system/programs/utilities/passwords.nix deleted file mode 100644 index 8bb3650..0000000 --- a/system/programs/utilities/passwords.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - bitwarden - ]; -} diff --git a/system/security/firewall.nix b/system/security/firewall.nix index 4d69c1e..2ea96cb 100644 --- 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; } diff --git a/system/util/dbus.nix b/system/utilities/dbus.nix similarity index 100% rename from system/util/dbus.nix rename to system/utilities/dbus.nix diff --git a/system/util/default.nix b/system/utilities/default.nix similarity index 79% rename from system/util/default.nix rename to system/utilities/default.nix index 2656592..e7c8376 100644 --- a/system/util/default.nix +++ b/system/utilities/default.nix @@ -4,5 +4,6 @@ imports = [ ./dbus.nix ./gnome-keyring.nix + ./miscellaneous.nix ]; } diff --git a/system/util/gnome-keyring.nix b/system/utilities/gnome-keyring.nix similarity index 100% rename from system/util/gnome-keyring.nix rename to system/utilities/gnome-keyring.nix diff --git a/system/utilities/miscellaneous.nix b/system/utilities/miscellaneous.nix new file mode 100644 index 0000000..a6052a6 --- /dev/null +++ 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 + ]; +} diff --git a/user/browser/vivaldi.nix b/user/browser/vivaldi.nix new file mode 100644 index 0000000..e6e0740 --- /dev/null +++ b/user/browser/vivaldi.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, ... }: + +{ + home.packages = (with pkgs; [ + vivaldi + ]); +} diff --git a/system/programs/development/default.nix b/user/development/default.nix similarity index 100% rename from system/programs/development/default.nix rename to user/development/default.nix diff --git a/user/development/vscode.nix b/user/development/vscode.nix new file mode 100644 index 0000000..a20e13c --- /dev/null +++ b/user/development/vscode.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, ... }: + +{ + home.packages = (with pkgs; [ + vscode + ]); +} diff --git a/system/programs/gaming/compatibility.nix b/user/gaming/compatibility.nix similarity index 54% rename from system/programs/gaming/compatibility.nix rename to user/gaming/compatibility.nix index a1bbf3e..6108a43 100644 --- a/system/programs/gaming/compatibility.nix +++ b/user/gaming/compatibility.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, ... }: { - environment.systemPackages = with pkgs; [ + home.packages = (with pkgs; [ wine protonup-qt - ]; + ]); } diff --git a/system/programs/gaming/default.nix b/user/gaming/default.nix similarity index 100% rename from system/programs/gaming/default.nix rename to user/gaming/default.nix diff --git a/system/programs/gaming/launchers.nix b/user/gaming/launchers.nix similarity index 80% rename from system/programs/gaming/launchers.nix rename to user/gaming/launchers.nix index 7dce775..68bb185 100644 --- a/system/programs/gaming/launchers.nix +++ b/user/gaming/launchers.nix @@ -7,10 +7,10 @@ gamescopeSession.enable = true; }; - environment.systemPackages = with pkgs; [ + home.packages = (with pkgs; [ bottles lutris heroic prismlauncher - ]; + ]); } diff --git a/system/programs/gaming/utilities.nix b/user/gaming/utilities.nix similarity index 77% rename from system/programs/gaming/utilities.nix rename to user/gaming/utilities.nix index bc7cc9c..09b153d 100644 --- a/system/programs/gaming/utilities.nix +++ b/user/gaming/utilities.nix @@ -7,9 +7,9 @@ # enableRenice = true; }; - environment.systemPackages = with pkgs; [ + home.packages = (with pkgs; [ mangohud goverlay vkbasalt - ]; + ]); } diff --git a/system/programs/launcher/default.nix b/user/launcher/default.nix similarity index 100% rename from system/programs/launcher/default.nix rename to user/launcher/default.nix diff --git a/user/launcher/dmenu.nix b/user/launcher/dmenu.nix new file mode 100644 index 0000000..a392ab9 --- /dev/null +++ b/user/launcher/dmenu.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, ... }: + +{ + home.packages = (with pkgs; [ + dmenu + ]); +} diff --git a/user/launcher/rofi.nix b/user/launcher/rofi.nix new file mode 100644 index 0000000..0873f13 --- /dev/null +++ b/user/launcher/rofi.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, ... }: + +{ + home.packages = (with pkgs; [ + rofi + ]); +} diff --git a/system/programs/media/creation.nix b/user/media/creation.nix similarity index 55% rename from system/programs/media/creation.nix rename to user/media/creation.nix index a1db1a3..f1cb2fd 100644 --- a/system/programs/media/creation.nix +++ b/user/media/creation.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, ... }: { - environment.systemPackages = with pkgs; [ + home.packages = (with pkgs; [ blender obs-studio - ]; + ]); } diff --git a/system/programs/media/default.nix b/user/media/default.nix similarity index 100% rename from system/programs/media/default.nix rename to user/media/default.nix diff --git a/system/programs/media/editors.nix b/user/media/editors.nix similarity index 61% rename from system/programs/media/editors.nix rename to user/media/editors.nix index 810ee26..eb5d2a3 100644 --- a/system/programs/media/editors.nix +++ b/user/media/editors.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, ... }: { - environment.systemPackages = with pkgs; [ + home.packages = (with pkgs; [ gimp libsForQt5.kdenlive ffmpeg - ]; + ]); } diff --git a/system/programs/media/players.nix b/user/media/players.nix similarity index 70% rename from system/programs/media/players.nix rename to user/media/players.nix index 5da2ea7..a93b83f 100644 --- a/system/programs/media/players.nix +++ b/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 - ]; + ]); } diff --git a/system/programs/productivity/communication.nix b/user/productivity/communication.nix similarity index 63% rename from system/programs/productivity/communication.nix rename to user/productivity/communication.nix index e236052..24bd9c6 100644 --- a/system/programs/productivity/communication.nix +++ b/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 - ]; + ]); } diff --git a/system/programs/productivity/default.nix b/user/productivity/default.nix similarity index 100% rename from system/programs/productivity/default.nix rename to user/productivity/default.nix diff --git a/user/productivity/finance.nix b/user/productivity/finance.nix new file mode 100644 index 0000000..3fdaac5 --- /dev/null +++ b/user/productivity/finance.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, ... }: + +{ + home.packages = (with pkgs; [ + gnucash + ]); +} diff --git a/system/programs/productivity/notes.nix b/user/productivity/notes.nix similarity index 53% rename from system/programs/productivity/notes.nix rename to user/productivity/notes.nix index 33fab0e..5fcedd4 100644 --- a/system/programs/productivity/notes.nix +++ b/user/productivity/notes.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, ... }: { - environment.systemPackages = with pkgs; [ + home.packages = (with pkgs; [ anytype logseq - ]; + ]); } diff --git a/system/programs/productivity/office.nix b/user/productivity/office.nix similarity index 67% rename from system/programs/productivity/office.nix rename to user/productivity/office.nix index 7fd456d..2a182f5 100644 --- a/system/programs/productivity/office.nix +++ b/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 - ]; + ]); } diff --git a/user/terminal/kitty.nix b/user/terminal/kitty.nix new file mode 100644 index 0000000..e3d2686 --- /dev/null +++ b/user/terminal/kitty.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, ... }: + +{ + home.packages = (with pkgs; [ + kitty + ]); +} diff --git a/system/programs/utilities/3d-printing.nix b/user/utilities/3d-printing.nix similarity index 50% rename from system/programs/utilities/3d-printing.nix rename to user/utilities/3d-printing.nix index bfb9a37..73b31a6 100644 --- a/system/programs/utilities/3d-printing.nix +++ b/user/utilities/3d-printing.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { - environment.systemPackages = with pkgs; [ + home.packages = (with pkgs; [ prusa-slicer - ]; + ]); } diff --git a/user/utilities/bootable-media.nix b/user/utilities/bootable-media.nix new file mode 100644 index 0000000..6652257 --- /dev/null +++ b/user/utilities/bootable-media.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, ... }: + +{ + home.packages = (with pkgs; [ + ventoy + ]); +} diff --git a/system/programs/utilities/default.nix b/user/utilities/default.nix similarity index 100% rename from system/programs/utilities/default.nix rename to user/utilities/default.nix diff --git a/system/programs/utilities/file-syncing.nix b/user/utilities/file-syncing.nix similarity index 100% rename from system/programs/utilities/file-syncing.nix rename to user/utilities/file-syncing.nix diff --git a/user/utilities/keyboard-configuration.nix b/user/utilities/keyboard-configuration.nix new file mode 100644 index 0000000..eadb050 --- /dev/null +++ b/user/utilities/keyboard-configuration.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, ... }: + +{ + home.packages = (with pkgs; [ + via + ]); +} diff --git a/user/utilities/passwords.nix b/user/utilities/passwords.nix new file mode 100644 index 0000000..8d86720 --- /dev/null +++ b/user/utilities/passwords.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, ... }: + +{ + home.packages = (with pkgs; [ + bitwarden + ]); +}