bump lock

This reverts commit 73df58ccb0.

flake.lock

@@ -14,11 +14,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1739612324,
-        "narHash": "sha256-3RQgKLNSKlcLtdfAo7Zx3+Q+3Bwgy8rx3gZ6ejTeh1w=",
+        "lastModified": 1744375272,
+        "narHash": "sha256-xvWbdTctLu5YWgcp+lNTh51GAY3vB2XEXUFKRMJUiCM=",
         "owner": "nix-community",
         "repo": "authentik-nix",
-        "rev": "efd801f6faecf6caf489fa03dbd6e32e416bec6d",
+        "rev": "105b3b6c004ce00d1d3c7a88669bea4aadfd4580",
         "type": "github"
       },
       "original": {
@@ -30,33 +30,27 @@
     "authentik-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1738183650,
-        "narHash": "sha256-4XdYlqfd23TVPaJ0R5tEBIpDXLV4mFHdXhIWp5dIvIE=",
+        "lastModified": 1744135136,
+        "narHash": "sha256-7wvoCRhLipX4qzrb/ctsozG565yckx+moxiF6vRo84I=",
         "owner": "goauthentik",
         "repo": "authentik",
-        "rev": "f1b7a9f934e6b58a1884ba753575eac6267f4b6e",
+        "rev": "74eab55c615b156e4191ee98dc789e2d58c016f9",
         "type": "github"
       },
       "original": {
         "owner": "goauthentik",
-        "ref": "version/2024.12.3",
+        "ref": "version/2025.2.4",
         "repo": "authentik",
         "type": "github"
       }
     },
     "crane": {
-      "inputs": {
-        "nixpkgs": [
-          "lanzaboote",
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1717535930,
-        "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=",
+        "lastModified": 1731098351,
+        "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "55e7754ec31dac78980c8be45f8a28e80e370946",
+        "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
         "type": "github"
       },
       "original": {
@@ -102,11 +96,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1738453229,
-        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -123,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717285511,
-        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
         "type": "github"
       },
       "original": {
@@ -179,24 +173,6 @@
       "inputs": {
         "systems": "systems_3"
       },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
-      "inputs": {
-        "systems": "systems_4"
-      },
       "locked": {
         "lastModified": 1731533236,
         "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
@@ -253,24 +229,23 @@
         "crane": "crane",
         "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts_2",
-        "flake-utils": "flake-utils_3",
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-unstable"
         ],
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1718178907,
-        "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=",
+        "lastModified": 1737639419,
+        "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086",
+        "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "v0.4.1",
+        "ref": "v0.4.2",
         "repo": "lanzaboote",
         "type": "github"
       }
@@ -278,11 +253,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1739546930,
-        "narHash": "sha256-m9s8XjIFd9ByX45/mnsryQa0G5ncMjOBJE4kAOHPoUI=",
-        "rev": "1077bc626e8dfc153524da40eddad46ef893d66e",
+        "lastModified": 1744302352,
+        "narHash": "sha256-QJQecf/Z1rLZBpVoQaI+EunLX5U7c7uYGER5iw00YrI=",
+        "rev": "81d476984901d1f00fdcac36a0a8f06cb54048f6",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1077bc626e8dfc153524da40eddad46ef893d66e.tar.gz?rev=1077bc626e8dfc153524da40eddad46ef893d66e"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/81d476984901d1f00fdcac36a0a8f06cb54048f6.tar.gz?rev=81d476984901d1f00fdcac36a0a8f06cb54048f6"
       },
       "original": {
         "type": "tarball",
@@ -291,21 +266,21 @@
     },
     "lix-module": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
         "flakey-profile": "flakey-profile",
         "lix": [
           "lix"
         ],
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-unstable"
         ]
       },
       "locked": {
-        "lastModified": 1738176840,
-        "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=",
-        "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e",
+        "lastModified": 1742945498,
+        "narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=",
+        "rev": "fa69ae26cc32dda178117b46487c2165c0e08316",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/621aae0f3cceaffa6d73a4fb0f89c08d338d729e.tar.gz?rev=621aae0f3cceaffa6d73a4fb0f89c08d338d729e"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fa69ae26cc32dda178117b46487c2165c0e08316.tar.gz?rev=fa69ae26cc32dda178117b46487c2165c0e08316"
       },
       "original": {
         "type": "tarball",
@@ -387,11 +362,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1738816619,
-        "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=",
+        "lastModified": 1744633460,
+        "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "2eccff41bab80839b1d25b303b53d339fbb07087",
+        "rev": "9a049b4a421076d27fee3eec664a18b2066824cb",
         "type": "github"
       },
       "original": {
@@ -403,11 +378,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739484910,
-        "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=",
+        "lastModified": 1744440957,
+        "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8",
+        "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
         "type": "github"
       },
       "original": {
@@ -419,39 +394,42 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1738452942,
-        "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+        "lastModified": 1743296961,
+        "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1710695816,
-        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
+        "lastModified": 1730741070,
+        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
+        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1739446958,
-        "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
+        "lastModified": 1744932701,
+        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
+        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
         "type": "github"
       },
       "original": {
@@ -479,11 +457,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1738741221,
-        "narHash": "sha256-UiTOA89yQV5YNlO1ZAp4IqJUGWOnTyBC83netvt8rQE=",
+        "lastModified": 1743690424,
+        "narHash": "sha256-cX98bUuKuihOaRp8dNV1Mq7u6/CQZWTPth2IJPATBXc=",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "be1fe795035d3d36359ca9135b26dcc5321b31fb",
+        "rev": "ce2369db77f45688172384bbeb962bc6c2ea6f94",
         "type": "github"
       },
       "original": {
@@ -506,11 +484,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1717664902,
-        "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
+        "lastModified": 1731363552,
+        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
+        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
         "type": "github"
       },
       "original": {
@@ -537,21 +515,17 @@
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": [
-          "lanzaboote",
-          "flake-utils"
-        ],
         "nixpkgs": [
           "lanzaboote",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1717813066,
-        "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=",
+        "lastModified": 1731897198,
+        "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465",
+        "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
         "type": "github"
       },
       "original": {
@@ -567,11 +541,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739262228,
-        "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
+        "lastModified": 1744669848,
+        "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
+        "rev": "61154300d945f0b147b30d24ddcafa159148026a",
         "type": "github"
       },
       "original": {
@@ -641,21 +615,6 @@
         "type": "github"
       }
     },
