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

configs/common.nix

@@ -1,4 +1,7 @@
 { config, pkgs, lib, ... }:
+let
+  unstable = import <nixos-unstable> {};
+in
 {
   environment.shells = with pkgs; [ bashInteractive zsh ];
 
@@ -16,6 +19,7 @@
     vnstat.enable = true;
     tuptime.enable = true;
     locate.enable = true;
+
     openssh = {
       enable = true;
       settings = {
@@ -51,28 +55,35 @@
 
   networking = {
     nameservers = [ "127.0.0.1" ];
-    # hosts = {
-    #   "207.180.220.97" = [ "szczepan.ski" ];
-    #   "10.100.0.1" = [ "vps.wg" ];
-    #   "10.100.0.2" = [ "desktop.wg" ];
-    #   "10.100.0.3" = [ "mini.wg" ];
-    # };
     # If using dhcpcd:
     dhcpcd.extraConfig = "nohook resolv.conf";
     # If using NetworkManager:
     networkmanager.dns = "none";
   };
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with unstable.pkgs; [
     ack
     borgbackup
     borgmatic
+
     btrfs-progs
+
     cargo
-    dog
+    # dog # different cat
     doggo # DNS Resolver
+
     du-dust
+    ncdu
+
     duf
+    dfc
+
+    eza
+
+    btop
+    htop
+    glances
+
     gnupg
     gocryptfs
     graphviz
@@ -90,6 +101,7 @@
     nix-du
     nix-tree
     nixpkgs-fmt
+
     nmap
     nodejs
     parallel
@@ -104,7 +116,7 @@
 
   nix.settings = {
     auto-optimise-store = true;
-    experimental-features = [ "nix-command" ];
+    experimental-features = [ "nix-command" "flakes" ];
   };
 
   boot = {

configs/docker.nix

@@ -13,5 +13,7 @@
     lazydocker
     minikube
     dive
+
+    distrobox
   ];
-}
+}

configs/games.nix

@@ -2,20 +2,19 @@
 let
   unstable = import <nixos-unstable> {
     config.allowUnfree = true;
-    config.packageOverrides = pkgs: {
-      lutris = pkgs.lutris.override {
-        extraPkgs = pkgs: with unstable.pkgs; [ gamescope mangohud ];
-      };
-    };
   };
+  nix-gaming = import (builtins.fetchTarball "https://github.com/fufexan/nix-gaming/archive/master.tar.gz");
 in
 {
   programs = {
-    gamescope.enable = true;
+    gamescope = {
+      enable = true;
+      capSysNice = true;
+    };
     steam = {
       enable = true;
-      package = pkgs.steam.override {
+      package = unstable.pkgs.steam.override {
-        extraPkgs = pkgs: with pkgs; [
+        extraPkgs = pkgs: with unstable.pkgs; [
           gamescope
           mangohud
           libkrb5
@@ -26,12 +25,25 @@ in
   };
 
   environment.systemPackages = with unstable.pkgs; [
-    lutris
+    (lutris.override {
+      extraPkgs = pkgs: with unstable.pkgs; [
+        gamescope mangohud
+        ];
+    })
+
+    heroic
+
     protontricks
     protonup-qt
     vulkan-tools
+
+    gamemode
+
     wine
     winetricks
+    # proton-ge-bin
     pcsx2
+    gamescope
+    mangohud
   ];
 }

configs/plasma.nix

@@ -23,6 +23,7 @@
       krusader
       ktimetracker
       kdiff3
+      kdiskmark
     ];
   };
 

configs/user-gui.nix

@@ -46,15 +46,10 @@ in {
     sane.enable = true;
   };
 
-  services = {
+  # services = {
-    gvfs.enable = true;
+  #   gvfs.enable = true;
-    # mullvad-vpn.enable = true;
+  #   mullvad-vpn.enable = true;
-
+  # };
-    # etesync-dav = {
-    #   enable = true;
-    #   apiUrl = "https://etesync.szczepan.ski/";
-    # };
-  };
 
   programs = {
     adb.enable = true;
@@ -69,24 +64,17 @@ in {
 
   environment.systemPackages = with unstable.pkgs; [
     alacritty
-    # baobab
-    # gparted
     czkawka # fslint before
-    # discord
-    # espeak-ng
     grsync
     handbrake
     insomnia
     keepassxc
     meld
+    exfatprogs
     nextcloud-client
     pinta
-    # remmina
     rustdesk-flutter
     simple-scan
-    # signal-desktop
-    # solaar
-    # spotify
     virt-manager
   ];
 
@@ -109,6 +97,7 @@ in {
 
       kitty = {
         enable = true;
+        package = unstable.pkgs.kitty;
         extraConfig = ''
           enable_audio_bell false
 

configs/user.nix

@@ -51,16 +51,10 @@ in {
       stateVersion = "24.05";
       packages = with unstable.pkgs; [
         # atop
-        btop
         broot
-        dfc
-        eza
         ffmpeg
         git-secret
-        glances
-        htop
         kubectl
-        ncdu
         neofetch
         nixfmt-classic
         pstree

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" ];
+    extraModulePackages = with pkgs.linuxPackages; [ it87 ];
-    plymouth.enable = true;
+    kernelModules = [ "it87" ];
-
+    # kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ];
-    extraModulePackages = with pkgs.linuxPackages; [ it87 zenpower ];
-    kernelModules = [ "it87" "zenpower" ];
-    kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ];
-    supportedFilesystems = [ "ntfs" ];
-    blacklistedKernelModules = [ "k10temp" ];
   };
 
   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
+        DEVPATH=hwmon3=devices/platform/it87.656
-        DEVNAME=hwmon2=it8665
+        DEVNAME=hwmon3=it8665
-        FCTEMPS=hwmon2/pwm3=hwmon2/temp1_input hwmon2/pwm2=hwmon2/temp1_input hwmon2/pwm1=hwmon2/temp1_input
+        FCTEMPS=hwmon3/pwm3=hwmon2/temp1_input hwmon3/pwm2=hwmon2/temp1_input hwmon3/pwm1=hwmon2/temp1_input
-        FCFANS=hwmon2/pwm3=hwmon2/fan2_input hwmon2/pwm2=hwmon2/fan1_input hwmon2/pwm1=
+        FCFANS=hwmon3/pwm3=hwmon3/fan3_input hwmon3/pwm2=hwmon3/fan2_input hwmon3/pwm1=hwmon3/fan1_input
-        MINTEMP=hwmon2/pwm3=60 hwmon2/pwm2=60 hwmon2/pwm1=60
+        MINTEMP=hwmon3/pwm3=60 hwmon3/pwm2=60 hwmon3/pwm1=60
-        MAXTEMP=hwmon2/pwm3=75 hwmon2/pwm2=75 hwmon2/pwm1=75
+        MAXTEMP=hwmon3/pwm3=80 hwmon3/pwm2=80 hwmon3/pwm1=80
-        MINSTART=hwmon2/pwm3=51 hwmon2/pwm2=51 hwmon2/pwm1=51
+        MINSTART=hwmon3/pwm3=51 hwmon3/pwm2=51 hwmon3/pwm1=51
-        MINSTOP=hwmon2/pwm3=51 hwmon2/pwm2=51 hwmon2/pwm1=51
+        MINSTOP=hwmon3/pwm3=51 hwmon3/pwm2=51 hwmon3/pwm1=51
-        MINPWM=hwmon2/pwm1=51 hwmon2/pwm2=51 hwmon2/pwm3=51
+        MINPWM=hwmon3/pwm1=51 hwmon3/pwm2=51 hwmon3/pwm3=51
-        MAXPWM=hwmon2/pwm3=127 hwmon2/pwm2=204
+        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 = {