chore: merge remote-tracking branch 'refs/remotes/origin/master'

modules/core/default.nix

@@ -1,7 +1,8 @@
 { ... }:
 {
   imports =
-       [(import ./docker.nix)]
+       [(import ./../../variables.nix)] # Does not really fit here but I have no clue where else
+    ++ [(import ./docker.nix)]
     ++ [(import ./hardware.nix)]
     ++ [(import ./displaylink.nix)]
     # ++ [(import ./printing.nix)]

modules/core/default.server.nix

@@ -1,7 +1,8 @@
 { ... }:
 {
   imports =
-       [(import ./hardware.nix)]
+       [(import ./../../variables.nix)]
+    ++ [(import ./hardware.nix)]
     ++ [(import ./network.nix)]
     ++ [(import ./program.nix)]
     ++ [(import ./sshd.nix)]

modules/core/hardware.nix

@@ -1,20 +1,7 @@
 { pkgs, ... }:
 {  
-  hardware = {
-    graphics = {
-      enable = true;
-      # driSupport = true; # Has no effect anymore, as of 2024-06-21
-      # driSupport32Bit = true;
-    };
-    enableRedistributableFirmware = true;
-    opengl = {
-      extraPackages = with pkgs; [
-        amdvlk
-      ];
-      # For 32 bit applications as well
-      extraPackages32 = with pkgs; [
-        driversi686Linux.amdvlk
-      ];
-    };
+  services.smartd = {
+    enable = true;
+    autodetect = true;
   };
 }

modules/core/user.nix

@@ -10,7 +10,9 @@
         if (host == "desktop") then 
           [ ./../home/default.desktop.nix ] 
         else if (host == "violet") then
-          [ ./../home/default.violet.nix ]
+          [ ./../home/default.server.nix ]
+        else if (host == "dandelion") then
+          [ ./../home/default.server.nix ]
         else if (host == "yoshino") then
           [ ./../home/default.yoshino.nix ]
         else [ ./../home ];

modules/core/wireguard.nix

@@ -2,15 +2,15 @@
 {
   networking.wg-quick.interfaces = {
     wg0 = {
-      address = [ "10.7.0.2/24" "fddd:2c4:2c4:2c4::2/64" ];
+      address = [ "10.7.0.4/24" ];
       dns = [ "9.9.9.9" "149.112.112.112" ];
       privateKeyFile = "/root/wireguard-keys/privatekey";
       
       peers = [{
-        publicKey = "GfrFhe2JV8FS/711WAdx6CLF/QIEj1KoOGP/ErxBHkg=";
+        publicKey = "uE40chWhiPpnNHcgnLhMfOUfzotS6hK+dWwI1sIFcUw=";
         presharedKeyFile = "/root/wireguard-keys/preshared_from_peer0_key";
         allowedIPs = [ "0.0.0.0/0" "::/0" ];
-        endpoint = "57.129.46.171:51820";
+        endpoint = "213.210.34.27:58192";
         persistentKeepalive = 25;
       }];
     };

modules/home/default.server.nix

@@ -2,7 +2,7 @@
   imports =
        [(import ./git.nix)]                       # version control
     ++ [(import ./nvim.nix)]                      # neovim editor
-    ++ [(import ./packages.violet.nix)]           # other packages
+    ++ [(import ./packages.server.nix)]           # other packages
     ++ [(import ./scripts/scripts.nix)]           # personal scripts
     ++ [(import ./zsh.nix)]                       # shell
     ++ [(import ./tmux.nix)];                     # terminal multiplexer

modules/home/hyprland/config.nix

@@ -28,18 +28,18 @@
         color = "black";
       };
     };
-    # cursorTheme = {
-    #   name = "Bibata-Modern-Ice";
-    #   package = pkgs.bibata-cursors;
-    #   size = 24;
-    # };
+    cursorTheme = {
+      name = "Bibata-Modern-Ice";
+      package = pkgs.bibata-cursors;
+      size = 24;
+    };
   };
   
-  # home.pointerCursor = {
-  #   name = "Bibata-Modern-Ice";
-  #   package = pkgs.bibata-cursors;
-  #   size = 24;
-  # };
+  home.pointerCursor = {
+    name = "Bibata-Modern-Ice";
+    package = pkgs.bibata-cursors;
+    size = 24;
+  };
 
   # gtk = {
   #   enable = true;
@@ -84,7 +84,7 @@
       source = "~/nixos-config/modules/home/hyprland/displays.conf";
 
       "debug:disable_scale_checks" = true;
-      monitor = "eDP-1, 2256x1504@60, 0x0, 1.5";
+      monitor = "eDP-1, 2256x1504@60, 0x0, 1.5"; # this works as I only have one computer using eDP-1 as a display, I could also add LVDS or DP-1 since that'd also be machine-specific.
 
       # autostart
       exec-once = [
@@ -226,6 +226,8 @@
         "$mainMod SHIFT, V, exec, cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy"
 
         "$mainMod SHIFT, F, exec, librewolf"
+        "$mainMod SHIFT, C, exec, chromium"
+        "$mainMod SHIFT, Q, exec, qutebrowser"
         "$mainMod SHIFT, W, exec, wdisplays"
         "$mainMod SHIFT, T, exec, thunderbird"
         "$mainMod SHIFT, E, exec, element-desktop"

modules/home/packages.nix

@@ -61,8 +61,9 @@
     anki-bin
     obs-studio
     wdisplays
-    librewolf
-    ungoogled-chromium
+    librewolf # main
+    ungoogled-chromium # for things that don't work with librewolf
+    qutebrowser # focus
     nsxiv
     libreoffice
     xfce.thunar

modules/home/packages.server.nix

@@ -14,11 +14,6 @@
     ripgrep
     yt-dlp
     neofetch
-    yarn
-
-    # C / C++
-    gcc
-    gnumake
 
     # Python
     python3

modules/services/dandelion.nix

@@ -0,0 +1,6 @@
+{ ... }: {
+  imports =
+       [(import ./docker.nix)]
+    ++ [(import ./immich.nix)];
+    # ++ [(import ./scrutiny.nix)];
+}

modules/services/immich.nix

@@ -0,0 +1,22 @@
+{ config, ... }: {
+  services.immich = {
+    enable = true;
+    port = 2283;
+  };
+
+  # services.nginx.virtualHosts."" = {
+  #   enableACME = true;
+  #   forceSSL = true;
+  #   locations."/" = {
+  #     proxyPass = "http://localhost:${toString config.services.immich.port}";
+  #     proxyWebsockets = true;
+  #     recommendedProxySettings = true;
+  #     extraConfig = ''
+  #       client_max_body_size 50000M;
+  #       proxy_read_timeout   600s;
+  #       proxy_send_timeout   600s;
+  #       send_timeout         600s;
+  #     '';
+  #   };
+  # };
+}

modules/services/nextcloud.nix

@@ -1,41 +0,0 @@
-{ lib, config, ... }:
-{
-  security.acme = {
-    acceptTerms = true;
-    preliminarySelfsigned = false;
-    # defaults.email = config.security.acme.defaults.email;
-  };
-
-  services.nextcloud = {
-    enable = true;
-    home = "/var/nextcloud/home";
-    https = true;
-    configureRedis = false; # caching
-    maxUploadSize = "10G";
-    hostName = "cloud.liv.town";
-
-    config = {
-      adminuser = "liv";
-      adminpassFile = "/var/nextcloud/AdminPass";
-    };
-
-    settings = {
-      trusted_domains = [
-        "cloud.liv.town"
-      ];
-      enabledPreviewProviders = [
-        "OC\\Preview\\BMP"
-        "OC\\Preview\\GIF"
-        "OC\\Preview\\JPEG"
-        "OC\\Preview\\Krita"
-        "OC\\Preview\\MarkDown"
-        "OC\\Preview\\MP3"
-        "OC\\Preview\\OpenDocument"
-        "OC\\Preview\\PNG"
-        "OC\\Preview\\TXT"
-        "OC\\Preview\\XBitmap"
-        "OC\\Preview\\HEIC"
-      ];
-    };
-  };
-}

modules/services/nginx.nix

@@ -44,10 +44,9 @@
       #   # proxy_cookie_path / "/; secure; HttpOnly; SameSite=strict";
 
       # Most important headers
-      add_header meow "nya!";
-      add_header matrix "https://matrix.to/#/@liv:liv.town"
+      add_header meow "nyaa";
+      add_header matrix "@liv:liv.town";
       add_header pronouns "any but neopronouns";
-      add_header gender "maybe";
       add_header locale "[en_US, nl_NL]";
     '';
   };

modules/services/scrutiny.nix

@@ -1,18 +1,16 @@
-{ ... }:
-
-{
+{ config, ... }: {
   services.scrutiny = {
     enable = true;
     collector.enable = true;
     settings.web.listen.port = 8181;
     settings.notify.urls = [
-      "ntfy://notify.liv.town/violet"
+      "ntfy://${config.liv.variables.ntfyURL}/${config.networking.hostName}"
     ];
   };
 
-  services.nginx.virtualHosts."scrutiny.liv.town" = {
-    locations."/" = {
-      proxyPass = "http://localhost:8181/";
-    };
-  };
+  # services.nginx.virtualHosts."" = {
+  #   locations."/" = {
+  #     proxyPass = "http://localhost:8181/";
+  #   };
+  # };
 }

modules/services/sharkey-proxy.nix

@@ -7,6 +7,26 @@
       locations."/" = {
         proxyPass = "http://localhost:3000";
         proxyWebsockets = true;
+        extraConfig = ''
+          proxy_set_header Host $host;
+          proxy_set_header X-Real-IP $remote_addr;
+          proxy_set_header X-Forwarded-Proto https;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header X-Forwarded-Host $remote_addr;
+        '';
+      };
+      locations."/wiki/" = {
+        # Nepenthis
+        proxyPass = "http://localhost:8893";
+        extraConfig = ''
+          proxy_set_header X-Prefix '/wiki';
+          proxy_set_header Host $host;
+          proxy_set_header X-Real-IP $remote_addr;
+          proxy_set_header X-Forwarded-Proto https;
+          proxy_set_header X-Forwarded-For $remote_addr;
+          proxy_set_header X-Forwarded-Host $remote_addr;
+          proxy_buffering off;
+        '';
       };
     };
   };