feat: Nix version bump + other updatesHEADmaster

Lots of updates

8 files changed, 77 insertions, 35 deletions

diff --git a/home-manager/YATwm/default.nix b/home-manager/YATwm/default.nix
index 6c5e5f3..f63c8ca 100644
--- a/home-manager/YATwm/default.nix
+++ b/home-manager/YATwm/default.nix
@@ -1,6 +1,7 @@
 {
     pkgs,
     inputs,
+    lib,
     ...
 } : {
     imports = [
@@ -32,6 +33,11 @@
             right = "l";
             up = "k";
             down = "j";
+            wsBind = key: ws: {
+                "s-${key}" = "changeWS ${ws}";
+                "s-S-${key}" = "wToWS ${ws}";
+            };
+            wsBinds = workspaces: lib.attrsets.concatMapAttrs (key: ws: wsBind key ws) workspaces;
         in {
             # Important
             "s-E" = "exit";
@@ -63,32 +69,22 @@
             # Sound
             "s-[" = "spawn playerctl -p firefox play-pause";
             "s-]" = "spawn playerctl -p spotify play-pause";
-
-            # Workspaces
-            "s-1" = "changeWS 1";
-            "s-S-1" = "wToWS 1";
-            "s-2" = "changeWS 2";
-            "s-S-2" = "wToWS 2";
-            "s-3" = "changeWS 3";
-            "s-S-3" = "wToWS 3";
-            "s-4" = "changeWS 4";
-            "s-S-4" = "wToWS 4";
-            "s-5" = "changeWS 5";
-            "s-S-5" = "wToWS 5";
-            "s-6" = "changeWS 6";
-            "s-S-6" = "wToWS 6";
-            "s-7" = "changeWS 7";
-            "s-S-7" = "wToWS 7";
-            "s-8" = "changeWS 8";
-            "s-S-8" = "wToWS 8";
-            "s-9" = "changeWS 9";
-            "s-S-9" = "wToWS 9";
-            "s-0" = "changeWS 10";
-            "s-S-0" = "wToWS 10";
             
             # Special workspaces
             "s-p s" = "changeWS 11";
             "s-S-p s" = "wToWS 11";
+        } //
+        wsBinds {
+            "1" = "1";
+            "2" = "2";
+            "3" = "3";
+            "4" = "4";
+            "5" = "5";
+            "6" = "6";
+            "7" = "7";
+            "8" = "8";
+            "9" = "9";
+            "0" = "10";
         };
         workspaces = [
             {name = "1: A";}
diff --git a/home-manager/emacs/default.nix b/home-manager/emacs/default.nix
index 746e084..6bb1dc6 100644
--- a/home-manager/emacs/default.nix
+++ b/home-manager/emacs/default.nix
@@ -3,8 +3,10 @@ let
     tex = (pkgs.texlive.combine {
         inherit (pkgs.texlive) scheme-medium
             dvisvgm dvipng # for preview and export as html
+            # svg transparent
             etoolbox
             subfiles
+            enumitem
             wrapfig amsmath ulem hyperref capt-of;
     });
     myEmacs = (pkgs.emacsPackagesFor pkgs.emacs30).emacsWithPackages (epkgs: with epkgs; [
@@ -23,9 +25,10 @@ in
         emacsPackages.mu4e
         isync
         ispell
-        poppler_utils
+        poppler-utils
         tex
         ghostscript
+        haskell-language-server
         myEmacs
     ];
 }
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 9f468a6..3611afc 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -24,7 +24,7 @@
     home.packages = with pkgs; [
         feh
         pass
-        spotify
+        # spotify
         playerctl
         libqalculate
         libreoffice
@@ -50,19 +50,27 @@
         #     plover-controller
         # ]))
         pavucontrol
-        unzip
+        unzip zip
         appimage-run
         lunar-client
         libnotify
         xclip
         (python3.withPackages (ps: with ps; [
             python-lsp-server
+            numpy
+            matplotlib
+            jupyter
+            jupytext
+            pandas
+            pydot
         ]))
+        graphviz
         alacritty
         nyxt
         wireguard-tools
         brightnessctl
-        inputs.nil.packages.${system}.default
+        # inputs.nil.packages.${system}.default
+        nil
         #inputs.polymc.packages.${system}.default
         jre8
         #inputs.zen-browser.packages."${system}".default
@@ -72,7 +80,12 @@
         superTuxKart
         typst
         sops
+        ffmpeg
+        ghc
+        # hytale-launcher
+        # inputs.hytale-launcher.packages.${pkgs.system}.default
         #adom
+        flatpak
     ];
     
     nix = {
@@ -122,6 +135,8 @@
             input-overlay
         ];
     };
+
+    # services.easyeffects.enable = true;
     
 
     programs.firefox.enable = true;
@@ -131,7 +146,7 @@
     # };
     
 
-    stylix.targets.spicetify.enable = false;
+    stylix.targets.spicetify.enable = true;
     stylix.targets.firefox.profileNames = [ "default"];
     # stylix.targets.nixcord.enable = true;
     
@@ -140,18 +155,19 @@
             spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
         in
           {
-              enable = false;
+              enable = true;
               enabledExtensions = with spicePkgs.extensions; [
                   fullAppDisplay
                   powerBar
-                  addToQueueTop
+                  # addToQueueTop
+                  loopyLoop
               ];
               enabledCustomApps = with spicePkgs.apps; [
                   newReleases
                   lyricsPlus
                   betterLibrary
               ];
-              theme = spicePkgs.themes.nightlight;
+              # theme = spicePkgs.themes.nightlight;
           };
     
     
diff --git a/home-manager/i3/config b/home-manager/i3/config
index 59116ba..d58db13 100644
--- a/home-manager/i3/config
+++ b/home-manager/i3/config
@@ -133,7 +133,7 @@ bindsym $mod+Shift+d exec --no-startup-id "prime-run rofi -i -show drun -disable
 #bindsym $mod+d exec dmenu_run -i -nb '#303239' -nf '#f3f4f5' -sb  '#bf00f6' -sf '#f3f4f5'
 
 # Password menu
-bindsym $mod+g exec --no-startup-id "~/bin/rofi-passmenu"
+bindsym $mod+g exec --no-startup-id "rofi-passmenu"
 
 # i3 command runner
 bindsym $mod+Shift+semicolon exec --no-startup-id "i3-msg $(echo | rofi -l 0 -dmenu -p 'i3 command')"
diff --git a/home-manager/i3/default.nix b/home-manager/i3/default.nix
index 087415c..5fba6e1 100644
--- a/home-manager/i3/default.nix
+++ b/home-manager/i3/default.nix
@@ -21,12 +21,12 @@
     xsession.enable = true;
     xsession.windowManager.i3 = {
         enable = true;
-        package = pkgs.i3-gaps;
+        package = pkgs.i3;
     };
     xdg.configFile."i3/config".enable = false;
     home.file.".config/i3/config" = {
         source = ./config;
-        onChange = "${pkgs.i3-gaps}/bin/i3-msg restart";
+        onChange = "${pkgs.i3}/bin/i3-msg restart";
     };
     home.packages = with pkgs; [
 		i3lock
diff --git a/home-manager/i3/scripts/image_upload.sh b/home-manager/i3/scripts/image_upload.sh
index 896f23f..ea327ad 100755
--- a/home-manager/i3/scripts/image_upload.sh
+++ b/home-manager/i3/scripts/image_upload.sh
@@ -2,6 +2,6 @@
 image_name=$(rofi -dmenu -l 0 -p "Image name")
 xclip -selection clipboard -t image/png -o > ~/Documents/tehbox-files/$image_name
 eval $(ssh-agent)
-rsync ~/Documents/tehbox-files/$image_name files@tehbox.org:/srv/files
+rsync ~/Documents/tehbox-files/$image_name boss@tehbox.org:/srv/files
 notify-send "uploaded https://files.tehbox.org/$image_name"
 echo -n "https://files.tehbox.org/$image_name" | xclip -i -selection clipboard
diff --git a/home-manager/i3/scripts/rofi-passmenu b/home-manager/i3/scripts/rofi-passmenu
new file mode 100755
index 0000000..798961b
--- /dev/null
+++ b/home-manager/i3/scripts/rofi-passmenu
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+shopt -s nullglob globstar
+
+typeit=1
+
+if [[ -n $WAYLAND_DISPLAY ]]; then
+	rofi=rofi-wl
+	xdotool="ydotool type --file -"
+elif [[ -n $DISPLAY ]]; then
+	rofi=rofi
+	xdotool="xdotool type --clearmodifiers --file -"
+else
+	echo "Error: No Wayland or X11 display detected" >&2
+	exit 1
+fi
+
+prefix=${PASSWORD_STORE_DIR-~/.password-store}
+password_files=( "$prefix"/**/*.gpg )
+password_files=( "${password_files[@]#"$prefix"/}" )
+password_files=( "${password_files[@]%.gpg}" )
+
+password=$(printf '%s\n' "${password_files[@]}" | "$rofi" -dmenu "$@")
+
+[[ -n $password ]] || exit
+
+pass show "$password" | { IFS= read -r pass; printf %s "$pass"; } | $xdotool
diff --git a/home-manager/rofi/default.nix b/home-manager/rofi/default.nix
index 678fd71..5e900c3 100644
--- a/home-manager/rofi/default.nix
+++ b/home-manager/rofi/default.nix
@@ -8,6 +8,6 @@
         recursive = true;
     };
     home.packages = [
-        pkgs.rofi-wayland
+        pkgs.rofi
     ];
 }