bump lock

This reverts commit 73df58ccb0.

flake.lock

@@ -278,11 +278,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1739546930,
-        "narHash": "sha256-m9s8XjIFd9ByX45/mnsryQa0G5ncMjOBJE4kAOHPoUI=",
-        "rev": "1077bc626e8dfc153524da40eddad46ef893d66e",
+        "lastModified": 1740304046,
+        "narHash": "sha256-BaI27pORky5j8slRzGJTzaWR5tuKvY1z9I+n7n16YgM=",
+        "rev": "c64a9db6bb03d2755757188394d15fa1a0e12406",
         "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/c64a9db6bb03d2755757188394d15fa1a0e12406.tar.gz?rev=c64a9db6bb03d2755757188394d15fa1a0e12406"
       },
       "original": {
         "type": "tarball",
@@ -387,11 +387,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1738816619,
-        "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=",
+        "lastModified": 1740089251,
+        "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "2eccff41bab80839b1d25b303b53d339fbb07087",
+        "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30",
         "type": "github"
       },
       "original": {
@@ -403,11 +403,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739484910,
-        "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=",
+        "lastModified": 1740162160,
+        "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8",
+        "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9",
         "type": "github"
       },
       "original": {
@@ -447,11 +447,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1739446958,
-        "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
+        "lastModified": 1739866667,
+        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
+        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
         "type": "github"
       },
       "original": {

flake.nix

@@ -111,7 +111,7 @@
               ./modules/basic-tools
               ./modules/binary-caches.nix
               ./modules/devtools.nix
-              ./modules/sway.nix
+              ./modules/gnome.nix
               ./modules/gnupg.nix
               ./modules/radio.nix
               ./modules/science.nix

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/default.nix

@@ -1,22 +1,31 @@
-{ lib, pkgs, ... }: {
+{ lib, config, ... }:
+{
   imports = [
     ./mullvad.nix
     ./dumpdvb.nix
     ./zw.nix
   ];
 
-  environment.systemPackages = with pkgs; [ iwgtk impala ];
+  # Networkmanager shouldn't interfere with systemd managed interfaces
+  networking.networkmanager.unmanaged =
+    let
+      systemd_netdevs = lib.attrsets.attrValues (
+        lib.attrsets.mapAttrs (_name: value: value.netdevConfig.Name) config.systemd.network.netdevs
+      );
+    in
+    systemd_netdevs;
 
-  # kick out networkmanager
-  networking.networkmanager.enable = lib.mkForce false;
-  networking.useNetworkd = true;
-  systemd.network.enable = true;
+  systemd.network = {
+    enable = true;
+    wait-online.enable = false; # uplink is managed by networkmanager
+  };
+
+  users.users."0xa".extraGroups = [ "networkmanager" ];
 
   networking = {
     hostName = "toaster";
     firewall.enable = true;
     wireguard.enable = true;
-    wireless.iwd.enable = true;
   };
 
   services.resolved = {
@@ -30,34 +39,4 @@
     ];
   };
 
-  # 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/desktop-software.nix

@@ -5,18 +5,15 @@
     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
   ];
   programs.steam.enable = true;

modules/fonts.nix

@@ -26,7 +26,13 @@
     twemoji-color-font
     twitter-color-emoji
     iosevka-bin
-    (nerdfonts.override { fonts = [ "Hack" "3270" ]; })
+    cozette
+    (nerdfonts.override {
+      fonts = [
+        "Hack"
+        "3270"
+      ];
+    })
   ];
 
   fonts.enableDefaultPackages = true;

modules/sway.nix

@@ -1,5 +1,8 @@
 # General Desktop-related config
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
+let
+  unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
+in
 {
   imports = [
     ./desktop-software.nix
@@ -19,11 +22,12 @@
     termusic
     gsettings-desktop-schemas
     xdg-utils
-    foot
     qt5.qtwayland
     bashmount
-    nautilus
     audacity
+    spotify-player
+    zathura
+    ncdu
   ];
 
   # Enable sound.
@@ -61,16 +65,15 @@
     '';
     extraPackages = with pkgs; [
       adwaita-icon-theme
-      alacritty
       bluetui
       foot
       gammastep
       graphicsmagick
       grim
-      i3status-rust
+      unstablepkgs.i3status-rust
       impala
       kanshi
-      mako
+      swaynotificationcenter
       pamixer
       rofi-wayland
       slurp
@@ -78,6 +81,7 @@
       swaylock
       wl-clipboard
       wl-mirror
+      xfce.thunar
     ];
   };
   environment.sessionVariables = {