flake.lock

@@ -209,11 +209,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736199437,
+        "lastModified": 1733168902,
-        "narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=",
+        "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf",
+        "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1735940463,
+        "lastModified": 1733974299,
-        "narHash": "sha256-qrjv3UrlcFQf8zFjV4lMDmcBnlow/sqyyjGFAXp8mLk=",
+        "narHash": "sha256-fPvJ/ZsQGVqGJqYL2gKotalQUoG1wpUYTJkRKG2BrwA=",
         "owner": "lelgenio",
         "repo": "dzgui-nix",
-        "rev": "fccedf1386f484375570e0195c7a08d7687b1df6",
+        "rev": "580022e73efedb17ddf640115539cb9bd1423d44",
         "type": "github"
       },
       "original": {
@@ -440,11 +440,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735344290,
+        "lastModified": 1733951536,
-        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
+        "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+        "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f",
         "type": "github"
       },
       "original": {
@@ -481,11 +481,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736047960,
+        "lastModified": 1733629314,
-        "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=",
+        "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "816a6ae88774ba7e74314830546c29e134e0dffb",
+        "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8",
         "type": "github"
       },
       "original": {
@@ -501,14 +501,16 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-24_11": "nixpkgs-24_11"
+        "nixpkgs-24_05": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1735230346,
+        "lastModified": 1722877200,
-        "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=",
+        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b",
+        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
         "type": "gitlab"
       },
       "original": {
@@ -534,28 +536,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-24_11": {
-      "locked": {
-        "lastModified": 1734083684,
-        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-24.11",
-        "type": "indirect"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1736012469,
+        "lastModified": 1733759999,
-        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
+        "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
+        "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
         "type": "github"
       },
       "original": {
@@ -581,11 +568,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1732812356,
+        "lastModified": 1733749988,
-        "narHash": "sha256-LNcgjOLArRlx2W6XSi0yc0xwLjrK3KF9LxAMqUgFDgw=",
+        "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "581d7e4d23b91daf2afa0005a5d3d01d6a8884fe",
+        "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68",
         "type": "github"
       },
       "original": {
@@ -612,11 +599,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1736061677,
+        "lastModified": 1733808091,
-        "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
+        "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
+        "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e",
         "type": "github"
       },
       "original": {
@@ -902,11 +889,11 @@
     },
     "vpsadminos": {
       "locked": {
-        "lastModified": 1734458258,
+        "lastModified": 1733157322,
-        "narHash": "sha256-xZEbuwAAbxwujrGtuydDNBjzMLnE9YOcuLv3hdudZe4=",
+        "narHash": "sha256-lN6AY1zxZ0mQzpvLIfpdHdZ7oThHOlWFb2HUeOVcCJQ=",
         "owner": "vpsfreecz",
         "repo": "vpsadminos",
-        "rev": "83ddccf4462f155f12596af773e9291d7ebc37a3",
+        "rev": "8ba8b0885526f484da44c0aeb4894dbaf548e61f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -29,6 +29,7 @@
     nixos-mailserver = {
       url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs-24_05.follows = "nixpkgs";
     };
 
     dzgui-nix.url = "github:lelgenio/dzgui-nix";

hosts/monolith/amdgpu.nix

@@ -13,6 +13,7 @@ in
 {
   boot.initrd.kernelModules = [ "amdgpu" ];
   boot.kernelParams = [
+    "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
     "video=DP-1:1920x1080@144"
     "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting
   ];
@@ -21,10 +22,6 @@ in
     script = ''
       ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85
     '';
-    serviceConfig = {
-      Restart = "always";
-      RestartSec = 10;
-    };
     wantedBy = [ "multi-user.target" ];
   };
 
@@ -32,6 +29,10 @@ in
 
   hardware.graphics.extraPackages = with pkgs; [
     libva
+    libvdpau
+    vaapiVdpau
+    rocmPackages.clr
+    rocmPackages.rocm-smi
   ];
 
   services.udev.extraRules = ''

hosts/monolith/default.nix

@@ -41,6 +41,8 @@ in
     package = pkgs.unstable.opentabletdriver;
   };
 
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
   boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
 
   boot.initrd.kernelModules = [ "amdgpu" ];

hosts/monolith/factorio-server.nix

@@ -10,11 +10,6 @@
     extraSettingsFile = config.age.secrets.factorio-settings.path;
   };
 
-  systemd.services.factorio = {
-    after = [ "network-online.target" ];
-    wants = [ "network-online.target" ];
-  };
-
   age.secrets.factorio-settings = {
     file = ../../secrets/factorio-settings.age;
     mode = "777";

hosts/phantom/hardware-config.nix

@@ -1,14 +1,15 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
 {
   fileSystems."/var/lib/syncthing-data" = {
     device = "172.16.130.7:/nas/5749/syncthinng_data";
     fsType = "nfs";
     options = [ "nofail" ];
   };
-  fileSystems."/var/lib/mastodon" = {
-    device = "172.16.130.7:/nas/5749/mastodon";
-    fsType = "nfs";
-    options = [ "nofail" ];
-  };
 
   swapDevices = [
     {

pkgs/factorio-headless/default.nix

@@ -1,10 +1,10 @@
 { factorio-headless, pkgs }:
 
 factorio-headless.overrideAttrs (_: rec {
-  version = "2.0.28";
+  version = "2.0.23";
   src = pkgs.fetchurl {
     name = "factorio_headless_x64-${version}.tar.xz";
     url = "https://www.factorio.com/get-download/${version}/headless/linux64";
-    hash = "sha256-6pk3tq3HoY4XpOHmSZLsOJQHSXs25oKAuxT83UyITdM=";
+    hash = "sha256-6Bn8mtbfBhv51L/8kZiN0Y0OOYLIscIsBSXXi9o+8hY=";
   };
 })

scripts/_docker-block-external-connections

@@ -1,33 +0,0 @@
-#!/bin/sh
-
-# Create the DOCKER-USER chain if it doesn't exist
-iptables -N DOCKER-USER || true
-
-# Flush existing rules in the DOCKER-USER chain
-iptables -F DOCKER-USER
-
-# Get all external network interfaces
-interfaces=$(
-    ip -o -f inet addr show |
-    awk '{print $2}' |
-    grep -E '^(enp|eth|wlan|wlp)' |
-    sort -u
-)
-
-for iface in $interfaces; do
-    # Allow traffic from LAN
-    iptables -A DOCKER-USER -i "$iface" -s 127.0.0.1 -j ACCEPT
-    iptables -A DOCKER-USER -i "$iface" -s 10.0.0.0/8 -j ACCEPT
-    iptables -A DOCKER-USER -i "$iface" -s 192.168.0.0/16 -j ACCEPT
-
-    # Allow established and related connections
-    iptables -A DOCKER-USER -i "$iface" -m state --state RELATED,ESTABLISHED -j ACCEPT
-
-    # Drop all other traffic
-    iptables -A DOCKER-USER -i "$iface" -j DROP
-
-    echo "iptables rules have been set up for interface: $iface"
-done
-
-# Return to the previous chain
-iptables -A DOCKER-USER -j RETURN

scripts/amd-fan-control

@@ -18,7 +18,7 @@ bail() {
     exit 1
 }
 
-if ! [ -d "$HWMON" ]; then
+if ! [ -d $HWMON ]; then
     bail "Invalid HWMON"
 fi
 
@@ -28,31 +28,20 @@ if ! [ -f $TEMP_INPUT ]; then
     bail "Invalid TEMP_INPUT"
 fi
 
-TEMP_MIN="$2"
+MIN="$2"
-TEMP_MAX="$3"
+MAX="$3"
-
-if [ -z "$TEMP_MIN" ];then
-  bail "No minimum temperature provided"
-fi
-
-if [ -z "$TEMP_MAX" ];then
-  bail "No maximum temperature provided"
-fi
-
-PWM_MIN=0
-PWM_MAX=255
 
 echo "Running..." >&2
 while true; do
     TEMPERATURE_RAW=$(cat "$TEMP_INPUT")
     TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))"
     # Remap from a number between 60_000..90_000 to 0..255
-    PWM=$(( ($TEMPERATURE - $TEMP_MIN) * $PWM_MAX / ($TEMP_MAX - $TEMP_MIN) ))
+    PWM=$(( ($TEMPERATURE - $MIN) * 255 / ($MAX - $MIN) ))
 
-    if [ "$PWM" -gt $PWM_MAX ]; then
+    if [ "$PWM" -gt 255 ]; then
-        PWM=$PWM_MAX
+        PWM=255
-    elif [ "$PWM" -lt $PWM_MIN ]; then
+    elif [ "$PWM" -lt 0 ]; then
-        PWM=$PWM_MIN
+        PWM=0
     fi
 
     echo 1 > "$HWMON/pwm1_enable"

scripts/default.nix

@@ -125,12 +125,6 @@
       zbar
       wl-clipboard
     ];
-    git_clean_remote_deleted = [
-      git
-      gnugrep
-      gawk
-      findutils
-    ];
     pint-fmt = [ ];
     powerplay-led-idle = [
       bash
@@ -139,12 +133,6 @@
     ];
     vrr-fullscreen = [ ];
     controller-battery = [ ];
-    _docker-block-external-connections = [
-      iptables
-      gawk
-      gnugrep
-      iproute2
-    ];
   }
   // lib.mapAttrs importScript {
     wdmenu = ./wdmenu.nix;

scripts/git_clean_remote_deleted

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-git branch -vv \
-| grep ': gone]' \
-| awk '{print $1}' \
-| xargs git branch -D

system/containers.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   services.flatpak.enable = true;
 
@@ -22,8 +22,6 @@
     };
   };
 
