flake.lock: Update

Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/b0ff39b2ecfd233a8117dd95dd1b1bfd926714ae' (2024-02-29)
  → 'github:nix-community/emacs-overlay/88cb60b6c44861e422302371c0761a89377cf2c7' (2024-02-29)

flake.lock

@@ -73,11 +73,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1709024751,
+        "lastModified": 1709197479,
-        "narHash": "sha256-G6ZB1QsFzGgcYQNjOSLYRKmhXf/4b6ldY+1oCGQc3I4=",
+        "narHash": "sha256-2+Mu5f6sru7wfAXTo21EfYlTGEo4j8ddl4LrsBiv/6A=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "c94a9019370b0d719621e1478d5bb317223ec15b",
+        "rev": "88cb60b6c44861e422302371c0761a89377cf2c7",
         "type": "github"
       },
       "original": {
@@ -139,11 +139,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1705309234,
+        "lastModified": 1709126324,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
         "type": "github"
       },
       "original": {
@@ -291,11 +291,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1708594753,
+        "lastModified": 1709147990,
-        "narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=",
+        "narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958",
+        "rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159",
         "type": "github"
       },
       "original": {
@@ -369,11 +369,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1708831307,
+        "lastModified": 1709128929,
-        "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=",
+        "narHash": "sha256-GWrv9a+AgGhG4/eI/CyVVIIygia7cEy68Huv3P8oyaw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b",
+        "rev": "c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611",
         "type": "github"
       },
       "original": {
@@ -401,11 +401,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1708807242,
+        "lastModified": 1709150264,
-        "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
+        "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
+        "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
         "type": "github"
       },
       "original": {
@@ -417,11 +417,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1708831307,
+        "lastModified": 1709128929,
-        "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=",
+        "narHash": "sha256-GWrv9a+AgGhG4/eI/CyVVIIygia7cEy68Huv3P8oyaw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b",
+        "rev": "c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611",
         "type": "github"
       },
       "original": {

machines/nucturne/software.nix

@@ -15,10 +15,6 @@
     java.enable = true;
   };
 
