Justfile

@@ -31,7 +31,3 @@ alias gc := collectgarbage
 [group('maintainence')]
 collectgarbage:
   nh clean all
-
-alias s := search
-search this:
-  nh search {{this}}

flake.nix

@@ -1,7 +1,8 @@
 {
   description = "marleyOS";
 
-  outputs = inputs:
+  outputs =
+    inputs:
     inputs.snowfall-lib.mkFlake {
       inherit inputs;
       src = ./.;
@@ -71,6 +72,7 @@
     marleyvim = {
       url = "git+https://codewith.babesonthe.net/punkfairie/marleyvim";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.unstable.follows = "unstable";
     };
 
     # Rose pine themes that aren't included in the above flake:

homes/x86_64-linux/marley@nyx/default.nix

@@ -2,12 +2,14 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   inherit (lib.marleyos) enabled;
-in {
+in
-  imports = [./autorandr.nix];
+{
+  imports = [ ./autorandr.nix ];
 
-  home.keyboard.options = ["apple:alupckeys"];
+  home.keyboard.options = [ "apple:alupckeys" ];
 
   # FIXME: Remove once we are on NixOS
   targets.genericLinux = enabled;
@@ -70,7 +72,6 @@ in {
     };
     services = {
       clipboard = enabled;
-      kanata = enabled;
       syncthing = enabled;
     };
     xorg = {

modules/home/services/kanata/config.kbd

@@ -1,30 +0,0 @@
-;; vim: ft=commonlisp
-
-(defcfg
-  process-unmapped-keys yes
-)
-
-(defsrc
-  caps a s d f j k l ;
-)
-
-(defvar
-  tap-time 150
-  hold-time 200
-)
-
-(defalias
-  escctrl (tap-hold 100 100 esc caps)
-  a (tap-hold $tap-time $hold-time a lmet)
-  s (tap-hold $tap-time $hold-time s lalt)
-  d (tap-hold $tap-time $hold-time d lsft)
-  f (tap-hold $tap-time $hold-time f lctl)
-  j (tap-hold $tap-time $hold-time j rctl)
-  k (tap-hold $tap-time $hold-time k rsft)
-  l (tap-hold $tap-time $hold-time l ralt)
-  ; (tap-hold $tap-time $hold-time ; rmet)
-)
-
-(deflayer base
-  @escctrl @a @s @d @f @j @k @l @;
-)

modules/home/services/kanata/default.nix

@@ -1,43 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  system,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf getExe' getExe;
-  inherit (lib.snowfall.system) is-darwin;
-
-  cfg = config.marleyos.services.kanata;
-  isGenericLinux = config.targets.genericLinux.enable;
-  isNotNixOS = isGenericLinux || (is-darwin system);
-in {
-  options.marleyos.services.kanata.enable = mkEnableOption "kanata";
-
-  # Kanata is available as a module for nixOS and that should be preferred when
-  # possible.
-  config = mkIf (cfg.enable && isNotNixOS) {
-    home.packages = with pkgs; [
-      kanata
-    ];
-
-    systemd.user.services.kanata = {
-      Unit = {
-        Description = "Kanata keyboard remapper";
-        Documentation = "https://github.com/jtroo/kanata";
-      };
-
-      Service = {
-        Environment = [
-          "PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/bin"
-          "DISPLAY=:0"
-        ];
-        Type = "simple";
-        ExecStart = "${getExe' pkgs.klibc "sh"} -c 'exec ${getExe pkgs.kanata} --cfg ${./config.kbd}'";
-        Restart = "no";
-      };
-
-      Install.WantedBy = ["default.target"];
-    };
-  };
-}