hosts/murk/configuration.nix

@@ -1,21 +1,13 @@
-{
+{ config, lib, pkgs, inputs, system, sources, modulesPath, ... }:
-  config,
+let cfg = config.mods;
-  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
@@ -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,10 +1,4 @@
-{
+{ pkgs, lib, config, inputs, ... }: {
-  pkgs,
-  lib,
-  config,
-  inputs,
-  ...
-}: {
   options.mods.terminal.development.enable =
     lib.mkEnableOption "enables cli editor";
 
@@ -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;
           };