From 4d42bdad1c63b4ea7e63f439ba0f76117634c023 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Thu, 25 Aug 2022 09:33:52 +0200 Subject: [PATCH] WIP custom vital + zsh and audio configs Signed-off-by: Filippo Berto --- custom/default.nix | 7 ++++--- custom/vital-synth/default.nix | 28 ++++++++++++++++++++++++++++ hm_modules/any_nix_shell.nix | 7 +++++++ hm_modules/pro_audio.nix | 31 +++++++++++++++++-------------- nixos_modules/pro_audio.nix | 14 +++++++------- odin/common_configuration.nix | 2 ++ odin/hm.nix | 3 ++- thor/hm.nix | 2 +- 8 files changed, 68 insertions(+), 26 deletions(-) create mode 100644 custom/vital-synth/default.nix create mode 100644 hm_modules/any_nix_shell.nix diff --git a/custom/default.nix b/custom/default.nix index 45dd68c..1956996 100644 --- a/custom/default.nix +++ b/custom/default.nix @@ -4,10 +4,11 @@ let self = with pkgs; { - lockscreen = callPackage ./lockscreen { }; - update-background = callPackage ./update-background { }; - sddm-theme-clairvoyance = callPackage ./sddm-theme-clairvoyance { }; cocktail-bar-cli = callPackage ./cocktail-bar-cli { }; + lockscreen = callPackage ./lockscreen { }; + sddm-theme-clairvoyance = callPackage ./sddm-theme-clairvoyance { }; + update-background = callPackage ./update-background { }; + vital-synth = callPackage ./vital-synth { }; }; in (self) diff --git a/custom/vital-synth/default.nix b/custom/vital-synth/default.nix new file mode 100644 index 0000000..edbd3dd --- /dev/null +++ b/custom/vital-synth/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, fira-mono }: + +stdenv.mkDerivation rec { + pname = "vital"; + version = "20190530"; + + src = fetchFromGitHub { + owner = "mtytel"; + repo = pname; + rev = "636ca0e"; + sha256 = "sha25ww6-AcVQpG62PkMtAudqyu/iwZ4N6a2bCdfumCmdqE1E548="; + }; + + buildInputs = [ fira-mono ]; + + installPhase = '' + mkdir -p $out/usr/share/sddm/themes/ + cp -a . $out/usr/share/sddm/themes/clairvoyance + ''; + + meta = with lib; { + description = "Clairvoyance theme for SDDM"; + homepage = "https://github.com/eayus/sddm-theme-clairvoyance"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.bertof ]; + platforms = platforms.all; + }; +} diff --git a/hm_modules/any_nix_shell.nix b/hm_modules/any_nix_shell.nix new file mode 100644 index 0000000..a56b9a6 --- /dev/null +++ b/hm_modules/any_nix_shell.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + programs.zsh.enable = true; + programs.zsh.initExtra = '' + source <(${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right) + ''; +} diff --git a/hm_modules/pro_audio.nix b/hm_modules/pro_audio.nix index b561e2b..44d909a 100644 --- a/hm_modules/pro_audio.nix +++ b/hm_modules/pro_audio.nix @@ -1,28 +1,31 @@ { pkgs, ... }: let + user = "bertof"; + systemLibFolder = "/run/current-system/sw/lib/"; + userLibFolder = "/nix/var/nix/profiles/per-user/${user}/home-manager/home-path/lib/"; variables = { - DSSI_PATH = "$HOME/.dssi:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/dssi:/run/current-system/sw/lib/dssi"; - LADSPA_PATH = "$HOME/.ladspa:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/ladspa:/run/current-system/sw/lib/ladspa"; - LV2_PATH = "$HOME/.lv2:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/lv2:/run/current-system/sw/lib/lv2"; - LXVST_PATH = "$HOME/.lxvst:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/lxvst:/run/current-system/sw/lib/lxvst"; - VST_PATH = "$HOME/.vst:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/vst:/run/current-system/sw/lib/vst"; - VST3_PATH = "$HOME/.vst3:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/vst3:/run/current-system/sw/lib/vst3"; + DSSI_PATH = "$HOME/.dssi:${userLibFolder}/dssi:${systemLibFolder}/dssi"; + LADSPA_PATH = "$HOME/.ladspa:${userLibFolder}/ladspa:${systemLibFolder}/ladspa"; + LV2_PATH = "$HOME/.lv2:${userLibFolder}/lv2:${systemLibFolder}/lv2"; + LXVST_PATH = "$HOME/.lxvst:${userLibFolder}/lxvst:${systemLibFolder}/lxvst"; + VST_PATH = "$HOME/.vst:${userLibFolder}/vst:${systemLibFolder}/vst"; + VST3_PATH = "$HOME/.vst3:${userLibFolder}/vst3:${systemLibFolder}/vst3"; }; in { - home.packages = with pkgs; [ + home.packages = with pkgs.unstable; [ carla rnnoise ardour - unstable.zrythm - unstable.breeze-icons + zrythm + breeze-icons mixxx # Plugins - # artyFX + artyFX autotalent boops - unstable.cardinal + cardinal geonkick helm lsp-plugins @@ -31,9 +34,9 @@ in # speech-denoiser # stochas # sunvox - # surge - unstable.giada - unstable.surge-XT + surge + giada + surge-XT talentedhack tunefish vocproc diff --git a/nixos_modules/pro_audio.nix b/nixos_modules/pro_audio.nix index d0e0259..228df85 100644 --- a/nixos_modules/pro_audio.nix +++ b/nixos_modules/pro_audio.nix @@ -51,11 +51,11 @@ # cron.enable = false; # }; - environment.shellInit = '' - export VST_PATH=/nix/var/nix/profiles/default/lib/vst:/var/run/current-system/sw/lib/vst:~/.vst - export LXVST_PATH=/nix/var/nix/profiles/default/lib/lxvst:/var/run/current-system/sw/lib/lxvst:~/.lxvst - export LADSPA_PATH=/nix/var/nix/profiles/default/lib/ladspa:/var/run/current-system/sw/lib/ladspa:~/.ladspa - export LV2_PATH=/nix/var/nix/profiles/default/lib/lv2:/var/run/current-system/sw/lib/lv2:~/.lv2 - export DSSI_PATH=/nix/var/nix/profiles/default/lib/dssi:/var/run/current-system/sw/lib/dssi:~/.dssi - ''; + # environment.shellInit = '' + # export VST_PATH=/nix/var/nix/profiles/default/lib/vst:/var/run/current-system/sw/lib/vst:~/.vst + # export LXVST_PATH=/nix/var/nix/profiles/default/lib/lxvst:/var/run/current-system/sw/lib/lxvst:~/.lxvst + # export LADSPA_PATH=/nix/var/nix/profiles/default/lib/ladspa:/var/run/current-system/sw/lib/ladspa:~/.ladspa + # export LV2_PATH=/nix/var/nix/profiles/default/lib/lv2:/var/run/current-system/sw/lib/lv2:~/.lv2 + # export DSSI_PATH=/nix/var/nix/profiles/default/lib/dssi:/var/run/current-system/sw/lib/dssi:~/.dssi + # ''; } diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix index cc134b2..d9d441c 100644 --- a/odin/common_configuration.nix +++ b/odin/common_configuration.nix @@ -136,6 +136,8 @@ with lib; programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; programs.steam.enable = true; + services.joycond.enable = true; + programs.dconf.enable = true; programs.zsh = { enable = true; syntaxHighlighting.enable = true; }; diff --git a/odin/hm.nix b/odin/hm.nix index 23fe27a..f8b0d5d 100644 --- a/odin/hm.nix +++ b/odin/hm.nix @@ -23,7 +23,7 @@ # evince # evolution file - firefox + firefox-bin # freecad gallery-dl gnome.eog @@ -123,6 +123,7 @@ ../hm_modules/python.nix ../hm_modules/rust.nix + ../hm_modules/any_nix_shell.nix ../hm_modules/alacritty.nix ../hm_modules/autorandr.nix ../hm_modules/bspwm.nix diff --git a/thor/hm.nix b/thor/hm.nix index 257d0f3..6e69e95 100644 --- a/thor/hm.nix +++ b/thor/hm.nix @@ -24,7 +24,7 @@ # element-desktop # matrix client # evolution filelight - # firefox + firefox-bin # freecad gallery-dl gnome.eog