Cleanup

nixos/base.nix

@@ -35,10 +35,7 @@
     # Per-interface useDHCP will be mandatory in the future, so this generated config
     # replicates the default behaviour.
     useDHCP = false;
-    interfaces = {
+    interfaces = { enp60s0.useDHCP = true; wlp0s20f3.useDHCP = true; };
-      enp60s0.useDHCP = true;
-      wlp0s20f3.useDHCP = true;
-    };
 
     # Configure network proxy if necessary
     # proxy.default = "http://user:password@proxy:port/";
@@ -83,10 +80,7 @@
   # Enable CUPS to print documents.
   services.printing = {
     enable = true;
-    drivers = with pkgs; [
+    drivers = with pkgs; [ gutenprint cups-kyocera ];
-      gutenprint
-      cups-kyocera
-    ];
   };
 
   # Enable sound.
@@ -101,10 +95,7 @@
     enable = true;
     pulse.enable = true;
     jack.enable = true;
-    alsa = {
+    alsa = { enable = true; support32Bit = true; };
-      enable = true;
-      support32Bit = true;
-    };
     # media-session.enable = true;
   };
   environment.sessionVariables.LD_LIBRARY_PATH = lib.mkForce "${config.services.pipewire.package.jack}/lib"; # Temporary fix for WebKitGTK
@@ -118,42 +109,22 @@
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.bertof = {
     isNormalUser = true;
-    extraGroups = [
+    extraGroups = [ "audio" "input" "docker" "libvirtd" "network" "usb" "video" "wheel" ];
-      "audio"
-      "input"
-      "docker"
-      "libvirtd"
-      "network"
-      "usb"
-      "video"
-      "wheel"
-    ];
     shell = pkgs.zsh;
   };
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ tmux firefox kakoune vim ];
-    tmux
-    firefox
-    kakoune
-    vim
-  ];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
-  programs.gnupg.agent = {
+  programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
-    enable = true;
-    enableSSHSupport = true;
-  };
 
   programs.steam.enable = true;
   programs.dconf.enable = true;
-  programs.zsh = {
+  programs.zsh = { enable = true; syntaxHighlighting.enable = true; };
-    enable = true;
-    syntaxHighlighting.enable = true;
-  };
 
   # List services that you want to enable:
 
@@ -171,44 +142,20 @@
           TIMELINE_CREATE=yes
           TIMELINE_CLEANUP=yes
         '';
-        common = {
+        common = { extraConfig = bertofExtraConfig; };
-          extraConfig = bertofExtraConfig;
-        };
       in
       {
-        bertof_home = common // {
+        bertof_home = common // { subvolume = "/home/bertof"; };
-          subvolume = "/home/bertof";
+        bertof_music = common // { subvolume = "/home/bertof/Musica"; };
-        };
+        bertof_downloads = common // { subvolume = "/home/bertof/Scaricati"; };
-        bertof_music = common // {
+        bertof_images = common // { subvolume = "/home/bertof/Immagini"; };
-          subvolume = "/home/bertof/Musica";
+        bertof_videos = common // { subvolume = "/home/bertof/Video"; };
-        };
+        bertof_documents = common // { subvolume = "/home/bertof/Documenti"; };
-        bertof_downloads = common // {
+        bertof_games_ssd = common // { subvolume = "/home/bertof/Giochi/SSD"; };
-          subvolume = "/home/bertof/Scaricati";
+        bertof_games_hdd = common // { subvolume = "/home/bertof/Giochi/HDD"; };
-        };
+        bertof_git = common // { subvolume = "/home/bertof/Documenti/Git"; };
-        bertof_images = common // {
+        bertof_virt_ssd = common // { subvolume = "/home/bertof/Documenti/VirtManager/SSD"; };
-          subvolume = "/home/bertof/Immagini";
+        bertof_virt_hdd = common // { subvolume = "/home/bertof/Documenti/VirtManager/HDD"; };
-        };
-        bertof_videos = common // {
-          subvolume = "/home/bertof/Video";
-        };
-        bertof_documents = common // {
-          subvolume = "/home/bertof/Documenti";
-        };
-        bertof_games_ssd = common // {
-          subvolume = "/home/bertof/Giochi/SSD";
-        };
-        bertof_games_hdd = common // {
-          subvolume = "/home/bertof/Giochi/HDD";
-        };
-        bertof_git = common // {
-          subvolume = "/home/bertof/Documenti/Git";
-        };
-        bertof_virt_ssd = common // {
-          subvolume = "/home/bertof/Documenti/VirtManager/SSD";
-        };
-        bertof_virt_hdd = common // {
-          subvolume = "/home/bertof/Documenti/VirtManager/HDD";
-        };
       };
   };
 
@@ -217,33 +164,17 @@
   hardware.bluetooth.enable = true;
   # services.blueman.enable = true;
   services.zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
-  services.gvfs = {
+  services.gvfs = { enable = true; package = lib.mkForce pkgs.gnome3.gvfs; };
-    enable = true;
-    package = lib.mkForce pkgs.gnome3.gvfs;
-  };
   # services.tlp.enable = false;
-  services.avahi = {
+  services.avahi = { enable = true; nssmdns = true; };
-    enable = true;
-    nssmdns = true;
-    # publish = {
-    #   enable = true;
-    #   addresses = true;
-    # };
-  };
 
   # SMART
-  services.smartd = {
+  services.smartd = { enable = true; notifications.x11.enable = true; };
-    enable = true;
-    notifications.x11.enable = true;
-  };
 
   # FPRINTD
   services.fprintd = {
     enable = true;
-    tod = {
+    tod = { enable = true; driver = pkgs.libfprint-2-tod1-goodix; };
-      enable = true;
-      driver = pkgs.libfprint-2-tod1-goodix;
-    };
   };
   security.pam.services.login.fprintAuth = true;
   security.pam.services.xscreensaver.fprintAuth = true;