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

hosts/murk/configuration.nix

@@ -16,8 +16,12 @@ in {
     #   + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
   ];
 
-  environment.systemPackages = with inputs.nix-alien.packages.${system};
-    [ nix-alien ];
+  environment.systemPackages = with inputs.nix-alien.packages.${system}; [
+    nix-alien
+    pkgs.libratbag
+    pkgs.piper
+    pkgs.libpq
+  ];
 
   # System
   mods.user.name = "muon";
@@ -25,6 +29,7 @@ in {
   networking.hostId = "a2309090";
   mods.home.file = ./home.nix;
   nix.settings.trusted-users = [ "root" "muon" ];
+  users.users.muon.extraGroups = [ "docker" ];
 
   # Modules
   mods.desktop.enable = true;
@@ -38,27 +43,30 @@ in {
 
   mods.impermanence.enable = true;
 
+  services.hardware.openrgb.enable = true;
+  virtualisation.docker.enable = true;
+
   # Persist
   environment.persistence."/persist" = {
     directories = [ "/etc/NetworkManager" "/var/lib/NetworkManager" ];
   };
 
   # 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";
-  };
+  # 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 = {
@@ -70,6 +78,7 @@ in {
         position = "1264x1440";
         primary = true;
         rate = "60.00";
+        dpi = 192;
       };
     };
     left = {
@@ -79,6 +88,7 @@ in {
         mode = "2560x1440";
         position = "0x0";
         rate = "60.00";
+        dpi = 96;
       };
     };
     right = {
@@ -88,6 +98,7 @@ in {
         mode = "2560x1440";
         position = "2560x0";
         rate = "60.00";
+        dpi = 96;
       };
     };
   };

hosts/murk/home.nix

@@ -1,5 +1,12 @@
-{ pkgs, lib, config, osConfig, inputs, ... }:
-let cfg = osConfig.mods;
+{
+  pkgs,
+  lib,
+  config,
+  osConfig,
+  inputs,
+  ...
+}: let
+  cfg = osConfig.mods;
 in {
   imports = [inputs.impermanence.homeManagerModules.impermanence];
 
@@ -20,13 +27,17 @@ in {
       pulseaudio
       pavucontrol
       alsa-utils
+      qmk
+      qmk_hid
+      qmk-udev-rules
 
       docker
       fish
       devenv
+      dbeaver-bin
     ]
     # Non-free </3
-    ++ [ google-cloud-sdk ];
+    ++ [google-cloud-sdk google-cloud-sql-proxy];
 
   # Hardware preferences
   ## Monitors
@@ -55,12 +66,9 @@ in {
     };
     profiles.default = {
       fingerprint = {
-        "${cfg.monitors.right.name}" =
-          "00ffffffffffff0030aef465010101011e1e0103803c22782a31d5a65453a0240a5054bfcf00d1c0d100b300a9c09500818081c08100e973006aa0a034504220680055502100001a565e00a0a0a029503020350055502100001a000000fd00304b0f6e1e000a202020202020000000fc00513237712d31300a202020202001ff020329f04b10050403021f1413121101230907078301000067030c001000183c681a00000101304b00023a801871382d40582c450055502100001e662156aa51001e30468f330055502100001eab22a0a050841a303020360055502100001a7c2e90a0601a1e403020360055502100001a000000000000000000000000000026";
-        "${cfg.monitors.left.name}" =
-          "00ffffffffffff0005e30427b11a0000321f0104a53c22783be445a554529e260d5054bfef00d1c0b30095008180814081c001010101565e00a0a0a029503020350055502100001e000000ff005141424d434841303036383333000000fc00513237563447350a2020202020000000fd00304b72721e010a2020202020200163020318f14b0103051404131f120211902309070783010000a073006aa0a029500820350055502100001a2a4480a0703827403020350055502100001a023a801871382d40582c450055502100001ef03c00d051a0355060883a0055502100001c000000000000000000000000000000000000000000000000000000000000005f";
-        "${cfg.monitors.primary.name}" =
-          "00ffffffffffff0026cfab050000000000200104b51f147803de50a3544c99260f505400000001010101010101010101010101010101b29f00a0a04089631830760a38c310000019b29f00a0a040466018303c0038c310000019000000fd00285a969629010a202020202020000000fe004d3134354e574b31205230200a00ad";
+        "${cfg.monitors.right.name}" = "00ffffffffffff0030aef465010101011e1e0103803c22782a31d5a65453a0240a5054bfcf00d1c0d100b300a9c09500818081c08100e973006aa0a034504220680055502100001a565e00a0a0a029503020350055502100001a000000fd00304b0f6e1e000a202020202020000000fc00513237712d31300a202020202001ff020329f04b10050403021f1413121101230907078301000067030c001000183c681a00000101304b00023a801871382d40582c450055502100001e662156aa51001e30468f330055502100001eab22a0a050841a303020360055502100001a7c2e90a0601a1e403020360055502100001a000000000000000000000000000026";
+        "${cfg.monitors.left.name}" = "00ffffffffffff0005e30427b11a0000321f0104a53c22783be445a554529e260d5054bfef00d1c0b30095008180814081c001010101565e00a0a0a029503020350055502100001e000000ff005141424d434841303036383333000000fc00513237563447350a2020202020000000fd00304b72721e010a2020202020200163020318f14b0103051404131f120211902309070783010000a073006aa0a029500820350055502100001a2a4480a0703827403020350055502100001a023a801871382d40582c450055502100001ef03c00d051a0355060883a0055502100001c000000000000000000000000000000000000000000000000000000000000005f";
+        "${cfg.monitors.primary.name}" = "00ffffffffffff0026cfab050000000000200104b51f147803de50a3544c99260f505400000001010101010101010101010101010101b29f00a0a04089631830760a38c310000019b29f00a0a040466018303c0038c310000019000000fd00285a969629010a202020202020000000fe004d3134354e574b31205230200a00ad";
       };
       config = {
         "${cfg.monitors.primary.name}" = cfg.monitors.primary.config;