Compare commits
6 Commits
1b43d053f0
...
nixos
| Author | SHA1 | Date | |
|---|---|---|---|
|
b86cc94d23
|
|||
|
95825c6ff1
|
|||
|
3e7e404d4c
|
|||
|
bb4c77208d
|
|||
|
1f53cd2efb
|
|||
|
d9f8c16011
|
@@ -16,6 +16,7 @@
|
||||
domain = {
|
||||
natto = "weirdnatto.in";
|
||||
amneesh = "amneesh.com";
|
||||
chutiya = "chutiya.online";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
851
flake.lock
generated
851
flake.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -52,7 +52,7 @@
|
||||
};
|
||||
|
||||
filehost = {
|
||||
url = "github:natto1784/simpler-filehost";
|
||||
url = "github:natto1784/yamaf";
|
||||
};
|
||||
|
||||
nix-gaming.url = "github:fufexan/nix-gaming";
|
||||
|
||||
@@ -34,7 +34,9 @@
|
||||
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
|
||||
@@ -78,6 +80,15 @@
|
||||
(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
|
||||
@@ -192,8 +203,8 @@ To undo and redo easily like vi
|
||||
(use-package lsp-mode
|
||||
:defer t
|
||||
:commands lsp
|
||||
:init
|
||||
(setq lsp-enable-on-type-formatting nil))
|
||||
:init (setq lsp-enable-on-type-formatting nil)
|
||||
:hook (prog-mode . lsp-deferred))
|
||||
#+end_src
|
||||
|
||||
*** Configure lsp-ui
|
||||
@@ -462,24 +473,20 @@ 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
|
||||
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
|
||||
@@ -518,24 +525,6 @@ Stolen from [[https://www.reddit.com/r/emacs/comments/ft84xy/run_shell_command_i
|
||||
(vterm-send-return)))
|
||||
#+end_src
|
||||
|
||||
Compilation shortcuts for standalone files
|
||||
#+begin_src emacs-lisp
|
||||
(defun candrun ()
|
||||
(let ((full buffer-file-name)
|
||||
(file (file-name-sans-extension buffer-file-name)))
|
||||
(pcase (file-name-extension full)
|
||||
("c" (concat "gcc " full " -lm -pthread -o " file " && " file " && rm " file))
|
||||
("java" (concat "java " full))
|
||||
("py" (concat "python " full))
|
||||
("cpp" (concat "g++ " full " -o " file " && " file " && rm " file))
|
||||
("cc" (concat "g++ " full " -o " file " && " file " && rm " file))
|
||||
("hs" (concat "runhaskell " full))
|
||||
("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
|
||||
|
||||
* LLMs
|
||||
** gptel
|
||||
#+begin_src emacs-lisp
|
||||
@@ -625,8 +614,7 @@ not using this anymore
|
||||
"<f4>" (lambda () (interactive) (vterm t))
|
||||
"C-S-t" 'vterm-toggle-cd
|
||||
"C-t" 'vterm-toggle
|
||||
"<f1>" 'vterm-toggle
|
||||
"<f5>" (lambda () (interactive) (run-in-vterm (candrun))))
|
||||
"<f1>" 'vterm-toggle)
|
||||
(general-define-key
|
||||
:keymaps 'vterm-mode-map
|
||||
"<f3>" 'vterm-toggle-forward
|
||||
|
||||
@@ -24,11 +24,21 @@ 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 = {
|
||||
|
||||
@@ -1,25 +1,39 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
conf,
|
||||
...
|
||||
}:
|
||||
{
|
||||
systemd.services.filehost = {
|
||||
enable = true;
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
Environment = [
|
||||
"TITLE=nattofiles"
|
||||
"USER_URL=https://f.${conf.network.addresses.domain.natto}"
|
||||
"ROCKET_LIMITS={file=\"512MB\",data-form=\"512MB\"}"
|
||||
"ROCKET_LOG_LEVEL=debug"
|
||||
"ROCKET_ADDRESS=0.0.0.0"
|
||||
];
|
||||
Restart = "on-failure";
|
||||
ExecStart = "${inputs.filehost.packages.${pkgs.system}.simpler-filehost}/bin/simpler-filehost";
|
||||
systemd.services = rec {
|
||||
filehost = {
|
||||
enable = true;
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
Environment = [
|
||||
"TITLE=nattofiles"
|
||||
"INTERNAL_HOST=0.0.0.0"
|
||||
"INTERNAL_PORT=8000"
|
||||
"MAX_FILESIZE_MB=500"
|
||||
"EXTERNAL_HAS_TLS=1"
|
||||
"EXTERNAL_HOST=f.${conf.network.addresses.domain.natto}"
|
||||
];
|
||||
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}"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
conf,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
@@ -36,6 +35,18 @@
|
||||
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;
|
||||
};
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ conf, ... }:
|
||||
let
|
||||
domain = conf.network.addresses.domain.natto;
|
||||
chutiya = conf.network.addresses.domain.chutiya;
|
||||
in
|
||||
{
|
||||
services.nginx = {
|
||||
@@ -35,6 +36,17 @@ 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 {
|
||||
@@ -59,7 +71,15 @@ in
|
||||
};
|
||||
|
||||
# Personal filehost
|
||||
"f.${domain}" = genericHttpRProxy { addr = "http://${suwako}:8000"; };
|
||||
"f.${chutiya}" = genericHttpRProxy {
|
||||
addr = "http://${suwako}:8001";
|
||||
conf = "client_max_body_size 512M;";
|
||||
};
|
||||
|
||||
"f.${domain}" = genericHttpRProxy {
|
||||
addr = "http://${suwako}:8000";
|
||||
conf = "client_max_body_size 512M;";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user