new monitor arrived

flake.lock

@@ -236,11 +236,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1692394475,
+        "lastModified": 1693089798,
-        "narHash": "sha256-r3zTlMIdDhMdxKtQtj3Sg85baCVF6/7y5qR9Koav5XI=",
+        "narHash": "sha256-aNRPXtI7TXCu6rXAQMPdx9nmpWCyCQ7gaKIxOFX8W5I=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "e4c95f65a64a0553e1dafa365a40dcd5c328fa69",
+        "rev": "aeaeb09f486c2bc7f8c563bceece03a0954576b9",
         "type": "github"
       },
       "original": {
@@ -255,11 +255,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692260837,
+        "lastModified": 1693108765,
-        "narHash": "sha256-2FpkX1zl+7ni7djK7NeE1ZGupRUwZgjW+RPCSBgDf4k=",
+        "narHash": "sha256-U1btmyF7SMX+y80EXYva5Xj6lpn20xPbHbuoe/2bSIw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6a94c1a59737783c282c4031555a289c28b961e4",
+        "rev": "9706fb8e441a7c56c68bb079480938ed505e8102",
         "type": "github"
       },
       "original": {
@@ -356,11 +356,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691897365,
+        "lastModified": 1693107069,
-        "narHash": "sha256-jvWIU4ht3YAmF8TDVM2Ps2+Gf4MtNGLL1zEWQZdTrzU=",
+        "narHash": "sha256-5dVXPchyvzmytanlwXHcmeQP9AfO/98Q6V+QtsMl5vQ=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "f4d70d098f066a30c7087144063dca179495f7d6",
+        "rev": "53d40cf1bea235658ef8f6e8b8a1d033e2ecbfff",
         "type": "github"
       },
       "original": {
@@ -371,11 +371,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1692373088,
+        "lastModified": 1692952286,
-        "narHash": "sha256-EPgCecdc9I8aTdmDNoO1l7R72r2WPhZRcesV4nzxBj8=",
+        "narHash": "sha256-TsrtPv3+Q1KR0avZxpiJH+b6fX/R/hEQVHbjl1ebotY=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7f1836531b126cfcf584e7d7d71bf8758bb58969",
+        "rev": "817e297fc3352fadc15f2c5306909aa9192d7d97",
         "type": "github"
       },
       "original": {
@@ -432,11 +432,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1691874659,
+        "lastModified": 1693097136,
-        "narHash": "sha256-qgmixg0c/CRNT2p9Ad35kaC7NzYVZ6GRooErYI7OGJM=",
+        "narHash": "sha256-fBZSMdBaoZ0INFbyZ5s0DOF7zDNcLsLxgkwdDh3l9Pc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "efeed708ece1a9f4ae0506ae4a4d7da264a74102",
+        "rev": "9117c4e9dc117a6cd0319cca40f2349ed333669d",
         "type": "github"
       },
       "original": {
@@ -448,11 +448,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1692356644,
+        "lastModified": 1693003285,
-        "narHash": "sha256-AYkPFT+CbCVSBmh0WwIzPpwhEJ4Yy3A7JZvUkGJIg5o=",
+        "narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8ecc900b2f695d74dea35a92f8a9f9b32c8ea33d",
+        "rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7",
         "type": "github"
       },
       "original": {
@@ -586,11 +586,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1692127428,
+        "lastModified": 1693105804,
-        "narHash": "sha256-+e9dD67mpGLBhhqdv7A7i1g/r2AT/PmqthWaYHyVZR4=",
+        "narHash": "sha256-nlqNjW7dfucUJQqRGuG08MKPOSME8fLOCx/bd9hiEPs=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f81e73cf9a4ef4b949b9225be3daa1e586c096da",
+        "rev": "0618c8f0ed5255ad74ee08d1618841ff5af85c86",
         "type": "github"
       },
       "original": {

hosts/nuc/modules/nginx/default.nix

@@ -1,4 +1,7 @@
-{ ... }:
+{ lib, config, ... }:
+let
+  v = (builtins.attrNames config.services.nginx.virtualHosts);
+in
 {
   networking.firewall.allowedTCPPorts = [ 80 443 ];
   services.nginx = {
@@ -7,6 +10,7 @@
     recommendedProxySettings = true;
     recommendedGzipSettings = true;
     recommendedOptimisation = true;
+    # virtualHosts = lib.genAttrs v (name: { extraConfig = " lohustuff goes ith ${name}"; });
   };
   security.acme = {
     acceptTerms = true;

users/rouven/modules/packages.nix

@@ -50,6 +50,7 @@
     croc # send files anywhere
     bacula
     hcloud
+    jq
 
     # programming languages
     cargo

users/rouven/modules/wayland/river.nix

@@ -27,7 +27,7 @@
           riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad middle-emulation enabled
           riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad accel-profile adaptive
           
-          riverctl spawn "${pkgs.swaybg}/bin/swaybg -i ${../../../../images/wallpaper.png}"
+          riverctl spawn "${pkgs.swaybg}/bin/swaybg -i ${../../../../images/wallpaper.png} -m fill"
 
           riverctl map normal Super Return spawn footclient
           riverctl map normal Super+Shift Return zoom
@@ -50,7 +50,7 @@
 
           riverctl map-pointer normal Super BTN_RIGHT resize-view
 
-          riverctl map normal Alt Space spawn ${pkgs.fuzzel}/bin/fuzzel
+          riverctl map normal Alt Space spawn "${pkgs.fuzzel}/bin/fuzzel -w 50"
           riverctl map normal Super Space toggle-float
 
           for i in $(seq 1 9)

users/rouven/modules/wayland/shikane.nix

@@ -3,12 +3,46 @@
     enable = true;
     settings = {
       profile = [
+        {
+          # TODO home vertical
+          name = "home";
+          output = [
+            {
+              match = "eDP-1";
+              enable = true;
+              position = {
+                x = 1920;
+                y = 0;
+              };
+            }
+            {
+              match = "DP-2";
+              enable = true;
+              position = {
+                x = 0;
+                y = 0;
+              };
+            }
+            {
+              match = "HDMI-A-1";
+              enable = true;
+              position = {
+                x = 3840;
+                y = 0;
+              };
+            }
+          ];
+        }
         {
           name = "external-monitor-default";
           output = [
             {
               match = "eDP-1";
               enable = true;
+              position = {
+                x = 0;
+                y = 0;
+              };
             }
             {
               match = "HDMI-A-1";
@@ -20,12 +54,60 @@
             }
           ];
         }
+        {
+          name = "external-monitor-usb-c";
+          output = [
+            {
+              match = "eDP-1";
+              enable = true;
+              position = {
+                x = 1920;
+                y = 0;
+              };
+            }
+            {
+              match = "DP-2";
+              enable = true;
+              position = {
+                x = 0;
+                y = 0;
+              };
+            }
+          ];
+        }
+        # vertical mode if on dp-3
+        {
+          name = "external-monitor-usb-c-vertical";
+          output = [
+            {
+              match = "eDP-1";
+              enable = true;
+              position = {
+                x = 1080;
+                y = 840;
+              };
+            }
+            {
+              match = "DP-3";
+              enable = true;
+              position = {
+                x = 0;
+                y = 0;
+              };
+              transform = "270";
+            }
+          ];
+        }
         {
           name = "builtin";
           output = [
             {
               match = "eDP-1";
               enable = true;
+              position = {
+                x = 0;
+                y = 0;
+              };
             }
           ];
         }