dotfiles

commit b210f829c3f4acd876ad0ff2ae98133d9b9824e6
parent 5e820995d6071119e809bcbb6ba15fcf2dd2251b
Author: maydayv7 <maydayv7@gmail.com>
Date:   Sun, 28 Dec 2025 17:12:12 +0530

fix: Fix `git` Hooks

Also patch `nom` Rendering

Diffstat:

11 files changed, 92 insertions(+), 103 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,16 @@
 
 ### December
 
+- Patch `nom` rendering
 - Add an AppImage manager
 - Add a LaTeX Editor
 - GNOME Updates
   - Change terminal hotkeys
-  - Use [`copyous`](https://github.com/boerdereinar/copyous) instead of `pano` for clipboard
+  - Use [`copyous`](https://github.com/boerdereinar/copyous) instead of `pano`
 - Fix VFIO after update
-- Fix `git` GitHub authentication
+- `git` Fixes
+  - Hooks
+  - GitHub authentication
 - Update to NixOS 25.11 (Xantusia)
 
 ### November
diff --git a/devices/valkyrie/default.nix b/devices/valkyrie/default.nix
@@ -75,9 +75,9 @@
   };
 
   gui = {
-    desktop = "gnome";
+    desktop = "hyprland";
     display = "eDP-1";
-    wallpaper = "Bluewatch";
+    wallpaper = "Quasar";
     fancy = true;
   };
 
diff --git a/files/git/hooks/commit-msg b/files/git/hooks/commit-msg
@@ -2,14 +2,15 @@
 error() { echo -e "\033[0;31merror:\033[0m $1"; exit 7; }
 
 ## Commit Message ##
-# Keywords
-if ! head -1 "$1" | grep -qE "^(feat|fix|ci|blog|chore|docs|test|style|refactor)(\(.+?\))?\!?: .{1,}$"
+
+# 1. Structure
+if ! head -n 1 "$1" | grep -qE '^(feat|fix|ci|blog|chore|docs|test|style|refactor)(\([^)]+\))?!?: .+$'
 then
-  error "Commit Message is invalid"
+  error "Commit Message header is invalid\nFormat -> type(scope): subject"
 fi
 
-# Length
-if ! head -1 "$1" | grep -qE "^.{1,50}$"
+# 2. Length
+if ! head -n 1 "$1" | grep -qE '^.{1,50}$'
 then
-  error "Commit Message is too long"
+  error "Commit Message header is too long\nGreater than 50 characters"
 fi
diff --git a/files/git/hooks/pre-commit b/files/git/hooks/pre-commit
@@ -2,8 +2,9 @@
 error() { echo -e "\033[0;31merror:\033[0m $1"; exit 7; }
 
 ## Pre-Commit Checks ##
+
 # Nix Syntax
-if [ "$(find . -name '*.nix' 2>/dev/null | wc -l)" != 0 ]
+if [ "$(find . -name 'flake.nix' 2>/dev/null | wc -l)" != 0 ]
 then
-  nix flake check || error "Invalid Syntax"
+  nix flake check || error "Invalid Nix Flakes Configuration"
 fi
diff --git a/flake.lock b/flake.lock
@@ -448,7 +448,7 @@
         "type": "github"
       },
       "original": {
-        "owner": "Infinidoge",
+        "owner": "maydayv7",
         "repo": "nix-minecraft",
         "type": "github"
       }
