home/natto: add hyprlock,hypridle and hyprpaper

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

conf/network.nix

@@ -16,7 +16,6 @@
     domain = {
       natto = "weirdnatto.in";
       amneesh = "amneesh.com";
-      chutiya = "chutiya.online";
     };
   };
 

flake.nix

@@ -52,7 +52,7 @@
     };
 
     filehost = {
-      url = "github:natto1784/yamaf";
+      url = "github:natto1784/simpler-filehost";
     };
 
     nix-gaming.url = "github:fufexan/nix-gaming";

home/amneesh/default.nix

@@ -16,7 +16,7 @@
   imports = [
     ./pkgs.nix
     ./nixgl.nix
-    ./screen.nix
+    # wayland
     ./wayvnc.nix
 
     # From personal
@@ -26,10 +26,8 @@
     ../natto/dunst.nix
     ../natto/gtk.nix
     ../natto/cursor.nix
+    # wayland
     ../natto/wayland.nix
-    ../natto/hypridle.nix
-    ../natto/hyprlock.nix
-    ../natto/hyprpaper.nix
     ../natto/hyprland.nix
     ../natto/tofi.nix
     ../natto/foot.nix

home/amneesh/nixgl.nix

@@ -21,9 +21,5 @@ in
     ];
   };
 
-  # hyprland
   wayland.windowManager.hyprland.package = lib.mkForce (wrap hyprland);
-
-  # hypridle
-  services.hypridle.package = lib.mkForce (wrap pkgs.hypridle);
 }

home/amneesh/pkgs.nix

@@ -11,6 +11,7 @@
   };
 
   home.packages = with pkgs; [
+    clang-tools
     cmake
     corkscrew
     dtc
@@ -22,8 +23,5 @@
     ninja
     thunderbird
     wget
-    xfce.thunar
-    libreoffice
-    git-repo
   ];
 }

home/amneesh/screen.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  home = {
-    packages = [ pkgs.screen ];
-
-    file = {
-      ".screenrc".text = ''
-        defscrollback 10000
-      '';
-    };
-  };
-}

home/common/zsh/default.nix

@@ -17,7 +17,7 @@
       autosuggestions.color = "fg=yellow,bold";
       utility.safeOps = false;
       extraConfig = lib.mkBefore ''
-        export GREP_COLORS="mt=01;31"
+        export GREP_COLORS="ms=01;31"
       '';
     };
     initContent = lib.mkAfter ''

home/default.nix

@@ -14,7 +14,7 @@ let
   ];
 
   mkPkgs =
-    system: overlays:
+    system:
     import inputs.nixpkgs {
       inherit system;
       config = {
@@ -22,7 +22,7 @@ let
         allowBroken = true;
         allowInsecure = true;
       };
-      overlays = overlays ++ [ self.overlays.default ];
+      overlays = [ self.overlays.default ];
     };
 
   extraSpecialArgs = globalArgs;
@@ -37,7 +37,7 @@ in
         { isLaptop = true; }
       ]
       ++ common;
-      pkgs = mkPkgs "x86_64-linux" [ ];
+      pkgs = mkPkgs "x86_64-linux";
     };
 
     natto = inputs.home-manager.lib.homeManagerConfiguration {
@@ -47,7 +47,7 @@ in
         ./common/fonts
       ]
       ++ common;
-      pkgs = mkPkgs "x86_64-linux" [ ];
+      pkgs = mkPkgs "x86_64-linux";
     };
 
     spark = inputs.home-manager.lib.homeManagerConfiguration {
@@ -62,7 +62,7 @@ in
         }
       ]
       ++ common;
-      pkgs = mkPkgs "aarch64-linux" [ ];
+      pkgs = mkPkgs "aarch64-linux";
     };
 
     bat = inputs.home-manager.lib.homeManagerConfiguration {
@@ -77,7 +77,7 @@ in
         }
       ]
       ++ common;
-      pkgs = mkPkgs "x86_64-linux" [ ];
+      pkgs = mkPkgs "x86_64-linux";
     };
 
     spin = inputs.home-manager.lib.homeManagerConfiguration {
@@ -92,7 +92,7 @@ in
         }
       ]
       ++ common;
