hosts/murk/configuration.nix

@@ -1,5 +1,6 @@
 { config, lib, pkgs, inputs, system, sources, modulesPath, ... }:
 let cfg = config.mods;
+
 in {
   # Hardware
   imports = [
@@ -24,7 +25,6 @@ in {
   networking.hostName = "murk";
   networking.hostId = "a2309090";
   mods.home.file = ./home.nix;
-  nix.settings.trusted-users = [ "root" "muon" ];
 
   # Modules
   mods.desktop.enable = true;
@@ -44,53 +44,15 @@ in {
   };
 
   # Hardware preferences
-  # environment.variables = {
-  #   WINIT_HIDPI_FACTOR = "1";
-  #   WINIT_X11_SCALE_FACTOR = "1";
-  # };
+  environment.variables = {
+    WINIT_HIDPI_FACTOR = "1";
+    WINIT_X11_SCALE_FACTOR = "1";
+  };
 
   ## Laptop
   powerManagement.enable = true;
   services.thermald.enable = true;
   services.tlp.enable = true;
-  services.xserver.dpi = lib.mkForce 180;
-  environment.variables = {
-    GDK_SCALE = "2";
-    GDK_DPI_SCALE = "0.5";
-    _JAVA_OPTIONS = "-Dsun.java2d.uiScale=2";
-  };
-
-  ## Monitors
-  mods.monitors = {
-    primary = {
-      name = "eDP-1";
-      config = {
-        enable = true;
-        mode = "2560x1600";
-        position = "1264x1440";
-        primary = true;
-        rate = "60.00";
-      };
-    };
-    left = {
-      name = "DP-1-2";
-      config = {
-        enable = true;
-        mode = "2560x1440";
-        position = "0x0";
-        rate = "60.00";
-      };
-    };
-    right = {
-      name = "DP-1-1";
-      config = {
-        enable = true;
-        mode = "2560x1440";
-        position = "2560x0";
-        rate = "60.00";
-      };
-    };
-  };
 
   ## Mouse
   services.libinput.mouse.accelProfile = "flat";

hosts/murk/hardware-configuration.nix

@@ -8,7 +8,7 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];

hosts/murk/home.nix

@@ -1,7 +1,14 @@
-{ pkgs, lib, config, osConfig, inputs, ... }:
-let cfg = osConfig.mods;
+{
+  pkgs,
+  lib,
+  config,
+  osConfig,
+  inputs,
+  ...
+}: let
+  cfg = osConfig.mods;
 in {
-  imports = [ inputs.impermanence.homeManagerModules.impermanence ];
+  imports = [inputs.impermanence.homeManagerModules.impermanence];
 
   # Modules
   mods.xdg.enable = true;
@@ -23,27 +30,12 @@ in {
 
       docker
       fish
-      devenv
     ]
     # Non-free </3
-    ++ [ google-cloud-sdk ];
+    ++ [google-cloud-sdk];
 
   # Hardware preferences
   ## Monitors
-  xsession.windowManager.i3.config.workspaceOutputAssign = [
-    {
-      workspace = "1";
-      output = "${cfg.monitors.left.name}";
-    }
-    {
-      workspace = "2";
-      output = "${cfg.monitors.right.name}";
-    }
-    {
-      workspace = "4";
-      output = "${cfg.monitors.primary.name}";
-    }
-  ];
   services.autorandr.enable = true;
   programs.autorandr = {
     enable = true;
@@ -53,21 +45,6 @@ in {
         ${lib.getExe pkgs.feh} --bg-fill --nofehbg ${./wallpaper.png}
       '';
     };
-    profiles.default = {
-      fingerprint = {
-        "${cfg.monitors.right.name}" =
-          "00ffffffffffff0030aef465010101011e1e0103803c22782a31d5a65453a0240a5054bfcf00d1c0d100b300a9c09500818081c08100e973006aa0a034504220680055502100001a565e00a0a0a029503020350055502100001a000000fd00304b0f6e1e000a202020202020000000fc00513237712d31300a202020202001ff020329f04b10050403021f1413121101230907078301000067030c001000183c681a00000101304b00023a801871382d40582c450055502100001e662156aa51001e30468f330055502100001eab22a0a050841a303020360055502100001a7c2e90a0601a1e403020360055502100001a000000000000000000000000000026";
-        "${cfg.monitors.left.name}" =
-          "00ffffffffffff0005e30427b11a0000321f0104a53c22783be445a554529e260d5054bfef00d1c0b30095008180814081c001010101565e00a0a0a029503020350055502100001e000000ff005141424d434841303036383333000000fc00513237563447350a2020202020000000fd00304b72721e010a2020202020200163020318f14b0103051404131f120211902309070783010000a073006aa0a029500820350055502100001a2a4480a0703827403020350055502100001a023a801871382d40582c450055502100001ef03c00d051a0355060883a0055502100001c000000000000000000000000000000000000000000000000000000000000005f";
-        "${cfg.monitors.primary.name}" =
-          "00ffffffffffff0026cfab050000000000200104b51f147803de50a3544c99260f505400000001010101010101010101010101010101b29f00a0a04089631830760a38c310000019b29f00a0a040466018303c0038c310000019000000fd00285a969629010a202020202020000000fe004d3134354e574b31205230200a00ad";
-      };
-      config = {
-        "${cfg.monitors.primary.name}" = cfg.monitors.primary.config;
-        "${cfg.monitors.left.name}" = cfg.monitors.left.config;
-        "${cfg.monitors.right.name}" = cfg.monitors.right.config;
-      };
-    };
   };
 
   # Version of first install

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"];
           };
         }
       ];
@@ -117,7 +123,6 @@
             rust.enable = true;
             rust.crates.enable = true;
             python.enable = true;
-            python.format.type = "ruff";
             clang.enable = true;
           };
 
@@ -140,7 +145,7 @@
             todo-comments.enable = true;
           };
 
-          spellcheck = { enable = true; };
+          spellcheck = {enable = true;};
 
           binds = {
             whichKey.enable = true;