-    "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"
-      }
-    },
     "tmux-yank": {
       "flake": false,
       "locked": {

flake.nix

@@ -21,8 +21,8 @@
     };
 
     lanzaboote = {
-      url = "github:nix-community/lanzaboote/v0.4.1";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/lanzaboote/v0.4.2";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
     authentik-nix = {
@@ -37,7 +37,7 @@
 
     lix-module = {
       url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
       inputs.lix.follows = "lix";
     };
 
@@ -61,6 +61,7 @@
       microvm,
       nixos-hardware,
       nixpkgs,
+      nixpkgs-unstable,
       sops-nix,
       ...
     }:
@@ -97,7 +98,7 @@
         in
         microvms
         // {
-          toaster = nixpkgs.lib.nixosSystem {
+          toaster = nixpkgs-unstable.lib.nixosSystem {
             system = "x86_64-linux";
             specialArgs = { inherit inputs; };
             modules = [
@@ -117,8 +118,7 @@
               ./modules/science.nix
               ./modules/tlp.nix
               ./modules/virtualization.nix
-              ./hosts/toaster/secure-boot.nix
-              ./modules/chromium.nix
+              ./modules/emacs.nix
               ./modules/mail
               ./modules/wg
             ];

hosts/toaster/0xa-home.nix

@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+{
+  home.stateVersion = "24.11";
+
+  home.pointerCursor = {
+    name = "Banana";
+    size = 32;
+    package = pkgs.banana-cursor;
+    x11.enable = true;
+    gtk.enable = true;
+  };
+
+  gtk = {
+    enable = true;
+    cursorTheme = {
+      name = "Banana";
+      size = 32;
+      package = pkgs.banana-cursor;
+    };
+  };
+}

hosts/toaster/default.nix

@@ -46,6 +46,11 @@
     supportedLocales = [ "all" ];
   };
 
+  # support ddc brigtness control
+  hardware.i2c.enable = true;
+  boot.kernelModules = [ "i2c-dev" ];
+  environment.systemPackages = [ pkgs.ddcutil ];
+
   users.users."0xa" = {
     extraGroups = [
       "wheel"
@@ -55,6 +60,7 @@
       "bluetooth"
       "libvirtd"
       "qemu-libvirtd"
+      "i2c"
     ];
     group = "users";
     home = "/home/0xa";
@@ -63,8 +69,6 @@
     shell = pkgs.fish;
   };
 
-  services.emacs.defaultEditor = false;
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

hosts/toaster/hardware-configuration.nix

@@ -49,6 +49,12 @@
     options = [ "zfsutil" ];
   };
 
+  fileSystems."/tmp" = {
+    device = "zpool/nocomp/tmp";
+    fsType = "zfs";
+    options = [ "zfsutil" ];
+  };
+
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/A170-F83D";
     fsType = "vfat";

hosts/toaster/network/full-networkd.nix

@@ -0,0 +1,71 @@
+{ lib, pkgs, ... }:
+{
+  imports = [
+    ./mullvad.nix
+    ./dumpdvb.nix
+    ./zw.nix
+  ];
+
+  environment.systemPackages = with pkgs; [
+    iwgtk
+    impala
+  ];
+
+  # kick out networkmanager
+  networking.networkmanager.enable = lib.mkForce false;
+  networking.useNetworkd = true;
+  systemd.network.enable = true;
+
+  networking = {
+    hostName = "toaster";
+    firewall.enable = true;
+    wireguard.enable = true;
+    wireless.iwd.enable = true;
+  };
+
+  services.resolved = {
+    enable = true;
+    dnssec = "false";
+    fallbackDns = [
+      "9.9.9.9"
+      "2620:fe::fe"
+      "149.112.112.112"
+      "2620:fe::9"
+    ];
+  };
+
+  # we might have no interwebs at all
+  systemd.network.wait-online.enable = false;
+
+  # uplinks
+  systemd.network.networks = {
+    "10-ether-uplink" = {
+      matchConfig.Name = "enp1s0f0";
+      networkConfig = {
+        DHCP = "yes";
+        IPv6AcceptRA = true;
+      };
+    };
+    "10-dock-uplink" = {
+      matchConfig.Name = "enp5s0f4u1u1";
+      networkConfig = {
+        DHCP = "yes";
+        IPv6AcceptRA = true;
+      };
+      dhcpV4Config = {
+        RouteMetric = 666;
+      };
+      dhcpV6Config = {
+        RouteMetric = 666;
+      };
+    };
+    "wlan-uplink" = {
+      matchConfig.Name = "wlan0";
+      networkConfig = {
+        DHCP = "yes";
+        IPv6AcceptRA = true;
+      };
+    };
+  };
+
+}

hosts/toaster/zfs.nix

@@ -19,6 +19,7 @@
     supportedFilesystems = [ "zfs" ];
     kernelParams = [ "nohibernate" ];
     plymouth.enable = false;
-    tmp.useTmpfs = true;
+    tmp.useTmpfs = false;
+    tmp.cleanOnBoot = true;
   };
 }

