a

flake.lock

@@ -6,14 +6,15 @@
         "home-manager": "home-manager",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1696775529,
+        "lastModified": 1703433843,
-        "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
+        "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
+        "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
         "type": "github"
       },
       "original": {
@@ -101,11 +102,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694631477,
+        "lastModified": 1703432212,
-        "narHash": "sha256-35SgWnBkWTyyRwVPyUKoShjzXfX0H1+HDdEEjZ/LsXc=",
+        "narHash": "sha256-v/wpbH/xuh9SJjLeCQIDiCeEbyui2WuWvIjOIH+lx80=",
         "owner": "famedly",
         "repo": "conduit",
-        "rev": "3bfdae795d4d9ec9aeaac7465e7535ac88e47756",
+        "rev": "ca6219723b0d562d86a69824720215f8a1851836",
         "type": "gitlab"
       },
       "original": {
@@ -161,26 +162,17 @@
     },
     "crane_3": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
-        "flake-utils": [
-          "helix",
-          "flake-utils"
-        ],
         "nixpkgs": [
           "helix",
           "nixpkgs"
-        ],
-        "rust-overlay": [
-          "helix",
-          "rust-overlay"
         ]
       },
       "locked": {
-        "lastModified": 1688772518,
+        "lastModified": 1701025348,
-        "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=",
+        "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e",
+        "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",
         "type": "github"
       },
       "original": {
@@ -235,11 +227,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1673295039,
+        "lastModified": 1700795494,
-        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
         "type": "github"
       },
       "original": {
@@ -400,11 +392,11 @@
         "pyproject-nix": "pyproject-nix_3"
       },
       "locked": {
-        "lastModified": 1702457430,
+        "lastModified": 1705053819,
-        "narHash": "sha256-8NQiXtYCOiC7XFayy6GPGDudCBrPROry3mfWjpdVj5g=",
+        "narHash": "sha256-x+jLR9mHV0bVryOWF+4xrK+atldiY1PeaCINEDalREw=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "262198033e23e9ee832f0cc8133d38f07598f555",
+        "rev": "8300ad2d78f8388fa4ce25b0cd2fccd261dad579",
         "type": "github"
       },
       "original": {
@@ -534,50 +526,16 @@
         "type": "github"
       }
     },
-    "flake-compat_5": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib_3"
       },
       "locked": {
-        "lastModified": 1698579227,
+        "lastModified": 1701473968,
-        "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=",
+        "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f76e870d64779109e41370848074ac4eaa1606ec",
+        "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_4"
-      },
-      "locked": {
-        "lastModified": 1685662779,
-        "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
         "type": "github"
       },
       "original": {
@@ -587,24 +545,6 @@
       }
     },
     "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "inputs": {
         "systems": "systems_2"
       },
@@ -622,7 +562,7 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
+    "flake-utils_2": {
       "inputs": {
         "systems": "systems_3"
       },
@@ -640,9 +580,27 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -666,11 +624,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1700676250,
+        "lastModified": 1705243592,
-        "narHash": "sha256-08aSqFjN/TR82M6dkRPYMwemRHzvZ5qShTam8ltpfQE=",
+        "narHash": "sha256-gH4Mt/0P8Xyr72xjOfSbOp93IrnO93yuEmPLGQL7FyA=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "090ed97e0045bfad1e5bff8b96c61707b996b85a",
+        "rev": "3f88a3f4e6f75bf04246a8015652931e640e0821",
         "type": "github"
       },
       "original": {
@@ -686,11 +644,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700814342,
+        "lastModified": 1705169127,
-        "narHash": "sha256-orNc5wfsE7arQ9TWSTJwvk+utDvJrJ36V84N8o+VI/Y=",
+        "narHash": "sha256-j9OEtNxOIPWZWjbECVMkI1TO17SzlpHMm0LnVWKOR/g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e1f3b36ab01573fd35cae57d21f45d520433df61",
+        "rev": "f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8",
         "type": "github"
       },
       "original": {
@@ -708,11 +666,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682203081,
+        "lastModified": 1703113217,
-        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
+        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
+        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
         "type": "github"
       },
       "original": {
@@ -823,7 +781,7 @@
           "nixpkgs"
         ],
         "parts": "parts_6",
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1697228369,
@@ -925,18 +883,16 @@
     },
     "nh": {
       "inputs": {
-        "flake-parts": "flake-parts",
-        "nix-filter": "nix-filter",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1698826948,
+        "lastModified": 1705251288,
-        "narHash": "sha256-Th05oofIIhsN2bmJNsb0Xev3+RJgtk8stjHZX9EdWA0=",
+        "narHash": "sha256-TwCR7tZvrjsvz6SmgjWYOne7Qz7J2jn4Cr4Er0Yj+LA=",
         "owner": "viperML",
         "repo": "nh",
-        "rev": "23d21975231d569afbe3973eb19d955c650f8f08",
+        "rev": "36eba281576afe0f67e5aafb4e7a414f256dba31",
         "type": "github"
       },
       "original": {
@@ -945,34 +901,19 @@
         "type": "github"
       }
     },
