format

hosts/toaster/network/default.nix

@@ -1,11 +1,15 @@
-{ lib, pkgs, ... }: {
+{ lib, pkgs, ... }:
+{
   imports = [
     ./mullvad.nix
     ./dumpdvb.nix
     ./zw.nix
   ];
 
-  environment.systemPackages = with pkgs; [ iwgtk impala ];
+  environment.systemPackages = with pkgs; [
+    iwgtk
+    impala
+  ];
 
   # kick out networkmanager
   networking.networkmanager.enable = lib.mkForce false;
@@ -48,8 +52,12 @@
         DHCP = "yes";
         IPv6AcceptRA = true;
       };
-      dhcpV4Config = { RouteMetric = 666; };
+      dhcpV4Config = {
-      dhcpV6Config = { RouteMetric = 666; };
+        RouteMetric = 666;
+      };
+      dhcpV6Config = {
+        RouteMetric = 666;
+      };
     };
     "wlan-uplink" = {
       matchConfig.Name = "wlan0";

modules/basic-tools/default.nix

@@ -51,7 +51,15 @@
       whois
       mtr
     ]
-    ++ (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,8 +5,6 @@
     dino
     ffmpeg-full
     firefox-wayland
-    vivaldi
-    vivaldi-ffmpeg-codecs
     gimp
     inkscape
     signal-desktop
@@ -16,7 +14,6 @@
     yt-dlp
     element-desktop
     discord
-    spotify
     mpv
   ];
   programs.steam.enable = true;

modules/fonts.nix

@@ -27,7 +27,12 @@
     twitter-color-emoji
     iosevka-bin
     cozette
-    (nerdfonts.override { fonts = [ "Hack" "3270" ]; })
+    (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,10 @@
     termusic
     gsettings-desktop-schemas
     xdg-utils
-    foot
     qt5.qtwayland
     bashmount
-    nautilus
     audacity
+    spotify-player
   ];
 
   # Enable sound.
@@ -61,16 +63,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 +79,7 @@
       swaylock
       wl-clipboard
       wl-mirror
+      xfce.thunar
     ];
   };
   environment.sessionVariables = {