modules/basic-tools/default.nix

@@ -39,7 +39,6 @@
       exfatprogs
       nmap
       bind
-      nnn
       lf
       man-pages
       unzip
@@ -50,8 +49,17 @@
       sshfs
       whois
       mtr
+      joshuto
     ]
-    ++ (if config.networking.hostName == "toaster" then [ gitFull git-lfs ] else [ git ]);
+    ++ (
+      if config.networking.hostName == "toaster" then
+        [
+          gitFull
+          git-lfs
+        ]
+      else
+        [ git ]
+    );
 
   environment.variables =
     let

modules/basic-tools/fish.nix

@@ -5,7 +5,7 @@
     fzf
     fishPlugins.done
     fishPlugins.fzf-fish
-    fishPlugins.hydro
+    fishPlugins.tide
   ];
 
   programs.fish = {

modules/basic-tools/nix.nix

@@ -1,7 +1,5 @@
 {
-  lib,
   pkgs,
-  inputs,
   ...
 }:
 {
@@ -16,14 +14,10 @@
   # nix output-monitor
   environment.systemPackages = [ pkgs.nix-output-monitor ];
 
-  # override default nix shell nixpkgs# behaviour to use current flake lock
-  nix.registry =
-    let
-      flakes = lib.filterAttrs (_name: value: value ? outputs) inputs.self.inputs;
-    in
-    builtins.mapAttrs (_name: v: { flake = v; }) flakes;
-
-  nix.nixPath = lib.mapAttrsToList (name: value: "${name}=${value.outPath}") inputs.self.inputs;
+  nixpkgs.flake = {
+    setFlakeRegistry = true;
+    setNixPath = true;
+  };
 
   nixpkgs.config.allowUnfree = true;
 }

modules/chromium.nix

@@ -2,24 +2,23 @@
 
 {
   environment.systemPackages = with pkgs; [
-    chromium
+    (chromium.override { enableWideVine = true; })
   ];
 
-  nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland  --force-dark-mode --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization,WebUIDarkMode";
+  nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization,WebUIDarkMode";
 
   programs.chromium = {
     enable = true;
     extensions = [
-      # "pkehgijcmpdhfbdbbnkijodmdjhbjlgp" # privacy badger
       "ekhagklcjbdpajgpjgmbionohlpdbjgc" # zotero connector
       "nngceckbapebfimnlniiiahkandclblb" # bitwarden
-      # "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
-      # "ddkjiahejlhfcafbddmgiahcphecmpfh" # ublock lite
+      "ddkjiahejlhfcafbddmgiahcphecmpfh" # ublock lite
       "mnjggcdmjocbbbhaepdhchncahnbgone" # sponsorblock
+      "khncfooichmfjbepaaaebmommgaepoid" # unhook
     ];
     extraOpts = {
       "BrowserSignin" = 0;
-      # "SyncDisabled" = true;
+      "SyncDisabled" = true;
       "PasswordManagerEnabled" = false;
       "TranslateEnabled" = false;
       "AutofillAddressEnabled" = false;
@@ -27,10 +26,15 @@
       "AutoplayAllowed" = false;
       "DefaultNotificationSetting" = 2;
       "BackgroundModeEnabled" = false;
-      # "DefaultSearchProviderEnabled" = true;
+      "DefaultSearchProviderEnabled" = true;
       # "DefaultSearchProviderSearchURL" = "https://google.com/search?q={searchTerms}";
-      # "DefaultSearchProviderSearchURL" = "https://duckduckgo.com/?q={searchTerms}";
+      "DefaultSearchProviderSearchURL" = "https://duckduckgo.com/?q={searchTerms}";
       "SearchSuggestEnable" = false;
+      "BlockThirdPartyCookies" = true;
+      "PrivacySandboxAdMeasurementEnabled" = false;
+      "PrivacySandboxAdTopicsEnabled" = false;
+      "PrivacySandboxPromptEnabled" = false;
+      "PrivacySandboxSiteEnabledAdsEnabled" = false;
     };
   };
 }

modules/desktop-software.nix

@@ -1,23 +1,26 @@
 { pkgs, ... }:
 {
+  imports = [
+    ./chromium.nix
+  ];
   environment.systemPackages = with pkgs; [
+    audacity
     blender
     dino
     ffmpeg-full
-    firefox-wayland
-    vivaldi
-    vivaldi-ffmpeg-codecs
     gimp
     inkscape
     signal-desktop
-    tdesktop
+    telegram-desktop
     tor-browser
     wl-clipboard
     yt-dlp
     element-desktop
     discord
-    spotify
     mpv
+    # dwarf-fortress-packages.dwarf-fortress-full
+    obs-studio
+    firefox
   ];
   programs.steam.enable = true;
 }

modules/devtools.nix

@@ -1,8 +1,5 @@
 {
   pkgs,
-  inputs,
-  config,
-  lib,
   ...
 }:
 {
@@ -16,11 +13,6 @@
           kikit-library
         ];
       };
