desktop-2024-08-30-11-21-08

machine/desktop.nix

@@ -8,6 +8,10 @@ let
 in
 {
   imports = [
+    <nixos-hardware/common/cpu/amd/default.nix>
+    <nixos-hardware/common/cpu/amd/pstate.nix>
+    <nixos-hardware/common/cpu/amd/zenpower.nix>
+    <nixos-hardware/common/pc/ssd>
     /etc/nixos/hardware-configuration.nix
     ../configs/browser.nix
     ../configs/common.nix
@@ -36,14 +40,9 @@ in
       efi = { canTouchEfiVariables = true; };
     };
 
-    # initrd.kernelModules = [ "amdgpu" ];
-    plymouth.enable = true;
-
-    extraModulePackages = with pkgs.linuxPackages; [ it87 zenpower ];
-    kernelModules = [ "it87" "zenpower" ];
-    kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ];
-    supportedFilesystems = [ "ntfs" ];
-    blacklistedKernelModules = [ "k10temp" ];
+    extraModulePackages = with pkgs.linuxPackages; [ it87 ];
+    kernelModules = [ "it87" ];
+    # kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ];
   };
 
   systemd.services = {
@@ -81,19 +80,20 @@ in
   };
 
   environment.systemPackages = with unstable.pkgs; [
-    unigine-valley
-    unigine-superposition
     lact
     amdgpu_top
+
     python3
     python311Packages.tkinter
+
+    snapraid
+    mergerfs
   ];
 
   hardware = {
     keyboard.qmk.enable = true;
     enableAllFirmware = true;
     xone.enable = true;
-    cpu.amd.updateMicrocode = true;
 
     bluetooth.enable = true;
     opengl = {
@@ -113,16 +113,16 @@ in
       enable = true;
       config = ''
         INTERVAL=10
-        DEVPATH=hwmon2=devices/platform/it87.656
-        DEVNAME=hwmon2=it8665
-        FCTEMPS=hwmon2/pwm3=hwmon2/temp1_input hwmon2/pwm2=hwmon2/temp1_input hwmon2/pwm1=hwmon2/temp1_input
-        FCFANS=hwmon2/pwm3=hwmon2/fan2_input hwmon2/pwm2=hwmon2/fan1_input hwmon2/pwm1=
-        MINTEMP=hwmon2/pwm3=60 hwmon2/pwm2=60 hwmon2/pwm1=60
-        MAXTEMP=hwmon2/pwm3=75 hwmon2/pwm2=75 hwmon2/pwm1=75
-        MINSTART=hwmon2/pwm3=51 hwmon2/pwm2=51 hwmon2/pwm1=51
-        MINSTOP=hwmon2/pwm3=51 hwmon2/pwm2=51 hwmon2/pwm1=51
-        MINPWM=hwmon2/pwm1=51 hwmon2/pwm2=51 hwmon2/pwm3=51
-        MAXPWM=hwmon2/pwm3=127 hwmon2/pwm2=204
+        DEVPATH=hwmon3=devices/platform/it87.656
+        DEVNAME=hwmon3=it8665
+        FCTEMPS=hwmon3/pwm3=hwmon2/temp1_input hwmon3/pwm2=hwmon2/temp1_input hwmon3/pwm1=hwmon2/temp1_input
+        FCFANS=hwmon3/pwm3=hwmon3/fan3_input hwmon3/pwm2=hwmon3/fan2_input hwmon3/pwm1=hwmon3/fan1_input
+        MINTEMP=hwmon3/pwm3=60 hwmon3/pwm2=60 hwmon3/pwm1=60
+        MAXTEMP=hwmon3/pwm3=80 hwmon3/pwm2=80 hwmon3/pwm1=80
+        MINSTART=hwmon3/pwm3=51 hwmon3/pwm2=51 hwmon3/pwm1=51
+        MINSTOP=hwmon3/pwm3=51 hwmon3/pwm2=51 hwmon3/pwm1=51
+        MINPWM=hwmon3/pwm1=51 hwmon3/pwm2=51 hwmon3/pwm3=51
+        MAXPWM=hwmon3/pwm3=127 hwmon3/pwm2=153 hwmon3/pwm1=153
       '';
     };
 
@@ -135,7 +135,7 @@ in
     power-profiles-daemon.enable = true;
     netdata.enable = true;
     printing.enable = true;
-    # xserver.videoDrivers = [ "amdgpu" ];
+    fwupd.enable = true;
 
     displayManager.autoLogin = {
       enable = true;
@@ -149,6 +149,31 @@ in
       pulse.enable = true;
     };
 
+    samba = {
+      enable = true;
+      securityType = "user";
+      extraConfig = ''
+        workgroup = WORKGROUP
+        server string = server
+        netbios name = server
+        security = user
+        guest account = nobody
+        map to guest = bad user
+        logging = systemd
+        max log size = 50
+      '';
+      shares = {
+        storage = {
+          path = "/home/alex/shared/storage";
+          browseable = "yes";
+          "read only" = "no";
+          "guest ok" = "no";
+          "create mask" = "0644";
+          "directory mask" = "0755";
+        };
+      };
+    };
+
     tailscale.enable = true;
 
     borgbackup.jobs.home = rec {
@@ -173,12 +198,5 @@ in
     };
   };
 
-  home-manager.users.alex.services.barrier.client = {
-    enable = true;
-    enableCrypto = false;
-    name = "desktop";
-    server = "192.168.0.168:24800";
-  };
-
   system.stateVersion = "24.05";
 }

machine/framework.nix

@@ -8,7 +8,6 @@ in
 {
   imports = [
     <nixos-hardware/framework/13-inch/12th-gen-intel>
-    <home-manager/nixos>
     /etc/nixos/hardware-configuration.nix
     ../configs/browser.nix
     ../configs/common.nix
@@ -213,12 +212,5 @@ in
   };
   systemd.sleep.extraConfig = "HibernateDelaySec=60m";
 
-  home-manager.users.alex.services.barrier.client = {
-    enable = true;
-    enableCrypto = false;
-    name = "framework";
-    server = "192.168.0.168:24800";
-  };
-
   system.stateVersion = "24.05";
 }

machine/thinkpad.nix

@@ -14,7 +14,6 @@ in
       ../configs/plasma.nix
       ../configs/user-gui.nix
       ../configs/user.nix
-      <home-manager/nixos>
     ];
 
   boot = {