Merge branch 'master' of ssh://git.nx2.site:20022/nx2/dotfiles

flake.lock

@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "Hyprspace": {
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ]
+      },
+      "locked": {
+        "lastModified": 1718642173,
+        "narHash": "sha256-iyj4D6c77uROAH9QdZjPd9SKnS/DuACMESqaEKnBgI8=",
+        "owner": "KZDKM",
+        "repo": "Hyprspace",
+        "rev": "2f3edb68f47a8f5d99d10b322e9a85a285f53cc7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "KZDKM",
+        "repo": "Hyprspace",
+        "type": "github"
+      }
+    },
     "crane": {
       "inputs": {
         "flake-compat": [
@@ -73,6 +93,24 @@
       }
     },
     "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1717285511,
+        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
           "lanzaboote",
@@ -310,6 +348,26 @@
         "type": "github"
       }
     },
+    "hyprswitch": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1715721679,
+        "narHash": "sha256-Qq6F9AFK3TkLU5UCMIvX1mIrPKU8lJ63DjLUUGoB87M=",
+        "owner": "h3rmt",
+        "repo": "hyprswitch",
+        "rev": "a02a74c5cd073542c394567b1a9728f89743ade1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "h3rmt",
+        "ref": "release",
+        "repo": "hyprswitch",
+        "type": "github"
+      }
+    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -364,9 +422,9 @@
       "inputs": {
         "crane": "crane",
         "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
+        "flake-parts": "flake-parts_2",
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "rust-overlay": "rust-overlay"
       },
@@ -401,6 +459,18 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1717284937,
+        "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1678872516,
@@ -449,6 +519,21 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1711588226,
+        "narHash": "sha256-nd7goEu+nH/WZ/uCxvbWzSYqzZZn25kWTeKfANOhCjU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "7232f19f7fb710e3554cafaa9d8e93cff8273b59",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1682741954,
         "narHash": "sha256-RPZxzRu8XU0YD2WeYUFYzJy5yAvWUsxkuK+zWw+6WVk=",
@@ -464,7 +549,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1718208800,
         "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
@@ -512,12 +597,14 @@
     },
     "root": {
       "inputs": {
+        "Hyprspace": "Hyprspace",
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
+        "hyprswitch": "hyprswitch",
         "lanzaboote": "lanzaboote",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "sops-nix": "sops-nix"
       }

flake.nix

@@ -22,10 +22,11 @@
       url = "github:hyprwm/hyprland-plugins";
       inputs.hyprland.follows = "hyprland";
     };
-    # Hyprspace = {
+    Hyprspace = {
-    #   url = "github:KZDKM/Hyprspace";
+      url = "github:KZDKM/Hyprspace";
-    #   inputs.hyprland.follows = "hyprland";
+      inputs.hyprland.follows = "hyprland";
-    # };
+    };
+    hyprswitch.url = "github:h3rmt/hyprswitch/release";
 
     # nixvim = {
     #   url = "github:nix-community/nixvim/nixos-23.11";
@@ -93,7 +94,7 @@
         border-width = 3;
         color =
           let
-            dark = (-0.3);
+            dark = (-0.5);
             bright = (0.5);  
             alter-set = let f = rice.lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
             alter     = let f = rice.lib.alter-luminace-hex; in             color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; };
@@ -102,7 +103,7 @@
               white =   "#ddddff"; # "#dddddd" "#66dd66";
               blue =    "#4422ff"; # "#3333dd" "#003300";
               cyan =    "#11dddd"; # "#11dddd" "#00dd55";
-              green =   "#11dd99"; # "#11dd11" "#11dd11";
+              green =   "#11dd44"; # "#11dd11" "#11dd11";
               magenta = "#6622dd"; # "#dd11dd" "#005500";
               red =     "#dd1166"; # "#dd1111" "#00aa00";
               yellow =  "#dd6611"; # "#dddd11" "#ffff00";
@@ -159,6 +160,11 @@
             package = pkgs.atkinson-hyperlegible;
           };
         };
+        cursor = {
+          name = "Bibata-Original-Classic";
+          package = pkgs.bibata-cursors;
+          size = 24;
+        };
       };
     in
     {

home-modules/gtk.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, pkgs-unstable, lib, user, ... }:
+{ config, pkgs, pkgs-unstable, lib, rice, user, ... }:
 let
   theme-name = "Catppuccin-Macchiato-Compact-Pink-Dark";
   theme-package = pkgs.catppuccin-gtk.override {
@@ -17,6 +17,7 @@ lib.mkIf (user != "tv")
     gtk3
     gtk4
     catppuccin-gtk
+    bibata-cursors
   ] ++ [
     # pkgs-unstable.themix-gui
   ];