@@ -918,11 +918,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1764950072,
-        "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
+        "lastModified": 1766651565,
+        "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f61125a668a320878494449750330ca58b78c557",
+        "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
@@ -136,7 +136,7 @@
 
     # Minecraft Server
     minecraft = {
-      url = "github:Infinidoge/nix-minecraft";
+      url = "github:maydayv7/nix-minecraft";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "utils";
diff --git a/modules/apps/git/default.nix b/modules/apps/git/default.nix
@@ -25,12 +25,19 @@
 
     # Settings
     user = {
-      persist.directories = [ ".config/gh" ];
+      persist.directories = [
+        ".git-hooks"
+        ".config/gh"
+      ];
+
       homeConfig = {
         imports = [ ./user.nix ];
 
         # Hooks
-        home.file.".git-hooks".source = files.git.hooks;
+        home.file.".git-hooks" = {
+          source = files.git.hooks;
+          recursive = true;
+        };
 
         # GitHub CLI
         programs = {
diff --git a/modules/gui/desktop/hyprland/apps/launcher.nix b/modules/gui/desktop/hyprland/apps/launcher.nix
@@ -1,6 +1,7 @@
 {
   config,
   util,
+  pkgs,
   files,
   ...
 }:
@@ -12,55 +13,54 @@
       ".cache/hyprshell"
     ];
 
-    homeConfig = {
-      services.hyprshell = {
-        enable = true;
-        systemd.enable = true;
-        style = util.build.theme {
-          inherit (config.lib.stylix) colors;
-          file = files.hyprland.hyprshell;
-        };
+    homeConfig.services.hyprshell = {
+      enable = true;
+      systemd.enable = true;
+      package = pkgs.unstable.hyprshell.override { hyprland = config.programs.hyprland.package; };
+      style = util.build.theme {
+        inherit (config.lib.stylix) colors;
+        file = files.hyprland.hyprshell;
+      };
 
-        settings.windows = {
-          scale = 9.0;
-          items_per_row = 3;
+      settings.windows = {
+        scale = 9.0;
+        items_per_row = 3;
 
-          overview = {
-            modifier = "super";
-            key = "tab";
+        overview = {
+          modifier = "super";
+          key = "tab";
 
-            launcher = {
-              launch_modifier = "alt";
-              default_terminal = "kitty";
-              width = 700;
-              max_items = 4;
-              show_when_empty = true;
-              plugins = {
-                applications = {
-                  run_cache_weeks = 4;
-                  show_execs = true;
-                  show_actions_submenu = true;
-                };
-                websearch.engines = [
-                  {
-                    url = "https://www.google.com/search?q={}";
-                    name = "Google";
-                    key = "g";
-                  }
-                  {
-                    url = "https://en.wikipedia.org/wiki/Special:Search?search={}";
-                    name = "Wikipedia";
-                    key = "w";
-                  }
-                ];
+          launcher = {
+            launch_modifier = "alt";
+            default_terminal = "kitty";
+            width = 700;
+            max_items = 4;
+            show_when_empty = true;
+            plugins = {
+              applications = {
+                run_cache_weeks = 4;
+                show_execs = true;
+                show_actions_submenu = true;
               };
+              websearch.engines = [
+                {
+                  url = "https://www.google.com/search?q={}";
+                  name = "Google";
+                  key = "g";
+                }
+                {
+                  url = "https://en.wikipedia.org/wiki/Special:Search?search={}";
+                  name = "Wikipedia";
+                  key = "w";
+                }
+              ];
             };
           };
+        };
 
-          switch = {
-            modifier = "alt";
-            filter_by = [ "current_workspace" ];
-          };
+        switch = {
+          modifier = "alt";
+          filter_by = [ "current_workspace" ];
         };
       };
     };
diff --git a/modules/gui/fonts.nix b/modules/gui/fonts.nix
@@ -77,6 +77,7 @@
       font-awesome
       nerd-fonts.symbols-only
       noto-fonts
+      symbola
 
       fira
       fira-code
diff --git a/packages/overlays/nix-output-monitor.nix b/packages/overlays/nix-output-monitor.nix
@@ -0,0 +1,18 @@
+final: prev: {
+  # 'nom' Rendering
+  nix-output-monitor = prev.nix-output-monitor.overrideAttrs (old: {
+    postPatch = old.postPatch or "" + ''
+      sed -ie ${final.lib.escapeShellArg ''
+        s/↓/\\xf072e/
+        s/↑/\\xf0737/
+        s/⏱/\\xf520/
+        s/⏵/\\xf04b/
+        s/✔/\\xf00c/
+        s/⏸/\\xf04d/
+        s/⚠/\\xf071/
+        s/∅/\\xf1da/
+        s/∑/\\xf04a0/
+      ''} lib/NOM/Print.hs
+    '';
+  });
+}
diff --git a/packages/patches/hyprshell.patch b/packages/patches/hyprshell.patch
@@ -1,42 +0,0 @@
-diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix
-index 6b305826956fd..12ad67d1497bc 100644
---- a/pkgs/by-name/hy/hyprshell/package.nix
-+++ b/pkgs/by-name/hy/hyprshell/package.nix
-@@ -4,25 +4,25 @@
-   fetchFromGitHub,
-   pkg-config,
-   wrapGAppsHook4,
--  gtk4,
-   gtk4-layer-shell,
-   hyprland,
-   gcc,
-   pixman,
-+  libadwaita,
- }:
-
- rustPlatform.buildRustPackage (finalAttrs: {
-   pname = "hyprshell";
--  version = "4.7.2";
-+  version = "4.8.1";
-
-   src = fetchFromGitHub {
-     owner = "H3rmt";
-     repo = "hyprshell";
-     tag = "v${finalAttrs.version}";
--    hash = "sha256-6WC7vcPdtKR4iw5VHF88i/NQ+EBfvGxex8AvJONnG5w=";
-+    hash = "sha256-NsFOXepWzgbopnoqwg8EekDLbj01jr8vjaEz/F3QFKU=";
-   };
-
--  cargoHash = "sha256-g23W5cgGxWNyJ4uew2x12vgF5Bvaid1+phV2fxyHbas=";
-+  cargoHash = "sha256-/4mC1cgQKOSOME8WT61hggyHPALj0knVPtGZTa7lO1w=";
-
-   nativeBuildInputs = [
-     wrapGAppsHook4
-@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
-   ];
- 
-   buildInputs = [
--    gtk4
-+    libadwaita
-     gtk4-layer-shell
-   ];