diff --git a/flake.lock b/flake.lock index 95b734f..c2e61ce 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ ] }, "locked": { - "lastModified": 1738776578, - "narHash": "sha256-toDghGRq7NQmRNFysCeshZte9qgaNdoDWrUHzAH+KM4=", + "lastModified": 1739069463, + "narHash": "sha256-RuRJKPAc3VkLDguDi0yxOSw+G6D/SmQB9KvZyyiqiPg=", "ref": "refs/heads/master", - "rev": "af897fbb7a220314187a64f7d5d438c94695b54c", - "revCount": 103, + "rev": "21cb6f14f954890604ca78071d9961ea3068f2f2", + "revCount": 105, "type": "git", "url": "https://gt.emenel.ca/emenel/audio.nix.git" }, diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index 6155c8c..c3bf680 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -12,6 +12,8 @@ gnome niri waybar + desktop + music # shikane ]; @@ -23,58 +25,25 @@ inputs.affinity-nix.packages.x86_64-linux.designer ] - (with nix-config.packages.x86_64-linux; [ - mioctl - tal.bassline - tal.j8 - tal.u-no-lx - chair-audio.snare - chair-audio.cymb - the-usual-suspects.vavra - the-usual-suspects.nodal-red - the-usual-suspects.xenia - the-usual-suspects.ostirus - the-usual-suspects.osirus - paulxstretch - ]) - (with pkgs; [ guix thonny - bitwig-studio5-latest - - wayback dconf xorg.libX11 xorg.libxcb freetype - neofetch - nvd - ripgrep-all - silver-searcher - maestral - maestral-gui fstl - godot_4 - sane-airscan - xsane dbus gst_all_1.gstreamer alsa-oss - powertop - age sops - protonplus ispell (aspellWithDicts (dicts: with dicts; [ en en-computers en-science es fr ])) texlive.combined.scheme-full - appimage-run - libappimage - transmission_4-gtk guile python3 ruff @@ -86,7 +55,6 @@ serapeum ])) - kdotool ccl racket gdu @@ -94,74 +62,23 @@ cljfmt libxml2 - gdtoolkit_4 + nixfmt-rfc-style - wl-clipboard - clipse - maim php rustup shfmt html-tidy - wayland-utils - libheif.out openal - freecad procs rpi-imager - caligula - flatpak - prusa-slicer - - via - vial - bitwarden-cli - bitwarden-desktop - tailscale - trayscale - font-manager - scribus - pdfarranger - tdf - pdfchain - pdftk - zathura - gpu-viewer - - wl-mirror - - soundconverter - wmctrl - colloid-icon-theme - whitesur-gtk-theme - whitesur-cursors - whitesur-icon-theme - bibata-cursors - adwaita-qt icloudpd - squirreldisk - papers - newsflash borgbackup - stirling-pdf trash-cli - ripdrag - wineWowPackages.stagingFull - winetricks - (yabridge.override { - wine = wineWowPackages.stagingFull; - }) - (yabridgectl.override { - wine = wineWowPackages.stagingFull; - }) - - sway-launcher-desktop - swayosd spice spice-gtk @@ -169,101 +86,30 @@ virt-viewer virt-manager - thunderbird-latest - emojify - smile - impression - zoom-us - nyxt - ungoogled-chromium - obsidian - vlc - polychromatic - discord - slack - signal-desktop - eyedropper - onlyoffice-desktopeditors - libreoffice - hyphenDicts.en_US - plex-mpv-shim - plexamp - - carla - switcheroo - tenacity - supercollider-with-plugins - blender - davinci-resolve-studio - steam - processing - zotero jre tesseract - handbrake - renoise - krita - rawtherapee - inkscape - gimp - epsonscan2 - kicad - turbocase - openscad-unstable - openscad-lsp - picard - evolutionWithPlugins - plugdata - pavucontrol - qpwgraph - helvum - coppwr alsa-utils alsa-tools - clapper - ardour dockfmt impala - fractal - - oculante - - farge - halloy - paleta tree-sitter (tree-sitter.withPlugins (_: tree-sitter.allGrammars)) - - # Audio plugins (LV2, VST2, VST3, LADSPA) - eq10q - geonkick - bespokesynth - helm - surge - odin2 - calf - chow-kick - chow-phaser - chow-centaur - chow-tape-model - chow-multitool - easyeffects - vcv-rack - cardinal - roomeqwizard - guitarix - vital - helio-workstation - stochas ]) ]; username = "emenel"; homeDirectory = "/home/emenel"; - sessionPath = [ "/home/emenel/.config/emacs/bin" "/home/emenel/.npm-packages/bin" "/home/emenel/Applications" "/home/emenel/.local/bin" "/home/emenel/.local/share" "/home/emenel/.nix-profile/lib"]; + sessionPath = [ "/home/emenel/.config/emacs/bin" + "/home/emenel/.npm-packages/bin" + "/home/emenel/Applications" + "/home/emenel/.local/bin" + "/home/emenel/.local/share" + "/home/emenel/.nix-profile/lib" + "/etc/profiles/per-user/emenel/bin/" + "/home/emenel/.local/state/nix/profiles/home-manager/home-path/bin/" ]; sessionVariables = { WINEFSYNC = 1; @@ -276,24 +122,9 @@ MOZ_ENABLE_WAYLAND = 1; }; - pointerCursor = { - package = pkgs.rice.cursor.package; - name = pkgs.rice.cursor.name; - size = 24; - gtk.enable = true; - x11.enable = true; - }; - stateVersion = "24.05"; }; - gtk.cursorTheme = pkgs.rice.cursor; - - fonts = { - fontconfig = { - enable = true; - }; - }; sops = { age.keyFile = "/home/emenel/.config/sops/age/keys.txt"; # must have no password! @@ -319,10 +150,6 @@ programs = { home-manager.enable = true; - eww = { - enable = true; - configDir = ../../homes/emenel/dotfiles/dot_config/eww; - }; emacs = { enable = true; package = ((pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages ( @@ -348,15 +175,8 @@ pandoc.enable = true; password-store.enable = true; - - firefox.enable = true; }; - nixpkgs.config.packageOverrides = pkgs: { - renoise = pkgs.renoise.override { - releasePath = ../../assets/binary-installers/rns_344_linux_x86_64.tar.gz; - }; - }; services = { playerctld = { @@ -408,14 +228,6 @@ "/var/lib/flatpak/exports/share" ]; - services.flatpak = { - enable = true; - packages = [ - "com.github.tchx84.Flatseal" - "dev.qwery.AddWater" - ]; - }; - systemd.user = { enable = true; startServices = "sd-switch"; # auto reload services when home is rebuilt @@ -426,11 +238,9 @@ }; # moving files! - xdg.configFile."halloy/config.toml".source = ./dotfiles/dot_config/halloy/config.toml; xdg.configFile."git".source = ./dotfiles/dot_config/git; home.file.".npmrc".source = ./dotfiles/dot_npmrc; - home.file.".vst3/yabridge/yabridge.toml".source = ./dotfiles/dot_vst3/yabridge.toml; home.file.".sbclrc".source = ./dotfiles/dot_sbclrc; home.file.".signature".source = ./dotfiles/dot_signature; @@ -442,24 +252,5 @@ }; - home.file.".local/share/The Usual Suspects/Vavra" = { - recursive = true; - source = ../../packages/the-usual-suspects/vavra; - }; - home.file.".local/share/The Usual Suspects/Xenia" = { - recursive = true; - source = ../../packages/the-usual-suspects/xenia; - }; - home.file.".local/share/The Usual Suspects/Osirus" = { - recursive = true; - source = ../../packages/the-usual-suspects/osirus; - }; - home.file.".local/share/The Usual Suspects/OsTIrus" = { - recursive = true; - source = ../../packages/the-usual-suspects/ostirus; - }; - home.file.".local/share/The Usual Suspects/NodalRed2x" = { - recursive = true; - source = ../../packages/the-usual-suspects/nodal-red; - }; + } diff --git a/homes/emenel/dotfiles/dot_config/wezterm/wezterm.lua b/homes/emenel/dotfiles/dot_config/wezterm/wezterm.lua index 2f1c1f3..2fc4452 100644 --- a/homes/emenel/dotfiles/dot_config/wezterm/wezterm.lua +++ b/homes/emenel/dotfiles/dot_config/wezterm/wezterm.lua @@ -51,7 +51,7 @@ config.font = wezterm.font { -- config.enable_scroll_bar = true -config.color_scheme = 'One Dark (Gogh)' +config.color_scheme = 'One Half Black (Gogh)' -- config.color_scheme = 'Adventure' -- config.color_scheme = 'Monokai Pro Ristretto (Gogh)' -- config.color_scheme = 'Afterglow' diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix new file mode 100644 index 0000000..3f79151 --- /dev/null +++ b/modules/home/desktop.nix @@ -0,0 +1,160 @@ +{ pkgs, ... }: + +{ + + home.packages = with pkgs; [ + appimage-run + libappimage + transmission_4-gtk + wl-clipboard + clipse + maim + wayland-utils + libheif.out + + freecad + flatpak + + prusa-slicer + via + vial + scribus + pdfarranger + tdf + pdfchain + pdftk + zathura + gpu-viewer + + wl-mirror + + soundconverter + wmctrl + colloid-icon-theme + whitesur-gtk-theme + whitesur-cursors + whitesur-icon-theme + bibata-cursors + adwaita-qt + + godot_4 + gdtoolkit_4 + sane-airscan + xsane + + bitwarden-cli + bitwarden-desktop + tailscale + trayscale + font-manager + + + squirreldisk + papers + newsflash + + stirling-pdf + ripdrag + + wineWowPackages.stagingFull + winetricks + + sway-launcher-desktop + swayosd + + thunderbird-latest + emojify + smile + + impression + zoom-us + nyxt + ungoogled-chromium + obsidian + vlc + polychromatic + discord + slack + signal-desktop + eyedropper + onlyoffice-desktopeditors + libreoffice + hyphenDicts.en_US + plex-mpv-shim + plexamp + + switcheroo + + blender + davinci-resolve-studio + steam + processing + zotero + fractal + handbrake + krita + rawtherapee + inkscape + gimp + epsonscan2 + kicad + turbocase + openscad-unstable + openscad-lsp + picard + evolutionWithPlugins + plugdata + pavucontrol + qpwgraph + helvum + coppwr + clapper + ardour + + oculante + + farge + halloy + paleta + + wayback + protonplus + + + ]; + + home.pointerCursor = { + package = pkgs.rice.cursor.package; + name = pkgs.rice.cursor.name; + size = 24; + gtk.enable = true; + x11.enable = true; + }; + + gtk.cursorTheme = pkgs.rice.cursor; + + fonts = { + fontconfig = { + enable = true; + }; + }; + + services.flatpak = { + enable = true; + packages = [ + "com.github.tchx84.Flatseal" + "dev.qwery.AddWater" + ]; + }; + + programs = { + eww = { + enable = true; + configDir = ../../homes/emenel/dotfiles/dot_config/eww; + }; + firefox.enable = true; + }; + + xdg.configFile."halloy/config.toml".source = ./dotfiles/dot_config/halloy/config.toml; + +} diff --git a/modules/home/music.nix b/modules/home/music.nix new file mode 100644 index 0000000..853d97e --- /dev/null +++ b/modules/home/music.nix @@ -0,0 +1,88 @@ +{ nix-config, lib, pkgs, ... }: +{ + home.packages = lib.mkMerge [ + (with nix-config.packages.x86_64-linux; [ + mioctl + tal.bassline + tal.j8 + tal.u-no-lx + chair-audio.snare + chair-audio.cymb + the-usual-suspects.vavra + the-usual-suspects.nodal-red + the-usual-suspects.xenia + the-usual-suspects.ostirus + the-usual-suspects.osirus + paulxstretch + ]) + + (with pkgs; [ + bitwig-studio5-latest + + (yabridge.override { + wine = wineWowPackages.stagingFull; + }) + (yabridgectl.override { + wine = wineWowPackages.stagingFull; + }) + + supercollider-with-plugins + carla + tenacity + renoise + + # Audio plugins (LV2, VST2, VST3, LADSPA) + eq10q + geonkick + bespokesynth + helm + surge + odin2 + calf + chow-kick + chow-phaser + chow-centaur + chow-tape-model + chow-multitool + easyeffects + vcv-rack + cardinal + roomeqwizard + guitarix + vital + helio-workstation + stochas + + ]) + ]; + + nixpkgs.config.packageOverrides = pkgs: { + renoise = pkgs.renoise.override { + releasePath = ../../assets/binary-installers/rns_344_linux_x86_64.tar.gz; + }; + }; + + home.file.".local/share/The Usual Suspects/Vavra" = { + recursive = true; + source = ../../packages/the-usual-suspects/vavra; + }; + home.file.".local/share/The Usual Suspects/Xenia" = { + recursive = true; + source = ../../packages/the-usual-suspects/xenia; + }; + home.file.".local/share/The Usual Suspects/Osirus" = { + recursive = true; + source = ../../packages/the-usual-suspects/osirus; + }; + home.file.".local/share/The Usual Suspects/OsTIrus" = { + recursive = true; + source = ../../packages/the-usual-suspects/ostirus; + }; + home.file.".local/share/The Usual Suspects/NodalRed2x" = { + recursive = true; + source = ../../packages/the-usual-suspects/nodal-red; + }; + + home.file.".vst3/yabridge/yabridge.toml".source = ../../homes/emenel/dotfiles/dot_vst3/yabridge.toml; + +} diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index 1a7fa5c..4296f6a 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -53,6 +53,17 @@ numbat glpng nurl + neofetch + nvd + ripgrep-all + silver-searcher + maestral + maestral-gui + powertop + age + kdotool + + caligula # global node packages nodePackages.typescript-language-server