-      pkgs = mkPkgs "x86_64-linux" [ ];
+      pkgs = mkPkgs "x86_64-linux";
     };
 
     kero = inputs.home-manager.lib.homeManagerConfiguration {
@@ -107,7 +107,7 @@ in
         }
       ]
       ++ common;
-      pkgs = mkPkgs "aarch64-linux" [ ];
+      pkgs = mkPkgs "aarch64-linux";
     };
 
     amneesh = inputs.home-manager.lib.homeManagerConfiguration {
@@ -116,7 +116,7 @@ in
         ./amneesh
       ]
       ++ common;
-      pkgs = mkPkgs "x86_64-linux" [ (import ./overlays/standalone.nix) ];
+      pkgs = mkPkgs "x86_64-linux";
     };
   };
 }

home/natto/config/emacs/config.org

@@ -1,5 +1,5 @@
 #+TITLE: My Emacs Configuration
-#+AUTHOR: natto1784
+#+AUTHOR: Amneesh Singh
 #+PROPERTY: header-args :emacs-lisp :tangle yes
 
 * Settings
@@ -20,7 +20,6 @@
 (fringe-mode 0)
 (global-display-line-numbers-mode 1)
 (xterm-mouse-mode 1)
-(electric-pair-mode)
 (setq ring-bell-function 'ignore
       gc-cons-threshold most-positive-fixnum
       initial-major-mode 'fundamental-mode)
@@ -34,9 +33,7 @@
       scroll-step 1
       display-line-numbers-type 'relative
       confirm-kill-processes nil
-      inhibit-startup-screen t
+      inhibit-startup-screen t)
-      isearch-lazy-count t
-      lazy-count-prefix-format "[%s/%s] ")
 (setq-default tab-width 2
               indent-tabs-mode nil)
 #+end_src
@@ -60,7 +57,8 @@
 #+begin_src emacs-lisp
 (use-package benchmark-init
   :config
-  (add-hook 'after-init-hook 'benchmark-init/deactivate) )
+  ;; To disable collection of benchmark data after init is done.
+  :init (benchmark-init/deactivate))
 #+end_src
 
 ** Visual packages
@@ -80,15 +78,6 @@
   (dark-theme t))
 #+end_src
 
-*** Indent guides
-#+begin_src emacs-lisp
-(use-package highlight-indent-guides
-  :config
-  (setq highlight-indent-guides-method 'column)
-  :hook
-  (prog-mode . highlight-indent-guides-mode))
-#+end_src
-
 ** Minibuffer
 Enable vertico
 #+begin_src emacs-lisp
@@ -100,13 +89,6 @@ Enable vertico
               ("C-k" . vertico-previous)))
 #+end_src
 
-Save history over restarts
-#+begin_src emacs-lisp
-(use-package savehist
-  :init
-  (savehist-mode))
-#+end_src
-
 Marginalia for description
 #+begin_src emacs-lisp
 (use-package marginalia
@@ -149,7 +131,6 @@ Consult
 (use-package evil
   :init
   (setq-default evil-shift-width 2)
-  (setq evil-want-keybinding nil)
   :config
   (evil-set-initial-state 'vterm-mode 'insert)
   (evil-set-undo-system 'undo-tree)
@@ -202,9 +183,7 @@ To undo and redo easily like vi
 #+begin_src emacs-lisp
 (use-package lsp-mode
   :defer t
-  :commands lsp
+  :commands lsp)
-  :init (setq lsp-enable-on-type-formatting nil)
-  :hook (prog-mode . lsp-deferred))
 #+end_src
 
 *** Configure lsp-ui
@@ -246,6 +225,7 @@ For autocomplete
   (add-to-list 'company-backends 'company-dabbrev)
   (setq company-backends (append '(company-files) (remove 'company-files company-backends)))
   :hook (after-init . global-company-mode))
+
 #+end_src
 
 *** Configure company-quickhelp
@@ -276,8 +256,6 @@ For autocomplete
 
 ** Languages
 #+begin_src emacs-lisp