-    "nix-filter": {
-      "locked": {
-        "lastModified": 1694857738,
-        "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=",
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "rev": "41fd48e00c22b4ced525af521ead8792402de0ea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "type": "github"
-      }
-    },
     "nixd": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1699966122,
+        "lastModified": 1705244338,
-        "narHash": "sha256-zEN3ET7jfXpIKYeYh/z4xekOBOoaFS+n0q3oL3sVh+0=",
+        "narHash": "sha256-o+IXgYlzUWftoslnmeSZ6LJKTwv/7wRZ/G0/Ds3UIkQ=",
         "owner": "nix-community",
         "repo": "nixd",
-        "rev": "b3bb9ea7cd3c2f07c89779a474d6468b2c11e303",
+        "rev": "13142d8a2681dbd177d46741cc89a181b8f3dcc1",
         "type": "github"
       },
       "original": {
@@ -1003,11 +944,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1700559156,
+        "lastModified": 1705187059,
-        "narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=",
+        "narHash": "sha256-dSj+iIYqLA+7/5rLXWfUxw9IXRm0w8Mrm39af8klUH0=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb",
+        "rev": "ef811636cc847355688804593282078bac7758d4",
         "type": "github"
       },
       "original": {
@@ -1018,11 +959,11 @@
     },
     "nixos-persistence": {
       "locked": {
-        "lastModified": 1697303681,
+        "lastModified": 1703656108,
-        "narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=",
+        "narHash": "sha256-hCSUqdFJKHHbER8Cenf5JRzjMlBjIdwdftGQsO0xoJs=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "0f317c2e9e56550ce12323eb39302d251618f5b5",
+        "rev": "033643a45a4a920660ef91caa391fbffb14da466",
         "type": "github"
       },
       "original": {
@@ -1086,29 +1027,11 @@
     "nixpkgs-lib_3": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1696019113,
+        "lastModified": 1701253981,
-        "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
+        "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
+        "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib_4": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1685564631,
-        "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
         "type": "github"
       },
       "original": {
@@ -1121,11 +1044,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1700833572,
+        "lastModified": 1705264459,
-        "narHash": "sha256-37wu/QuEjwKSwks/nkNNNzuYc5QG6FB3wPSl1tP1OyY=",
+        "narHash": "sha256-LzjTi9OTZ4GfOANFtIIxjLb0wdsFJTYz84oPDvp1IyU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "102c2a845bd51e5b8ab60f4cb15205425a0f0813",
+        "rev": "3ea621c7ffc3a2bbf129b92c1069266baf1f2882",
         "type": "github"
       },
       "original": {
@@ -1138,11 +1061,11 @@
     "nixpkgs-wayland": {
       "flake": false,
       "locked": {
-        "lastModified": 1700828933,
+        "lastModified": 1705080950,
-        "narHash": "sha256-GkRUBmw8K2ciL9Xxw+zbX7IHpsM94ArhF/HXLJMUYAk=",
+        "narHash": "sha256-ltAQAwwE6UyUcVh6PIf+RYpuxvMSLgc7Dqwfox6HwPg=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "68af9863d0014be20f95b514047a2d3140ff3868",
+        "rev": "8621ab0a5a9953c719aa21d3d078532613accdcb",
         "type": "github"
       },
       "original": {
@@ -1168,11 +1091,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1690272529,
+        "lastModified": 1700794826,
-        "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
+        "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
+        "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
         "type": "github"
       },
       "original": {
@@ -1184,11 +1107,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1700612854,
+        "lastModified": 1705133751,
-        "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
+        "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
+        "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
         "type": "github"
       },
       "original": {
@@ -1200,11 +1123,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1700833528,
+        "lastModified": 1705263290,
-        "narHash": "sha256-NJptuSEWm0dnkZI81M0d1EMzrQq06x1nvkdl0s8oMks=",
+        "narHash": "sha256-KdeOMVfM7Ih/HdlUnNCyOl3Zw1q8lTpOOAK0ilM6nrM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "72ffcf71bf98be49a626d870395be6a8d9e632a8",
+        "rev": "e29cbed55ca5a2cf117662bd9179a85476184ff6",
         "type": "github"
       },
       "original": {
@@ -1553,11 +1476,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690424156,
+        "lastModified": 1701137803,
-        "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=",
+        "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "f335a0213504c7e6481c359dc1009be9cf34432c",
+        "rev": "9dd940c967502f844eacea52a61e9596268d4f70",
         "type": "github"
       },
       "original": {
@@ -1591,11 +1514,11 @@
         "src": "src_2"
       },
       "locked": {
-        "lastModified": 1703139742,
+        "lastModified": 1705126864,
-        "narHash": "sha256-+mheCk1rARNjmc7TVD58BhPyJQKcsfdnjj36CfpaKqU=",
+        "narHash": "sha256-DxB5JZYbSY71G8TFIJfNSb4Ak1wKZReWHT0OcdUu/7Q=",
         "owner": "yusdacra",
         "repo": "s3s-flake",
-        "rev": "48e012814655d9472f21889eb953c9573b9c2c29",
+        "rev": "c0ac2204c78aaca9e4b0c6c492d39d27c04d4d9b",
         "type": "github"
       },
       "original": {
@@ -1709,7 +1632,7 @@
     "stylix": {
       "inputs": {
         "base16": "base16",
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_3",
         "home-manager": [
           "home"
         ],
@@ -1778,6 +1701,21 @@
       }
     },
     "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_5": {
       "locked": {
         "lastModified": 1680978846,
         "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
@@ -1792,7 +1730,7 @@
         "type": "github"
       }
     },
-    "systems_5": {
+    "systems_6": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1853,18 +1791,18 @@
     },
     "vscode-extensions": {
       "inputs": {
-        "flake-compat": "flake-compat_5",
+        "flake-compat": "flake-compat_4",
         "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1700788670,
+        "lastModified": 1705195533,
-        "narHash": "sha256-0GKDTQV1MxKaFtbyifkD/BEcF6rqXAsCnTUuzgq3EXQ=",
+        "narHash": "sha256-df6LlJ96F2vpNDy12UUdJn6ny6akWb2Thi2H+78clbU=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "e58be34b0eed81fe51594473b65a700a499f2310",
+        "rev": "2f6e7ffeb04039c8a53adc5432bf7c85d541eb28",
         "type": "github"
       },
       "original": {

hosts/tkaronto/default.nix

@@ -68,9 +68,21 @@
 
   services.xserver.videoDrivers = ["nvidia" "amdgpu"];
   hardware = {
-    nvidia.prime = {
+    nvidia = {
-      amdgpuBusId = "PCI:5:0:0";
+      package = config.boot.kernelPackages.nvidiaPackages.production;
-      nvidiaBusId = "PCI:1:0:0";
+      modesetting.enable = true;
+      powerManagement.enable = false;
+      powerManagement.finegrained = true;
+      open = false;
+      nvidiaSettings = true;
+      prime = {
+        offload = {
+          enable = true;
+          enableOffloadCmd = true;
+        };
+        amdgpuBusId = "PCI:5:0:0";
+        nvidiaBusId = "PCI:1:0:0";
+      };
     };
     opengl = {
       driSupport = true;

hosts/tkaronto/modules/budgie.nix.disabled

@@ -0,0 +1 @@
+../../../modules/de/budgie/default.nix

modules/de/budgie/default.nix

@@ -0,0 +1,33 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  services.xserver = {
+    enable = true;
+    desktopManager = {
+      budgie.enable = true;
+      xterm.enable = false;
+    };
+    displayManager = {
+      gdm = {
+        enable = true;
+        wayland = false;
+      };
+      startx.enable = false;
+    };
+  };
+  systemd.services = {
+    "getty@tty1".enable = false;
+    "autovt@tty1".enable = false;
+  };
+  services.power-profiles-daemon.enable = false;
+  environment.systemPackages = with pkgs; [
+    ffmpegthumbnailer
+    webp-pixbuf-loader
+    yaru-theme
+  ];
+  # environment.etc."environment.d/10-use-amd.conf".text = ''
+  #   __EGL_VENDOR_LIBRARY_FILENAMES=/run/opengl-driver/glvnd/egl_vendor.d/50_mesa.json
+  # '';
+}

modules/de/gnome/default.nix

@@ -19,7 +19,7 @@
   services.tumbler.enable = true;
   programs = {
     geary.enable = lib.mkForce false;
-    gnome-terminal.enable = lib.mkForce false;
+    gnome-terminal.enable = true;
     evince.enable = true;
   };
   services.xserver = {
@@ -29,13 +29,9 @@
       xterm.enable = false;
     };
     displayManager = {
-      autoLogin = {
-        enable = true;
-        user = "patriot";
-      };
       gdm = {
         enable = true;
-        wayland = true;
+        wayland = false;
       };
       startx.enable = false;
     };

modules/de/greetd/default.nix

@@ -1,25 +1,10 @@
-{pkgs, ...}: let
+{pkgs, ...}: {
-  run-sway = pkgs.writeText "run-sway.sh" ''
-    export _JAVA_AWT_WM_NONREPARENTING=1
-
-    export XDG_CURRENT_DESKTOP=sway
-
-    export QT_QPA_PLATFORM=wayland
-    export QT_QPA_PLATFORMTHEME=qt5ct
-    export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-
-    export GDK_BACKEND=wayland
-    export WLR_DRM_DEVICES=/dev/dri/card0
-    export WL_DRM_DEVICES=/dev/dri/card0
-    sway --unsupported-gpu
-  '';
-in {
   services.greetd = {
     enable = true;
     settings = {
       terminal.vt = 1;
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --issue --time --cmd 'bash --login ${run-sway}'";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --issue --time --cmd 'sway --unsupported-gpu'";
         user = "greeter";
       };
     };

modules/network/networkmanager/default.nix

@@ -1,7 +1,10 @@
-{
+{config, ...}: {
   imports = [../dns ../iwd];
   networking.networkmanager = {
     enable = true;
     wifi.powersave = true;
   };
+  environment.persistence."${config.system.persistDir}" = {
+    directories = ["/etc/NetworkManager/system-connections"];
+  };
 }

pkgs-set/default.nix

@@ -32,6 +32,7 @@
     inherit system;
     config.allowUnfree = true;
     config.allowBroken = true;
+    config.permittedInsecurePackages = ["electron-25.9.0"];
     overlays = overlays ++ newPkgs;
   };
   pkgsToExport = import ./pkgs-to-export.nix pkgs;

pkgs-set/overlays/nixpkgs-wayland.nix

@@ -1,2 +0,0 @@
-# {inputs}: (import "${inputs.nixpkgs-wayland}/overlay.nix")
-final: prev: prev

users/modules/firefox/default.nix

@@ -10,7 +10,7 @@
   home.packages = [(pkgs.lib.hiPrio pkgs.floorp)];
   programs.firefox = {
     enable = true;
-    package = pkgs.firefox-wayland.override {
+    package = pkgs.firefox.override {
       extraPrefs = ''
         lockPref("privacy.resistFingerprinting.letterboxing", false);
         lockPref("browser.startup.homepage", "about:home");

users/modules/fluxbox/default.nix

@@ -0,0 +1,10 @@
+{pkgs, ...}: {
+  xsession.enable = true;
+  xsession.windowManager.fluxbox = {
+    enable = true;
+    menu = ''
+      [exec] (Floorp) {/etc/profiles/per-user/patriot/bin/floorp}
+      [exec] (urxvt) {/etc/profiles/per-user/patriot/bin/urxvt}
+    '';
+  };
+}

users/modules/urxvt/default.nix

@@ -0,0 +1,9 @@
+{...}: {
+  programs.urxvt = {
+    enable = true;
+    keybindings = {
+      "Shift-Control-C" = "eval:selection_to_clipboard";
+      "Shift-Control-V" = "eval:paste_clipboard";
+    };
+  };
+}

users/patriot/default.nix

@@ -107,15 +107,16 @@ in {
         # wm
         # ["hyprland" "foot"]
         ["sway" "wayland" "foot"]
+        # ["fluxbox" "urxvt"]
         # desktop stuff
         # ["wayland" "foot"]
         ["obsidian" "firefox"]
         # cli stuff
         ["zoxide" "zsh" "fzf" "starship" "direnv"]
         # dev stuff
-        ["helix" "git" "ssh" "code"]
+        ["helix" "git" "ssh"]
         # ["godot"]
-        ["musikcube" "musikcubed" "lollypop"]
+        ["musikcube" "musikcubed"]
         ["arrpc"]
         ["s3s"]
       ];
@@ -188,16 +189,16 @@ in {
     gtk.theme.package = pkgs.yaru-theme;
     gtk.theme.name = "Yaru-dark";
 
-    home.sessionVariables.QT_QPA_PLATFORMTHEME = "qt5ct";
+    # home.sessionVariables.QT_QPA_PLATFORMTHEME = "qt5ct";
-    xdg.configFile = {
+    # xdg.configFile = {
-      "environment.d/20-apply-qtct.conf".text = ''
+    #   "environment.d/20-apply-qtct.conf".text = ''
-        QT_QPA_PLATFORMTHEME=qt5ct
+    #     QT_QPA_PLATFORMTHEME=qt5ct
-      '';
+    #   '';
-    };
+    # };
-    qt.enable = true;
+    # qt.enable = true;
-    qt.platformTheme = "qtct";
+    # qt.platformTheme = "qtct";
-    qt.style.name = "phantom";
+    # qt.style.name = "phantom";
-    qt.style.package = pkgs.phantom;
+    # qt.style.package = pkgs.phantom;
 
     stylix.targets.gnome.enable = lib.mkForce false;
     stylix.targets.gtk.enable = lib.mkForce false;
@@ -226,8 +227,8 @@ in {
         # steamPackages.steamcmd
         # steam-tui
         # fractal-next
-        gtkcord4
+        # gtkcord4
-        gh
+        # gh
         transmission_4-gtk
         kdenlive
         ### music prod
@@ -237,14 +238,14 @@ in {
         ### stream / record
         obs-studio
         ### gayming
-        prismlauncher
+        # prismlauncher
-        (retroarch.override {
+        # (retroarch.override {
-          cores = with libretro; [desmume citra];
+        #   cores = with libretro; [desmume citra];
-        })
+        # })
-        yuzu
+        # yuzu
         # wineWowPackages.stagingFull
         # lutris
-        distrobox
+        # distrobox
         bottles
         blender
       ];