-
-      # binwalk v3 on 24.11
-      sys_ver = config.system.nixos.release;
-      unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
-      binwalkv3 = if lib.versionOlder "25.05" sys_ver then binwalk else unstablepkgs.binwalk;
     in
     [
       # general
@@ -29,7 +21,7 @@
       gef
       gdb
       binutils
-      binwalkv3
+      binwalk
       clang
       clang-tools
       direnv
@@ -41,7 +33,7 @@
       kikit
       freecad-wayland
       imhex
-      python313Full
+      python3Full
       nixfmt-rfc-style
       treefmt
       android-tools

modules/emacs.nix

@@ -0,0 +1,37 @@
+{
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  environment.systemPackages = with pkgs; [
+    direnv
+    mu
+  ];
+
+  services.emacs = {
+    install = true;
+    enable = false;
+    package =
+      with pkgs;
+      (
+        (emacsPackagesFor (
+          emacs-pgtk.overrideAttrs (old: {
+            passthru = old.passthru // {
+              treeSitter = true;
+            };
+          })
+        )).emacsWithPackages
+        (
+          epkgs: with epkgs; [
+            treesit-grammars.with-all-grammars
+            vterm
+            pdf-tools
+            mu4e
+          ]
+        )
+      );
+    defaultEditor = lib.mkDefault true;
+  };
+}