@@ -36,20 +37,13 @@ lib.mkIf (user != "tv")
       gtk4.extraConfig = {
         gtk-application-prefer-dark-theme = 1;
       };
-      cursorTheme = {
+      cursorTheme = rice.cursor;
-        name = "Catppuccin-Mocha-Pink-Cursors";
-        package = pkgs.catppuccin-cursors.mochaPink;
-        size = 20;
-      };
     };
 
     home.pointerCursor = {
       gtk.enable = true;
       x11.enable = true;
-      package = pkgs.catppuccin-cursors.mochaPeach;
+    } // rice.cursor;
-      name = "Catppuccin-Mocha-Pink-Cursors";
-      size = 20;
-    };
 
     xdg.configFile = {
       "gtk-4.0/assets".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets";

home-modules/helix.nix

@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, rice, ... }:
+{ pkgs, pkgs-unstable,lib, rice, ... }:
 {
   home = {
     packages = with pkgs; [
@@ -7,6 +7,8 @@
       python311Packages.python-lsp-server
       lldb # debugger for llvm stuff
       yaml-language-server # yaml
+      marksman # markdown
+      vale-ls # spellckecker lsp (needs vale)
      ] ++ (with pkgs-unstable; [
       helix
     ]);
@@ -57,9 +59,19 @@
         C-g = [":new" ":insert-output lazygit" ":buffer-close!" ":redraw"];
       };
     };
