hosts/murk/configuration.nix

@@ -1,21 +1,13 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  system,
-  sources,
-  modulesPath,
-  ...
-}: let
-  cfg = config.mods;
+{ config, lib, pkgs, inputs, system, sources, modulesPath, ... }:
+let cfg = config.mods;
 in {
   # Hardware
   imports = [
     ./hardware-configuration.nix
     "${
       builtins.fetchTarball {
-        url = "https://github.com/nix-community/disko/archive/refs/tags/v1.12.0.tar.gz";
+        url =
+          "https://github.com/nix-community/disko/archive/refs/tags/v1.12.0.tar.gz";
         sha256 = "0wbx518d2x54yn4xh98cgm65wvj0gpy6nia6ra7ns4j63hx14fkq";
       }
     }/module.nix"
@@ -29,7 +21,6 @@ in {
     pkgs.libratbag
     pkgs.piper
     pkgs.libpq
-    pkgs.qmk
   ];
 
   # System
@@ -37,8 +28,8 @@ in {
   networking.hostName = "murk";
   networking.hostId = "a2309090";
   mods.home.file = ./home.nix;
-  nix.settings.trusted-users = ["root" "muon"];
-  users.users.muon.extraGroups = ["docker"];
+  nix.settings.trusted-users = [ "root" "muon" ];
+  users.users.muon.extraGroups = [ "docker" ];
 
   # Modules
   mods.desktop.enable = true;
@@ -57,7 +48,7 @@ in {
 
   # Persist
   environment.persistence."/persist" = {
-    directories = ["/etc/NetworkManager" "/var/lib/NetworkManager"];
+    directories = [ "/etc/NetworkManager" "/var/lib/NetworkManager" ];
   };
 
   # Hardware preferences
@@ -97,7 +88,7 @@ in {
         mode = "2560x1440";
         position = "0x0";
         rate = "60.00";
-        dpi = 72;
+        dpi = 96;
       };
     };
     right = {
@@ -107,7 +98,7 @@ in {
         mode = "2560x1440";
         position = "2560x0";
         rate = "60.00";
-        dpi = 72;
+        dpi = 96;
       };
     };
   };
@@ -115,9 +106,6 @@ in {
   ## Mouse
   services.libinput.mouse.accelProfile = "flat";
 
-  ## Keyboard
-  hardware.keyboard.qmk.enable = true;
-
   # Version of first install
   system.stateVersion = "23.05";
 }

hosts/murk/home.nix

@@ -27,13 +27,14 @@ in {
       pulseaudio
       pavucontrol
       alsa-utils
-      rustdesk-flutter
+      qmk
+      qmk_hid
+      qmk-udev-rules
 
       docker
       fish
       devenv
       dbeaver-bin
-      ruff
     ]
     # Non-free </3
     ++ [google-cloud-sdk google-cloud-sql-proxy];

modules/home/terminal/development.nix

@@ -1,14 +1,8 @@
-{
-  pkgs,
-  lib,
-  config,
-  inputs,
-  ...
-}: {
+{ pkgs, lib, config, inputs, ... }: {
   options.mods.terminal.development.enable =
     lib.mkEnableOption "enables cli editor";
 
-  imports = [inputs.nvf.homeManagerModules.default];
+  imports = [ inputs.nvf.homeManagerModules.default ];
 
   config = lib.mkIf config.mods.terminal.development.enable {
     home.packages = with pkgs; [
@@ -42,18 +36,18 @@
 
       settings = {
         keys.normal = {
-          "esc" = ["collapse_selection" "keep_primary_selection"];
+          "esc" = [ "collapse_selection" "keep_primary_selection" ];
           "Z" = {
             "Q" = ":quit!";
             "Z" = ":write-quit!";
           };
-          "V" = ["select_mode" "extend_to_line_bounds"];
+          "V" = [ "select_mode" "extend_to_line_bounds" ];
         };
         editor = {
           line-number = "relative";
           completion-replace = true;
           bufferline = "always";
-          rulers = [80];
+          rulers = [ 80 ];
           soft-wrap.enable = true;
           indent-guides.render = true;
           cursor-shape = {
@@ -82,18 +76,18 @@
         }
         {
           name = "glsl";
-          language-servers = ["glsl"];
+          language-servers = [ "glsl" ];
         }
         {
           name = "wgsl";
-          language-servers = ["wgsl"];
+          language-servers = [ "wgsl" ];
         }
         {
           name = "python";
           auto-format = true;
           formatter = {
             command = "${pkgs.black}/bin/black";
-            args = ["-" "--quiet" "--line-length=79"];
+            args = [ "-" "--quiet" "--line-length=79" ];
           };
         }
       ];
@@ -122,12 +116,8 @@
             bash.enable = true;
             rust.enable = true;
             rust.crates.enable = true;
-
             python.enable = true;
-            python.lsp.server = "pyright";
-            # python.lsp.package = [(lib.getExe pkgs.ruff) "server"];
             python.format.type = "ruff";
-
             clang.enable = true;
           };
 
@@ -150,7 +140,7 @@
             todo-comments.enable = true;
           };
 
-          spellcheck = {enable = true;};
+          spellcheck = { enable = true; };
 
           binds = {
             whichKey.enable = true;