system update

flake.lock

@@ -838,11 +838,11 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1679514902,
+        "lastModified": 1679528172,
-        "narHash": "sha256-fjRU7bp7q6KDyYOrssYpPuY1Ysxl3y65kN8UP5p3tHI=",
+        "narHash": "sha256-pqYxAkFIN+Qb9ksSID+xlEM9ljrSiwCp4gIzxuTWTFk=",
         "owner": "nixos",
         "repo": "nix",
-        "rev": "6dbce3215fa2e30e1daafcc70d6926cd97987612",
+        "rev": "e5146a6a505003f16b40160486c21a70204480a2",
         "type": "github"
       },
       "original": {
@@ -1073,11 +1073,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1679525029,
+        "lastModified": 1679526881,
-        "narHash": "sha256-tOXMyPjW+m/YwhC5T6zzwLaOoKHettuI7oPNWVdyU5g=",
+        "narHash": "sha256-dcx33Ia9XjUGk8McxJ6H6O0zCOczpO8MRpFGVmK/Vg4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "07051c0beef43958131b171c74a757b3ee97a94a",
+        "rev": "49ca35cf163026c3cf91ee1d1e363476f6b5aa7f",
         "type": "github"
       },
       "original": {

machines/Flakes-ISO/default.nix

@@ -15,7 +15,7 @@
     programs.ssh.extraConfig = ''
       Host nix-builder
         hostname 192.168.0.100
-        user alukard
+        user ataraxia
         identitiesOnly yes
         identityFile /home/nixos/ssh-builder
     '';
@@ -33,7 +33,7 @@
       buildMachines = [{
         hostName = "nix-builder";
         maxJobs = 8;
-        sshUser = "alukard";
+        sshUser = "ataraxia";
         sshKey = "/home/nixos/ssh-builder";
         systems = [ "x86_64-linux" "i686-linux" ];
         supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];

patches/zen-kernels.patch

@@ -1,16 +1,15 @@
 diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
-index 865d028..97f6685 100644
+index 1464bd4..ad21483 100644
 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
 +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
 @@ -11,9 +11,9 @@ let
    };
    # ./update-zen.py lqx
    lqxVariant = {
--    version = "6.2.5"; #lqx
+-    version = "6.2.6"; #lqx
--    suffix = "lqx3"; #lqx
--    sha256 = "0njzx2wkdiimp4lp7sl22ldsma65kcvz287z2dj46l0sssgh3830"; #lqx
 +    version = "6.1.18"; #lqx
-+    suffix = "lqx1"; #lqx
+     suffix = "lqx1"; #lqx
+-    sha256 = "1b454badr366pbxiyz7h2n47405wy5pa35rdkk1is8q574yf6scy"; #lqx
 +    sha256 = "1gyjy01ys74apa65abgvxcj0y51vf5ixampyj3jd8lxzn4vvkih6"; #lqx
      isLqx = true;
    };

profiles/applications/packages.nix

@@ -51,8 +51,6 @@ with config.deviceSpecific; {
     discord
     feh
     foliate
-    jellyfin-media-player
-    joplin-desktop
     pinta
     qbittorrent
     qimgv
@@ -72,11 +70,14 @@ with config.deviceSpecific; {
     audacity
     blueman
     cachix
+    jellyfin-media-player
+    joplin-desktop
     libreoffice
     nodePackages.peerflix
     samba
     schildichat-desktop-wayland
     scrcpy
+    sonixd
   ] ++ lib.optionals isGaming [
     ceserver
     gamescope

profiles/applications/vscode/default.nix

@@ -52,7 +52,7 @@ in
           vscode.mkhl.direnv
           vscode.ms-azuretools.vscode-docker
           vscode.ms-vscode.hexeditor
-          vscode.ms-vscode-remote.remote-ssh
+          nixpkgs.ms-vscode-remote.remote-ssh #FIX later
           vscode.pkief.material-icon-theme
           nixpkgs.rust-lang.rust-analyzer
 

profiles/boot.nix

@@ -27,17 +27,13 @@ with config.deviceSpecific; {
 
     supportedFilesystems = [ "ntfs" ];
 
-    extraModprobeConfig = lib.mkIf (config.device == "AMD-Workstation") ''
-      options snd slots=snd_virtuoso,snd_usb_audio
-    '';
-
     consoleLogLevel = 3;
     kernel.sysctl = {
       "vm.swappiness" = if config.deviceSpecific.isSSD then 1 else 10;
     };
 
-    cleanTmpDir = true;
+    cleanTmpDir = !config.boot.tmpOnTmpfs;
-    zfs.forceImportAll = false;
+    zfs.forceImportAll = lib.mkForce false;
   } else if isServer then {
     kernelPackages = pkgs.linuxPackages_hardened;
     kernelModules = [ "tcp_bbr" ];
@@ -66,11 +62,11 @@ with config.deviceSpecific; {
       "vm.swappiness" = if config.deviceSpecific.isSSD then 1 else 10;
     };
     cleanTmpDir = true;
-    zfs.forceImportAll = false;
+    zfs.forceImportAll = lib.mkForce false;
   } else {
     kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
     kernelParams = lib.mkForce [ "zswap.enabled=0" ];
     supportedFilesystems = lib.mkForce [ "ext4" "vfat" "btrfs" "ntfs" ];
-    zfs.forceImportAll = false;
+    zfs.forceImportAll = lib.mkForce false;
   };
 }

profiles/nix/default.nix

@@ -43,7 +43,7 @@ with config.deviceSpecific; {
       {
         hostName = "nix-builder";
         maxJobs = 8;
-        sshUser = "alukard";
+        sshUser = "ataraxia";
         sshKey = config.secrets.ssh-builder.decrypted;
         systems = [ "x86_64-linux" "i686-linux" ];
         supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];

profiles/security.nix

@@ -21,6 +21,7 @@ with config.deviceSpecific; {
       "networkmanager"
       "podman"
       "qemu-libvirtd"
+      "render"
       "scanner"
       "systemd-journal"
       "smbuser"

profiles/workspace/ssh.nix

@@ -18,7 +18,7 @@ with config.deviceSpecific; {
   programs.ssh.extraConfig = ''
     Host nix-builder
       hostname 192.168.0.100
-      user alukard
+      user ataraxia
       identitiesOnly yes
       identityFile ${config.secrets.ssh-builder.decrypted}
     Host hypervisor

profiles/workspace/zsh/default.nix

@@ -97,6 +97,22 @@
           manix-fzf() {
             manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview="manix '{}'" | xargs manix
           }
+          # zst 7z archive
+          z7za() {
+            rm /tmp/7z-exclude.lst > /dev/null 2>&1 || true
+            for var in "$@"; do
+              \find "$var" -type l -print -exec readlink -f {} \; >> /tmp/7z-exclude.lst
+            done
+            7z a $(basename "$1").7z "$@" -m0=zstd -mx3 -xr@/tmp/7z-exclude.lst
+          }
+          # zst 7z archive to backup folder
+          z7zab() {
+            rm /tmp/7z-exclude.lst > /dev/null 2>&1 || true
+            for var in "$@"; do
+              \find "$var" -type l -print -exec readlink -f {} \; >> /tmp/7z-exclude.lst
+            done
+            7z a ~/backup/$(basename "$1").7z "$@" -m0=zstd -mx3 -xr@/tmp/7z-exclude.lst
+          }
 
           XDG_DATA_DIRS=$XDG_DATA_DIRS:$GSETTINGS_SCHEMAS_PATH