feat(monitors): from int to str for more precision

2025-10-19 21:09:40 +02:00
8 changed files with 132 additions and 144 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -29,11 +29,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1761238850,
-        "narHash": "sha256-WGoqR+ULsh1w7yDNAtJiE27HX6zSlGPR4I2pgjAU/SA=",
+        "lastModified": 1760083914,
+        "narHash": "sha256-I9IMO9d+z71oeqOz6gOre07tK2Du3vp2FcOW3x4FDXw=",
        "owner": "anyrun-org",
        "repo": "anyrun",
-        "rev": "ae3c499316e9aa568acb3832566a1978ca665748",
+        "rev": "3050aa30e25957bbb9e1ac91a44d3979eccadf59",
        "type": "github"
      },
      "original": {
@@ -83,11 +83,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760101617,
-        "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
+        "lastModified": 1759499898,
+        "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
+        "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798",
        "type": "github"
      },
      "original": {
@@ -153,11 +153,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1760986121,
-        "narHash": "sha256-ilwuwZDPh0pNPTUYKUQQarAnwJwsggr60lQyae5R1vc=",
+        "lastModified": 1760747305,
+        "narHash": "sha256-SsuuyaFp4TbJ+ofti9EXot9gIOk4vZqccat/zERVQN4=",
        "owner": "chaotic-cx",
        "repo": "nyx",
-        "rev": "45286364d2570149037013a4fa098709776bdb41",
+        "rev": "9838e14b30857ac0a50dbe98a5ba2233d6ccb2de",
        "type": "github"
      },
      "original": {
@@ -212,11 +212,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1761201787,
-        "narHash": "sha256-RQG899vzsoRIMQ6ZR5bi1W9HOomUgID7tk3COQf/OaY=",
+        "lastModified": 1760856120,
+        "narHash": "sha256-yH1K/WDJpwIIw7e3wKdRgwHAZ38LXgcGE2Ecvk3I6GU=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "1ab39eca6ce37b1db23b595c2a754c81ebf49507",
+        "rev": "b435bfccee71c6591dbce2fcfabe3e17e98c09fa",
        "type": "github"
      },
      "original": {
@@ -332,11 +332,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760948891,
-        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
+        "lastModified": 1760813311,
+        "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
+        "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8",
        "type": "github"
      },
      "original": {
@@ -571,11 +571,11 @@
    },
    "hardware": {
      "locked": {
-        "lastModified": 1760958188,
-        "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
+        "lastModified": 1760106635,
+        "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
+        "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
        "type": "github"
      },
      "original": {
@@ -590,11 +590,11 @@
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1761141169,
-        "narHash": "sha256-5IZjbTvP5dNTD8CbEYlNbicdGcbCN9SC9ksMm2ZEXH0=",
+        "lastModified": 1760832569,
+        "narHash": "sha256-wg925OdUZdhjJub5XfpBTWQ3EOJYH7JnaBWHfh849J4=",
        "owner": "helix-editor",
        "repo": "helix",
-        "rev": "d79cce4e4bfc24dd204f1b294c899ed73f7e9453",
+        "rev": "97aee4950fd9a08a78415cd8992354ae5cf3aaf0",
        "type": "github"
      },
      "original": {
@@ -610,11 +610,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1761235135,
-        "narHash": "sha256-cux9xeceLIER1lBxUa1gMafkz7gg5ntcUmJBynWdBWI=",
+        "lastModified": 1760887455,
+        "narHash": "sha256-/xU8iYZjolWbMUNBQF6af5zgGs73Qw21WMgz1tLs3Yw=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "0adf9ba3f567da2d53af581a857aacf671aaa547",
+        "rev": "aeabc1ac63e6ebb8ba4714c4abdfe0556f2de765",
        "type": "github"
      },
      "original": {
@@ -652,11 +652,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760929667,
-        "narHash": "sha256-nZh6uvc71nVNaf/y+wesnjwsmJ6IZZUnP2EzpZe48To=",
+        "lastModified": 1760662441,
+        "narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "189c21cf879669008ccf06e78a553f17e88d8ef0",
+        "rev": "722792af097dff5790f1a66d271a47759f477755",
        "type": "github"
      },
      "original": {
@@ -710,11 +710,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760445448,
-        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
+        "lastModified": 1759490292,
+        "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
+        "rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
        "type": "github"
      },
      "original": {
@@ -803,11 +803,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1761129162,
-        "narHash": "sha256-vJYlThaqdSYRKn1HcaMbkHeB95bXQwgG1ugrlSKQjHg=",
+        "lastModified": 1760874867,
+        "narHash": "sha256-w2JettCPyqWKMYoJRCTc5/nsSvGrSV9jG4kbn8Q0pZk=",
        "owner": "hyprwm",
        "repo": "hyprland",
-        "rev": "057695bc3f7de5e8841c15252fc51029590895e4",
+        "rev": "59ff7b2f891d06f4097128faf7027a3863542167",
        "type": "github"
      },
      "original": {
@@ -874,11 +874,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759610243,
-        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
+        "lastModified": 1749046714,
+        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
+        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
        "type": "github"
      },
      "original": {
@@ -1278,11 +1278,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1761184286,
-        "narHash": "sha256-yK/XQSwkOlgljcxNhlu08Zyp96DzF4eIU1leyWjyNZE=",
+        "lastModified": 1760839259,
+        "narHash": "sha256-9KYm1Oh3jB2Xf0LiFxIBFgOuqRN4FNW4PKfrxXDV418=",
        "owner": "fufexan",
        "repo": "nix-gaming",
-        "rev": "8ac5469d67b8c197832575db87f6bde38032a947",
+        "rev": "6aa0613ecf363840e011006b05aefa094b78b053",
        "type": "github"
      },
      "original": {
@@ -1363,11 +1363,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1760878510,
-        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
-        "owner": "NixOS",
+        "lastModified": 1760703608,
+        "narHash": "sha256-MMIIShabm9KnYTmm0WbJ2h+jxI86gfE7NcByVOaBNNU=",
+        "owner": "PedroHLC",
        "repo": "nixpkgs",
-        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
+        "rev": "95d8e5f411dc2fcc7f73a72766aaabfab1a1c456",
        "type": "github"
      },
      "original": {
@@ -1411,11 +1411,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1760878510,
-        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
+        "lastModified": 1759381078,
+        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
+        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
        "type": "github"
      },
      "original": {
@@ -1443,11 +1443,11 @@
    },
    "nixpkgs_8": {
      "locked": {
-        "lastModified": 1761114652,
-        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
+        "lastModified": 1760524057,
+        "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
+        "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
        "type": "github"
      },
      "original": {
@@ -1482,11 +1482,11 @@
        "systems": "systems_5"
      },
      "locked": {
-        "lastModified": 1761112426,
-        "narHash": "sha256-fa3fIyXP3xQhsPaZX4WsFwPM9g64EMOucfDEC4o8Nwc=",
+        "lastModified": 1760153667,
+        "narHash": "sha256-F7KmXT/Izse6Q6CkD5GCImoGPaDJxl03Kd7eD+eY/bU=",
        "owner": "notashelf",
        "repo": "nvf",
-        "rev": "9b3e7bcf68ace2f07eb7478c40e45ce79332482b",
+        "rev": "9df9d51fd9fc8f9a8fc377f984ea3b7ae796172d",
        "type": "github"
      },
      "original": {
@@ -1505,11 +1505,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760663237,
-        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+        "lastModified": 1758108966,
+        "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
        "type": "github"
      },
      "original": {
@@ -1626,11 +1626,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1761178311,
-        "narHash": "sha256-M5VeAtfip2zdqHKG9Su+5vlDG8AhtTk1ktxUGXdARc8=",
+        "lastModified": 1760714286,
+        "narHash": "sha256-WOt9KquZ1BXjMcVyHpMeliqNRL6BfRvBHFGfRDriDx4=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "f362735f822fe66ed2e357db53717b3db69dc6c9",
+        "rev": "1e20331e42449dfc0b44bce84147a06772d045d7",
        "type": "github"
      },
      "original": {
@@ -1648,11 +1648,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760927964,
-        "narHash": "sha256-+TjujgwBpeN0aaQ/lZQ8UPsWl9oEaihgbt6FvxTlpZk=",
+        "lastModified": 1760668505,
+        "narHash": "sha256-Ed0cGwPZtLRiSvMx4KgPx8bhLYzn5jiJ7s5o5vj4oG0=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "6b1e691089a62d0852f9d3fd6693ee027bc98ac3",
+        "rev": "18234d2c11b10eaec9ccc3a1089a5ea872ec8858",
        "type": "github"
      },
      "original": {
@@ -1815,11 +1815,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760945191,
-        "narHash": "sha256-ZRVs8UqikBa4Ki3X4KCnMBtBW0ux1DaT35tgsnB1jM4=",
+        "lastModified": 1760889407,
+        "narHash": "sha256-ppIp04fmz+BaTpJs1nIOmPADg02asfQFrFbhb3SmxsE=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2",
+        "rev": "3f258dead9fed51f53862366d3a6bc1b622ee7cb",
        "type": "github"
      },
      "original": {
@@ -1903,11 +1903,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760713634,
-        "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
+        "lastModified": 1755354946,
+        "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
+        "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
        "type": "github"
      },
      "original": {
@@ -1923,11 +1923,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1761179366,
-        "narHash": "sha256-uH/qjlISL4oXjuFTMvOScsPBQPZG1wVEQCFyY3pNZNE=",
+        "lastModified": 1759969704,
+        "narHash": "sha256-T7f/invcFIKHrBqD+FLf/C/HOGmpYfbZUzTDxFscpOA=",
        "ref": "refs/heads/main",
-        "rev": "772796d1e5d05e9f2f443f61eb0da70391788053",
-        "revCount": 139,
+        "rev": "1173c777dc8daddcc4959260a7b00fd8abc884c5",
+        "revCount": 137,
        "type": "git",
        "url": "https://git.sr.ht/~canasta/zen-browser-flake"
      },
--- a/hosts/bunk/settings.nix
+++ b/hosts/bunk/settings.nix
@@ -10,7 +10,7 @@
        name = "DP-3";
        width = 2560;
        height = 1440;
-        refreshRate = "143.99";
+        refreshRate = "240";
        position = "0x0";
        transform = 0;
        bitDepth = 10;
--- a/modules/home/programs/git/default.nix
+++ b/modules/home/programs/git/default.nix
@@ -15,54 +15,47 @@ in
  };
  config = mkIf cfg.enable {
    home.packages = [ pkgs.gh ];
-    programs = {
-      git = {
-        enable = true;
-        settings = {
-          # user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
-          user = {
-            name = osConfig.settings.accounts.username;
-            email = osConfig.settings.accounts.mail;
-            signingkey = "${config.home.homeDirectory}/.config/git/allowed_signers";
-          };
-          signing = {
-            format = lib.mkDefault "ssh";
-            key = "${config.home.homeDirectory}/.ssh/id_ed25519";
-            signByDefault = true;
-          };
-          gpg = {
-            # format = lib.mkDefault "ssh";
-            ssh.allowedSignersFile =
-              config.home.homeDirectory + "/" + config.xdg.configFile."git/allowed_signers".target;
-          };
-          commit = {
-            verbose = true;
-            gpgSign = false;
-          };
-          init.defaultBranch = "main";
-          merge.conflictStyle = "diff3";
-          diff.algorithm = "histogram";
-          log.date = "iso";
-          column.ui = "auto";
-          branch.sort = "committerdate";
-          push.autoSetupRemote = true;
-          rerere.enabled = true;
-        };
-        lfs.enable = true;
-        ignores = [
-          ".direnv"
-          "result"
-          ".jj"
-        ];
-      };
-
+    programs.git = {
+      enable = true;
+      userName = osConfig.settings.accounts.username;
+      userEmail = osConfig.settings.accounts.mail;
      delta = {
-        enableGitIntegration = true;
        enable = true;
        options.dark = true;
      };
+      extraConfig = {
+        # user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
+        user.signingkey = "${config.home.homeDirectory}/.config/git/allowed_signers";
+        signing = {
+          format = lib.mkDefault "ssh";
+          key = "${config.home.homeDirectory}/.ssh/id_ed25519";
+          signByDefault = true;
+        };
+        gpg = {
+          # format = lib.mkDefault "ssh";
+          ssh.allowedSignersFile =
+            config.home.homeDirectory + "/" + config.xdg.configFile."git/allowed_signers".target;
+        };
+        commit = {
+          verbose = true;
+          gpgSign = false;
+        };
+        init.defaultBranch = "main";
+        merge.conflictStyle = "diff3";
+        diff.algorithm = "histogram";
+        log.date = "iso";
+        column.ui = "auto";
+        branch.sort = "committerdate";
+        push.autoSetupRemote = true;
+        rerere.enabled = true;
+      };
+      lfs.enable = true;
+      ignores = [
+        ".direnv"
+        "result"
+        ".jj"
+      ];
    };
-
    xdg.configFile."git/allowed_signers".text = ''
      ${osConfig.settings.accounts.mail} namespaces="git" ${osConfig.settings.accounts.sshKey}
    '';
--- a/modules/nixos/programs/hyprland/appearance.nix
+++ b/modules/nixos/programs/hyprland/appearance.nix
@@ -18,9 +18,7 @@ in
        gaps_in = 2;
        gaps_out = "4, 4, 4, 4";
        border_size = 3;
-        #col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
-        #col.inactive_border = rgba(595959aa)
-        "col.active_border" = "rgb(4c7a5d)"; # rgba(b16286ee) 45deg
+        "col.active_border" = "rgb(4c7a5d)";
        "col.inactive_border" = "rgb(504945)";
        layout = "dwindle";
        resize_on_border = true;
--- a/modules/nixos/programs/hyprland/keybinds.nix
+++ b/modules/nixos/programs/hyprland/keybinds.nix
@@ -49,6 +49,20 @@ in
          "$mod, P, pseudo,"
          "$mod, J, togglesplit,"
          "$mod, C, exec, hyprctl dispatch exec copyq toggle"
+          "$mod, left, movefocus, l"
+          "$mod, right, movefocus, r"
+          "$mod, up, movefocus, u"
+          "$mod, down, movefocus, d"
+          "$mod, 1, workspace, 1"
+          "$mod, 2, workspace, 2"
+          "$mod, 3, workspace, 3"
+          "$mod, 4, workspace, 4"
+          "$mod, 5, workspace, 5"
+          "$mod, 6, workspace, 6"
+          "$mod, 7, workspace, 7"
+          "$mod, 8, workspace, 8"
+          "$mod, 9, workspace, 9"
+          "$mod, 0, workspace, 10"
          "$mod SHIFT, 1, movetoworkspace, 1"
          "$mod SHIFT, 2, movetoworkspace, 2"
          "$mod SHIFT, 3, movetoworkspace, 3"
@@ -61,30 +75,6 @@ in
          "$mod SHIFT, 0, movetoworkspace, 10"
          "CTRL SHIFT, Escape, exec, ${runOnce "resources"}"

-          "$mod, 1, workspace, 1"
-          "$mod, 2, workspace, 2"
-          "$mod, 3, workspace, 3"
-          "$mod, 4, workspace, 4"
-          "$mod, 5, workspace, 5"
-          "$mod, 6, workspace, 6"
-          "$mod, 7, workspace, 7"
-          "$mod, 8, workspace, 8"
-          "$mod, 9, workspace, 9"
-          "$mod, 0, workspace, 10"
-
-          "$mod, left, movefocus, l"
-          "$mod, right, movefocus, r"
-          "$mod, up, movefocus, u"
-          "$mod, down, movefocus, d"
-          "$mod SHIFT, left, resizeactive, -20 0"
-          "$mod SHIFT, right, resizeactive, 20 0"
-          "$mod SHIFT, up, resizeactive, 0 -20"
-          "$mod SHIFT, down, resizeactive, 0 20"
-          "$mod CTRL, left, swapwindow, l"
-          "$mod CTRL, right, swapwindow, r"
-          "$mod CTRL, up, swapwindow, u"
-          "$mod CTRL, down, swapwindow, d"
-
          ",XF86AudioLowerVolume, exec, volume-control.sh --dec"
          ",XF86AudioRaiseVolume, exec, volume-control.sh --inc"
          ",XF86AudioMute, exec, volume-control.sh --toggle"
--- a/modules/nixos/programs/pkgs/default.nix
+++ b/modules/nixos/programs/pkgs/default.nix
@@ -82,6 +82,7 @@ in
        ]

        (mkIf cfg.common.enable [
+          qt6.full
          swappy
          wayfreeze
          imagemagick
--- a/modules/nixos/services/kanata/default.nix
+++ b/modules/nixos/services/kanata/default.nix
@@ -16,10 +16,17 @@ in
    services.kanata = {
      enable = true;
      package = pkgs.kanata-with-cmd;
-      keyboards.default = {
+      keyboards.hhkbse = {
        extraDefCfg = ''
          process-unmapped-keys yes
+          linux-dev-names-include (
+            "HHKB-Hybrid_1 Keyboard"
+           )
        '';
+        devices = [
+          "/dev/input/by-id/usb-PFU_Limited_HHKB-Hybrid-event-kbd"
+          "/dev/input/event2"
+        ];
        config = builtins.readFile (./. + "/hhkbse.kbd");
      };
    };
--- a/modules/server/services/ollama/default.nix
+++ b/modules/server/services/ollama/default.nix
@@ -9,7 +9,6 @@
 in {
  config = lib.mkIf cfg.enable {
    environment.systemPackages = with pkgs; [
-      ollama
      intel-compute-runtime
      intel-graphics-compiler
      level-zero