-(use-package dts-mode
-  :mode ("\\.dts\\'" "\\.dtsi\\'" "\\.overlay\\'"))
 (use-package lsp-haskell
   :mode "\\.hs\\'")
 (use-package lsp-latex
@@ -298,26 +276,11 @@ For autocomplete
   :mode "\\.go\\'")
 #+end_src
 
-** Git
+** Magit
-magit for git operations
 #+begin_src emacs-lisp
 (use-package magit :defer t)
 #+end_src
 
-blamer for git blame
-#+begin_src emacs-lisp
-(use-package blamer
-  :defer 20
-  :custom
-  (blamer-idle-time 0.3)
-  (blamer-min-offset 70)
-  :config
-  (global-blamer-mode 1)
-  :init
-  (setq blamer-show-avatar-p nil
-        blamer-max-commit-message-length 72))
-#+end_src
-
 ** VTerm
 *** Configure vterm
 #+begin_src emacs-lisp
@@ -368,64 +331,26 @@ Do not use centaur tabs for now
 #+end_src
 
 ** Misc packages
-*** Icons
+#+begin_src emacs-lisp 
-For installing icons
-#+begin_src emacs-lisp
 (use-package all-the-icons
-  :defer t
   :if (display-graphic-p))
-#+end_src
 
-*** Projectile
+(use-package elcord :defer t)
-For tracking project root
+
-#+begin_src emacs-lisp
 (use-package projectile
   :defer t
   :config
   (define-key projectile-mode-map (kbd "C-x p") 'projectile-command-map)
   (projectile-mode +1))
-#+end_src
 
-*** Rainbow
-For highlighting colors
-#+begin_src emacs-lisp
 (use-package rainbow-mode :defer t)
-#+end_src
 
-*** Rainbow delimiters
-To make distinguishing parens easier
-#+begin_src emacs-lisp
 (use-package rainbow-delimiters
   :hook (prog-mode . rainbow-delimiters-mode))
+
+(use-package flex-autopair)
 #+end_src
 
-*** Olivetti
-When you want write prose or something similar
-#+begin_src emacs-lisp
-(use-package olivetti
-  :defer t
-  :diminish olivetti-mode
-  :custom
-  (olivetti-body-width 100)
-  (olivetti-minimum-body-width 50)
-  (olivetti-style 'fancy)
-  (olivetti-recall-visual-line-mode-entry-state t)
-  :config
-  (defvar-local my/olivetti--saved-line-numbers nil
-    "Stores the previous value of `display-line-numbers` before enabling Olivetti.")
-
-  (defun my/olivetti-toggle-line-numbers ()
-    "Hide line numbers when entering Olivetti, restore when exiting."
-    (if olivetti-mode
-        (progn
-          (setq my/olivetti--saved-line-numbers display-line-numbers)
-          (setq display-line-numbers nil))
-      (setq display-line-numbers my/olivetti--saved-line-numbers)))
-
-  (add-hook 'olivetti-mode-hook #'my/olivetti-toggle-line-numbers))
-#+end_src
-
-
 ** Org
 ** Add org-mode
 #+begin_src emacs-lisp
@@ -473,31 +398,22 @@ When you want write prose or something similar
    (latex . t)))
 #+end_src
 
+* Mode specific hooks
+#+begin_src emacs-lisp
+(add-hook 'c-mode-hook 'lsp)
+(add-hook 'c++-mode-hook 'lsp)
+(add-hook 'haskell-mode-hook #'lsp)
+(add-hook 'haskell-literate-mode-hook #'lsp)
+#+end_src
+
 * Random eye candy stuff
-* Mode line
+
-** Doom modeline
+* Custom mode line
-Switched to doom modeline after using my own modeline for a while
+switched to doom modeline after using my own modeline for a while
 #+begin_src emacs-lisp
 (use-package doom-modeline
   :init (doom-modeline-mode 1))
 #+end_src
