diff --git a/flake.lock b/flake.lock index 7f9f47e0..20d0d6df 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754433428, - "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", + "lastModified": 1760836749, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", + "rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1760395520, - "narHash": "sha256-4hVEyj3H4i0kwtO8dDIKee1WoZ0iMZxr3ageSdJ6Cck=", + "lastModified": 1760747305, + "narHash": "sha256-SsuuyaFp4TbJ+ofti9EXot9gIOk4vZqccat/zERVQN4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "c438d72cee048fe6203df15c81a230efb16fa409", + "rev": "9838e14b30857ac0a50dbe98a5ba2233d6ccb2de", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1760596988, - "narHash": "sha256-+h9FVfiNnsWKpk2HiaecPocq4gWD9GNn5/eVS3I9Z+8=", + "lastModified": 1760856120, + "narHash": "sha256-yH1K/WDJpwIIw7e3wKdRgwHAZ38LXgcGE2Ecvk3I6GU=", "owner": "nix-community", "repo": "fenix", - "rev": "8e99c7d8e07635dea2e1001485f9de41bb1587f2", + "rev": "b435bfccee71c6591dbce2fcfabe3e17e98c09fa", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760813311, + "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8", "type": "github" }, "original": { @@ -491,11 +491,11 @@ ] }, "locked": { - "lastModified": 1760392170, - "narHash": "sha256-WftxJgr2MeDDFK47fQKywzC72L2jRc/PWcyGdjaDzkw=", + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "46d55f0aeb1d567a78223e69729734f3dca25a85", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { @@ -590,11 +590,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1760540014, - "narHash": "sha256-aRHbYRS0xekHabEMer6YsHsYHbEFZpMXgUP0Q6GEGSU=", + "lastModified": 1760832569, + "narHash": "sha256-wg925OdUZdhjJub5XfpBTWQ3EOJYH7JnaBWHfh849J4=", "owner": "helix-editor", "repo": "helix", - "rev": "f6f8634eb07f35f02bd2881666925a90513f6f3b", + "rev": "97aee4950fd9a08a78415cd8992354ae5cf3aaf0", "type": "github" }, "original": { @@ -610,11 +610,11 @@ ] }, "locked": { - "lastModified": 1760500983, - "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", + "lastModified": 1760887455, + "narHash": "sha256-/xU8iYZjolWbMUNBQF6af5zgGs73Qw21WMgz1tLs3Yw=", "owner": "nix-community", "repo": "home-manager", - "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", + "rev": "aeabc1ac63e6ebb8ba4714c4abdfe0556f2de765", "type": "github" }, "original": { @@ -652,11 +652,11 @@ ] }, "locked": { - "lastModified": 1760312644, - "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=", + "lastModified": 1760662441, + "narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=", "owner": "nix-community", "repo": "home-manager", - "rev": "e121f3773fa596ecaba5b22e518936a632d72a90", + "rev": "722792af097dff5790f1a66d271a47759f477755", "type": "github" }, "original": { @@ -803,11 +803,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1760621586, - "narHash": "sha256-sIbe3te3RrL9PY4ASKGwv1KuJs0pyn4Zvo3xIF3jFms=", + "lastModified": 1760874867, + "narHash": "sha256-w2JettCPyqWKMYoJRCTc5/nsSvGrSV9jG4kbn8Q0pZk=", "owner": "hyprwm", "repo": "hyprland", - "rev": "8164b90bc2839d4d2a10c0d2b26c4a413ecf90b2", + "rev": "59ff7b2f891d06f4097128faf7027a3863542167", "type": "github" }, "original": { @@ -1191,11 +1191,11 @@ ] }, "locked": { - "lastModified": 1760266702, - "narHash": "sha256-TP19RpzIyo1JeYAhKii13seYwmhkv7IOD+dCnQOrcgQ=", + "lastModified": 1760534924, + "narHash": "sha256-OIOCC86DxTxp1VG7xAiM+YABtVqp6vTkYIoAiGQMqso=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3d7e970d4cac5d3ee3fe7cafa17cc9868fa21fed", + "rev": "100b4e000032b865563a9754e5bca189bc544764", "type": "github" }, "original": { @@ -1278,11 +1278,11 @@ ] }, "locked": { - "lastModified": 1760579393, - "narHash": "sha256-YuXbuaJ/2EZ1FePhz1eTyo/b+kpiEmw4lj6wX0u0Q/0=", + "lastModified": 1760839259, + "narHash": "sha256-9KYm1Oh3jB2Xf0LiFxIBFgOuqRN4FNW4PKfrxXDV418=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "7d002241668a738df3973a6c07ef5d79e5508b24", + "rev": "6aa0613ecf363840e011006b05aefa094b78b053", "type": "github" }, "original": { @@ -1363,11 +1363,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", - "owner": "NixOS", + "lastModified": 1760703608, + "narHash": "sha256-MMIIShabm9KnYTmm0WbJ2h+jxI86gfE7NcByVOaBNNU=", + "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "rev": "95d8e5f411dc2fcc7f73a72766aaabfab1a1c456", "type": "github" }, "original": { @@ -1626,11 +1626,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1760497432, - "narHash": "sha256-ImhJMtnkBlADdrC8jzMDflhA4WMdaCRKkhsJC2pzPcM=", + "lastModified": 1760714286, + "narHash": "sha256-WOt9KquZ1BXjMcVyHpMeliqNRL6BfRvBHFGfRDriDx4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "fcfff0827f64a91f5676d617f0d4dd8b58eefbd1", + "rev": "1e20331e42449dfc0b44bce84147a06772d045d7", "type": "github" }, "original": { @@ -1648,11 +1648,11 @@ ] }, "locked": { - "lastModified": 1760236527, - "narHash": "sha256-h9+WEQtUIZaZMvA1pnbZbMM+5X39OFnW92Q8hNoToD0=", + "lastModified": 1760668505, + "narHash": "sha256-Ed0cGwPZtLRiSvMx4KgPx8bhLYzn5jiJ7s5o5vj4oG0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a38dd7f462825c75ce8567816ae38c2e7d826bfa", + "rev": "18234d2c11b10eaec9ccc3a1089a5ea872ec8858", "type": "github" }, "original": { @@ -1815,11 +1815,11 @@ ] }, "locked": { - "lastModified": 1760120816, - "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", + "lastModified": 1760889407, + "narHash": "sha256-ppIp04fmz+BaTpJs1nIOmPADg02asfQFrFbhb3SmxsE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "761ae7aff00907b607125b2f57338b74177697ed", + "rev": "3f258dead9fed51f53862366d3a6bc1b622ee7cb", "type": "github" }, "original": { diff --git a/hosts/bunk/settings.nix b/hosts/bunk/settings.nix index a74c5580..0e91c5c8 100644 --- a/hosts/bunk/settings.nix +++ b/hosts/bunk/settings.nix @@ -10,7 +10,7 @@ name = "DP-3"; width = 2560; height = 1440; - refreshRate = 240; + refreshRate = "240"; position = "0x0"; transform = 0; bitDepth = 10; @@ -20,7 +20,7 @@ name = "HDMI-A-1"; width = 1920; height = 1080; - refreshRate = 60; + refreshRate = "60"; position = "2560x0"; # transform = 3; workspace = "5"; @@ -29,7 +29,7 @@ name = "eDP-1"; width = 1920; height = 1200; - refreshRate = 60; + refreshRate = "60"; workspace = "1"; } ]; diff --git a/hosts/kima/settings.nix b/hosts/kima/settings.nix index 0debd06e..0e518c3b 100644 --- a/hosts/kima/settings.nix +++ b/hosts/kima/settings.nix @@ -10,7 +10,7 @@ name = "DP-3"; width = 2560; height = 1440; - refreshRate = 240; + refreshRate = "143.99"; position = "0x0"; transform = 0; bitDepth = 10; @@ -20,7 +20,7 @@ name = "HDMI-A-1"; width = 1920; height = 1080; - refreshRate = 60; + refreshRate = "60"; position = "2560x0"; transform = 3; workspace = "5"; @@ -29,7 +29,7 @@ name = "eDP-1"; width = 1920; height = 1200; - refreshRate = 60; + refreshRate = "60"; workspace = "1"; } ]; diff --git a/hosts/toothpc/settings.nix b/hosts/toothpc/settings.nix index 37bfa915..90145edf 100644 --- a/hosts/toothpc/settings.nix +++ b/hosts/toothpc/settings.nix @@ -10,7 +10,7 @@ name = "DVI-D-1"; width = 1920; height = 1080; - refreshRate = 144; + refreshRate = "144"; position = "0x0"; transform = 0; workspace = "1"; diff --git a/modules/home/programs/waybar/config/config.jsonc b/modules/home/programs/waybar/config/config.jsonc index 523da8a1..3b88d857 100644 --- a/modules/home/programs/waybar/config/config.jsonc +++ b/modules/home/programs/waybar/config/config.jsonc @@ -126,9 +126,13 @@ "all-outputs": false, "format": "{icon}", "format-icons": { - "urgent": "", - "visible": "", - "empty": "" + "1": "1", + "2": "2", + "3": "3", + "4": "4", + "5": "5", + "active": "_", + "default": "_" }, "on-click": "activate", "show-special": false, diff --git a/modules/home/programs/waybar/config/style.css b/modules/home/programs/waybar/config/style.css index 00a8c5ac..4283d810 100644 --- a/modules/home/programs/waybar/config/style.css +++ b/modules/home/programs/waybar/config/style.css @@ -28,8 +28,8 @@ tooltip label { margin: 0 0px; background-color: transparent; color: #fbf1c7; - border-top: 3px solid transparent; - border-bottom: 3px solid transparent; + border-top: 2px solid transparent; + border-bottom: 2px solid transparent; } #workspaces button:hover { @@ -45,7 +45,7 @@ tooltip label { background-image: url("assets/button.svg"); background-position: center; background-repeat: no-repeat; - background-size: 18px 15px; + background-size: 24px 20px; } #custom-trayicon { diff --git a/modules/nixos/programs/hyprland/appearance.nix b/modules/nixos/programs/hyprland/appearance.nix index ee939054..37ea7149 100644 --- 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; diff --git a/modules/nixos/programs/hyprland/layout.nix b/modules/nixos/programs/hyprland/layout.nix index 492bd0fa..6d9afdab 100644 --- a/modules/nixos/programs/hyprland/layout.nix +++ b/modules/nixos/programs/hyprland/layout.nix @@ -21,7 +21,7 @@ in let resolution = if m.width != null && m.height != null then - "${toString m.width}x${toString m.height}@${toString m.refreshRate}" + "${toString m.width}x${toString m.height}@${m.refreshRate}" else "preferred"; diff --git a/modules/nixos/services/kanata/default.nix b/modules/nixos/services/kanata/default.nix index 260a5a9d..f379d92a 100644 --- a/modules/nixos/services/kanata/default.nix +++ b/modules/nixos/services/kanata/default.nix @@ -19,6 +19,9 @@ in 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" diff --git a/modules/settings/monitors/default.nix b/modules/settings/monitors/default.nix index d5306ca1..23d46e37 100644 --- a/modules/settings/monitors/default.nix +++ b/modules/settings/monitors/default.nix @@ -21,8 +21,8 @@ in example = 1080; }; refreshRate = mkOption { - type = types.int; - default = 60; + type = types.str; + default = "60"; }; transform = mkOption { type = types.int;