diff --git a/flake.lock b/flake.lock index a0a5f69..4ef8c57 100644 --- a/flake.lock +++ b/flake.lock @@ -210,28 +210,6 @@ "type": "github" } }, - "kmonad": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "nix", - "lastModified": 1691843304, - "narHash": "sha256-aLAMpvbQPLkpjJDUWYTYRmEclAQTo+IVzqPQYOfmxfw=", - "owner": "kmonad", - "repo": "kmonad", - "rev": "a05e93c62ca2c25cc81d76d9cf36880fe0bf183a", - "type": "github" - }, - "original": { - "dir": "nix", - "owner": "kmonad", - "repo": "kmonad", - "type": "github" - } - }, "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_2", @@ -345,7 +323,6 @@ "deploy-rs": "deploy-rs", "home-manager": "home-manager_2", "homepage": "homepage", - "kmonad": "kmonad", "nix-minecraft": "nix-minecraft", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index cf76864..f41961c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,11 +12,6 @@ baduhai-nur.url = "github:baduhai/nur"; - kmonad = { - url = "github:kmonad/kmonad?dir=nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; @@ -48,9 +43,9 @@ }; }; - outputs = inputs@{ self, nixpkgs, home-manager, baduhai-nur, kmonad - , nixpkgs-stable, deploy-rs, agenix, nixos-generators, homepage - , nix-minecraft, yousable, ... }: { + outputs = inputs@{ self, nixpkgs, home-manager, baduhai-nur, nixpkgs-stable + , deploy-rs, agenix, nixos-generators, homepage, nix-minecraft, yousable + , ... }: { nixosConfigurations = { rotterdam = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -58,7 +53,6 @@ modules = [ ./hosts/desktops/rotterdam.nix agenix.nixosModules.default - kmonad.nixosModules.default { nixpkgs.overlays = [ baduhai-nur.overlay agenix.overlays.default ]; @@ -72,7 +66,6 @@ modules = [ ./hosts/desktops/io.nix agenix.nixosModules.default - kmonad.nixosModules.default { nixpkgs.overlays = [ baduhai-nur.overlay agenix.overlays.default ]; @@ -166,7 +159,8 @@ }; devShells = { - "x86_64-linux".default = nixpkgs.legacyPackages."x86_64-linux".mkShell { packages = with nixpkgs.legacyPackages."x86_64-linux"; [ nil nixfmt ]; + "x86_64-linux".default = nixpkgs.legacyPackages."x86_64-linux".mkShell { + packages = with nixpkgs.legacyPackages."x86_64-linux"; [ nil nixfmt ]; }; "aarch64-linux".default = nixpkgs.legacyPackages."aarch64-linux".mkShell { diff --git a/hosts/desktops/io.nix b/hosts/desktops/io.nix index 9b3abf3..c28f844 100644 --- a/hosts/desktops/io.nix +++ b/hosts/desktops/io.nix @@ -35,12 +35,49 @@ write_stylus ]; - services = { - kmonad = { - enable = true; - keyboards.internal = { - device = "/dev/input/by-path/platform-i8042-serio-0-event-kbd"; - config = builtins.readFile ./io/kmonad.kbd; + services.keyd = { + enable = true; + keyboards.main = { + ids = [ "0001:0001" ]; + settings = { + main = { + meta = "overload(meta, esc)"; + f1 = "back"; + f2 = "forward"; + f3 = "refresh"; + f4 = "M-f11"; + f5 = "M-w"; + f6 = "brightnessdown"; + f7 = "brightnessup"; + f8 = "timeout(mute, 200, micmute)"; + f9 = "play"; + f10 = "timeout(nextsong, 200, previoussong)"; + f13 = "delete"; + "102nd" = "layer(function)"; + }; + shift = { + leftshift = "capslock"; + rightshift = "capslock"; + }; + function = { + escape = "f1"; + f1 = "f2"; + f2 = "f3"; + f3 = "f4"; + f4 = "f5"; + f5 = "f6"; + f6 = "f7"; + f7 = "f8"; + f8 = "f9"; + f9 = "f10"; + f10 = "f11"; + f13 = "f12"; + u = "sysrq"; + k = "home"; + l = "pageup"; + "," = "end"; + "." = "pagedown"; + }; }; }; }; diff --git a/hosts/desktops/io/kmonad.kbd b/hosts/desktops/io/kmonad.kbd deleted file mode 100644 index 1090d86..0000000 --- a/hosts/desktops/io/kmonad.kbd +++ /dev/null @@ -1,54 +0,0 @@ -(defcfg - input (device-file "/dev/input/by-path/platform-i8042-serio-0-event-kbd") - output (uinput-sink "KMonad Virtal Keyboard" - "/run/current-system/sw/bin/sleep 1 && /run/current-system/sw/bin/setxkbmap -option compose:ralt") - cmp-seq ralt - cmp-seq-delay 5 - fallthrough true - allow-cmd false -) - -(defalias - ovrvw M-w #|Overview button|# - fsc (multi-tap 150 M-pgup M-f11) - cps (tap-hold 400 esc caps) #|Caps lock replacement|# - medkey (multi-tap 200 KeyNextSong KeyPreviousSong) #|Play-pause key|# - mute (multi-tap 200 KeyMute M-KeyMute) #|Mute audio and mic|# - - #|Handling function key|# - fk (layer-toggle fkeys) - fkk (layer-switch fkeys) - fks (multi-tap 200 @fk @fkk) - fkout (layer-switch default) - fko (multi-tap 200 @fk @fkout) -) - -(defsrc - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f13 - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] ret - lmet a s d f g h j k l ; ' \ - lsft 102d z x c v b n m , . / rsft - lctl lalt spc ralt rctl up - left down rght -) - -(deflayer default - esc KeyBack KeyForward KeyRefresh @fsc @ovrvw brdn brup @mute pp @medkey del - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] ret - @cps a s d f g h j k l ; ' \ - lsft @fks z x c v b n m , . / rsft - lctl lalt spc ralt rctl up - left down rght -) - -(deflayer fkeys - f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 - _ _ _ _ _ _ _ _ _ kp/ kp* kp- KeyHome _ - _ prnt _ _ _ _ _ _ 7 8 9 kp+ pgup _ - _ _ _ _ _ _ _ _ 4 5 6 kprt pgdn - _ @fko _ _ _ _ _ _ _ 1 2 3 KeyEnd - _ _ _ 0 . _ - _ _ _ -) diff --git a/hosts/desktops/rotterdam.nix b/hosts/desktops/rotterdam.nix index 06ac00c..7eab2c7 100644 --- a/hosts/desktops/rotterdam.nix +++ b/hosts/desktops/rotterdam.nix @@ -17,6 +17,7 @@ keyd = { enable = true; keyboards.main = { + ids = [ "1ea7:0907" ]; settings = { main = { capslock = "overload(meta, esc)"; }; shift = { @@ -24,7 +25,6 @@ rightshift = "capslock"; }; }; - ids = [ "1ea7:0907" ]; }; }; };