-Also show columns
-#+begin_src emacs-lisp
-(column-number-mode 1)
-#+end_src
-
-** Nyan Mode
-#+begin_src emacs-lisp
-(use-package nyan-mode
-  :ensure t
-  :init
-  (when (display-graphic-p)
-    (nyan-mode 1))
-  :custom
-  (nyan-animate-nyancat t)
-  :config
-  (nyan-start-animation))
-#+end_src
 
 * Pop-up terminal
 Stolen from [[https://www.reddit.com/r/emacs/comments/ft84xy/run_shell_command_in_new_vterm/][this]] reddit post
@@ -525,35 +441,33 @@ Stolen from [[https://www.reddit.com/r/emacs/comments/ft84xy/run_shell_command_i
     (vterm-send-return)))
 #+end_src
 
-* LLMs
+Compilation shortcuts for standalone files
-** gptel
 #+begin_src emacs-lisp
-(use-package gptel
+(defun candrun ()
-  :defer t
+  (let ((full buffer-file-name)
-  :config
+        (file (file-name-sans-extension buffer-file-name)))
-  (setq  gptel-model 'claude-sonnet-4-20250514
+    (pcase (file-name-extension full)
-         gptel-backend (gptel-make-anthropic "Claude"
+           ("c" (concat "gcc " full " -lm -pthread -o " file " && " file " && rm " file))
-                        :stream t
+           ("java" (concat "java " full))
-                        :protocol "https"
+           ("py" (concat "python " full))
-                        :key (getenv "ANTHROPIC_API_KEY")
+           ("cpp" (concat "g++ " full " -o " file " && " file " && rm " file))
-                        :host (getenv "ANTHROPIC_API_BASE_DOMAIN")))
+           ("cc" (concat "g++ " full " -o " file " && " file " && rm " file))
-  (setq gptel-default-mode 'org-mode)
+           ("hs" (concat "runhaskell " full))
-  :bind (("C-c g" . gptel)))
+           ("sh" (concat "sh " full))
-
+           ("js" (concat "node " full))
+           ("ts" (concat "tsc " full " && node " file ".js && rm " file ".js" ))
+           ("rs" (concat "rustc " full " -o " file " && " file " && rm " file)))))
 #+end_src
 
-** Aidermacs
+* Custom Functions
 #+begin_src emacs-lisp
-(use-package aidermacs
+(defun detach-process ()
-  :defer t
+  "Run processes but detached from the parent"
-  :bind (("C-c a" . aidermacs-transient-menu))
+  (interactive)
-  :custom
+  (let ((command (read-string "Enter command:")))
-  ; See the Configuration section below
+    (call-process-shell-command (concat command " &") nil 0)))
-  (aidermacs-default-chat-mode 'architect)
-  (aidermacs-default-model "sonnet"))
 #+end_src
 
-
 * Keybinds
 ** General
 *** Colemak translations
@@ -614,7 +528,8 @@ not using this anymore
       "<f4>"  (lambda () (interactive) (vterm t))
       "C-S-t" 'vterm-toggle-cd
       "C-t" 'vterm-toggle
-      "<f1>" 'vterm-toggle)
+      "<f1>" 'vterm-toggle
+      "<f5>" (lambda () (interactive) (run-in-vterm (candrun))))
     (general-define-key
       :keymaps 'vterm-mode-map
       "<f3>" 'vterm-toggle-forward

home/natto/config/hypr/hyprland.conf

@@ -0,0 +1,173 @@
+monitor=, highrr, auto, 1
+
+input {
+    kb_layout = us,us
+    kb_variant = colemak_dh,
+    kb_model =
+    kb_options = grp:rctrl_toggle
+    kb_rules =
+
+    follow_mouse = 1
+
+    touchpad {
+        natural_scroll = yes
+        scroll_factor = 0.4
+    }
+
+    repeat_delay = 300
+    accel_profile = flat
+}
+
+general {
+    gaps_in = 5
+    gaps_out = 10
+    border_size = 2
+
+    # home-manager is going to override these
+    col.active_border = rgba(b4befeee) rgba(f5c2e7ff) 135deg
+    col.inactive_border = rgba(595959ff)
+
+    layout = dwindle
+}
+
+decoration {
+    rounding = 1
+    inactive_opacity = 0.8
+
+    shadow {
+        enabled = true
+    }
+
+    blur {
+        enabled = true
+        size = 8
+        new_optimizations = true
+        xray = true
+    }
+}
+
+animations {
+    enabled = yes
+
+    bezier =overshot,0.01, 0.9, 0.1, 1.05
+    bezier =easeoutexpo,0.16, 1, 0.3, 1
+
+    animation = windows, 1, 7, overshot, popin 50%
+    animation = windowsOut, 1, 7, easeoutexpo, popin 50%
+    animation = border, 1, 10, default
+    animation = fade, 1, 7, default
+    animation = workspaces, 1, 6, overshot
+}
+
+cursor {
+  no_hardware_cursors = true
+}
+
+dwindle {
+    pseudotile = yes
+    preserve_split = yes
+}
+
+gestures {
+    workspace_swipe = off
+}
+
+misc {
+    disable_hyprland_logo = true
+}
+
+$mainMod=SUPER
+
+binde=$mainMod, RETURN, exec, foot
+bindr=SUPER, D, exec, pkill tofi || tofi-drun | xargs hyprctl dispatch exec --
+bindr=SUPER SHIFT, D, exec, pkill tofi || tofi-run --require-match=false | xargs hyprctl dispatch exec --
+
+$playerctl=playerctl -p 'playerctld,%any'
+
+bind=$mainMod, P, exec, $playerctl play-pause
+bind=, XF86AudioPlay, exec, $playerctl play-pause
+bind=, XF86AudioNext, exec, $playerctl position 5+
+bind=, XF86AudioPrev, exec, $playerctl position 5-
+bind=$mainMod, XF86AudioNext, exec, $playerctl next
+bind=$mainMod, XF86AudioPrev, exec, $playerctl previous
+binde=, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+binde=, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bind=, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+
+binde=, XF86MonBrightnessUp, exec, light -A 5
+binde=, XF86MonBrightnessDown, exec, light -U 5
+
+bind=$mainMod SHIFT, F1, exec, setxkbmap us colemak_dh
+bind=$mainMod SHIFT, F2, exec, setxkbmap us basic
+bind=$mainMod SHIFT, F3, exec, setxkbmap in deva
+bind=$mainMod SHIFT, F4, exec, setxkbmap in guru
+bind=$mainMod SHIFT, F5, exec, setxkbmap colemak dhz
+
+bind=, PRINT, exec, grimblast --notify copysave screen
+bind=SHIFT, PRINT, exec, grimblast --notify copysave area
+
+binde=$mainMod SHIFT, Q, killactive,
+bind=$mainMod ALT, f, exit,
+bind=$mainMod SHIFT, t, pseudo,
+bind=$mainMod, f, fullscreen,
+bind=$mainMod, t, togglefloating,
+
+bindm=SUPER, mouse:272, movewindow
+bindm=SUPER, mouse:273, resizewindow
+
+bind=$mainMod, left, movefocus, l
+bind=$mainMod, h, movefocus, l
+bind=$mainMod, right, movefocus, r
+bind=$mainMod, l, movefocus, r
+bind=$mainMod, up, movefocus, u
+bind=$mainMod, k, movefocus, u
+bind=$mainMod, down, movefocus, d
+bind=$mainMod, j, movefocus, d
+
+binde=$mainMod SHIFT, left, movewindow, l
+binde=$mainMod SHIFT, h, movewindow, l
+binde=$mainMod SHIFT, right, movewindow, r
+binde=$mainMod SHIFT, l, movewindow, r
+binde=$mainMod SHIFT, up, movewindow, u
+binde=$mainMod SHIFT, k, movewindow, u
+binde=$mainMod SHIFT, down, movewindow, d
+binde=$mainMod SHIFT, j, movewindow, d
+
+binde=SHIFT ALT, left, resizeactive, -10 0
+binde=SHIFT ALT, h, resizeactive, -10 0
+binde=SHIFT ALT, right, resizeactive, 10 0
+binde=SHIFT ALT, l, resizeactive, 10 0
+binde=SHIFT ALT, up, resizeactive, 0 -10
+binde=SHIFT ALT, k, resizeactive, 0 -10
+binde=SHIFT ALT, down, resizeactive, 0 10
+binde=SHIFT ALT, j, resizeactive, 0 10
+
+bind=$mainMod, 1, workspace, 1
+bind=$mainMod, 2, workspace, 2
+bind=$mainMod, 3, workspace, 3
+bind=$mainMod, 4, workspace, 4
+bind=$mainMod, 5, workspace, 5
+bind=$mainMod, 6, workspace, 6
+bind=$mainMod, 7, workspace, 7
+bind=$mainMod, 8, workspace, 8
+bind=$mainMod, 9, workspace, 9
+bind=$mainMod, 0, workspace, 10
+
+bind=$mainMod SHIFT, 1, movetoworkspacesilent, 1
+bind=$mainMod SHIFT, 2, movetoworkspacesilent, 2
+bind=$mainMod SHIFT, 3, movetoworkspacesilent, 3
+bind=$mainMod SHIFT, 4, movetoworkspacesilent, 4
+bind=$mainMod SHIFT, 5, movetoworkspacesilent, 5
+bind=$mainMod SHIFT, 6, movetoworkspacesilent, 6
+bind=$mainMod SHIFT, 7, movetoworkspacesilent, 7
+bind=$mainMod SHIFT, 8, movetoworkspacesilent, 8
+bind=$mainMod SHIFT, 9, movetoworkspacesilent, 9
+bind=$mainMod SHIFT, 0, movetoworkspacesilent, 10
+
+bind=$mainMod SHIFT, comma, focusmonitor, -1
+bind=$mainMod SHIFT, period, focusmonitor, +1
+
+bind=CTRL ALT, r, pass, ^(com\.obsproject\.Studio)$
+
+exec-once=eww open bar
+exec-once=swaybg -i ~/Wallpapers/current.*

home/natto/emacs.nix

@@ -24,21 +24,11 @@ in
       alwaysEnsure = true;
       alwaysTangle = true;
       defaultInitFile = true;
-      extraEmacsPackages = epkgs: with epkgs; [
+      extraEmacsPackages =
+        epkgs: with epkgs; [
           use-package
           (tree-sitter-langs.withPlugins (_: tree-sitter-langs.plugins))
         ];
-
-      override = final: prev: {
-        evil = prev.melpaPackages.evil.overrideAttrs(_: {
-          src = pkgs.fetchFromGitHub {
-            owner = "natto1784";
-            repo = "evil";
-            rev = "isearch-lazy-count";
-            sha256 = "sha256-YqXoqPqOWRvszzktb0MYHMe590mzTQxCMgBloy3MHkQ=";
-          };
-        });
-      };
     };
   };
   services.emacs = {

home/natto/foot.nix

@@ -8,7 +8,7 @@
           font = "Fira Mono:style=Regular:pixelsize=18";
           font-bold = "Fira Mono:style=Bold:pixelsize=18";
         };
-        scrollback.lines = 10000;
+        scrollback.lines = 4000;
         colors = with conf.colors.default; {
           inherit foreground background;
           regular0 = surface1;

home/natto/hyprlock.nix

@@ -52,7 +52,7 @@
           text = "Layout: $LAYOUT";
           font_size = 25;
           color = "0x${text}";
-          position = "30, -30";
+          position = "2%, -2%";
           valign = "top";
           halign = "left";
         }
@@ -61,7 +61,7 @@
           text = "$TIME";
           font_size = 90;
           color = "0x${text}";
-          position = "-30, 0";
+          position = "-2%, 0";
           valign = "top";
           halign = "right";
         }
@@ -70,7 +70,7 @@
           text = "cmd[update:3600000] date +\"%A, %d %B %Y\"";
           font_size = 25;
           color = "0x${text}";
-          position = "-30, -150";
+          position = "-2%, -10%";
           valign = "top";
           halign = "right";
         }

home/overlays/standalone.nix

@@ -1,13 +0,0 @@
-final: prev:
-let
-  pam = prev.pam.overrideAttrs (oa: {
-    postPatch = ''
-      substituteInPlace modules/module-meson.build \
-        --replace "sbindir / 'unix_chkpwd'" "'/usr/bin/unix_chkpwd'"
-    '';
-  });
-in
-{
-  hyprlock = prev.hyprlock.override { inherit pam; };
-  swaylock = prev.swaylock.override { inherit pam; };
-}

hosts/suwako/services/filehost.nix

@@ -1,39 +1,25 @@
 {
-  lib,
+  config,
   pkgs,
   inputs,
   conf,
   ...
 }:
 {
-  systemd.services = rec {
+  systemd.services.filehost = {
-    filehost = {
+    enable = true;
-      enable = true;
+    wantedBy = [ "multi-user.target" ];
-      wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
-      serviceConfig = {
+      Type = "simple";
-        Type = "simple";
+      Environment = [
-        Environment = [
+        "TITLE=nattofiles"
-          "TITLE=nattofiles"
+        "USER_URL=https://f.${conf.network.addresses.domain.natto}"
-          "INTERNAL_HOST=0.0.0.0"
+        "ROCKET_LIMITS={file=\"512MB\",data-form=\"512MB\"}"
-          "INTERNAL_PORT=8000"
+        "ROCKET_LOG_LEVEL=debug"
-          "MAX_FILESIZE_MB=500"
+        "ROCKET_ADDRESS=0.0.0.0"
-          "EXTERNAL_HAS_TLS=1"
+      ];
-          "EXTERNAL_HOST=f.${conf.network.addresses.domain.natto}"
+      Restart = "on-failure";
-        ];
+      ExecStart = "${inputs.filehost.packages.${pkgs.system}.simpler-filehost}/bin/simpler-filehost";
-        Restart = "on-failure";
-        ExecStart = "${inputs.filehost.packages.${pkgs.system}.yamaf}/bin/yamaf";
-      };
-    };
-
-    filehost-chutiya = lib.recursiveUpdate filehost {
-      serviceConfig.Environment = [
-          "TITLE=chutiyafiles"
-          "INTERNAL_HOST=0.0.0.0"
-          "INTERNAL_PORT=8001"
-          "MAX_FILESIZE_MB=500"
-          "EXTERNAL_HAS_TLS=1"
-          "EXTERNAL_HOST=f.${conf.network.addresses.domain.chutiya}"
-        ];
-      };
     };
+  };
 }

hosts/suwako/services/gitea.nix

@@ -1,6 +1,7 @@
 {
+  config,
+  pkgs,
   conf,
-  lib,
   ...
 }:
 {
@@ -35,18 +36,6 @@
             USER = FROM;
             REGISTER_MAIL_CONFIRM = true;
           };
-          service = {
-            ENABLE_CAPTCHA = true;
-            EMAIL_DOMAIN_ALLOWLIST = lib.strings.concatStringsSep "," [
-              "gmail.com"
-              "outlook.com"
-              "proton.me"
-              "protonmail.com"
-              conf.network.addresses.domain.natto
-              conf.network.addresses.domain.amneesh
-              conf.network.addresses.domain.chutiya
-            ];
-          };
           oauth2_client.REGISTER_MAIL_CONFIRM = true;
           actions.ENABLED = false;
         };

