diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 9d9030e..ec0351c 100755 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -114,8 +114,10 @@ in { }; packages = with pkgs; [ - ## Auth/Security + ## Network & Auth/Security + #networkmanagerapplet # Tray applet for networkmanager hyprpolkitagent # Hyprland native polkit agent + networkmanager # Network manager ... gnome-keyring # Keyring for login prompts gnome-secrets # GTK password manager keepass-diff # CLI-tool to diff kbdx files @@ -133,15 +135,8 @@ in { hyprpicker # Colour picker hyprcursor # Cursor, duh ydotool # Click/Keypress emulator - swww # Wallpaper daemon - swaybg # Wallpaper daemon - - #networkmanagerapplet # Tray applet for networkmanager - networkmanager # Network manager ... - #blueman # GUI bluetooth control - easyeffects # Graphical volume control - pavucontrol # Graphical volume control - helvum # GTK patchbay + #swww # Wallpaper daemon + #swaybg # Wallpaper daemon ## Desktop App Suite gnome-calculator # GTK calculator @@ -169,22 +164,16 @@ in { }; programs = { - ## CLI fuzzy find fzf = { enable = true; enableFishIntegration = true; }; - }; services = { - ## Daemon for easyeffects - easyeffects.enable = true; ## GTK keyring for password prompts gnome-keyring.enable = true; - ## Another method to enable nm-applet - network-manager-applet.enable = true; ## Mobile <-> desktop interaction kdeconnect = { enable = true; diff --git a/home/programs/multimedia/default.nix b/home/programs/multimedia/default.nix index c015b0f..3f82755 100644 --- a/home/programs/multimedia/default.nix +++ b/home/programs/multimedia/default.nix @@ -8,21 +8,24 @@ ./music-production.nix ]; - home = { - packages = with pkgs; [ - - ## Image and Video playback and production - #inkscape # Vector image editing - #shotcut # Video editing - #blender # 3D modelling - gimp # Image editor - vlc # Multimedia player - - ## Miscellaneous - themix-gui # for creating gtk themes - orca-slicer # 3d printing slicer - - ]; - }; + ## Easy effects daemon + services.easyeffects.enable = true; + home.packages = with pkgs; [ + ## Audio + helvum # Patchbay + pavucontrol # Volume control + easyeffects # Effects and routing + ## Image + gimp # General image editing + #inkscape # Vector image editing + ## Video + vlc # Video playback + #shotcut # Video editing + ## 3D Creative + blender # 3D modelling software + orca-slicer # 3D print slicing + ## Miscellaneous + themix-gui # for creating gtk themes + ]; }