too much rewriting at once... (bad idea)

modules/default.nix

@@ -7,6 +7,7 @@
     ./net
     ./input
     ./media
+    ./nix.nix
     ./graphics.nix
   ];
 }

modules/desktop-legacy/default.nix

@@ -23,11 +23,6 @@ with lib; {
   };
 
   services.illum.enable = true;
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    openFirewall = true;
-  };
   services.smartd = {
     enable = true;
     notifications.test = true;

modules/desktop/audio.nix

@@ -11,10 +11,8 @@
     };
   };
   environment.systemPackages = with pkgs; [
-    pavucontrol
-    volumeicon
     playerctl
-
+    pulsemixer
     helvum
   ];
 }

modules/desktop/locale.nix

@@ -1,4 +1,5 @@
 {...}: {
+  time.timeZone = "Europe/Berlin";
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "de_DE.UTF-8";
     LC_IDENTIFICATION = "de_DE.UTF-8";

modules/graphics.nix

@@ -1,3 +0,0 @@
-{...}: {
-  hardware.graphics.enable = true;
-}

modules/net/default.nix

@@ -5,7 +5,9 @@
     ./eduroam.nix
     ./dispatchers
   ];
+  networking.networkmanager.enable = true;
   networking.networkmanager.wifi.backend = "wpa_supplicant";
+
   systemd.services."NetworkManager-wait-online".enable = false;
   services.mullvad-vpn.enable = true;
   home-manager.users.jade = {pkgs, ...}: {

modules/nix.nix

@@ -0,0 +1,29 @@
+{
+  rs-programs,
+  niri,
+  ...
+}: {
+  nix = {
+    extraOptions = ''
+      experimental-features = nix-command flakes
+      keep-outputs = true
+      keep-derivations = true
+    '';
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 60d";
+    };
+  };
+
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      permittedInsecurePackages = [
+        "electron-27.3.11"
+        "nodejs-16.20.0"
+      ];
+    };
+    overlays = [rs-programs niri.overlays.niri];
+  };
+}

modules/shell/default.nix

@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
   imports = [
     ./helix.nix
     ./nu.nix
@@ -7,6 +7,7 @@
     ./git.nix
     ./mprocs.nix
     ./btop.nix
+    ./sudo.nix
   ];
   programs.mosh.enable = true;
   programs.bat.enable = true;
@@ -14,4 +15,6 @@
     programs.carapace.enable = true;
     programs.direnv.enable = true;
   };
+
+  users.defaultUserShell = pkgs.nushell;
 }

modules/shell/sudo.nix

@@ -0,0 +1,6 @@
+{...}: {
+  nixpkgs.config.packageOverrides = pkgs: {
+    sudo = pkgs.sudo.override {withInsults = true;};
+  };
+  security.sudo.extraConfig = "Defaults insults";
+}