updated flake inputs

2026-02-18 15:52:27 -05:00
parent 79ffcea64b
commit b188e29dfd
19 changed files with 1616 additions and 316 deletions
--- a/modules/home/environment/hyprland.nix
+++ b/modules/home/environment/hyprland.nix
@@ -18,10 +18,10 @@ let
 		"f[1], gapsout:0, gapsin:0"
 	];
 	smartGapsWindowrules = [
-		"bordersize 0, floating:0, onworkspace:w[tv1]"
-		"rounding 0, floating:0, onworkspace:w[tv1]"
-		"bordersize 0, floating:0, onworkspace:f[1]"
-		"rounding 0, floating:0, onworkspace:f[1]"
+		"border_size 0, match:float 0, match:workspace w[tv1]"
+		"rounding 0, match:float 0, match:workspace w[tv1]"
+		"border_size 0, match:float 0, match:workspace f[1]"
+		"rounding 0, match:float 0, match:workspace f[1]"
 	];
 in {

@@ -76,7 +76,7 @@ in {
          "swaync &"
          "wl-paste --type text --watch cliphist store &"
          "wl-paste --type image --watch cliphist store &"
-          "wl-clip-persist --clipboard both"
+          "wl-clip-persist --clipboard regular"
          "systemctl --user import-environment &"
          "hash dbus-update-activation-environment 2>/dev/null &"
          "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &"
@@ -108,36 +108,38 @@ in {
          "XDG_DATA_HOME,$HOME/.local/share"
          "XDG_CACHE_HOME,$HOME/.cache"
        ];
-        layerrule = [ "blur,waybar" "ignorezero,waybar" "blur,launcher" ];
-				windowrulev2 = [
-					"float, class:^(thunar)$,title:^(.*File Operation Progress.*)$"
-					"float, class:^(firefox)$,title:^(Library)$"
-					"float, class:^(thunar)$,title:^(File Operation Progress)$"
-					"float, class:^(thunar)$,title:^(Confirm to replace files)$"
-					"float, title:^(bwarn)$"
-					"float, title:^(bwarn)$"
-					"noinitialfocus, class:^(steam)$"
-					"float, class:^(firefox)$,title:^(ログイン - Google アカウント — Mozilla Firefox)$"
-					"float, class:^(firefox)$,title:^(Firefox — Sharing Indicator)$"
-					"float, class:^(firefox)$,title:^(Firefox — 共有インジケーター)$"
-					"float, class:(firefox), title:^(*.Sign in.*)$"
-				];
+        layerrule = [
+          "match:namespace = waybar, blur 1"
+          "match:namespace = waybar, ignore_alpha 0"
+          "match:namespace = launcher, blur 1"
+        ];
 				windowrule = [
-					"float, class:^(qt5ct)$"
-					"float, class:^(zoom)$"
-					"float, class:^(Steam)$"
-					"idleinhibit focus, class:mpv"
-					"float, title:^(Picture-in-Picture)$"
-					"float, class:^(nm-connection-editor)$"
-					"float, class:^(waypaper)$"
-					"float, title:^(Sign In)(.*)$"
-					"float, title:^(Firefox — 共有インジケーター)$"
-					"nofocus, title:^(Firefox — 共有インジケーター)$"
-					"float, class:^(firefox)$,title^(Sign in - Google Accounts — Mozilla Firefox)$"
-					"size 0 0, title:^(Firefox — 共有インジケーター)$"
-					"move 100%-470 15,title:^(Firefox — Sharing Indicator)$"
-					"move 100%-470 15,title:^(Firefox — 共有インジケーター)$"
-
+					# From old windowrulev2
+					"float true, match:class ^(thunar)$, match:title ^(.*File Operation Progress.*)$"
+					"float true, match:class ^(firefox)$, match:title ^(Library)$"
+					"float true, match:class ^(thunar)$, match:title ^(File Operation Progress)$"
+					"float true, match:class ^(thunar)$, match:title ^(Confirm to replace files)$"
+					"float true, match:title ^(bwarn)$"
+					"no_initial_focus on, match:class ^(steam)$"
+					"float true, match:class ^(firefox)$, match:title ^(ログイン - Google アカウント — Mozilla Firefox)$"
+					"float true, match:class ^(firefox)$, match:title ^(Firefox — Sharing Indicator)$"
+					"float true, match:class ^(firefox)$, match:title ^(Firefox — 共有インジケーター)$"
+					"float true, match:class ^(firefox)$, match:title ^(.*Sign in.*)$"
+					# From old windowrule
+					"float true, match:class ^(qt5ct)$"
+					"float true, match:class ^(zoom)$"
+					"float true, match:class ^(Steam)$"
+					"idle_inhibit focus, match:class ^(mpv)$"
+					"float true, match:title ^(Picture-in-Picture)$"
+					"float true, match:class ^(nm-connection-editor)$"
+					"float true, match:class ^(waypaper)$"
+					"float true, match:title ^(Sign In)(.*)$"
+					"float true, match:title ^(Firefox — 共有インジケーター)$"
+					"no_focus on, match:title ^(Firefox — 共有インジケーター)$"
+					"float true, match:class ^(firefox)$, match:title ^(Sign in - Google Accounts — Mozilla Firefox)$"
+					"size 0 0, match:title ^(Firefox — 共有インジケーター)$"
+					"move 100%-470 15, match:title ^(Firefox — Sharing Indicator)$"
+					"move 100%-470 15, match:title ^(Firefox — 共有インジケーター)$"
 				] ++ smartGapsWindowrules;

        input = {
@@ -149,13 +151,12 @@ in {
        };
 				general = {
 					gaps_in = 5;
-					gaps_out = 9;
+					gaps_out = "0, 9, 9, 9";  # top, right, bottom, left
 					border_size = 3;
 					"col.active_border" = lib.mkForce "rgba(404042ff)";
 					"col.inactive_border" = lib.mkForce "rgba(83858a00)";
 					layout = "dwindle";
 					resize_on_border = true;
-					no_border_on_floating = false;

 					snap = {
 						enabled = true;
@@ -203,10 +204,6 @@ in {
 					hide_on_key_press = true;
 				};

-				experimental = {
-					xx_color_management_v4 = true;
-				};
-
        animations = {
          enabled = true;

--- a/modules/home/environment/userpkgs.nix
+++ b/modules/home/environment/userpkgs.nix
@@ -25,6 +25,7 @@ let
    myScripts.color-commit
    myScripts.mntstack
  ];
+  pythonWithStuff = pkgs.python3.withPackages(ps: with ps; [ requests ]);
 in {
  options = {
    movOpts.envConfig.userPkgs.enable =
@@ -50,7 +51,7 @@ in {
      wf-recorder
      toilet
      vkbasalt
-      librewolf
+      firefox
      spotify
      zathura
      tor
@@ -64,21 +65,27 @@ in {
      w3m
      neovide
      claude-code
-      python3
+      pythonWithStuff
+      monero-cli
+      protonup-qt
+      piper
+      libratbag
      ghostty
      firefox
      fd
      delta
      glfw
-      glxinfo
+      mesa-demos
      xwayland
      discord
      cloc
      wine
+      gimp
      fira-code
      nerd-fonts.fira-code
      nodejs_latest
      myPkgs.noto-sans-jp
+      myPkgs.billy-font
    ] ++ scripts;
  };
 }
--- a/modules/home/environment/zsh/aliases.nix
+++ b/modules/home/environment/zsh/aliases.nix
@@ -22,13 +22,6 @@
        iv = "invoke";
        cfgfilecount = ''find ".\.nix" $FLAKEPATH | wc -l | toilet -f 3d | lolcat'';
        record = "wf-recorder";
-        #git
-        ga = "playshellsound ${self}/assets/sound/gitadd.wav; git add";
-        gcomm = "gitcommit_sfx";
-        gpush = "gitpush_sfx";
-        gpull = "gitpull_sfx";
-        greb = "gitrebase_sfx";
-        rsh = "$HOME/Coding/projects/rust/rsh/target/debug/rsh";
        vide = "neovide";
        pk9 = "pkill -9";
        mkexe = "chmod +x";
@@ -36,6 +29,14 @@
        suvi = "sudoedit";
        suvide = "EDITOR=neovide; suvi";
        rustdev = "nix develop github:km-clay/devshells#rust";
+        claude = "RAW_SHELL=1 claude";
+
+        #git
+        ga = "playshellsound ${self}/assets/sound/gitadd.wav; git add";
+        gcomm = "gitcommit_sfx";
+        gpush = "gitpush_sfx";
+        gpull = "gitpull_sfx";
+        greb = "gitrebase_sfx";
      };
    };
  };
--- a/modules/home/environment/zsh/extraconfig.nix
+++ b/modules/home/environment/zsh/extraconfig.nix
@@ -13,6 +13,33 @@ in
  config = lib.mkIf config.movOpts.envConfig.zshConfig.extraConfig.enable {
    programs.zsh = {
      initContent = ''
+        claude() {
+          bash -c "claude $@"
+        }
+        logmeds() {
+          date >> "$HOME"/medlog.txt
+        }
+        medlog() {
+          cat "$HOME"/medlog.txt
+        }
+        encrypt() {
+          if [ -z "$1" ]; then
+            echo "Usage: encrypt <text> [recipient]"
+            return 1
+          fi
+          if [ -z "$2" ]; then
+            gpg --encrypt --armor -r "$1"
+          else
+            echo "$1" | gpg --encrypt --armor -r "$2"
+          fi
+        }
+        decrypt() {
+          if [ -z "$1" ]; then
+            gpg --decrypt --quiet 2>/dev/null
+          else
+            echo "$1" | gpg --decrypt --quiet
+          fi
+        }
        build-drv() { # Put the derivation path in $RESULT instead of making a 'result' symlink
          RESULT=$(nix-build "$@" --no-link)
          if [ -z "$RESULT" ]; then
@@ -107,6 +134,7 @@ in
        }
        unalias ls
        ls() {
+          if [ "$RAW_SHELL" = "1" ]; then command ls; fi
          eza -1 --group-directories-first --icons "$@"
          ${shellsound} ${sndpath}/ls.wav
          return 0
@@ -126,6 +154,7 @@ in
        }

        cd() {
+          if [ "$RAW_SHELL" = "1" ]; then builtin cd "$@"; return $?; fi
          local prev_sounds_enabled="$SOUNDS_ENABLED"
          SOUNDS_ENABLED=0
          eza -1 --group-directories-first --icons "$@"
--- a/modules/home/programs/git.nix
+++ b/modules/home/programs/git.nix
@@ -6,9 +6,11 @@
  config = lib.mkIf config.movOpts.programConfigs.gitConfig.enable {
    programs.git = {
      enable = true;
-      userEmail = "kylerclay@proton.me";
-      userName = "${username}";
-      extraConfig = {
+      settings = {
+        user = {
+          email = "kylerclay@proton.me";
+          name = "${username}";
+        };
        core.pager = "delta";
        interactive.diffFilter = "delta --color-only";
        delta.navigate = "true";
--- a/modules/home/programs/nixvim/options.nix
+++ b/modules/home/programs/nixvim/options.nix
@@ -42,6 +42,7 @@ in {
      vim.g.vimwiki_list = {{path = '~/vimwiki/', syntax = 'markdown', ext = '.md'}}

      vim.opt.number = true
+      vim.opt.autochdir = false
      vim.opt.relativenumber = true
      vim.opt.hlsearch = true
      vim.opt.incsearch = true
--- a/modules/home/programs/nixvim/plugins/lsp.nix
+++ b/modules/home/programs/nixvim/plugins/lsp.nix
@@ -77,6 +77,7 @@
          jsonls.enable = true;
          lua_ls.enable = true;
          marksman.enable = true;
+          csharp_ls.enable = true;
          rust_analyzer = {
            enable = true;
            installCargo = false;
--- a/modules/home/programs/nixvim/plugins/telescope.nix
+++ b/modules/home/programs/nixvim/plugins/telescope.nix
@@ -6,6 +6,7 @@
        defaults = {
          file_ignore_patterns = [
            "%.snap"
+            "^%.git/"
          ];
        };
        pickers = {