hosts/toaster/network/default.nix

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

modules/basic-tools/default.nix

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

modules/fonts.nix

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

modules/sway.nix

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