From 669316009ca547651b333b0b0b946ea802944841 Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 3 Nov 2024 17:50:29 -0600 Subject: [PATCH] feat: reorganized misc home manager files --- .../{command-line.nix => commandLine.nix} | 3 ++- home-manager/modules/misc/desktop.nix | 22 +++++++++++++++++++ .../misc/{gaming.nix => entertainment.nix} | 3 +++ home-manager/modules/misc/file-management.nix | 12 ---------- home-manager/modules/misc/gnome-extras.nix | 15 ------------- home-manager/modules/misc/internet-extras.nix | 12 ---------- home-manager/modules/misc/internet.nix | 10 +++++++-- home-manager/modules/misc/kde-extras.nix | 10 --------- home-manager/modules/misc/media.nix | 16 -------------- home-manager/modules/misc/privacy.nix | 12 ---------- .../modules/misc/production-art-extras.nix | 15 ------------- home-manager/modules/misc/production-code.nix | 10 --------- .../modules/misc/production-video.nix | 14 ------------ .../{production-art.nix => productionArt.nix} | 0 ...oduction-audio.nix => productionAudio.nix} | 2 +- .../{wpsoffice.nix => productionVideo.nix} | 3 ++- ...tion-writing.nix => productionWriting.nix} | 0 .../misc/{jellyfin.nix => tracking.nix} | 7 ++++-- home-manager/modules/misc/yazi.nix | 10 --------- 19 files changed, 43 insertions(+), 133 deletions(-) rename home-manager/modules/misc/{command-line.nix => commandLine.nix} (97%) create mode 100755 home-manager/modules/misc/desktop.nix rename home-manager/modules/misc/{gaming.nix => entertainment.nix} (75%) delete mode 100755 home-manager/modules/misc/file-management.nix delete mode 100755 home-manager/modules/misc/gnome-extras.nix delete mode 100755 home-manager/modules/misc/internet-extras.nix delete mode 100755 home-manager/modules/misc/kde-extras.nix delete mode 100755 home-manager/modules/misc/media.nix delete mode 100755 home-manager/modules/misc/privacy.nix delete mode 100755 home-manager/modules/misc/production-art-extras.nix delete mode 100755 home-manager/modules/misc/production-code.nix delete mode 100755 home-manager/modules/misc/production-video.nix rename home-manager/modules/misc/{production-art.nix => productionArt.nix} (100%) rename home-manager/modules/misc/{production-audio.nix => productionAudio.nix} (100%) rename home-manager/modules/misc/{wpsoffice.nix => productionVideo.nix} (76%) rename home-manager/modules/misc/{production-writing.nix => productionWriting.nix} (100%) rename home-manager/modules/misc/{jellyfin.nix => tracking.nix} (80%) delete mode 100755 home-manager/modules/misc/yazi.nix diff --git a/home-manager/modules/misc/command-line.nix b/home-manager/modules/misc/commandLine.nix similarity index 97% rename from home-manager/modules/misc/command-line.nix rename to home-manager/modules/misc/commandLine.nix index 520b8f3..0f446dd 100755 --- a/home-manager/modules/misc/command-line.nix +++ b/home-manager/modules/misc/commandLine.nix @@ -29,9 +29,10 @@ wezterm wget wine + xdg-utils xdotool - zip yt-dlp + zip ; }; } diff --git a/home-manager/modules/misc/desktop.nix b/home-manager/modules/misc/desktop.nix new file mode 100755 index 0000000..88bcf4a --- /dev/null +++ b/home-manager/modules/misc/desktop.nix @@ -0,0 +1,22 @@ +{pkgs, ...}: { + home.packages = builtins.attrValues { + inherit + (pkgs.kdePackages) + # KDE Packages + + kolourpaint + okular + partitionmanager + ; + inherit + (pkgs) + bulky + flameshot + gnome-calculator + gnome-disk-utility + gnome-software + gparted + usbimager + ; + }; +} diff --git a/home-manager/modules/misc/gaming.nix b/home-manager/modules/misc/entertainment.nix similarity index 75% rename from home-manager/modules/misc/gaming.nix rename to home-manager/modules/misc/entertainment.nix index b588c59..0ff54c3 100755 --- a/home-manager/modules/misc/gaming.nix +++ b/home-manager/modules/misc/entertainment.nix @@ -2,7 +2,10 @@ home.packages = builtins.attrValues { inherit (pkgs) + feishin prismlauncher + spotify + vlc ; }; } diff --git a/home-manager/modules/misc/file-management.nix b/home-manager/modules/misc/file-management.nix deleted file mode 100755 index bbbc524..0000000 --- a/home-manager/modules/misc/file-management.nix +++ /dev/null @@ -1,12 +0,0 @@ -{pkgs, ...}: { - home.packages = builtins.attrValues { - inherit - (pkgs) - celeste - bulky - flameshot - gparted - usbimager - ; - }; -} diff --git a/home-manager/modules/misc/gnome-extras.nix b/home-manager/modules/misc/gnome-extras.nix deleted file mode 100755 index 6d03370..0000000 --- a/home-manager/modules/misc/gnome-extras.nix +++ /dev/null @@ -1,15 +0,0 @@ -{pkgs, ...}: { - home.packages = builtins.attrValues { - inherit - (pkgs) - evince - file-roller - gnome-calculator - gnome-characters - gnome-disk-utility - gnome-software - gnome-system-monitor - nautilus - ; - }; -} diff --git a/home-manager/modules/misc/internet-extras.nix b/home-manager/modules/misc/internet-extras.nix deleted file mode 100755 index 0e9d6a1..0000000 --- a/home-manager/modules/misc/internet-extras.nix +++ /dev/null @@ -1,12 +0,0 @@ -{pkgs, ...}: { - home.packages = builtins.attrValues { - inherit - (pkgs) - brave - firefox - tdesktop - teams-for-linux - whatsapp-for-linux - ; - }; -} diff --git a/home-manager/modules/misc/internet.nix b/home-manager/modules/misc/internet.nix index 50547f8..d9995d7 100755 --- a/home-manager/modules/misc/internet.nix +++ b/home-manager/modules/misc/internet.nix @@ -2,12 +2,18 @@ home.packages = builtins.attrValues { inherit (pkgs) + # Messaging + discord element-desktop - openvpn signal-desktop vesktop - xdg-utils + # Privacy + + bitwarden + ledger-live-desktop + openvpn + tor-browser ; }; } diff --git a/home-manager/modules/misc/kde-extras.nix b/home-manager/modules/misc/kde-extras.nix deleted file mode 100755 index 5f39b1c..0000000 --- a/home-manager/modules/misc/kde-extras.nix +++ /dev/null @@ -1,10 +0,0 @@ -{pkgs, ...}: { - home.packages = builtins.attrValues { - inherit - (pkgs.kdePackages) - okular - partitionmanager - kolourpaint - ; - }; -} diff --git a/home-manager/modules/misc/media.nix b/home-manager/modules/misc/media.nix deleted file mode 100755 index 2988219..0000000 --- a/home-manager/modules/misc/media.nix +++ /dev/null @@ -1,16 +0,0 @@ -{pkgs, ...}: { - home.packages = builtins.attrValues { - inherit - (pkgs) - beets - flameshot - celluloid - feishin - nomacs - mpv - open-dyslexic - spotify - vlc - ; - }; -} diff --git a/home-manager/modules/misc/privacy.nix b/home-manager/modules/misc/privacy.nix deleted file mode 100755 index 21459ad..0000000 --- a/home-manager/modules/misc/privacy.nix +++ /dev/null @@ -1,12 +0,0 @@ -{pkgs, ...}: { - home.packages = builtins.attrValues { - inherit - (pkgs) - bitwarden - ledger-live-desktop - protonvpn-gui - protonvpn-cli - tor-browser - ; - }; -} diff --git a/home-manager/modules/misc/production-art-extras.nix b/home-manager/modules/misc/production-art-extras.nix deleted file mode 100755 index de613f7..0000000 --- a/home-manager/modules/misc/production-art-extras.nix +++ /dev/null @@ -1,15 +0,0 @@ -{pkgs, ...}: { - home.packages = builtins.attrValues { - inherit - (pkgs) - blender - darktable - gimp - opentabletdriver - ; - inherit - (pkgs.sweethome3d) - application - ; - }; -} diff --git a/home-manager/modules/misc/production-code.nix b/home-manager/modules/misc/production-code.nix deleted file mode 100755 index 0d1b621..0000000 --- a/home-manager/modules/misc/production-code.nix +++ /dev/null @@ -1,10 +0,0 @@ -{pkgs, ...}: { - home.packages = builtins.attrValues { - inherit - (pkgs.nodePackages_latest) - dotenv-cli - forever - nodejs - ; - }; -} diff --git a/home-manager/modules/misc/production-video.nix b/home-manager/modules/misc/production-video.nix deleted file mode 100755 index 5fe70b1..0000000 --- a/home-manager/modules/misc/production-video.nix +++ /dev/null @@ -1,14 +0,0 @@ -{pkgs, ...}: { - home.packages = builtins.attrValues { - inherit - (pkgs) - droidcam - deskreen - shotcut - # syncplay # group streaming thingie - - # yt-dlp # dependency for syncplay - - ; - }; -} diff --git a/home-manager/modules/misc/production-art.nix b/home-manager/modules/misc/productionArt.nix similarity index 100% rename from home-manager/modules/misc/production-art.nix rename to home-manager/modules/misc/productionArt.nix diff --git a/home-manager/modules/misc/production-audio.nix b/home-manager/modules/misc/productionAudio.nix similarity index 100% rename from home-manager/modules/misc/production-audio.nix rename to home-manager/modules/misc/productionAudio.nix index 5ee17fb..e897a3b 100755 --- a/home-manager/modules/misc/production-audio.nix +++ b/home-manager/modules/misc/productionAudio.nix @@ -2,8 +2,8 @@ home.packages = builtins.attrValues { inherit (pkgs) - reaper ardour + reaper yabridge ; }; diff --git a/home-manager/modules/misc/wpsoffice.nix b/home-manager/modules/misc/productionVideo.nix similarity index 76% rename from home-manager/modules/misc/wpsoffice.nix rename to home-manager/modules/misc/productionVideo.nix index 7978a11..8f048ae 100755 --- a/home-manager/modules/misc/wpsoffice.nix +++ b/home-manager/modules/misc/productionVideo.nix @@ -2,7 +2,8 @@ home.packages = builtins.attrValues { inherit (pkgs) - wpsoffice + shotcut + syncplay ; }; } diff --git a/home-manager/modules/misc/production-writing.nix b/home-manager/modules/misc/productionWriting.nix similarity index 100% rename from home-manager/modules/misc/production-writing.nix rename to home-manager/modules/misc/productionWriting.nix diff --git a/home-manager/modules/misc/jellyfin.nix b/home-manager/modules/misc/tracking.nix similarity index 80% rename from home-manager/modules/misc/jellyfin.nix rename to home-manager/modules/misc/tracking.nix index a5d8f69..0c13add 100755 --- a/home-manager/modules/misc/jellyfin.nix +++ b/home-manager/modules/misc/tracking.nix @@ -2,12 +2,15 @@ home.packages = builtins.attrValues { inherit (pkgs) + # Mp3 + kid3 mp3gain - nicotine-plus puddletag + # Tracking + + nicotine-plus soulseekqt - yt-dlp ; }; } diff --git a/home-manager/modules/misc/yazi.nix b/home-manager/modules/misc/yazi.nix deleted file mode 100755 index 530974d..0000000 --- a/home-manager/modules/misc/yazi.nix +++ /dev/null @@ -1,10 +0,0 @@ -{pkgs, ...}: { - home.packages = builtins.attrValues { - inherit - (pkgs) - desktop-file-utils - exiftool - mediainfo - ; - }; -}