modules/fonts.nix

@@ -1,6 +1,7 @@
 { pkgs, ... }:
 {
   fonts.packages = with pkgs; [
+    adwaita-fonts
     monoid
     font-awesome
     dejavu_fonts
@@ -26,7 +27,8 @@
     twemoji-color-font
     twitter-color-emoji
     iosevka-bin
-    (nerdfonts.override { fonts = [ "Hack" ]; })
+    cozette
+    nerd-fonts.hack
   ];
 
   fonts.enableDefaultPackages = true;

modules/gnome.nix

@@ -8,12 +8,17 @@
   environment.systemPackages = with pkgs; [
     amberol
     celluloid
+    ddcutil
     gnome-console
     gnome-obfuscate
     gnome-boxes
     gnome-tweaks
     qbittorrent
     gnomeExtensions.caffeine
+    gnomeExtensions.brightness-control-using-ddcutil
+    spotify
+    ghostty
+    fractal
   ];
 
   environment.gnome.excludePackages = with pkgs; [
@@ -37,12 +42,6 @@
     };
   };
 
-  qt = {
-    enable = true;
-    platformTheme = "gnome";
-    style = "adwaita-dark";
-  };
-
   services.xserver = {
     enable = true;
     desktopManager.gnome.enable = true;

modules/niri.nix

@@ -1,16 +1,39 @@
 # General Desktop-related config
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
+  nixpkgs.overlays = [ inputs.niri.overlays.niri ];
+
+  programs.niri.enable = true;
+
   imports = [
     ./desktop-software.nix
     ./fonts.nix
   ];
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages =
+    let
+      xwayland-satellite-git = pkgs.xwayland-satellite.overrideAttrs (
+        final: prev: {
+          version = "git";
+          cargoHash = "sha256-MaF2FyR3HvQAKkZKa8OO/5jbO64/Ncv7+JqHda4jN50=";
+          src = pkgs.fetchFromGitHub {
+            owner = "Supreeeme";
+            repo = "xwayland-satellite";
+            rev = "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc";
+            sha256 = "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM=";
+          };
+          cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
+            inherit (final) pname src version;
+            hash = final.cargoHash;
+          };
+        }
+      );
+    in
+    with pkgs;
+    [
       screen-message
       qbittorrent
       gajim
       imv
-    swayimg
       mpv
       evince
       brightnessctl
@@ -19,11 +42,32 @@
       termusic
       gsettings-desktop-schemas
       xdg-utils
-    foot
       qt5.qtwayland
       bashmount
-    nautilus
       audacity
+      spotify-player
+      zathura
+      ncdu
+      adwaita-icon-theme
+      bluetui
+      gammastep
+      graphicsmagick
+      i3status-rust
+      impala
+      kanshi
+      pamixer
+      swayidle
+      swaylock
+      wl-clipboard
+      xfce.thunar
+      banana-cursor
+      fuzzel
+      alacritty
+      i3bar-river
+      mako
+      swww
+      oculante
+      xwayland-satellite-git
     ];
 
   # Enable sound.
@@ -48,45 +92,14 @@
   programs.light.enable = true;
 
   programs.xwayland.enable = true;
-  programs.sway = {
-    enable = true;
-    wrapperFeatures.gtk = true;
-    extraSessionCommands = ''
-      export SDL_VIDEODRIVER=wayland
-      export QT_QPA_PLATFORM=wayland-egl
-      export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
-      export QT_QPA_PLATFORMTHEME="gnome"
-      export QT_STYLE_OVERRIDE="adwaita-dark"
-      # export WLR_DRM_NO_ATOMIC=1
-    '';
-    extraPackages = with pkgs; [
-      adwaita-icon-theme
-      alacritty
-      bluetui
-      foot
-      gammastep
-      graphicsmagick
-      grim
-      i3status-rust
-      impala
-      kanshi
-      mako
-      pamixer
-      rofi-wayland
-      slurp
-      swayidle
-      swaylock
-      wl-clipboard
-      wl-mirror
-    ];
-  };
+
   environment.sessionVariables = {
     GTK_THEME = "Adwaita:dark";
   };
   xdg.portal = {
     enable = true;
     wlr.enable = true;
-    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+    extraPortals = [ pkgs.xdg-desktop-portal-gnome ];
   };
 
   services.udisks2.enable = true;
@@ -114,7 +127,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.sway}/bin/sway";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.niri-stable}/bin/niri-session";
       };
     };
   };