-  services = {
-    autorandr.enable = false;
-  };
-
   elss = {
     programs = {
       aspell.enable = true;

machines/stel-xps/default.nix

@@ -29,6 +29,7 @@
       i3.enable = false;
       plasma.enable = false;
       xmonad.enable = true;
+      xserver.autorandr.enable = true;
       # set dpi if used in mobile applications
       dpi = 192;
     };

modules/autorandr.nix

@@ -0,0 +1,154 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; {
+  config = mkIf config.elss.graphical.xserver.autorandr.enable {
+    services.autorandr = {
+      enable = true;
+      profiles = {
+        "home" = {
+          fingerprint = {
+            DP-1 = "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf";
+            eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+          };
+          config = {
+            eDP-1.enable = false;
+            DP-1 = {
+              enable = true;
+              crtc = 1;
+              primary = true;
+              position = "0x0";
+              mode = "3840x2160";
+              dpi = 96;
+            };
+          };
+        };
+        "mobile" = {
+          fingerprint.eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+          config = {
+            eDP-1 = {
+              enable = true;
+              primary = true;
+              mode = "3840x2160";
+              dpi = 192;
+            };
+          };
+        };
+        "work-new" = {
+          fingerprint = {
+            eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+            DP-2 = "00ffffffffffff0009d13d804554000024210104b54627783e6875a6564fa2260e5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500b9882100001a000000ff0035395030303831353031390a20000000fd00324c1e873c010a202020202020000000fc0042656e5120504433323035550a014c020338f14f5d5e5f6061101f22212004131203012309070783010000e200cf6d030c0010003878200060010203e305c301e6060501626200565e00a0a0a0295030203500b9882100001e4d6c80a070703e8030203a00b9882100001a0000000000000000000000000000000000000000000000000000000000000000000000c7";
+          };
+          config = {
+            eDP-1 = {
+              enable = true;
+              crtc = 0;
+              position = "3840x0";
+              mode = "3840x2160";
+              #dpi = 288;
+              dpi = 192;
+            };
+            DP-2 = {
+              enable = true;
+              primary = true;
+              mode = "3840x2160";
+              #dpi = 144;
+              dpi = 96;
+              position = "0x0";
+            };
+          };
+        };
+
+        "work" = {
+          fingerprint = {
+            eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+            DP-2 = "00ffffffffffff0010acb5414c4133452c1e0104b53c22783eee95a3544c99260f5054a54b00e1c0d100d1c0b300a94081808100714f4dd000a0f0703e803020350055502100001a000000ff0031444e593132330a2020202020000000fd00184b1e8c36010a202020202020000000fc0044454c4c205532373230510a2001af020319f14c101f2005140413121103020123097f0783010000a36600a0f0703e803020350055502100001a565e00a0a0a029503020350055502100001a114400a0800025503020360055502100001a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d9";
+          };
+          config = {
+            eDP-1 = {
+              enable = true;
+              crtc = 0;
+              position = "3840x0";
+              mode = "3840x2160";
+              #dpi = 288;
+              dpi = 96;
+            };
+            DP-2 = {
+              enable = true;
+              primary = true;
+              mode = "3840x2160";
+              #dpi = 144;
+              dpi = 96;
+              position = "0x0";
+              crtc = 1;
+            };
+          };
+        };
+        "home-nuc" = {
+          fingerprint = {
+            DP-2 = "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf";
+          };
+          config = {
+            DP-2 = {
+              enable = true;
+              crtc = 1;
+              primary = true;
+              position = "0x0";
+              mode = "3840x2160";
+              dpi = 96;
+            };
+          };
+        };
+
+        "e3027" = {
+          fingerprint = {
+            e-DP1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+            DP-1 = "00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089";
+          };
+          config = {
+            eDP-1 = {
+              enable = true;
+              crtc = 0;
+              position = "0x0";
+              mode = "3840x2160";
+            };
+            DP-1 = {
+              enable = true;
+              crtc = 1;
+              position = "3840x0";
+              mode = "1920x1200";
+            };
+          };
+        };
+
+        "e3027-clone" = {
+          fingerprint = {
+            e-DP1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+            DP-1 = "00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089";
+          };
+          config = {
+            eDP-1 = {
+              enable = true;
+              crtc = 0;
+              position = "0x0";
+              mode = "1920x1200";
+            };
+            DP-1 = {
+              enable = true;
+              crtc = 1;
+              position = "0x0";
+              mode = "1920x1200";
+            };
+          };
+        };
+      };
+      hooks.postswitch = {
+        "polybar" = "systemctl --user restart polybar.service";
+        change-bg = "/home/ellmau/.fehbg";
+      };
+    };
+  };
+}

modules/xmonad.nix

@@ -11,7 +11,7 @@ with lib; {
     mkIf cfg.enable {
       elss.graphical.xserver = {
         enable = true;
-        autorandr.enable = true;
+        #autorandr.enable = true;
       };
       elss.users.dunst.enable = true;
       elss.graphical.xmonad.polybar.enable = true;

users/ellmau/autorandr.nix

@@ -42,7 +42,7 @@ with lib; {
               };
             };
           };
-          "work_new" = {
+          "work-new" = {
             fingerprint = {
               eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
               DP-2 = "00ffffffffffff0009d13d804554000024210104b54627783e6875a6564fa2260e5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500b9882100001a000000ff0035395030303831353031390a20000000fd00324c1e873c010a202020202020000000fc0042656e5120504433323035550a014c020338f14f5d5e5f6061101f22212004131203012309070783010000e200cf6d030c0010003878200060010203e305c301e6060501626200565e00a0a0a0295030203500b9882100001e4d6c80a070703e8030203a00b9882100001a0000000000000000000000000000000000000000000000000000000000000000000000c7";

users/ellmau/default.nix

@@ -7,7 +7,7 @@
 }: {
   imports = [
     ./alacritty.nix
-    ./autorandr.nix
+    #./autorandr.nix
     ./dunst.nix
     ./git.nix
     ./gpg.nix