Merge branch 'main' of codeberg.org:muon/home

hosts/murk/configuration.nix

@@ -1,13 +1,21 @@
-{ 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 =
+        url = "https://github.com/nix-community/disko/archive/refs/tags/v1.12.0.tar.gz";
-          "https://github.com/nix-community/disko/archive/refs/tags/v1.12.0.tar.gz";
         sha256 = "0wbx518d2x54yn4xh98cgm65wvj0gpy6nia6ra7ns4j63hx14fkq";
       }
     }/module.nix"
@@ -21,6 +29,7 @@ in {
     pkgs.libratbag
     pkgs.piper
     pkgs.libpq
+    pkgs.qmk
   ];
 
   # System
@@ -28,8 +37,8 @@ in {
   networking.hostName = "murk";
   networking.hostId = "a2309090";
   mods.home.file = ./home.nix;
-  nix.settings.trusted-users = [ "root" "muon" ];
+  nix.settings.trusted-users = ["root" "muon"];
-  users.users.muon.extraGroups = [ "docker" ];
+  users.users.muon.extraGroups = ["docker"];
 
   # Modules
   mods.desktop.enable = true;
@@ -48,7 +57,7 @@ in {
 
   # Persist
   environment.persistence."/persist" = {
-    directories = [ "/etc/NetworkManager" "/var/lib/NetworkManager" ];
+    directories = ["/etc/NetworkManager" "/var/lib/NetworkManager"];
   };
 
   # Hardware preferences
@@ -88,7 +97,7 @@ in {
         mode = "2560x1440";
         position = "0x0";
         rate = "60.00";
-        dpi = 96;
+        dpi = 72;
       };
     };
     right = {
@@ -98,7 +107,7 @@ in {
         mode = "2560x1440";
         position = "2560x0";
         rate = "60.00";
-        dpi = 96;
+        dpi = 72;
       };
     };
   };
@@ -106,6 +115,9 @@ 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,14 +27,13 @@ in {
       pulseaudio
       pavucontrol
       alsa-utils
-      qmk
+      rustdesk-flutter
-      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,8 +1,14 @@
-{ 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; [
@@ -36,18 +42,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 = {
@@ -76,18 +82,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"];
           };
         }
       ];
@@ -116,8 +122,12 @@
             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;
           };
 
@@ -140,7 +150,7 @@
             todo-comments.enable = true;
           };
 
-          spellcheck = { enable = true; };
+          spellcheck = {enable = true;};
 
           binds = {
             whichKey.enable = true;