7 files changed, 18 insertions, 194 deletions
diff --git a/home/don/common/core/bash.nix b/home/don/common/core/bash.nix
index 77f0cf4..7bfb808 100644
--- a/home/don/common/core/bash.nix
+++ b/home/don/common/core/bash.nix
@@ -3,8 +3,14 @@
     enable = true;
     enableCompletion = true;
     shellAliases = {
-      ll = "ls -alF --color=auto";
+      grep = "grep --color=auto";
+      ip = "ip -c=auto";
       la = "ls -aF --color=auto";
+      ll = "ls -alF --color=auto";
+      lock = "xscreensaver-command -lock";
+      nix-list-derivations = "nix-store --query --requisites /run/current-system | cut -d- -f2- | sort | uniq";
+      nix-list-generations = "nixos-rebuild list-generations";
+      zgrep = "zgrep --color=auto";
     };
   };
 }
diff --git a/home/don/common/core/default.nix b/home/don/common/core/default.nix
index 5983f42..8250d0c 100644
--- a/home/don/common/core/default.nix
+++ b/home/don/common/core/default.nix
@@ -2,11 +2,7 @@
 {
   imports = [
     ./bash.nix
-    #./git.nix
-    #./ssh.nix
-    #./tmux
     ./vim
-    ./zsh
   ];
 
   home = {
diff --git a/home/don/common/core/zsh/default.nix b/home/don/common/core/zsh/default.nix
deleted file mode 100644
index c78884f..0000000
--- a/home/don/common/core/zsh/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib, ... }:
-{
-  programs.zsh = {
-    enable = 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";
-      CLAP_PATH = makePluginPath "clap";
-      COLORFGBG = ";0";
-      #COLORFGBG = "green;blue";
-      #COLORTERM = "truecolor";
-      DSSI_PATH = makePluginPath "dssi";
-      EDITOR = "vim";
-      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 = "$HOME/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";
-      grep = "grep --color=auto";
-      ip = "ip -c=auto";
-      la = "ls -aF --color=auto";
-      ll = "ls -alFhs --color=auto";
-      lock = "xscreensaver-command -lock";
-      nix-list-derivations = "nix-store --query --requisites /run/current-system | cut -d- -f2- | sort | uniq";
-      nix-list-generations = "nixos-rebuild list-generations";
-      steam-no-beta = "steam -clearbeta";
-      zgrep = "zgrep --color=auto";
-    };
-  };
-}
diff --git a/home/don/common/core/zsh/zshrc b/home/don/common/core/zsh/zshrc
deleted file mode 100644
index f724569..0000000
--- a/home/don/common/core/zsh/zshrc
+++ /dev/null
@@ -1,125 +0,0 @@
-umask 022
-
-eval $(dircolors)
-
-# set SWAYSOCK correctly
-#if pgrep -U don -x sway >/dev/null; then
-#	export SWAYSOCK=/run/user/$(id -u)/sway-ipc.$(id -u).$(pgrep -x sway).sock
-#fi
-
-# start sway by default if logging into tty1
-#if [[ -z "${DISPLAY}" ]] && [[ $(tty) == "/dev/tty1" ]]; then
-#
-#	export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-#
-#	# set some Wayland specific variables
-#	export MOZ_ENABLE_WAYLAND=1
-#	export GDK_BACKEND=wayland
-#	export QT_QPA_PLATFORM=wayland
-#	export SDL_VIDEODRIVER=wayland
-#	export XDG_SESSION_TYPE=wayland
-#
-#	exec sway > ~/.sway.log
-#
-#fi
-
-# if already in Wayland, update the GPG TTY so ssh-askpass will work correctly
-#if [[ -n "${WAYLAND_DISPLAY}" ]]; then
-#	gpg-connect-agent updatestartuptty /bye >/dev/null
-#fi
-
-# completion options
-setopt LIST_PACKED MENU_COMPLETE
-# expansion and globbing options
-setopt NO_NOMATCH
-# history options
-setopt SHARE_HISTORY EXTENDED_HISTORY HIST_FCNTL_LOCK HIST_IGNORE_ALL_DUPS HIST_REDUCE_BLANKS HIST_SAVE_NO_DUPS
-# input/output options
-setopt PRINT_EXIT_VALUE RM_STAR_SILENT
-# job control options
-setopt LONG_LIST_JOBS NO_HUP
-# zle options
-setopt NO_BEEP
-
-# menu completion
-zstyle ':completion:*' menu select=5
-
-# vi keybindings and settings
-bindkey -v
-export KEYTIMEOUT=1
-autoload -U edit-command-line
-zle -N edit-command-line
-bindkey -M vicmd v edit-command-line
-
-# always open tmux if interactive
-[[ $- != *i* ]] && return
-#[[ -z "$TMUX" ]] && (tmux -2 new-session -t default \; new-window || tmux -2 new-session -s default)
-[[ -z "$TMUX" ]] && (tmux -2 attach -t default || tmux -2 new-session -s default)
-
-# useful helper functions
-function nix-file-list { find $(nix build ${1} --print-out-paths --no-link) }
-
-function ntrace {
-
-	if [[ -z ${argv} ]]; then
-		echo 'you must specify a command to strace!' >&2
-		return 1
-	fi
-
-	eval strace -f -e trace=network -s 10000 ${=argv[@]}
-
-}
-
-# prompt/theme shit
-function precmd {
-
-	local RC=${?}
-	#local RC=${(%)RC-%?}
-	
-	print -nP '\n'
-	
-	# current user
-	if [[ ${EUID} -eq 0 ]]; then
-		print -nP '%{%S%F{red}%}%n%{%f%s%}'
-	else
-		print -nP '%{%F{magenta}%}%n%{%f%}'
-	fi
-	
-	print -nP '@'
-	
-	# current host
-	if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then
-		print -nP '%{%F{yellow}%}%m%{%f%}'
-	else
-		print -nP '%{%F{green}%}%m%{%f%}'
-	fi
-	
-	# connected terminal
-	print -nP '/%{%U%}%l%{%u%} '
-	
-	# cwd
-	print -nP '%{%F{cyan}%}%~%{%f%} '
-	
-	# job count
-	JOBCOUNT='%j'
-	if [[ ${(%)JOBCOUNT} -gt 0 ]]; then
-		print -nP 'j=%{%F{yellow}%}%j%{%f%} '
-	fi
-	
-	# previous return code
-	if [[ ${RC} -ne 0 ]]; then
-		print -nP 'rc=%{%F{red}%}'
-		echo -n "${RC}"
-		print -nP '%{%f%} '
-	else
-		print -nP 'rc=%{%F{green}%}'
-		echo -n "${RC}"
-		print -nP '%{%f%} '
-	fi
-	
-	# time stamp
-	print -P '%{%F{cyan}%}%D{%FT%T%z}%{%f%}'
-
-}
-
-PS1='%# '
diff --git a/home/nipsy/fangorn.nix b/home/nipsy/fangorn.nix
index 83c92cd..cee431b 100644
--- a/home/nipsy/fangorn.nix
+++ b/home/nipsy/fangorn.nix
@@ -2,5 +2,8 @@
 {
   imports = [
     common/core
+    common/optional/desktops
+    common/optional/desktops/services/blueman-applet.nix
+    common/optional/desktops/services/xscreensaver.nix
   ];
 }
