From f267326f5594d1ffc5c06058c969997b7523d85e Mon Sep 17 00:00:00 2001 From: serenity-F Date: Mon, 2 Mar 2026 18:24:33 +1000 Subject: [PATCH] tidied `home/` --- home/desktop/default.nix | 1 + home/multimedia/default.nix | 48 ++++++++++++++++----- home/multimedia/music-production.nix | 52 ----------------------- home/multimedia/music.nix | 62 +++++++++++++++++++++------- home/multimedia/obs.nix | 19 --------- home/multimedia/web.nix | 41 ------------------ 6 files changed, 86 insertions(+), 137 deletions(-) delete mode 100755 home/multimedia/music-production.nix delete mode 100755 home/multimedia/obs.nix delete mode 100755 home/multimedia/web.nix diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 412ad81..99f7245 100755 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -154,6 +154,7 @@ in { libnotify libva meson + themix-gui # GTK theme creation ]; }; diff --git a/home/multimedia/default.nix b/home/multimedia/default.nix index 0d2443f..eea2354 100755 --- a/home/multimedia/default.nix +++ b/home/multimedia/default.nix @@ -6,36 +6,62 @@ ./web.nix ./obs.nix ./music.nix - ./music-production.nix ]; ## Easy effects daemon services.easyeffects.enable = true; home.packages = with pkgs; [ - ## Audio - helvum # Patchbay - pavucontrol # Volume control - easyeffects # Effects and routing - ## Image + + # Browsing & Filesharing + transmission_4-gtk # Torrent client + nicotine-plus # P2P Media sharing + carburetor # GUI settings for tractor + syncplay # Synchronise media playback + #lagrange # GUI Gemini browser + tractor # TOR network routing + tor # The Onion Router + + # Messaging & Social + #telegram-desktop + #fractal-next + #fractal + vesktop + + # Image gimp # General image editing #inkscape # Vector image editing - ## Video + + # Video vlc # Video playback #shotcut # Video editing - ## 3D Creative + + # 3D Creative blender # 3D modelling software orca-slicer # 3D print slicing - ## Miscellaneous + + # Miscellaneous themix-gui # for creating gtk themes obsidian # note taking ]; programs = { + + # Web browser + firefox = { enable = true; }; + + # Note taking obsidian = { - # note taking enable = true; - #defaultSettings = { }; + }; + + # Screenshare & recording + obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + #droidcam-obs + ]; }; }; diff --git a/home/multimedia/music-production.nix b/home/multimedia/music-production.nix deleted file mode 100755 index 56414e5..0000000 --- a/home/multimedia/music-production.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ inputs, outputs, lib, config, pkgs, ... }: - -{ - - home = { - packages = with pkgs; [ - - ## Misc. Tools - glfw # unsure - libjack2 # unsure exactly - zenity # unsure - metronome # GTK metronome - - ## Digital Audio Workstations - audacity # Audio editing and DAW - reaper # Digital audio workstation - ardour # Digital Audio Workstation - - ## Modular and programmatic music production - #supercollider-with-plugins - #tidal # from flake ? - bespokesynth # Modular synth and sequencer - cardinal # VST Analogue modular synth - - ## Models and synths - #neural-amp-modeler-lv2 # Guitar amp emulator - #cardinal # vcv-rack but as an open source VST - vital # Synth/VST - helm # Synth/VST:) - - ## Tidal Cycles stuff - #tidal # vers. from flake input - #vim-tidal - #superdirt-start - #superdirt-install - ]; #++ (with pkgs.haskellPackages; [ - #tidal # Pattern language for improvised music - #tidal # Pattern language for improvised music - #tidal-core # Core pattern library for Tidal - #tidal-vis # Visual rendering for Tidal patterns - #]); - }; - - ## Neovim plugins for Supercollider & Tidal Cycles - ## - full nvim environment for supercollider is WIP - ## - same goes for Tidal Cycles - #programs.nixvim.extraPlugins = with pkgs.vimPlugins; [ - #nvim-treesitter-parsers.supercollider # as below for SC - #vim-tidal # tidal cycles LSP for neovim - #]; - -} diff --git a/home/multimedia/music.nix b/home/multimedia/music.nix index a355a66..fb836b8 100755 --- a/home/multimedia/music.nix +++ b/home/multimedia/music.nix @@ -1,30 +1,64 @@ -# # Chore: pick an offline music player already lol -## Requirements: -## - have last.fm support -## - match other UI styles -## - handle large amounts of FLAC/HiRes audio -## - optionally support metadata editing - -{ pkgs, ... }: +{ inputs, outputs, lib, config, pkgs, ... }: { - imports = [ ]; - home = { packages = with pkgs; [ - ## Utilities - puddletag # Music metadata editing + ## Chore: pick an offline music player already lol + ## Requirements: + ## - have last.fm support + ## - match other UI styles + ## - handle large amounts of FLAC/HiRes audio + ## - optionally support metadata editing - ## Music players + # Music players spotify # corpo trash strawberry # QT music player #lollypop # GTK/Gnome native music player #pragha # Music player #tauon # Music player - ]; + # Music Production + easyeffects # Effects and DSP + pavucontrol # Precise volume control + helvum # Patchbay and routing + #neural-amp-modeler-lv2 # Guitar amp emulator + metronome # GTK metronome + bespokesynth # DAW/Synth + audacity # Audio editing and DAW + cardinal # Synth/VST + reaper # DAW + ardour # DAW + vital # Synth/VST + helm # Synth/VST + + # Misc. Tools + puddletag # Music metadata editor + libjack2 # unsure + zenity # unsure + glfw # unsure + + # Tidal/Supercollider + #supercollider-with-plugins + #tidal # vers. from flake input + #vim-tidal + #superdirt-start + #superdirt-install + ]; #++ (with pkgs.haskellPackages; [ + #tidal # Pattern language for improvised music + #tidal # Pattern language for improvised music + #tidal-core # Core pattern library for Tidal + #tidal-vis # Visual rendering for Tidal patterns + #]); }; + ## Neovim plugins for Supercollider & Tidal Cycles + ## - full nvim environment for supercollider is WIP + ## - same goes for Tidal Cycles + #programs.nixvim.extraPlugins = with pkgs.vimPlugins; [ + #nvim-treesitter-parsers.supercollider # as below for SC + #vim-tidal # tidal cycles LSP for neovim + #]; + } diff --git a/home/multimedia/obs.nix b/home/multimedia/obs.nix deleted file mode 100755 index 9602dcf..0000000 --- a/home/multimedia/obs.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, ... }: - -{ - - programs = { - - obs-studio = { - - enable = true; - plugins = with pkgs.obs-studio-plugins; - [ - wlrobs - #droidcam-obs - ]; - }; - - }; - -} diff --git a/home/multimedia/web.nix b/home/multimedia/web.nix deleted file mode 100755 index 4530b5a..0000000 --- a/home/multimedia/web.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ pkgs, ... }: - -{ - - imports = [ ]; - - home = { - packages = with pkgs; [ - - ## Browsing & Filesharing - transmission_4-gtk # Torrent client - nicotine-plus # P2P Media sharing - carburetor # GUI settings for tractor - #jellyfin # Self-hosted media streaming - syncplay # Synchronise media playback - #lagrange # GUI Gemini browser - tractor # TOR network routing - tor # The Onion Router - - ## Messaging & Social - #telegram-desktop - #fractal-next - #fractal - vesktop - ]; - }; - - programs = { - - firefox = { # Web browser of choice - enable = true; - }; - - ## https://mynixos.com/home-manager/option/programs.nheko.settings - #nheko = { - #enable = true; - #}; - - }; - -}