-  networking.firewall.extraCommands = lib.getExe pkgs._docker-block-external-connections;
-
   programs.extra-container.enable = true;
 
   programs.firejail.enable = true;

user/chat.nix

@@ -9,15 +9,15 @@
   wayland.windowManager.sway = {
     extraConfig = ''
       exec thunderbird
-      exec discordcanary
+      exec vesktop
       exec telegram-desktop
     '';
   };
 
   home.packages = with pkgs; [
     tdesktop
-    discord-canary
+    vesktop
     thunderbird
-    element-desktop
+    element-desktop-wayland
   ];
 }

user/git.nix

@@ -36,13 +36,8 @@ in
         alias = {
           graph = "log --graph --oneline --branches";
           root = "rev-parse --show-toplevel";
-          clean-deleted-remotes = "!" + (lib.getExe pkgs.git_clean_remote_deleted);
         };
       };
     };
-
-    home.packages = with pkgs; [
-      git_clean_remote_deleted
-    ];
   };
 }

user/kakoune/default.nix

@@ -127,7 +127,7 @@ in
       ranger
       bmenu
       kak-lsp
-      kak-tree-sitter
+      unstable.kak-tree-sitter
       kak-pager
       kak-man-pager
 

user/sway/open-tablet-driver.json

@@ -10,8 +10,8 @@
       "Filters": [],
       "AbsoluteModeSettings": {
         "Display": {
-          "Width": 1920.0,
+          "Width": 960.0,
-          "Height": 1080.0,
+          "Height": 540.0,
           "X": 960.0,
           "Y": 540.0,
           "Rotation": 0.0
@@ -76,7 +76,7 @@
             "Settings": [
               {
                 "Property": "Keys",
-                "Value": "Control+Shift+Z"
+                "Value": "Control+O"
               }
             ],
             "Enable": true

user/sway/sway-assigns.nix

@@ -58,6 +58,7 @@ in
         { app_id = "wdisplays"; }
         { app_id = "pavucontrol"; }
         { app_id = ".*[Hh]elvum.*"; }
+        { workspace = "9"; }
       ];
     };
   };