diff --git a/flake.lock b/flake.lock index 65e73738..50daea14 100644 --- a/flake.lock +++ b/flake.lock @@ -123,11 +123,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1742572951, - "narHash": "sha256-agPhzkYO6G0qaXXQhkg/yuUkl+z8NVlzFoO9y0FiFxU=", + "lastModified": 1742736978, + "narHash": "sha256-wagSECZiMywU2KcyM/V0cDZAkBJLOFCqL7fGCUzLR+E=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "7603a3d49776bff0c68e68b2c6b0d31259c6c3d7", + "rev": "1aea029a74c8f3a683451c882e24dc1218e0d682", "type": "github" }, "original": { @@ -479,11 +479,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1742589311, - "narHash": "sha256-YCAEmOPDSHVKygFov2zOg3Fkb060SRgjiGi4P7y9+kc=", + "lastModified": 1742702839, + "narHash": "sha256-9atn1IrQH/R2ahK+Zj6JpS0CfjSPBLObHQeTw/4Vv5Q=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "747c43ffa0047aa2ef550aa361ba63f4060a85ba", + "rev": "c58fe676ad6212114455ac89a2703dcc3b8b67b7", "type": "github" }, "original": { @@ -538,11 +538,11 @@ }, "hardware": { "locked": { - "lastModified": 1742376361, - "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", + "lastModified": 1742631601, + "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", + "rev": "380ed15bcd6440606c6856db44a99140d422b46f", "type": "github" }, "original": { @@ -575,11 +575,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1742566224, - "narHash": "sha256-8uZamLPJdJV+JodhLwLtEpHkB44eBXv0h3/gpoRCPKg=", + "lastModified": 1742743678, + "narHash": "sha256-PcY8JUpG3RA/vxpE3RnPu3AGTk4HwRuGlgmTFWopeFI=", "owner": "helix-editor", "repo": "helix", - "rev": "1c9a5bd366720bcec96b5f98747112355df0bdea", + "rev": "8ff544757fafe5c280ed82d8d0e2967c0424251d", "type": "github" }, "original": { @@ -595,11 +595,11 @@ ] }, "locked": { - "lastModified": 1742588233, - "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=", + "lastModified": 1742744903, + "narHash": "sha256-qd2uiGol/kb9Dk0vgOOLBl9VsycG0VfteM78OduFl2Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d", + "rev": "5ff90f09d1bd189b722e60798513724cdd3580b6", "type": "github" }, "original": { @@ -637,11 +637,11 @@ ] }, "locked": { - "lastModified": 1742569620, - "narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=", + "lastModified": 1742701794, + "narHash": "sha256-bJIFFa6/4vBGoNmCwjO5TCIbiveV2BRxVLqHcxk5jXw=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a68f18e96bcab13e4f97bece61e6602298a3141", + "rev": "9172a6f956f7e0f7810861b9b1146f1c43d9abcb", "type": "github" }, "original": { @@ -788,11 +788,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1742584793, - "narHash": "sha256-Zhau0ocCNRDg/+MTIutjPkN1+pYjYzgyW3P7eqL/LkQ=", + "lastModified": 1742746774, + "narHash": "sha256-6BMwAfC604szlL8S7BJkH8a090p0505rFB+mAiApBoo=", "owner": "hyprwm", "repo": "hyprland", - "rev": "ccbdba7ee2ccb835306de89a6023134fa6b8006f", + "rev": "e4abf26069b4d43c8f6ad6b3dfb56c952abb38c2", "type": "github" }, "original": { @@ -1298,11 +1298,11 @@ ] }, "locked": { - "lastModified": 1742607855, - "narHash": "sha256-lUF/tpSON29qNIqhECX/Ue4qVmI3FOvMaW4iUnK49C4=", + "lastModified": 1742694749, + "narHash": "sha256-hH/Wofw+RKBbcTMuzCvvgPrnTkmEZd54bOsT0QR7EJM=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "9818734e2117dac703767585d48b805fad3e7a5e", + "rev": "1491461d4a47f61264df62863ed163a00192b2f1", "type": "github" }, "original": { @@ -1567,11 +1567,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1742471089, - "narHash": "sha256-wiGkhJcDdg2/wy4QxaudNsU98y7CzzZpB6pnjUrNNDQ=", + "lastModified": 1742745896, + "narHash": "sha256-SoUqJPbN/YBPavmM92nC/iUPOH/bKpt9SQLdRGW5EFQ=", "owner": "notashelf", "repo": "nvf", - "rev": "3a28d05684f7f4e314eb4e56a5af624b648ab278", + "rev": "14fb42562e346e689d002c505fbc06b8a0d40b21", "type": "github" }, "original": { diff --git a/modules/nixos/services/kanata/default.nix b/modules/nixos/services/kanata/default.nix index b7118329..1f3051cf 100644 --- a/modules/nixos/services/kanata/default.nix +++ b/modules/nixos/services/kanata/default.nix @@ -15,6 +15,9 @@ in { enable = true; package = pkgs.kanata-with-cmd; keyboards.hhkbse = { + extraDefCfg = '' + process-unmapped-keys yes + ''; devices = [ "/dev/input/by-id/usb-PFU_Limited_HHKB-Hybrid-event-kbd" "/dev/input/event2" diff --git a/modules/nixos/services/kanata/hhkbse.kbd b/modules/nixos/services/kanata/hhkbse.kbd index 3d12736f..58af79d7 100644 --- a/modules/nixos/services/kanata/hhkbse.kbd +++ b/modules/nixos/services/kanata/hhkbse.kbd @@ -15,47 +15,30 @@ ) (defsrc - esc 1 2 3 4 5 6 7 8 9 0 + ´ ' § - tab q w e r t y u i o p å ¨ bspc - lctl a s d f g h j k l ö ä ret - lsft z x c v b n m , . - rsft - lalt lmet spc rmet ralt + 2 3 4 5 6 7 8 9 0 + ´ ' § + e p ¨ + l ö ä + z x rmet ) (deflayer default - esc 1 2 3 4 5 6 7 8 9 0 + pgdn pgup del - tab q w e r t y u i o p å ' bspc - lctl a s d f g h j k l ö ä ret - @shift z x c v b n m , . - rsft - lalt lmet spc @level3 @ralt -) - -(deflayer shift - esc S-1 S-2 S-3 RA-4 S-5 S-6 S-7 S-8 S-9 S-0 S-+ RA-7 RA-0 RA-< - tab S-q S-w S-e S-r S-t S-y S-u S-i S-o S-p S-å S-¨ bspc - lctl S-a S-s S-d S-f S-g S-h S-j S-k S-l S-ö S-ä S-ret - @shift S-z S-x S-c S-v S-b S-n S-m S-, S-. S-- rsft - lalt lmet spc @level3 @ralt + _ _ _ _ _ _ _ _ _ _ pgdn pgup del + _ _ ' + _ _ _ + _ _ @level3 ) (deflayer level3 - esc 1 RA-2 RA-3 S-4 RA-5 RA-6 RA-7 RA-8 RA-9 RA-0 RA-+ ⇤ ⇥ S-' - tab q w RA-5 r t y u i o ▲ å RA-¨ bspc - lctl a s d f g h j k ◀ ▼ ▶ ret - @shift RA-S-z RA-S-x c v b n m , . - rsft - lalt lmet spc @level3 @ralt + RA-2 RA-3 S-4 RA-5 S-¨ RA-7 RA-8 RA-9 RA-0 RA-+ ⇥ ⇤ S-' + RA-5 ▲ RA-¨ + ◀ ▼ ▶ + RA-S-z RA-S-x @level3 ) -(deflayer ralt - esc 1 2 3 4 5 6 7 8 9 0 + pgdn pgup del - tab q w e r t y u i o p å S-´ bspc - lctl a s d f g h j k l ö ä ret - @shift z x c v b n m , . - rsft - lalt lmet spc @level3 @ralt +(defoverrides + (lsft 4) (ralt 4) ) (defalias - shift (layer-toggle shift) level3 (layer-toggle level3) - ralt (layer-toggle ralt) ) diff --git a/modules/nixos/services/scx/default.nix b/modules/nixos/services/scx/default.nix index 8f7d44d3..f2ec6fad 100644 --- a/modules/nixos/services/scx/default.nix +++ b/modules/nixos/services/scx/default.nix @@ -24,7 +24,7 @@ in { config = mkIf cfg.enable { systemd.services.scx = { enable = true; - wantedBy = ["graphical.target"]; + wantedBy = ["multi-user.target"]; unitConfig = { Description = "Start scx_scheduler"; ConditionPathIsDirectory = "/sys/kernel/sched_ext"; diff --git a/users/cnst/default.nix b/users/cnst/default.nix index 0d49b279..25741618 100644 --- a/users/cnst/default.nix +++ b/users/cnst/default.nix @@ -45,5 +45,5 @@ programs.home-manager.enable = true; - systemd.user.targets.tray.Unit.Requires = lib.mkForce ["graphical-session.target"]; + # systemd.user.targets.tray.Unit.Requires = lib.mkForce ["graphical-session.target"]; }