diff --git a/home/nipsy/secrets/arrakis.yaml b/home/nipsy/secrets/arrakis.yaml
index 6b8813f..49dc27c 100644
--- a/home/nipsy/secrets/arrakis.yaml
+++ b/home/nipsy/secrets/arrakis.yaml
@@ -1,10 +1,6 @@
 reaper_license: ENC[AES256_GCM,data:v+3MRFYfshEg+v/wrf5kYY3zIJsQhl0RUXaOw/VmbIqjswH0aTy28UsU8rt4+btvywpb4TT9ta9NkBrnsHBgE5jTnIrnUyt6NJHOSnA/I9TUzvumg6ijKzuu86w3uahCwlPE/ZBrR+BKRM0pK5d7En9HHuNTNUwVrmAkMOk0YeuaArWu+e50CWl+Yx84HiNCP7BgsUbc8Wa9PZMinvXpzwd69WKDmsVdVLGnHPxTJHFTH8/8XAV0DrHbW4nV/xUiFALTURWqbyZlQpcfMjSHDT7YNq/c6JZzU4YYFZOrYrkiUPAn5Zjz/r/XcdteIpai2wZrgRir7/1Vxhul2wK2Ku0Z/66JeNxj2Tk4/CPcWQIbwZF4k13Z5x4wm8duOWrDgnjSRRwM10TSeERP4KiFsIL9xFR5MATYsUD1gTKtCDRN8SsO+/NGXlUn4nkN4tNxedxeRfGNmxwijmkJ6RTFwdcKwUh8KHMh/TEpGG05/hGZ6Z+Q7/5QsT+wrCb1kMwFZuEjLMCNyT+wBy6G2Ns5pSyiNwFRXzqYjYMqlPGliZOaaVZ6HWkthd9G7CiqYbP5YZfI6VspbVoqc2FDvTvf65YBrh8VFHWelwbrbnWX8/glB8UWNp0pwoTxM/sjfQLwXNMmb/EGU4X1SYbQcPe4gNLuspDjaqwA/g==,iv:tq8oSvqZTmy2pZK3LhxqBM1OZG3x+LS4ov0+lE5I0B0=,tag:J/WTEMSjl+EYZn7HbifGMQ==,type:str]
