diff options
| -rw-r--r-- | home/nipsy/common/core/zsh/default.nix | 58 | ||||
| -rw-r--r-- | hosts/common/optional/sound.nix | 17 |
2 files changed, 34 insertions, 41 deletions
diff --git a/home/nipsy/common/core/zsh/default.nix b/home/nipsy/common/core/zsh/default.nix index befa183..5bd6338 100644 --- a/home/nipsy/common/core/zsh/default.nix +++ b/home/nipsy/common/core/zsh/default.nix @@ -1,37 +1,45 @@ +{ lib, ... }: { programs.zsh = { enable = true; - envExtra = '' -export PATH=~/bin:''${PATH} -#export PS1="%B%n%b@%U%m%u/%l:%~> " -export PAGER=less -export EDITOR=vim -export BROWSER=firefox - -export LC_COLLATE="C" -export QUOTING_STYLE="literal" - -export IRCNICK="nipsy" -export IRCNAME="Mark Nipper" - -export NNTPSERVER="news.giganews.com" - -#export COLORTERM=truecolor -#export COLORFGBG="green;blue" -export COLORFGBG=";0" - -# fix stupid broken Java shit -export _JAVA_AWT_WM_NONREPARENTING=1 - -# enable pass extensions -export PASSWORD_STORE_ENABLE_EXTENSIONS=true - ''; history = { save = 100000; size = 100000; }; + initExtra = (builtins.readFile ./zshrc); + + sessionVariables = let makePluginPath = format: + (lib.strings.makeSearchPath format [ + "$HOME/.nix-profile/lib" + "/run/current-system/sw/lib" + "/etc/profiles/per-user/$USER/lib" + ]) + ":$HOME/.${format}"; + in { + _JAVA_AWT_WM_NONREPARENTING = 1; # fix stupid broken Java shit + BROWSER = "firefox"; + COLORFGBG = ";0"; + #COLORFGBG = "green;blue"; + #COLORTERM = "truecolor"; + DSSI_PATH = makePluginPath "dssi"; + EDITOR = "vim"; + IRCNAME = "Mark Nipper"; + IRCNICK = "nipsy"; + LADSPA_PATH = makePluginPath "ladspa"; + LC_COLLATE = "C"; + LV2_PATH = makePluginPath "lv2"; + LXVST_PATH = makePluginPath "lxvst"; + NNTPSERVER = "news.giganews.com"; + PAGER = "less"; + PASSWORD_STORE_ENABLE_EXTENSIONS = "true"; + PATH = "~/bin:$PATH"; + #PS1 = "%B%n%b@%U%m%u/%l:%~> "; + QUOTING_STYLE = "literal"; + VST_PATH = makePluginPath "vst"; + VST3_PATH = makePluginPath "vst3"; + }; + shellAliases = { fixkeyboard = "setxkbmap -layout us -option caps:super -option compose:ralt"; geniso = "nix build ~/git/nix/nipsy#nixosConfigurations.iso.config.system.build.isoImage && ll result/iso/*iso"; diff --git a/hosts/common/optional/sound.nix b/hosts/common/optional/sound.nix index 61ab23f..c54461a 100644 --- a/hosts/common/optional/sound.nix +++ b/hosts/common/optional/sound.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ pkgs, ... }: { environment = { systemPackages = with pkgs; [ @@ -27,20 +27,5 @@ yoshimi zynaddsubfx ]; - - variables = let makePluginPath = format: - (lib.strings.makeSearchPath format [ - "$HOME/.nix-profile/lib" - "/run/current-system/sw/lib" - "/etc/profiles/per-user/$USER/lib" - ]) + ":$HOME/.${format}"; - in { - DSSI_PATH = makePluginPath "dssi"; - LADSPA_PATH = makePluginPath "ladspa"; - LV2_PATH = makePluginPath "lv2"; - LXVST_PATH = makePluginPath "lxvst"; - VST_PATH = makePluginPath "vst"; - VST3_PATH = makePluginPath "vst3"; - }; }; } |