-    languages.language = [{
+    languages = {
-      name = "nix";
+      language = [
-    }];
+        {
+          name = "latex";
+          language-servers = ["texlab" "spsdfsellchek"]; 
+        }
+      ];
+      language-server = {
+        spellcheck = {
+          command = lib.getExe pkgs.vale-ls; 
+        };
+      };
+    };
     themes = {
       base16 = with rice.color; {
         "attributes" = foreground; 
@@ -80,13 +92,13 @@
         "function" = secondary.bright; 
         "hint" = tertiary.bright;
         "info" = foreground; 
-        "keyword" = secondary.base;
+        "keyword" = special.base;
         "label" = foreground;
         "namespace" = weird.bright;
         "operator" = foreground;
         "special" = special.base; 
         "string" = secondary.bright; 
-        "type" = red.dark; 
+        "type" = red.base; 
         "variable" = accent.base; 
         "variableother.member" = foreground; 
         "warning" = red.base; 
@@ -210,7 +222,8 @@
           "fg" = black.bright;
         };
         "ui.virtual.inlay-hint" = {
-          "fg" = black.bright;
+          "fg" = weird.bright;
+          "bg" = weird.dark;
         };
         "ui.virtual.ruler" = {
           "bg" = background;

home-modules/hyprland.nix

@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, inputs, host, user, nvidia, rice, lib, ... }:
+{config, pkgs, pkgs-unstable, inputs, host, user, nvidia, rice, lib, ... }:
 let
   animation-speed = "5";
   transparency = builtins.toString rice.transparency;
@@ -49,19 +49,22 @@ let
 in
 lib.mkIf (user != "tv")
 {
-  home.packages = with pkgs; [
+  home.packages = (with pkgs; [
     # hyprland itself is a system package
     hyprland-protocols
-
     hyprlock
     hypridle
+    hyprcursor
 
     grim
     slurp
 
-  ] ++ (with pkgs-unstable; [
+  # ]) ++ (with pkgs-unstable; [
     
+  ]) ++ (with inputs; [
+    hyprswitch.packages.x86_64-linux.default
   ]);
+  
 
   wayland.windowManager.hyprland = {
     enable = true;
@@ -143,6 +146,8 @@ lib.mkIf (user != "tv")
         "GBM_BACKEND,nvidia-drm"
         "__GLX_VENDOR_LIBRARY_NAME,nvidia"
         "WLR_NO_HARDWARE_CURSORS,1"
+        "HYPRCURSOR_THEME,${config.gtk.cursorTheme.name}"
+        "HYPRCURSOR_SIZE,${toString config.gtk.cursorTheme.size}"
       ] else [];
 
       input = {
@@ -251,6 +256,7 @@ lib.mkIf (user != "tv")
         "mako"
         "ibus engine xkb:de::deu"
         "libinput-gestures"
+        # "hyprswitch --daemon"
       ];
 
       windowrulev2 = [
@@ -373,6 +379,7 @@ lib.mkIf (user != "tv")
         # "SUPER,       TAB, overview:toggle"
         # "SUPER,       TAB, hyprexpo:expo, toggle"
         "ALT,         TAB, focuscurrentorlast"
+        # "SUPER,       TAB, exec, hyprswitch --daemon"
         "SUPER,       Q, killactive"
         "SUPER,       W, exec, waybar_mode set '󰈹 '"
         "SUPER,       W, submap, browserSM "
@@ -385,6 +392,8 @@ lib.mkIf (user != "tv")
         # "SUPER,       Z, "
         "SUPER,       U, exec, thunderbird "
         "SUPER,       I, exec, kitty -e fish -c 'hx ~/nix-dots/ && fish'"
+        "SUPER SHIFT, I, exec, kitty -e fish -c 'nh home switch || read'"
+        "SUPER CTRL,  I, exec, kitty -e fish -c 'nh os switch || read'"
         "SUPER,       O, exec, obsidian "
         "SUPER,       P, pin "
         # "SUPER,       Ü,"
@@ -482,6 +491,9 @@ lib.mkIf (user != "tv")
       bindl = [
         # ",switch:on:Lid Switch, exec, hyprlock &"
       ];
+      binde = [
+        # "SUPER, TAB, exec, hyprswitch --daemon --do-initial-execute"
+      ];
     };
 
 
@@ -818,6 +830,56 @@ lib.mkIf (user != "tv")
               showEmptyWorkspace = false
           }
       }
+
+      # allows repeated switching with same keypress that starts the submap
+      binde = SUPER, TAB, exec, hyprswitch --daemon --do-initial-execute
+      bind = SUPER, TAB, submap, switch
+      bind = SUPER, TAB, exec, waybar_mode set "sw" 
+
+      # allows repeated switching with same keypress that starts the submap
+      binde = SUPER SHIFT, TAB, exec, hyprswitch --daemon --do-initial-execute -r
+      bind = SUPER SHIFT, TAB, submap, switch
+      bind = SUPER, TAB, exec, waybar_mode set "swr" 
+
+      submap = switch
+      # allow repeated window switching in submap (same keys as repeating while starting)
+      binde = SUPER, TAB, exec, hyprswitch --daemon
+      binde = SUPER SHIFT, TAB, exec, hyprswitch --daemon -r
+
+      # switch to specific window offset
+      bind = , 1, exec, hyprswitch --daemon --offset=1
+      bind = , 2, exec, hyprswitch --daemon --offset=2
+      bind = , 3, exec, hyprswitch --daemon --offset=3
+      bind = , 4, exec, hyprswitch --daemon --offset=4
+      bind = , 5, exec, hyprswitch --daemon --offset=5
+      bind = , 6, exec, hyprswitch --daemon --offset=6
+      bind = , 7, exec, hyprswitch --daemon --offset=7
+      bind = , 8, exec, hyprswitch --daemon --offset=8
+      bind = , 8, exec, hyprswitch --daemon --offset=8
+      bind = , 9, exec, hyprswitch --daemon --offset=9
+
+      bind = SUPER $reverse, 1, exec, hyprswitch --daemon --offset=1 -r
+      bind = SUPER $reverse, 2, exec, hyprswitch --daemon --offset=2 -r
+      bind = SUPER $reverse, 3, exec, hyprswitch --daemon --offset=3 -r
+      bind = SUPER $reverse, 4, exec, hyprswitch --daemon --offset=4 -r
+      bind = SUPER $reverse, 5, exec, hyprswitch --daemon --offset=5 -r
+      bind = SUPER $reverse, 6, exec, hyprswitch --daemon --offset=6 -r
+      bind = SUPER $reverse, 7, exec, hyprswitch --daemon --offset=7 -r
+      bind = SUPER $reverse, 8, exec, hyprswitch --daemon --offset=8 -r
+      bind = SUPER $reverse, 9, exec, hyprswitch --daemon --offset=9 -r
+      bind = SUPER $reverse, 5, exec, hyprswitch --daemon --offset=5 -r
+
+
+      # exit submap and stop hyprswitch
+      bindrt = SUPER, SUPER_L, exec, hyprswitch --stop-daemon
+      bindrt = SUPER, SUPER_L, submap, reset
+      bindrt = SUPER, SUPER_L, exec, waybar_mode unset
+
+      # if it somehow doesn't close on releasing $switch_release, escape can kill
+      bindr = ,escape, exec, pkill hyprswitch
+      bindr = ,escape, submap, reset
+      submap = reset
+      
     '';
   };
 

home-modules/latex.nix

@@ -2,6 +2,7 @@
 lib.mkIf (host != "NxACE")
 {
   home.packages = with pkgs; [
+    texlab # LSP
     (texlive.combine { inherit (texlive) scheme-full xifthen ifmtarg framed paralist titlesec xcolor; }) 
   ];
 }

home-modules/mako.nix

@@ -14,7 +14,7 @@ lib.mkIf (user != "tv")
     borderSize = border-width;
     font = font.code.name2;
     borderRadius = rounding;
-    anchor = "bottom-right";
+    anchor = "top-right";
     margin = builtins.toString (gap-size * 2) ;
   };
 }

