update conduwuit to latest

flake.nix

@@ -21,8 +21,8 @@
     };
 
     lanzaboote = {
-      url = "github:nix-community/lanzaboote/v0.4.2";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      url = "github:nix-community/lanzaboote/v0.4.1";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     authentik-nix = {
@@ -30,19 +30,19 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    lix = {
-      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
-      flake = false;
-    };
-
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-      inputs.lix.follows = "lix";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     website = {
-      url = "git+https://git.oxapentane.com/0xa/website.git?ref=main";
+      url = "git+https://codeberg.org/0xa/website.git?ref=main";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
+
+    conduwuit = {
+      url = "github:girlbossceo/conduwuit";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
@@ -61,7 +61,6 @@
       microvm,
       nixos-hardware,
       nixpkgs,
-      nixpkgs-unstable,
       sops-nix,
       ...
     }:
@@ -98,7 +97,7 @@
         in
         microvms
         // {
-          toaster = nixpkgs-unstable.lib.nixosSystem {
+          toaster = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
             specialArgs = { inherit inputs; };
             modules = [
@@ -118,7 +117,8 @@
               ./modules/science.nix
               ./modules/tlp.nix
               ./modules/virtualization.nix
-              ./modules/emacs.nix
+              ./hosts/toaster/secure-boot.nix
+              ./modules/chromium.nix
               ./modules/mail
               ./modules/wg
             ];

hosts/cloud/proxy/conduwuit.nix

@@ -14,9 +14,11 @@ let
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
 
+    keepalive_timeout 65;
+    send_timeout 600s;
+
     proxy_read_timeout 600s;
     proxy_send_timeout 600s;
-    send_timeout 600s;
   '';
 
 in
@@ -24,11 +26,15 @@ in
   services.nginx.upstreams.conduwuit = {
     servers = {
       "10.89.88.16:6167" = { };
-      "[fd31:185d:722f::16]:6167" = { };
+      #"[fd31:185d:722f::16]:6167" = { };
     };
   };
 
   services.nginx.virtualHosts."oxapentane.com" = {
+    extraConfig = ''
+      client_header_timeout 600;
+      client_body_timeout 600;
+    '';
     locations."/_matrix/" = {
       proxyPass = "http://conduwuit$request_uri";
       extraConfig = proxy-conf;

hosts/conduwuit/conduwuit.nix

@@ -1,8 +1,11 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
+let
+  conduwuit-latest = inputs.conduwuit.packages.${pkgs.system}.all-features;
+in
 {
   services.matrix-conduit = {
     enable = true;
-    package = pkgs.conduwuit;
+    package = conduwuit-latest;
     settings = {
       global = {
         database_backend = "rocksdb";

hosts/forgejo/default.nix

@@ -18,8 +18,7 @@ in
   microvm = {
     hypervisor = "qemu";
     mem = 3 * 1024;
-    balloonMem = 4 * 1024;
-    vcpu = 4;
+    vcpu = 2;
     interfaces = [
       {
         type = "tap";

hosts/toaster/0xa-home.nix

@@ -1,21 +0,0 @@
-{ pkgs, ... }:
-{
-  home.stateVersion = "24.11";
-
-  home.pointerCursor = {
-    name = "Banana";
-    size = 32;
-    package = pkgs.banana-cursor;
-    x11.enable = true;
-    gtk.enable = true;
-  };
-
-  gtk = {
-    enable = true;
-    cursorTheme = {
-      name = "Banana";
-      size = 32;
-      package = pkgs.banana-cursor;
-    };
-  };
-}

hosts/toaster/default.nix

@@ -46,11 +46,6 @@
     supportedLocales = [ "all" ];
   };
 
-  # support ddc brigtness control
-  hardware.i2c.enable = true;
-  boot.kernelModules = [ "i2c-dev" ];
-  environment.systemPackages = [ pkgs.ddcutil ];
-
   users.users."0xa" = {
     extraGroups = [
       "wheel"
@@ -60,7 +55,6 @@
       "bluetooth"
       "libvirtd"
       "qemu-libvirtd"
-      "i2c"
     ];
     group = "users";
     home = "/home/0xa";
@@ -69,6 +63,8 @@
     shell = pkgs.fish;
   };
 
+  services.emacs.defaultEditor = false;
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

hosts/toaster/hardware-configuration.nix

@@ -49,12 +49,6 @@
     options = [ "zfsutil" ];
   };
 
-  fileSystems."/tmp" = {
-    device = "zpool/nocomp/tmp";
-    fsType = "zfs";
-    options = [ "zfsutil" ];
-  };
-
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/A170-F83D";
     fsType = "vfat";

hosts/toaster/network/full-networkd.nix

@@ -1,71 +0,0 @@
-{ lib, pkgs, ... }:
-{
-  imports = [
-    ./mullvad.nix
-    ./dumpdvb.nix
-    ./zw.nix
-  ];
-
-  environment.systemPackages = with pkgs; [
-    iwgtk
-    impala
-  ];
-
-  # kick out networkmanager
-  networking.networkmanager.enable = lib.mkForce false;
-  networking.useNetworkd = true;
-  systemd.network.enable = true;
-
-  networking = {
-    hostName = "toaster";
-    firewall.enable = true;
-    wireguard.enable = true;
-    wireless.iwd.enable = true;
-  };
-
-  services.resolved = {
-    enable = true;
-    dnssec = "false";
-    fallbackDns = [
-      "9.9.9.9"
-      "2620:fe::fe"
-      "149.112.112.112"
-      "2620:fe::9"
-    ];
-  };
-
-  # we might have no interwebs at all
-  systemd.network.wait-online.enable = false;
-
-  # uplinks
-  systemd.network.networks = {
-    "10-ether-uplink" = {
-      matchConfig.Name = "enp1s0f0";
-      networkConfig = {
-        DHCP = "yes";
-        IPv6AcceptRA = true;
-      };
-    };
-    "10-dock-uplink" = {
-      matchConfig.Name = "enp5s0f4u1u1";
-      networkConfig = {
-        DHCP = "yes";
-        IPv6AcceptRA = true;
-      };
-      dhcpV4Config = {
-        RouteMetric = 666;
-      };
-      dhcpV6Config = {
-        RouteMetric = 666;
-      };
-    };
-    "wlan-uplink" = {
-      matchConfig.Name = "wlan0";
-      networkConfig = {
-        DHCP = "yes";
-        IPv6AcceptRA = true;
-      };
-    };
-  };
-
-}

hosts/toaster/zfs.nix

@@ -19,7 +19,6 @@
     supportedFilesystems = [ "zfs" ];
     kernelParams = [ "nohibernate" ];
     plymouth.enable = false;
-    tmp.useTmpfs = false;
-    tmp.cleanOnBoot = true;
+    tmp.useTmpfs = true;
   };
 }

modules/basic-tools/default.nix

@@ -39,6 +39,7 @@
       exfatprogs
       nmap
       bind
+      nnn
       lf
       man-pages
       unzip
@@ -49,17 +50,8 @@
       sshfs
       whois
       mtr
-      joshuto
     ]
-    ++ (
-      if config.networking.hostName == "toaster" then
-        [
-          gitFull
-          git-lfs
-        ]
-      else
-        [ git ]
-    );
+    ++ (if config.networking.hostName == "toaster" then [ gitFull ] else [ git ]);
 
   environment.variables =
     let

modules/basic-tools/fish.nix

@@ -3,9 +3,11 @@
   environment.systemPackages = with pkgs; [
     lsd
     fzf
+    grc
     fishPlugins.done
     fishPlugins.fzf-fish
     fishPlugins.tide
+    fishPlugins.grc
   ];
 
   programs.fish = {
@@ -13,7 +15,6 @@
     interactiveShellInit = ''
       set fish_greeting
       function fish_command_not_found
-        echo "Command not found"
       end
     '';
     shellAliases = {

modules/basic-tools/nix.nix

@@ -1,5 +1,7 @@
 {
+  lib,
   pkgs,
+  inputs,
   ...
 }:
 {
@@ -14,10 +16,14 @@
   # nix output-monitor
   environment.systemPackages = [ pkgs.nix-output-monitor ];
 
-  nixpkgs.flake = {
-    setFlakeRegistry = true;
-    setNixPath = true;
-  };
+  # override default nix shell nixpkgs# behaviour to use current flake lock
+  nix.registry =
+    let
+      flakes = lib.filterAttrs (_name: value: value ? outputs) inputs.self.inputs;
+    in
+    builtins.mapAttrs (_name: v: { flake = v; }) flakes;
+
+  nix.nixPath = lib.mapAttrsToList (name: value: "${name}=${value.outPath}") inputs.self.inputs;
 
   nixpkgs.config.allowUnfree = true;
 }

modules/chromium.nix

@@ -2,23 +2,24 @@
 
 {
   environment.systemPackages = with pkgs; [
-    (chromium.override { enableWideVine = true; })
+    chromium
   ];
 
-  nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization,WebUIDarkMode";
+  nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland  --force-dark-mode --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization,WebUIDarkMode";
 
   programs.chromium = {
     enable = true;
     extensions = [
+      # "pkehgijcmpdhfbdbbnkijodmdjhbjlgp" # privacy badger
       "ekhagklcjbdpajgpjgmbionohlpdbjgc" # zotero connector
       "nngceckbapebfimnlniiiahkandclblb" # bitwarden
-      "ddkjiahejlhfcafbddmgiahcphecmpfh" # ublock lite
+      # "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
+      # "ddkjiahejlhfcafbddmgiahcphecmpfh" # ublock lite
       "mnjggcdmjocbbbhaepdhchncahnbgone" # sponsorblock
-      "khncfooichmfjbepaaaebmommgaepoid" # unhook
     ];
     extraOpts = {
       "BrowserSignin" = 0;
-      "SyncDisabled" = true;
+      # "SyncDisabled" = true;
       "PasswordManagerEnabled" = false;
       "TranslateEnabled" = false;
       "AutofillAddressEnabled" = false;
@@ -26,15 +27,10 @@
       "AutoplayAllowed" = false;
       "DefaultNotificationSetting" = 2;
       "BackgroundModeEnabled" = false;
-      "DefaultSearchProviderEnabled" = true;
+      # "DefaultSearchProviderEnabled" = true;
       # "DefaultSearchProviderSearchURL" = "https://google.com/search?q={searchTerms}";
-      "DefaultSearchProviderSearchURL" = "https://duckduckgo.com/?q={searchTerms}";
+      # "DefaultSearchProviderSearchURL" = "https://duckduckgo.com/?q={searchTerms}";
       "SearchSuggestEnable" = false;
-      "BlockThirdPartyCookies" = true;
-      "PrivacySandboxAdMeasurementEnabled" = false;
-      "PrivacySandboxAdTopicsEnabled" = false;
-      "PrivacySandboxPromptEnabled" = false;
-      "PrivacySandboxSiteEnabledAdsEnabled" = false;
     };
   };
 }

modules/desktop-software.nix

@@ -1,26 +1,24 @@
 { pkgs, ... }:
 {
-  imports = [
-    ./chromium.nix
-  ];
   environment.systemPackages = with pkgs; [
-    audacity
     blender
     dino
     ffmpeg-full
+    firefox-wayland
+    vivaldi
+    vivaldi-ffmpeg-codecs
     gimp
     inkscape
+    kicad
     signal-desktop
-    telegram-desktop
+    tdesktop
     tor-browser
     wl-clipboard
     yt-dlp
     element-desktop
     discord
+    spotify
     mpv
-    # dwarf-fortress-packages.dwarf-fortress-full
-    obs-studio
-    firefox
   ];
   programs.steam.enable = true;
 }

modules/devtools.nix

@@ -1,5 +1,8 @@
 {
   pkgs,
+  inputs,
+  config,
+  lib,
   ...
 }:
 {
@@ -13,6 +16,11 @@
           kikit-library
         ];
       };
+
+      # binwalk v3 on 24.11
+      sys_ver = config.system.nixos.release;
+      unstablepkgs = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
+      binwalkv3 = if lib.versionOlder "25.05" sys_ver then binwalk else unstablepkgs.binwalk;
     in
     [
       # general
@@ -21,7 +29,7 @@
       gef
       gdb
       binutils
-      binwalk
+      binwalkv3
       clang
       clang-tools
       direnv
@@ -33,7 +41,7 @@
       kikit
       freecad-wayland
       imhex
-      python3Full
+      python313Full
       nixfmt-rfc-style
       treefmt
       android-tools

modules/emacs.nix

@@ -1,37 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}:
-
-{
-  environment.systemPackages = with pkgs; [
-    direnv
-    mu
-  ];
-
-  services.emacs = {
-    install = true;
-    enable = false;
-    package =
-      with pkgs;
-      (
-        (emacsPackagesFor (
-          emacs-pgtk.overrideAttrs (old: {
-            passthru = old.passthru // {
-              treeSitter = true;
-            };
-          })
-        )).emacsWithPackages
-        (
-          epkgs: with epkgs; [
-            treesit-grammars.with-all-grammars
-            vterm
-            pdf-tools
-            mu4e
-          ]
-        )
-      );
-    defaultEditor = lib.mkDefault true;
-  };
-}

modules/fonts.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
 {
   fonts.packages = with pkgs; [
-    adwaita-fonts
     monoid
     font-awesome
     dejavu_fonts
@@ -27,8 +26,7 @@
     twemoji-color-font
     twitter-color-emoji
     iosevka-bin
-    cozette
-    nerd-fonts.hack
+    (nerdfonts.override { fonts = [ "Hack" ]; })
   ];
 
   fonts.enableDefaultPackages = true;

modules/gnome.nix

@@ -8,17 +8,12 @@
   environment.systemPackages = with pkgs; [
     amberol
     celluloid
-    ddcutil
     gnome-console
     gnome-obfuscate
     gnome-boxes
     gnome-tweaks
     qbittorrent
     gnomeExtensions.caffeine
-    gnomeExtensions.brightness-control-using-ddcutil
-    spotify
-    ghostty
-    fractal
   ];
 
   environment.gnome.excludePackages = with pkgs; [
@@ -42,6 +37,12 @@
     };
   };
 
+  qt = {
+    enable = true;
+    platformTheme = "gnome";
+    style = "adwaita-dark";
+  };
+
   services.xserver = {
     enable = true;
     desktopManager.gnome.enable = true;

modules/sway.nix

@@ -1,39 +1,16 @@
 # General Desktop-related config
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
-  nixpkgs.overlays = [ inputs.niri.overlays.niri ];
-
-  programs.niri.enable = true;
-
   imports = [
     ./desktop-software.nix
     ./fonts.nix
   ];
-  environment.systemPackages =
-    let
-      xwayland-satellite-git = pkgs.xwayland-satellite.overrideAttrs (
-        final: prev: {
-          version = "git";
-          cargoHash = "sha256-MaF2FyR3HvQAKkZKa8OO/5jbO64/Ncv7+JqHda4jN50=";
-          src = pkgs.fetchFromGitHub {
-            owner = "Supreeeme";
-            repo = "xwayland-satellite";
-            rev = "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc";
-            sha256 = "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM=";
-          };
-          cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
-            inherit (final) pname src version;
-            hash = final.cargoHash;
-          };
-        }
-      );
-    in
-    with pkgs;
-    [
+  environment.systemPackages = with pkgs; [
     screen-message
     qbittorrent
     gajim
     imv
+    swayimg
     mpv
     evince
     brightnessctl
@@ -42,32 +19,11 @@
     termusic
     gsettings-desktop-schemas
     xdg-utils
+    foot
     qt5.qtwayland
     bashmount
+    nautilus
     audacity
-      spotify-player
-      zathura
-      ncdu
-      adwaita-icon-theme
-      bluetui
-      gammastep
-      graphicsmagick
-      i3status-rust
-      impala
-      kanshi
-      pamixer
-      swayidle
-      swaylock
-      wl-clipboard
-      xfce.thunar
-      banana-cursor
-      fuzzel
-      alacritty
-      i3bar-river
-      mako
-      swww
-      oculante
-      xwayland-satellite-git
   ];
 
   # Enable sound.
@@ -92,14 +48,45 @@
   programs.light.enable = true;
 
   programs.xwayland.enable = true;
-
+  programs.sway = {
+    enable = true;
+    wrapperFeatures.gtk = true;
+    extraSessionCommands = ''
+      export SDL_VIDEODRIVER=wayland
+      export QT_QPA_PLATFORM=wayland-egl
+      export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+      export QT_QPA_PLATFORMTHEME="gnome"
+      export QT_STYLE_OVERRIDE="adwaita-dark"
+      # export WLR_DRM_NO_ATOMIC=1
+    '';
+    extraPackages = with pkgs; [
+      adwaita-icon-theme
+      alacritty
+      bluetui
+      foot
+      gammastep
+      graphicsmagick
+      grim
+      i3status-rust
+      impala
+      kanshi
+      mako
+      pamixer
+      rofi-wayland
+      slurp
+      swayidle
+      swaylock
+      wl-clipboard
+      wl-mirror
+    ];
+  };
   environment.sessionVariables = {
     GTK_THEME = "Adwaita:dark";
   };
   xdg.portal = {
     enable = true;
     wlr.enable = true;
-    extraPortals = [ pkgs.xdg-desktop-portal-gnome ];
+    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   };
 
   services.udisks2.enable = true;
@@ -127,7 +114,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.niri-stable}/bin/niri-session";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.sway}/bin/sway";
       };
     };
   };