Rupert: Adapt for 24.05

Lifted from nixpkgs-unstable, but with the most recent commit of Dune
3D.

base/defaults.nix

@@ -3,7 +3,7 @@
     config = lib.mkDefault {
         i18n.defaultLocale = "en_GB.UTF-8";
         console.keyMap = "us";
-        services.xserver.layout = "us-fruchti";
+        services.xserver.xkb.layout = "us-fruchti";
         services.openssh = {
             enable = true;
             settings = {

base/neovim.nix

@@ -19,7 +19,7 @@
                     changeColorScheme-vim
                     vim-dispatch
                     vimtex
-                    suda-vim
+                    vim-suda
                 ]; 
                 opt = [];
             };

base/packages.nix

@@ -5,7 +5,8 @@
         tmux zellij
         wget
         rsync
-        git
+        magic-wormhole
+        git git-lfs
         gnupg
         file
         ripgrep
@@ -13,7 +14,7 @@
         htop
         ncdu
         killall
-        ranger nnn joshuto
+        ranger nnn # joshuto
         hexyl
         rink
 
@@ -37,7 +38,7 @@
         xsel
     ];
 
-    fonts.fonts = with pkgs; [
+    fonts.packages = with pkgs; [
         vollkorn
         alegreya alegreya-sans
         b612

base/users.nix

@@ -24,7 +24,7 @@ in
             groups = [ "wheel" ];
             commands = [
                 {
-                    command = "${pkgs.nixos-rebuild}/bin/nixos-rebuild *";
+                    command = "/run/current-system/sw/bin/nixos-rebuild";
                     options = [ "NOPASSWD" ];
                 }
             ];

base/xkb/default.nix

@@ -1,6 +1,6 @@
 { ... }:
 {
-    services.xserver.extraLayouts = {
+    services.xserver.xkb.extraLayouts = {
         de-x270 = {
             description = "DE layout with some small changes for Thinkpad X270";
             languages   = [ "deu" ];

hosts/Disco.nix

@@ -2,7 +2,7 @@
 {
     imports = [
         ./development.nix
-        ./gnome.nix
+        ./xfce.nix
         ./x270.nix
         ./scanner.nix
         ./printer.nix
@@ -63,13 +63,16 @@
 
         zathura
         inkscape
-        vlc
+        vlc mpv a52dec
         gthumb
         gimp
         tenacity
+
         openscad
         freecad
         solvespace
+        (pkgs.callPackage ../packages/dune3d.nix {})
+
         vscodium
         marktext
         tor-browser-bundle-bin
@@ -172,6 +175,16 @@
         LidSwitchIgnoreInhibited = no
     '';
 
+    services.earlyoom = {
+        enable = true;
+        enableNotifications = true;
+    };
+
+    swapDevices = [{
+        device = "/swapfile";
+        size = 16 * 1024;
+    }];
+
     # 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/Emitter.nix

@@ -1,12 +1,12 @@
 { config, pkgs, ... }:
 {
     imports = [
-        ./gitea.nix
+        ./forgejo.nix
         ./tls_sni.nix
     ];
 
     boot.loader.grub.enable = true;
-    boot.loader.grub.device = "/dev/vda";
+    boot.loader.grub.device = "/dev/sda";
 
     networking.hostName = "Emitter";
 
@@ -14,12 +14,12 @@
     networking.useDHCP = false;
     networking = {
         defaultGateway = {
-            address = "2.59.133.1";
+            address = "176.96.139.1";
-            interface = "ens3";
+            interface = "ens18";
         };
         defaultGateway6 = {
-            address = "2a0d:5940:7::1";
+            address = "2a0d:5940:80:4e::1";
-            interface = "ens3";
+            interface = "ens18";
         };
         nameservers = [
             "9.9.9.10"
@@ -27,38 +27,38 @@
             "2606:4700:4700::1111"
             "2001:4860:4860::8888"
         ];
-        interfaces.ens3 = {
+        interfaces.ens18 = {
             ipv4 = {
                 addresses = [
                     {
-                        address = "2.59.133.12";
+                        address = "176.96.139.54";
                         prefixLength = 24;
                     }
                 ];
                 routes = [
                     {
-                        address = "2.59.133.0";
+                        address = "176.96.139.0";
                         prefixLength = 24;
-                        via = "2.59.133.1";
+                        via = "176.96.139.1";
                     }
                 ];
             };
             ipv6 = {
                 addresses = [
                     {
-                        address = "2a0d:5940:7:16f:216:3cff:fe63:9a54";
+                        address = "2a0d:5940:80:4e::2";
                         prefixLength = 64;
                     }
                     {
-                        address = "fe80::216:3cff:fe63:9a54";
+                        address = "fe80::4874:40ff:fe38:7a45";
                         prefixLength = 64;
                     }
                 ];
                 routes = [
                     {
-                        address = "2a0d:5940:7:16f:216:3cff:fe63:9a54";
+                        address = "2a0d:5940:80:4e::2";
                         prefixLength = 64;
-                        via = "2a0d:5940:7::1";
+                        via = "2a0d:5940:80:4e::1";
                     }
                 ];
             };
@@ -131,7 +131,11 @@
         };
         serviceConfig = {
             Restart = "on-failure";
+
             RestartSec = retryDelay;
+            # Skip transitions through failed state, i.e. don’t send a e-mail
+            # before the maximum number of retries is exhausted
+            RestartMode = "direct";
         };
     };
 

hosts/Rupert.nix

@@ -21,6 +21,24 @@ in
     boot.loader.efi.canTouchEfiVariables = true;
     boot.kernelParams = [ "acpi=force" "reboot=bios" ];
 
+    boot.initrd.kernelModules = [ "i915" ];
+    nixpkgs.config.packageOverrides = pkgs: {
+        vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+    };
+    hardware.opengl = {
+        enable = true;
+        extraPackages = with pkgs; [
+            (if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then vaapiIntel else intel-vaapi-driver)
+            libvdpau-va-gl
+            vaapiVdpau
+            # intel-media-driver
+        ];
+    };
+    environment.variables = {
+        VDPAU_DRIVER = "va_gl";
+    };
+    hardware.cpu.intel.updateMicrocode = true;
+
     networking.hostName = "Rupert";
 
     users.users = {
@@ -56,6 +74,7 @@ in
     services.flatpak.enable = true;
     xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
     xdg.portal.enable = true;
+    xdg.portal.config.common.default = "*";
 
     hardware.bluetooth = {
         enable = true;
@@ -127,6 +146,11 @@ in
           SUBSYSTEM=="video4linux", ATTRS{idProduct}=="0002", ATTRS{idVendor}=="1d6b", SYMLINK+="hdmi_capture"
     '';
 
+    swapDevices = [{
+        device = "/swapfile";
+        size = 8 * 1024;
+    }];
+
     # 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/bspwm.nix

@@ -4,12 +4,14 @@
         enable = true;
         windowManager.bspwm.enable = true;
         displayManager = {
-            defaultSession = "none+bspwm";
             lightdm.enable = true;
+        };
+    };
+    services.displayManager = {
+        defaultSession = "none+bspwm";
         autoLogin.enable = true;
         autoLogin.user = "waldi";
     };
-    };
 
     services.unclutter-xfixes = {
         enable = true;

hosts/development.nix

@@ -31,7 +31,7 @@
         SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE="0660", GROUP="plugdev"
 
         # WCH-LinkE
-        SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="8010", MODE="0660", GROUP="plugdev"
+        SUBSYSTEMS=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="8010", MODE="0660", GROUP="plugdev"
 
         # Glasgow
         SUBSYSTEM=="usb", ATTRS{idVendor}=="20b7", ATTRS{idProduct}=="9db1", MODE="0660", GROUP="plugdev"

hosts/forgejo.nix

@@ -2,18 +2,17 @@
 
 let
     domain = "git.25120.org";
-    giteaCustom = pkgs.callPackage ../packages/directory.nix {
+    forgejoCustom = pkgs.callPackage ../packages/directory.nix {
-        name = "gitea-custom";
+        name = "forgejo-custom";
-        source = ./gitea-custom;
+        source = ./forgejo-custom;
     };
 in
 {
-    services.gitea = {
+    services.forgejo = {
         enable = true;
-        appName = "${domain}";
         database = {
             type = "postgres";
-            passwordFile = "/secrets/gitea_db_password";
+            passwordFile = "/secrets/forgejo_db_password";
             createDatabase = false;
         };
         repositoryRoot = "/data/git/repositories";
@@ -22,12 +21,13 @@ in
             contentDir = "/data/git/data/lfs";
         };
         settings = let
+            python = pkgs.python311;
             docutils =
-                pkgs.python310.withPackages (ps: with ps; [
+                python.withPackages (ps: with ps; [
                 docutils  # Provides rendering of ReStructured Text files
                 pygments  # Provides syntax highlighting
             ]);
-            nbconvert = pkgs.python310.withPackages (ps: with ps; [
+            nbconvert = python.withPackages (ps: with ps; [
                 jupyter
                 ipykernel
                 nbconvert
@@ -41,7 +41,7 @@ in
                 input_file="$1"
 
                 command="${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic"
-                cache_directory="${config.services.gitea.stateDir}/markup_cache/jupyter"
+                cache_directory="${config.services.forgejo.stateDir}/markup_cache/jupyter"
                 max_cache_file_count="${toString max_cached_jupyter_notebooks}"
 
                 cache_file="$cache_directory/$(md5sum "$input_file" | cut -d' ' -f1)"
@@ -64,6 +64,7 @@ in
             '';
         in
         {
+            DEFAULT.APP_NAME = "${domain}";
             server = {
                 SSH_PORT = lib.head config.services.openssh.ports;
                 ROOT_URL = "https://${domain}/";
@@ -72,6 +73,7 @@ in
             };
             service.DISABLE_REGISTRATION = true;
             session.COOKIE_SECURE = true;
+            UI.DEFAULT_THEME = "forgejo-auto";
             "markup.restructuredtext" = {
                 ENABLED = true;
                 FILE_EXTENSIONS = ".rst";
@@ -103,11 +105,11 @@ in
     services.postgresql = {
         enable = true;
         authentication = ''
-          local gitea all ident map=gitea-users
+          local forgejo all ident map=forgejo-users
         '';
-        # Map the gitea user to postgresql
+        # Map the forgejo user to postgresql
         identMap = ''
-            gitea-users gitea gitea
+            forgejo-users forgejo forgejo
         '';
     };
 
@@ -124,14 +126,14 @@ in
         };
     };
 
-    # users.users.gitea.extraGroups = [ "keys" ];
+    # users.users.forgejo.extraGroups = [ "keys" ];
-    systemd.services.gitea = {
+    systemd.services.forgejo = {
         serviceConfig = {
             ReadOnlyPaths = [ "/secrets" ];
         };
         preStart = ''
-            cp -frT "${giteaCustom}/" "${config.services.gitea.stateDir}/custom/"
+            cp -frT "${forgejoCustom}/" "${config.services.forgejo.stateDir}/custom/"
-            find  "${config.services.gitea.stateDir}/custom/" -type d -exec chmod 0750 '{}' + -or -type f -exec chmod 0640 '{}' +
+            find  "${config.services.forgejo.stateDir}/custom/" -type d -exec chmod 0750 '{}' + -or -type f -exec chmod 0640 '{}' +
         '';
     };
 

hosts/gnome.nix

@@ -11,6 +11,7 @@
     autoLogin.user = "fruchti";
   };
   security.pam.services.gdm.enableGnomeKeyring = true;
+  services.gnome.gnome-keyring.enable = true;
 
   services.touchegg.enable = true;
   services.gnome.gnome-settings-daemon.enable = true;

hosts/hedgedoc.nix

@@ -5,7 +5,6 @@ in
 {
     services.hedgedoc = {
         enable = true;
-        workDir = "/data/hedgedoc";
         environmentFile = "/secrets/hedgedoc.env";
         settings = {
             port = 7000;
@@ -39,9 +38,7 @@ in
         ensureUsers = [
             {
                 name = "hedgedoc";
-                ensurePermissions = {
+                ensureDBOwnership = true;
-                    "DATABASE hedgedoc" = "ALL PRIVILEGES";
-                };
             }
         ];
         ensureDatabases = [ "hedgedoc" ];

hosts/nextcloud.nix

@@ -6,20 +6,21 @@ in
     services.nextcloud = {
         enable = true;
         https = true;
-        package = pkgs.nextcloud26;
+        package = pkgs.nextcloud28;
         hostName = hostName;
         datadir = "/data/nextcloud";
-        config = {
+        settings = {
-            dbtype = "pgsql";
+            trusted_domains = [
-            dbhost = "/run/postgresql";
-            adminpassFile = "/secrets/nextcloud_admin_password.txt";
-            extraTrustedDomains = [
                 ((lib.toLower config.networking.hostName) + ".lan")
                 (lib.toLower config.networking.hostName)
             ];
         };
+        config = {
+            dbtype = "pgsql";
+            dbhost = "/run/postgresql";
+            adminpassFile = "/secrets/nextcloud_admin_password.txt";
+        };
         caching.redis = true;
-        enableBrokenCiphersForSSE = false;
     };
 
     services.postgresql = {
@@ -27,16 +28,14 @@ in
         ensureUsers = [
             {
                 name = "nextcloud";
-                ensurePermissions = {
+                ensureDBOwnership = true;
-                    "DATABASE nextcloud" = "ALL PRIVILEGES";
-                };
-            }
-            {
-                name = "superuser";
-                ensurePermissions = {
-                    "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
-                };
             }
+            # {
+            #     name = "superuser";
+            #     ensurePermissions = {
+            #         "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
+            #     };
+            # }
         ];
         ensureDatabases = [ "nextcloud" ];
     };

hosts/x270.nix

@@ -6,6 +6,17 @@
         speed = 170;
     };
 
+    # Ensure that trackpoint mouse buttons work after suspend without having
+    # to touch the trackpoint first
+    powerManagement = {
+        powerDownCommands = ''
+            modprobe -r psmouse
+        '';
+        resumeCommands = ''
+            modprobe psmouse
+        '';
+    };
+
     services.xserver.videoDrivers = [ "modesetting" ];
 
     boot.initrd.kernelModules = [ "i915" ];

hosts/xfce.nix

@@ -0,0 +1,43 @@
+{ config, pkgs, ... }:
+{
+    services.xserver = {
+        enable = true;
+        libinput.enable = true;
+        desktopManager = {
+            xfce.enable = true;
+            xterm.enable = false;
+        };
+        displayManager = {
+            lightdm.enable = true;
+            defaultSession = "xfce";
+            autoLogin.enable = true;
+            autoLogin.user = "fruchti";
+        };
+    };
+    nixpkgs.config.pulseaudio = true;
+    hardware.pulseaudio.enable = true;
+    hardware.bluetooth.enable = true;
+    services.blueman.enable = true;
+    # environment.xfce.excludePackages = with pkgs.xfce; [
+    #     xfce4-terminal
+    # ];
+    environment.systemPackages = with pkgs; [
+        xfce.xfce4-whiskermenu-plugin
+        xfce.xfce4-pulseaudio-plugin
+        xfce.xfce4-volumed-pulse
+        xfce.xfwm4-themes
+        pinentry-gnome
+        lounge-gtk-theme
+        hackneyed
+        blueman
+        gnome.file-roller
+    ];
+    security.pam.services.lightdm.enableGnomeKeyring = true;
+    services.gnome.gnome-keyring.enable = true;
+
+    services.cpupower-gui.enable = true;
+
+    programs.gnupg.agent.pinentryFlavor = "gnome3";
+    services.pcscd.enable = true;
+    services.dbus.packages = [ pkgs.gcr ];
+}

options/status-email.nix

@@ -20,7 +20,7 @@ in
                 to="${toAddress}"
                 service="$1"
                 full_status="$(systemctl status --full --lines 200 "$service")"
-                exit_code="$(echo "$full_status" | head -n5 | tail -1 | sed -e 's/.*status=\(.*\))$/\1/g')"
+                exit_code="$(echo "$full_status" | head -n5 | tail -1 | sed -e 's/.*ExecStart=.*status=\(.*\))$/\1/g')"
                 # state="$(systemctl is-failed "$service")"
 
                 fail_priority=1

overlays/default.nix

@@ -2,5 +2,6 @@
 {
     imports = [
         ./burp.nix
+        ./horizon-eda.nix
     ];
 }

overlays/horizon-eda.nix

@@ -0,0 +1,13 @@
+{ config, ... }:
+{
+    nixpkgs.overlays = [
+        (self: super: {
+            horizon-eda = (super.horizon-eda.overrideAttrs (old: {
+                # Add an environment variable to fix redraw issues on Intel Graphics
+                patches = [
+                    ./horizon_software_draw_surface.patch
+                ];
+            }));
+        })
+    ];
+}

overlays/horizon_software_draw_surface.patch

@@ -0,0 +1,10 @@
+diff --git a/org.horizon_eda.HorizonEDA.desktop b/org.horizon_eda.HorizonEDA.desktop
+index 7551df54..d8df7800 100644
+--- a/org.horizon_eda.HorizonEDA.desktop
++++ b/org.horizon_eda.HorizonEDA.desktop
+@@ -5,4 +5,4 @@ Categories=Development;Engineering;Electronics;
+ Type=Application
+ Terminal=false
+ Icon=org.horizon_eda.HorizonEDA
+-Exec=horizon-eda %U
++Exec=env GDK_GL=software-draw-surface horizon-eda %U

packages/dune3d.nix

@@ -0,0 +1,65 @@
+{
+    cmake,
+    eigen,
+    fetchFromGitHub,
+    glm,
+    gobject-introspection,
+    gtkmm4,
+    lib,
+    libepoxy,
+    librsvg,
+    libspnav,
+    libuuid,
+    meson,
+    ninja,
+    opencascade-occt,
+    pkg-config,
+    python3,
+    gcc13Stdenv,
+    wrapGAppsHook,
+}:
+
+gcc13Stdenv.mkDerivation rec {
+    pname = "dune3d";
+    version = "1.1.0";
+
+    src = fetchFromGitHub {
+        owner = "dune3d";
+        repo = "dune3d";
+        rev = "v${version}";
+        hash = "sha256-Z/kdOc/MbnnEyRsel3aZGndTAy1eCdAK0Wdta0HxaE4=";
+    };
+
+    nativeBuildInputs = [
+        gobject-introspection
+        meson
+        ninja
+        pkg-config
+        wrapGAppsHook
+    ];
+    buildInputs = [
+        cmake
+        eigen
+        glm
+        gtkmm4
+        libepoxy
+        librsvg
+        libspnav
+        libuuid
+        opencascade-occt
+        (python3.withPackages (pp: [
+            pp.pygobject3
+        ]))
+    ];
+
+    env.CASROOT = opencascade-occt;
+
+    meta = with lib; {
+        description = "3D CAD application";
+        homepage = "https://dune3d.org";
+        license = licenses.gpl3Plus;
+        mainProgram = "dune3d";
+        platforms = platforms.linux;
+    };
+}
+