hosts/suwako/services/nginx.nix

@@ -1,7 +1,6 @@
 { conf, ... }:
 let
   domain = conf.network.addresses.domain.natto;
-  chutiya = conf.network.addresses.domain.chutiya;
 in
 {
   services.nginx = {
@@ -36,17 +35,6 @@ in
       in
       with conf.network.addresses.wireguard.ips;
       {
-
-        "${chutiya}" = {
-          addSSL = true;
-          enableACME = true;
-          locations."/" = {
-            root = "/var/lib/chutiya";
-            index = "index.html";
-          };
-          serverAliases = [ "www.${chutiya}" ];
-        };
-
         "moj.${domain}" = genericHttpRProxy { addr = "https://${suwako}:25565"; };
 
         "puffer.${domain}" = genericHttpRProxy {
@@ -71,15 +59,7 @@ in
         };
 
         # Personal filehost
-        "f.${chutiya}" = genericHttpRProxy {
+        "f.${domain}" = genericHttpRProxy { addr = "http://${suwako}:8000"; };
-          addr = "http://${suwako}:8001";
-          conf = "client_max_body_size 512M;";
-        };
-
-        "f.${domain}" = genericHttpRProxy {
-          addr = "http://${suwako}:8000";
-          conf = "client_max_body_size 512M;";
-        };
       };
   };
 }