From 226f1f1195ff5df33e424c50db0aebd986eaa4ab Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 20 Nov 2023 07:28:24 +0000 Subject: [PATCH] Remove kmonad --- flake.lock | 23 ----------------------- flake.nix | 7 +------ home/emacs/init.el | 5 ----- home/emacs/init.org | 9 --------- hosts/Northstar/kmonad.kbd | 31 ------------------------------- hosts/Ronin/kmonad.kbd | 31 ------------------------------- system/desktop.nix | 1 - 7 files changed, 1 insertion(+), 106 deletions(-) delete mode 100644 hosts/Northstar/kmonad.kbd delete mode 100644 hosts/Ronin/kmonad.kbd diff --git a/flake.lock b/flake.lock index 7d834ed5..77e032d0 100644 --- a/flake.lock +++ b/flake.lock @@ -245,28 +245,6 @@ "type": "github" } }, - "kmonad": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "nix", - "lastModified": 1698213131, - "narHash": "sha256-RPfi08g5DHvq5oEX57sJ1al2smBk0d9d8gAzL7jRnNQ=", - "owner": "kmonad", - "repo": "kmonad", - "rev": "1b2ec006259ddbe6cda30db8eb783e8177a9f12b", - "type": "github" - }, - "original": { - "dir": "nix", - "owner": "kmonad", - "repo": "kmonad", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1697059129, @@ -287,7 +265,6 @@ "inputs": { "anyrun": "anyrun", "home-manager": "home-manager", - "kmonad": "kmonad", "nixpkgs": "nixpkgs", "stylix": "stylix" } diff --git a/flake.nix b/flake.nix index dcb2f792..9e3fc297 100644 --- a/flake.nix +++ b/flake.nix @@ -11,17 +11,13 @@ url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; - kmonad = { - url = "github:kmonad/kmonad?dir=nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; anyrun = { url = "github:Kirottu/anyrun"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { nixpkgs, home-manager, stylix, kmonad, anyrun, ... }: + outputs = { nixpkgs, home-manager, stylix, anyrun, ... }: let default = { hostName = "Atlas"; @@ -57,7 +53,6 @@ ./hosts/${hostName}/hardware-configuration.nix home-manager.nixosModules.home-manager stylix.nixosModules.stylix - kmonad.nixosModules.default ({ config, lib, pkgs, ... }: { boot.loader = { systemd-boot.enable = true; diff --git a/home/emacs/init.el b/home/emacs/init.el index 9a0646a5..bd7591be 100644 --- a/home/emacs/init.el +++ b/home/emacs/init.el @@ -576,11 +576,6 @@ :ensure t :hook prog-mode) -(unless (package-installed-p 'kbd-mode) - (package-vc-install - '(kbd-mode . (:url "https://github.com/kmonad/kbd-mode")))) -(use-package kbd-mode) - (setq sendmail-program (executable-find "msmtp") send-mail-function #'smtpmail-send-it message-sendmail-f-is-evil t diff --git a/home/emacs/init.org b/home/emacs/init.org index c482bf3d..c1c8850b 100644 --- a/home/emacs/init.org +++ b/home/emacs/init.org @@ -690,15 +690,6 @@ For reference information, see [[https://orgmode.com][Org-mode website]] :hook prog-mode) #+end_src -** Language-specific settings -*** kmonad -#+begin_src emacs-lisp - (unless (package-installed-p 'kbd-mode) - (package-vc-install - '(kbd-mode . (:url "https://github.com/kmonad/kbd-mode")))) - (use-package kbd-mode) -#+end_src - * Internet ** TODO Email #+BEGIN_SRC emacs-lisp diff --git a/hosts/Northstar/kmonad.kbd b/hosts/Northstar/kmonad.kbd deleted file mode 100644 index 39a6a7bc..00000000 --- a/hosts/Northstar/kmonad.kbd +++ /dev/null @@ -1,31 +0,0 @@ -(defcfg - ;; For Linux - input (device-file "/dev/input/by-path/platform-i8042-serio-0-event-kbd") - output (uinput-sink "My KMonad output") - - ;; Comment this if you want unhandled events not to be emitted - fallthrough true - - ;; Set this to false to disable any command-execution in KMonad - allow-cmd false - ) - -(defsrc - a s d f g h j k l ; - ) - -(defalias - met_a (tap-hold-next-release 200 a lmet) - alt_s (tap-hold-next-release 200 s lalt) - ctl_d (tap-hold-next-release 200 d lctl) - sft_f (tap-hold-next-release 200 f lsft) - - sft_j (tap-hold-next-release 200 j rsft) - ctl_k (tap-hold-next-release 200 k rctl) - alt_l (tap-hold-next-release 200 l lalt) - met_; (tap-hold-next-release 200 ; rmet) - ) - -(deflayer homerowmods - @met_a @alt_s @ctl_d @sft_f g h @sft_j @ctl_k @alt_l @met_; -) diff --git a/hosts/Ronin/kmonad.kbd b/hosts/Ronin/kmonad.kbd deleted file mode 100644 index 56dbf41c..00000000 --- a/hosts/Ronin/kmonad.kbd +++ /dev/null @@ -1,31 +0,0 @@ -(defcfg - ;; For Linux - input (device-file "/dev/input/by-id/usb-0430_Sun_USB_Keyboard-event-kbd") - output (uinput-sink "My KMonad output") - - ;; Comment this if you want unhandled events not to be emitted - fallthrough true - - ;; Set this to false to disable any command-execution in KMonad - allow-cmd false - ) - -(defsrc - a s d f g h j k l ; - ) - -(defalias - met_a (tap-hold-next-release 200 a lmet) - alt_s (tap-hold-next-release 200 s lalt) - ctl_d (tap-hold-next-release 200 d lctl) - sft_f (tap-hold-next-release 200 f lsft) - - sft_j (tap-hold-next-release 200 j rsft) - ctl_k (tap-hold-next-release 200 k rctl) - alt_l (tap-hold-next-release 200 l lalt) - met_; (tap-hold-next-release 200 ; rmet) - ) - -(deflayer homerowmods - @met_a @alt_s @ctl_d @sft_f g h @sft_j @ctl_k @alt_l @met_; -) diff --git a/system/desktop.nix b/system/desktop.nix index 053e07da..240ca0e7 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -30,7 +30,6 @@ accounts-daemon.enable = true; dbus.packages = with pkgs; [ gcr ]; gnome.gnome-keyring.enable = true; - kmonad.enable = true; pipewire = { enable = true; alsa.enable = true;