-ssh_config: ENC[AES256_GCM,data:lHK4qHMOToG4LzWwAeJ7nSwHXtYSlaCvUqsch7+Vvzn7kpuE8hFphw1OVbbUOFl7vpRxaJ06ghjE3qSNN45J028KytI5nVVGd+k8qjvhrsp2Y+j0XwtpGA0C+dXUpIdRQcdFx8jZRBqej6ipnUl1e25Tt5XZs+aZfdblql3rw2tyYASNyYszjvJR/5LmLSIaJo79tao+gg8yOR5T1uLeS4fcC5d8V9hXSE+RxaBZXyAjBshowADMCbUl2R1FFzRVg+6kp/GpwsQSNZrDasH2aWziwZmA7h9rc2Kc2zMcZeiQ/KUEhq8xj5fwsSqp1URsZXvv3kEdTKceGI6eszHNsqbLipkTXmK1LnyfZrymJ1oToL3REDPd8La7wRyrSyX7Eq32w2GgB2eGbQIdEAE37XkK7wwINO6BzB5mdyo0PDghvakTvPhxnp5d6raogb99H+aZwDD4Rb6kmTpuZZdedtuAOqXWREq7+BQsC501inIkcDcJ5wrOj+6HNttsA5BGc16vrSRw+NX++E63OP5Mjbh6LZeWPRutIubIf38nis8pcBtvzhOrt/fWn4QqWMOJ0LdEXpEU7GzETq4klwg+ohdDCLGZqa1WNTmvNQUslxZFZb7J+2Od/MxVhQg7VUxlJZrvsht6oKzBkDQXHJdBtMDsxpkqUhO65GX8bSdiJp62j2aiinQ7P250S3dGwTYHzDC8Q6KpfzHGY+YUa81soggjDLAuViCFYqnvXK9egKl8G/6WiDDo6O3gv/csywcMUSVR+AFGFH/SwRMf6n70nFHkUO+pNQphONKZQoNMV9TA53K9ChUX/7lG3AQvfe2jb2MGYc77AY6+L+vzzNw7o2Iffjy8fEV+Ytq4rQaqxOqDQwhOUWZcQo6k1pmtbXVzPgn1b6VYq/RHTG2uw8zx1pzuesofh6GP5TmaNoWNxKN42J8jm5AeDmuuFoOBjmpUpAzMsmf4g5jZiZRGjguZDo3laVATNXVU8iYNcMRsH7wzPIsMHn7+LoKcoIX67/uD/cURUX5HFBQJUKkxOAk18P1u2pLr59Lw4zUA6I+tPZgN2iyxe5Nn/blXI8KPWXo3l85pdJEYgZzEVxozCUDrEo0ESgw8KdY6JzLctkreskHg1AwMKCe2udO/yInTipQH2pOAv9+LOzZylBZJaYgMo1+G/lik8bodK6/CuCXo/rPEky0CejN/k5E6QqG2uRTqOD/j5k/E+dV3zVtXcWHW9NvX5hOkmgbTN/cAtGiEcAmfDyOflJ0nUBLGtTAB0zlEGJH+M9B1AS1BUWW2J9UJ8GIsAn+5/iu3RsB1/mNCtV2BWsCzIlF9BkRybW+rpWXS0ubUaLK/ckQ2/uTfqLle4asQofdY5jhvi9DtoXv8rpREDRPFfgNz6CtjeVogftDaywKLRFC7JU8DRQqzYN3nz4RiJLrG3WO6L3rxEADY+vgTe5Jy4bAz2yUrLwkM8iP7SgwbHAFWxXOWsdYkZt/xbZ/mydr7X9ZAAM9TaqIzYRrR2yIFPRhYjxhn3V2uuonPykKqx+cUwUjUIN8B3tcfuXVpGv5A1zNoHv7iao1LrRE7J9n83ZeSbSYh1cnHm0Jkr9xzxVuV49KVYySIyi2Afo4+oGMFZHlZ/8d1bqCktrInFNBOSN3s2Q==,iv:oe6PtLmY9V4QuhuLrdtMMQJFsuaCC6XoPAWlGlvmSFw=,tag:BrGrA+jVCaTN7yFtl02bVA==,type:str]
+ssh_config: ENC[AES256_GCM,data:SAgBseS02Ja6ziGetbuXQWzF/h2aScCVxBte6yzTqWsOb0nachm2YndfuZydmjSFtkmE++Ro0p42rbxEyK+lvWgGSFKv7PXew88QeY/cwzokV/BcxJDcwMbmgwZgigsk8ku3BDJos/2YNfAACsu/c7McHpzSZU5txY35h06EEwPPr5oOaAR+7KnVz8crLdwadLKWdFQj+UK2h6ZcxpoeKXTXjmee7jJGCnKk8mDnwfT+zpDWodlTZB98wgz6LbwRNgtL2jj1vChxvsy4dQ1EDc1apguBylAGhx8Is38uy5Gdoe09emc+y24rsurYVqHC8P1AMW5KC/N0IVwDKHeWZYC+kSIlDqT4SCQAH1TsTi3eAr56fEQTLAZtsDWCcp2AvtVzYAhHkl17HNMfRvRZGb/u4INZuLnB/zANxeB6QhYM/61HWSBbcDXf/mXeC7ieJV9kTA/loHO4JJQzMLuE/3ey1BgWGuAcCe38YoXQF5V+0FldbK2v3sMmTWk1EHsGw1Q6RoCSzhLuj+FQfAQCJS0d/rTbqVZyT/1Q0kL9eviREqCTyMkWK+p8Sui2haUojZdeSoJfuXJddnmP1iHmwWpwj6vAAcCJbR+oVHaCqjJxvQx1DQYxG3I+gCnYbPAtJ7mQIY8fhlxt6JUjaX0ssqheKpGGjHheirJ3t0ZOOAiuyLLzpk9WFuLgQ2y3hd94W1Idrqaxo/LolBKFAgbAF/nKbmjYgvRupljTBdvtpchpIDMsJ/HTDwousCFts+tqv3V1IZ+dfTmRAX69JicS+Xhno8x4Ap/f+yIFOTUYZMqIWUYrQQ1mmQiWhs9JpgT7AYp/aLA/u5dcVjRKz6bUmdi9r9Ez/VbfCpIobRUpjtVuXq5wy4R9LGGxCmzeqOEnwK/VZn8uBdFFLQzT+VUHzpqfHiRKpeAyJXpCOd85ytTIstZlM+nQ5l6FHt6YujY4tyzjM+iIaLAn349JJvYy1SAvjkOKxxZNztRSCPEq6XBhq0FW5ARHjDokQzi1RAwBjDR+ErgXadh9VrSIjvKPn+d6wZUQcgtJ8xpOl8D8f3vVybpLTVu94XhzxNH1IhvOYL4efFMA+io1dGmnvWcB3FQdwy4K9JF/QE22q701n3BUJu5rhcwScwoj2vyAnW1lBoEpZ2eq73j/bOJSMV5bzYgi9NUvhg7NjXD6XWqtyUx7mEsdcPE8m0cfwqQRgYOECjHiD/Txb78bt57PQ9S3evxCP4BUBURSADUxwq3PeLKb0dpYa7fumlA2Vl7xX4iDkFrG398uIvl5FF03ujQYeVRh0iGIlSvCJkpbwsET229wJRAM8FNMEAgg3GRf+Hh9YOHgCrF2D+gZeLJy+qYvuX2OqivEknh2NehOM8IVruRMn8Zltsk8zu/uPjFtDbgb3Ffyp8Xo5eV8i10drRo1C8aCv54bDnhhPojCGXNRgNGIAnQKVpSdCGbh/18/OOYqhQ5cncez5DYVOaD+qsw5efqGBCVMyBdpeyxAlZ4wUgULKAXDq/YO1PTiM8q0rUxDQmlnDt+4nLXWa9Tmkk+atxkk/xn79tas3V5AN80sDlhYDz42AEvWvfNsmK0kJKgytn0DVLMVqpbMpDQq20LUCbduVY3oYKg3ILpsZnKa8gx/JWbvSa08DmuS4b+tgD2Byxkf3a6poP8ccmp0G1j8potAqWGnkTo0SkAX,iv:hZriR4K4omzqDH5TGSp0WfTCsNQoOcN9HZ3nMKA+gmI=,tag:TPKW1HjavYCPMetoZxEVqQ==,type:str]
 sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
     age:
         - recipient: age1a9gp70y8576pkvklz2arz6h9ecnrjeue2vvh9mvvk92z4ymqrg4qdqm9va
           enc: |