home-modules/programming/c.nix

@@ -2,13 +2,26 @@
 {
   home = {
     packages = with pkgs; [
-      libclang
+      # libclang
       glibc
-      # clang-tools
+      gcc
+      # gnustep.stdenv
+      # pkg-config
+      # gnumake
+      # ninja
+      # cmake
+      # meson
+      # bashInteractive
+
+      # lld
+      clang-tools
+      # clang
+      # cppcheck
     ];
-    sessionVariables = {
+    sessionVariables = with pkgs; {
-      LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include";
+      LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include";
-      C_INCLUDE_PATH = "${pkgs.llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include";
+      C_INCLUDE_PATH = "${llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include";
+      CLANG_RESOURCE_DIR = "${llvmPackages.clang-unwrapped}";
     };
   };
 }

home-modules/vale.nix

@@ -0,0 +1,20 @@
+{ pkgs, lib, user, ... }:
+let 
+  vws = pkgs.vale.withStyles (s: [ s.alex s.google ]); 
+in
+lib.mkIf (user != "tv")
+{
+  home = {
+    packages = [
+      vws
+    ];
+    file.".config/vale/.vale.ini".text = ''
+      StylesPath = ${vws}/share/vale/styles/
+
+      MinAlertLevel = suggestion
+
+      [*]
+      BasedOnStyles = alex, Google 
+    '';
+  };
+}

home-modules/waybar.nix

@@ -164,7 +164,7 @@ lib.mkIf (user != "tv")
         };
       };
     };
-    style = ''
+    style = with rice.color; let f = rice.lib.hex-to-rgb-comma-string; in ''
       * {
         font-family: ${rice.font.code.name2};
         font-size: 1em;
@@ -174,10 +174,10 @@ lib.mkIf (user != "tv")
       }
 
       window#waybar {
-        background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.background},${builtins.toString rice.transparency});
+        background-color: rgba(${f background},${builtins.toString rice.transparency});
         transition-duration: 5s;
         transition-property: background-color;
-        /* border: ${builtins.toString rice.border-width}px solid rgb(${rice.lib.hex-to-rgb-comma-string rice.color.border}); */
+        /* border: ${builtins.toString rice.border-width}px solid rgb(${f border}); */
         /* margin: ${builtins.toString rice.gap-size}px; */
         /* border-radius: ${builtins.toString rice.rounding}px; */
       }
@@ -199,54 +199,54 @@ lib.mkIf (user != "tv")
         padding: 0px 3px;
         margin-top: 0.3em;
         border-radius: ${builtins.toString rice.rounding}px;
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.accent.bright});
+        color: rgb(${f accent.bright});
       }
 
       #workspaces button {
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.white.dark});
+        color: rgb(${f accent.base});
         padding-left: 15px;
         padding-right: 15px;
         border-radius: ${builtins.toString rice.rounding}px;
       }
 
       #workspaces button.active {
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.background});
+        color: rgb(${f background});
-        background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.accent.base},${builtins.toString rice.transparency});
+        background-color: rgba(${f accent.base},${builtins.toString rice.transparency});
       }
 
       #workspaces button:hover {
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.tertiary.bright});
+        color: rgb(${f tertiary.bright});
       }
 
       #workspaces button.urgent {
-        background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.magenta.base},${builtins.toString rice.transparency});
+        background-color: rgba(${f magenta.base},${builtins.toString rice.transparency});
       }
 
       #custom-mode {
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red.base});
+        color: rgb(${f red.base});
       }
 
       #window, #custom-ctimeremaining {
         font-family: ${rice.font.base.name}, ${rice.font.code.name2};
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.tertiary.bright});
+        color: rgb(${f tertiary.bright});
       }
 
       #wireplumber.muted {
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.tertiary.bright});
+        color: rgb(${f tertiary.bright});
       }
       #wireplumber {
         padding-left: 10px;
       }
 
       #battery.warning:not(.charging) {
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.green.base});;
+        color: rgb(${f green.base});;
       }
 
       #battery.critical { 
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red.dark});;
+        color: rgb(${f red.dark});;
-        background: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red.bright});
+        background: rgb(${f red.bright});
       }
-      #battery.charging { color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.green.base}); }
+      #battery.charging { color: rgb(${f green.base}); }
     '';
 
       #battery.critical:not(.charging) { 

home.nix

@@ -31,6 +31,7 @@
     ./home-modules/starship.nix
     # ./home-modules/nvim.nix
     ./home-modules/helix.nix
+    ./home-modules/vale.nix
 
     ./home-modules/yazi.nix
     ./home-modules/zoxide.nix