Gitea: Disable Jupyter notebook rendering

base/defaults.nix

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

base/neovim.nix

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

base/packages.nix

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

base/users.nix

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

base/xkb/default.nix

@@ -1,6 +1,6 @@
 { ... }:
 {
-    services.xserver.xkb.extraLayouts = {
+    services.xserver.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
-        ./xfce.nix
+        ./gnome.nix
         ./x270.nix
         ./scanner.nix
         ./printer.nix
@@ -63,16 +63,13 @@
 
         zathura
         inkscape
-        vlc mpv a52dec
+        vlc
         gthumb
         gimp
         tenacity
-
         openscad
         freecad
         solvespace
-        (pkgs.callPackage ../packages/dune3d.nix {})
-
         vscodium
         marktext
         tor-browser-bundle-bin
@@ -175,16 +172,6 @@
         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 = [
-        ./forgejo.nix
+        ./gitea.nix
         ./tls_sni.nix
     ];
 
     boot.loader.grub.enable = true;
-    boot.loader.grub.device = "/dev/sda";
+    boot.loader.grub.device = "/dev/vda";
 
     networking.hostName = "Emitter";
 
@@ -14,12 +14,12 @@
     networking.useDHCP = false;
     networking = {
         defaultGateway = {
-            address = "176.96.139.1";
-            interface = "ens18";
+            address = "2.59.133.1";
+            interface = "ens3";
         };
         defaultGateway6 = {
-            address = "2a0d:5940:80:4e::1";
-            interface = "ens18";
+            address = "2a0d:5940:7::1";
+            interface = "ens3";
         };
         nameservers = [
             "9.9.9.10"
@@ -27,38 +27,38 @@
             "2606:4700:4700::1111"
             "2001:4860:4860::8888"
         ];
-        interfaces.ens18 = {
+        interfaces.ens3 = {
             ipv4 = {
                 addresses = [
                     {
-                        address = "176.96.139.54";
+                        address = "2.59.133.12";
                         prefixLength = 24;
                     }
                 ];
                 routes = [
                     {
-                        address = "176.96.139.0";
+                        address = "2.59.133.0";
                         prefixLength = 24;
-                        via = "176.96.139.1";
+                        via = "2.59.133.1";
                     }
                 ];
             };
             ipv6 = {
                 addresses = [
                     {
-                        address = "2a0d:5940:80:4e::2";
+                        address = "2a0d:5940:7:16f:216:3cff:fe63:9a54";
                         prefixLength = 64;
                     }
                     {
-                        address = "fe80::4874:40ff:fe38:7a45";
+                        address = "fe80::216:3cff:fe63:9a54";
                         prefixLength = 64;
                     }
                 ];
                 routes = [
                     {
-                        address = "2a0d:5940:80:4e::2";
+                        address = "2a0d:5940:7:16f:216:3cff:fe63:9a54";
                         prefixLength = 64;
-                        via = "2a0d:5940:80:4e::1";
+                        via = "2a0d:5940:7::1";
                     }
                 ];
             };
@@ -131,11 +131,7 @@
         };
         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,24 +21,6 @@ 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 = {
@@ -74,7 +56,6 @@ 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;
@@ -146,11 +127,6 @@ 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,14 +4,12 @@
         enable = true;
         windowManager.bspwm.enable = true;
         displayManager = {
-            lightdm.enable = true;
-        };
-    };
-    services.displayManager = {
             defaultSession = "none+bspwm";
+            lightdm.enable = true;
             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
-        SUBSYSTEMS=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="8010", MODE="0660", GROUP="plugdev"
+        SUBSYSTEM=="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/gitea.nix

@@ -2,17 +2,18 @@
 
 let
     domain = "git.25120.org";
-    forgejoCustom = pkgs.callPackage ../packages/directory.nix {
-        name = "forgejo-custom";
-        source = ./forgejo-custom;
+    giteaCustom = pkgs.callPackage ../packages/directory.nix {
+        name = "gitea-custom";
+        source = ./gitea-custom;
     };
 in
 {
-    services.forgejo = {
+    services.gitea = {
         enable = true;
+        appName = "${domain}";
         database = {
             type = "postgres";
-            passwordFile = "/secrets/forgejo_db_password";
+            passwordFile = "/secrets/gitea_db_password";
             createDatabase = false;
         };
         repositoryRoot = "/data/git/repositories";
@@ -41,7 +42,7 @@ in
                 input_file="$1"
 
                 command="${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic"
-                cache_directory="${config.services.forgejo.stateDir}/markup_cache/jupyter"
+                cache_directory="${config.services.gitea.stateDir}/markup_cache/jupyter"
                 max_cache_file_count="${toString max_cached_jupyter_notebooks}"
 
                 cache_file="$cache_directory/$(md5sum "$input_file" | cut -d' ' -f1)"
@@ -64,7 +65,6 @@ in
             '';
         in
         {
-            DEFAULT.APP_NAME = "${domain}";
             server = {
                 SSH_PORT = lib.head config.services.openssh.ports;
                 ROOT_URL = "https://${domain}/";
@@ -73,43 +73,42 @@ in
             };
             service.DISABLE_REGISTRATION = true;
             session.COOKIE_SECURE = true;
-            UI.DEFAULT_THEME = "forgejo-auto";
             "markup.restructuredtext" = {
                 ENABLED = true;
                 FILE_EXTENSIONS = ".rst";
                 RENDER_COMMAND = "${docutils}/bin/rst2html.py";
                 IS_INPUT_FILE = false;
             };
-            "markup.jupyter" = {
-                ENABLED = true;
-                FILE_EXTENSIONS = ".ipynb";
-                # RENDER_COMMAND = "\"${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic \"";
-                RENDER_COMMAND = "\"${cached_jupyter_preview} \"";
-                IS_INPUT_FILE = true;
-                # RENDER_CONTENT_MODE = "iframe";
-            };
-            "markup.sanitizer.jupyter.div" = { ELEMENT = "div"; ALLOW_ATTR = "class"; REGEXP = ""; };
-            "markup.sanitizer.jupyter.span" = { ELEMENT = "span"; ALLOW_ATTR = "class"; REGEXP = ""; };
-            "markup.sanitizer.jupyter.img" = { ELEMENT = "img"; ALLOW_ATTR = "class"; REGEXP = ""; ALLOW_DATA_URI_IMAGES = "true"; };
-            "markup.sanitizer.jupyter.svg.width" = { ELEMENT = "svg"; ALLOW_ATTR = "width"; REGEXP = ""; };
-            "markup.sanitizer.jupyter.svg.height" = { ELEMENT = "svg"; ALLOW_ATTR = "height"; REGEXP = ""; };
-            "markup.sanitizer.jupyter.svg.viewbox" = { ELEMENT = "svg"; ALLOW_ATTR = "viewbox"; REGEXP = ""; };
-            "markup.sanitizer.jupyter.svg.use" = { ELEMENT = "use"; ALLOW_ATTR = "transform"; REGEXP = ""; };
-            "markup.sanitizer.jupyter.svg.g" = { ELEMENT = "g"; ALLOW_ATTR = "class"; REGEXP = ""; };
-            "markup.sanitizer.jupyter.svg.path.style" = { ELEMENT = "path"; ALLOW_ATTR = "style"; REGEXP = ""; };
-            "markup.sanitizer.jupyter.svg.path.d" = { ELEMENT = "path"; ALLOW_ATTR = "d"; REGEXP = ""; };
-            "markup.sanitizer.jupyter.svg.path.transform" = { ELEMENT = "path"; ALLOW_ATTR = "transform"; REGEXP = ""; };
+            # "markup.jupyter" = {
+            #     ENABLED = true;
+            #     FILE_EXTENSIONS = ".ipynb";
+            #     # RENDER_COMMAND = "\"${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic \"";
+            #     RENDER_COMMAND = "\"${cached_jupyter_preview} \"";
+            #     IS_INPUT_FILE = true;
+            #     # RENDER_CONTENT_MODE = "iframe";
+            # };
+            # "markup.sanitizer.jupyter.div" = { ELEMENT = "div"; ALLOW_ATTR = "class"; REGEXP = ""; };
+            # "markup.sanitizer.jupyter.span" = { ELEMENT = "span"; ALLOW_ATTR = "class"; REGEXP = ""; };
+            # "markup.sanitizer.jupyter.img" = { ELEMENT = "img"; ALLOW_ATTR = "class"; REGEXP = ""; ALLOW_DATA_URI_IMAGES = "true"; };
+            # "markup.sanitizer.jupyter.svg.width" = { ELEMENT = "svg"; ALLOW_ATTR = "width"; REGEXP = ""; };
+            # "markup.sanitizer.jupyter.svg.height" = { ELEMENT = "svg"; ALLOW_ATTR = "height"; REGEXP = ""; };
+            # "markup.sanitizer.jupyter.svg.viewbox" = { ELEMENT = "svg"; ALLOW_ATTR = "viewbox"; REGEXP = ""; };
+            # "markup.sanitizer.jupyter.svg.use" = { ELEMENT = "use"; ALLOW_ATTR = "transform"; REGEXP = ""; };
+            # "markup.sanitizer.jupyter.svg.g" = { ELEMENT = "g"; ALLOW_ATTR = "class"; REGEXP = ""; };
+            # "markup.sanitizer.jupyter.svg.path.style" = { ELEMENT = "path"; ALLOW_ATTR = "style"; REGEXP = ""; };
+            # "markup.sanitizer.jupyter.svg.path.d" = { ELEMENT = "path"; ALLOW_ATTR = "d"; REGEXP = ""; };
+            # "markup.sanitizer.jupyter.svg.path.transform" = { ELEMENT = "path"; ALLOW_ATTR = "transform"; REGEXP = ""; };
         };
     };
 
     services.postgresql = {
         enable = true;
         authentication = ''
-          local forgejo all ident map=forgejo-users
+          local gitea all ident map=gitea-users
         '';
-        # Map the forgejo user to postgresql
+        # Map the gitea user to postgresql
         identMap = ''
-            forgejo-users forgejo forgejo
+            gitea-users gitea gitea
         '';
     };
 
@@ -126,14 +125,14 @@ in
         };
     };
 
-    # users.users.forgejo.extraGroups = [ "keys" ];
-    systemd.services.forgejo = {
+    # users.users.gitea.extraGroups = [ "keys" ];
+    systemd.services.gitea = {
         serviceConfig = {
             ReadOnlyPaths = [ "/secrets" ];
         };
         preStart = ''
-            cp -frT "${forgejoCustom}/" "${config.services.forgejo.stateDir}/custom/"
-            find  "${config.services.forgejo.stateDir}/custom/" -type d -exec chmod 0750 '{}' + -or -type f -exec chmod 0640 '{}' +
+            cp -frT "${giteaCustom}/" "${config.services.gitea.stateDir}/custom/"
+            find  "${config.services.gitea.stateDir}/custom/" -type d -exec chmod 0750 '{}' + -or -type f -exec chmod 0640 '{}' +
         '';
     };
 

hosts/gnome.nix

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

hosts/nextcloud.nix

@@ -6,21 +6,20 @@ in
     services.nextcloud = {
         enable = true;
         https = true;
-        package = pkgs.nextcloud28;
+        package = pkgs.nextcloud26;
         hostName = hostName;
         datadir = "/data/nextcloud";
-        settings = {
-            trusted_domains = [
-                ((lib.toLower config.networking.hostName) + ".lan")
-                (lib.toLower config.networking.hostName)
-            ];
-        };
         config = {
             dbtype = "pgsql";
             dbhost = "/run/postgresql";
             adminpassFile = "/secrets/nextcloud_admin_password.txt";
+            extraTrustedDomains = [
+                ((lib.toLower config.networking.hostName) + ".lan")
+                (lib.toLower config.networking.hostName)
+            ];
         };
         caching.redis = true;
+        enableBrokenCiphersForSSE = false;
     };
 
     services.postgresql = {
@@ -28,14 +27,16 @@ in
         ensureUsers = [
             {
                 name = "nextcloud";
-                ensureDBOwnership = true;
+                ensurePermissions = {
+                    "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,17 +6,6 @@
         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

@@ -1,43 +0,0 @@
-{ 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/.*ExecStart=.*status=\(.*\))$/\1/g')"
+                exit_code="$(echo "$full_status" | head -n5 | tail -1 | sed -e 's/.*status=\(.*\))$/\1/g')"
                 # state="$(systemctl is-failed "$service")"
 
                 fail_priority=1

overlays/default.nix

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

overlays/horizon-eda.nix

@@ -1,13 +0,0 @@
-{ 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

@@ -1,10 +0,0 @@
-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

@@ -1,65 +0,0 @@
-{
-    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;
-    };
-}
-