@@ -15,8 +11,7 @@ sops:
             cWx6Z2psUUlobDdFd20wcXBvS2tUaW8Knod4aI4/qOIJqMr2rdQzUta/G3HDFif8
             LoREomHElDv31FYrR1EVEr8Fk11hhkuZs7a0iEzxTxPe6CjCiSfqbQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-10-16T07:02:53Z"
-    mac: ENC[AES256_GCM,data:wAbaSouSNEIt+gpRhtJ8Dcay662f8p/flpVz+YCYmSXXgm8AXVJfWOCnKCLM5WC6Uge9tZVlAli8oYdJ3PcKMqE+0dSXH0haEi3uenhvOxj63eLLIiccDRjOI45OJk+9J0ilKsqiaP7S1nnY185DCDtgDdLr9mOZlpBrHZohKxw=,iv:ue4DD08RllFhDZHf2BlsuFRouM+596skjXw9KQxMs2U=,tag:7gU9N7pwl/VdRMr0ndpRug==,type:str]
-    pgp: []
+    lastmodified: "2025-04-14T20:50:20Z"
+    mac: ENC[AES256_GCM,data:nnR4QBAJZu91gBstCqkSvzymiEnPhjwdHifmld6KQKXSFaa+zp3XSzwtdWJ5EitmCS74JedWckS9rcADIq8u020LG+0MITiqoK3ev9eRehGUrWOVBD77A6lGu0nj2lqcmczwXFt9wjEvEEVKvz2AgELDdltE4fHKeCLwoJkonS4=,iv:oz8U/jgMQG8gELUQhXMq7dNHBk/AhbwsI0gYkb3TeQk=,tag:sjTPTBP2FWzxVhVIE9NTBw==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.9.1
+    version: 3.10.1
diff --git a/home/root/fangorn.nix b/home/root/fangorn.nix
index 83c92cd..72dbda0 100644
--- a/home/root/fangorn.nix
+++ b/home/root/fangorn.nix
@@ -3,4 +3,8 @@
   imports = [
     common/core
   ];
+
+  nix.extraOptions = ''
+    !include /run/secrets/nix-access-token-github
+  '';
 }