niri, ocaml meat

system/cachix.nix

@@ -15,17 +15,19 @@ in {
       "https://cache.nixos.org"
       "https://nix-community.cachix.org"
       "https://helix.cachix.org"
-      "https://cosmic.cachix.org"
       "https://cuda-maintainers.cachix.org"
-      "https://hyprland.cachix.org"
+      "https://cache.garnix.io"
+      "https://walker-git.cachix.org"
+      "https://anmonteiro.nix-cache.workers.dev"
     ];
     trusted-public-keys = [
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
-      "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
       "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
-      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+      "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM="
+      "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY="
     ];
   };
 }

system/configuration.nix

@@ -54,22 +54,34 @@
     ./modules/docs.nix
     ./modules/nix-meta.nix
     ./modules/anal-retentive.nix
+    ./modules/niri.nix
   ];
 
-  programs.niri = {
-    enable = true;
-    package = pkgs.niri-unstable;
-  };
-
   hardware.enableRedistributableFirmware = true;
   hardware.enableAllFirmware = true;
 
   boot.tmp.useTmpfs = true;
 
-  services.libinput.enable = true;
+  services.udev.extraHwdb = ''
+    evdev:atkbd:*
+      KEYBOARD_KEY_3a=esc
+  '';
+  # services.xserver.xkb.options = "caps:swapescape";
+  services.xserver.xkb.extraLayouts."swap" = {
+    description = "caps swap";
+    languages = [ "eng" ];
+    symbolsFile = pkgs.writeText "keyboard" ''
+      xkb_symbols
+      {
+        include "us(basic)"
 
-  # busted as hell
-  # services.usbmuxd.enable = true; # for iphone
+        key <CAPS> {[ Escape ]};
+      }
+    '';
+  };
+  services.kmscon.useXkbConfig = true;
+  console.useXkbConfig = true;
+  services.libinput.enable = true;
 
   hardware.graphics.enable = true;
   hardware.graphics.enable32Bit = true;
@@ -90,10 +102,8 @@
     eza
     git
     jujutsu
-
   ];
 
-  
   services.atuin.enable = true;
 
   programs.nh = {

system/modules/hyprland.nix

@@ -1,8 +0,0 @@
-{ pkgs, inputs, ...}:
-{
-  programs.hyprland = {
-    enable = true;
-    package = inputs.hyprland.packages.x86_64-linux.hyprland;
-    portalPackage = inputs.hyprland.packages.x86_64-linux.xdg-desktop-portal-hyprland;
-  };
-}

system/modules/niri.nix

@@ -1,4 +1,18 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = let
+        tuigreet = "${lib.getExe pkgs.greetd.tuigreet}";
+      in {
+        command = "${tuigreet} -g yo -r";
+      };
+    };
+  };
   programs.niri = {
     enable = true;
     package = pkgs.niri-unstable;

system/modules/term.nix

@@ -1,10 +1,11 @@
 {pkgs, ...}: let
-  inherit (pkgs) murex zsh;
+  inherit (pkgs) murex zsh elvish;
 in {
   environment.pathsToLink = ["/share/zsh"];
   programs.zsh.enable = true;
   environment.systemPackages = [
     murex
+    elvish
   ];
   environment.shells = [murex];
   users.defaultUserShell = murex;

system/quiver.nix

@@ -3,6 +3,7 @@
   lib,
   pkgs,
   mainUser,
+  inputs,
   ...
 }: {
   imports = [
@@ -107,12 +108,15 @@
   #   };
   # };
 
-  services.hardware.openrgb = {
-    enable = true;
-    motherboard = "amd";
-  };
+  # services.hardware.openrgb = {
+  #   enable = true;
+  #   motherboard = "amd";
+  # };
 
-  hardware.ckb-next.enable = true;
+  hardware.ckb-next= {
+    enable = true;
+    package = inputs.nixpkgs-stable.legacyPackages.x86_64-linux.ckb-next;
+  };
 
   environment.systemPackages = with pkgs; [
     wl-clipboard