diff --git a/doom_files/config.el b/doom_files/config.el index 96eea0a..8f68d90 100644 --- a/doom_files/config.el +++ b/doom_files/config.el @@ -3,13 +3,15 @@ (setq user-full-name "liv" user-mail-address "shadows@with.al") -;; Set fonts and window sizes conditionally based on what machine Emacs is running on -(when (string= (system-name) "enoko") - (setq doom-font (font-spec :family "RecMonoCasual Nerd Font" :size 25 :weight 'semi-light)) - (add-to-list 'default-frame-alist '(fullscreen . maximized))) +;; Set fonts and window sizes +(add-to-list 'default-frame-alist '(fullscreen . maximized)) + +(if (string= (system-name) "enoko") + (setq doom-font (font-spec :family "RecMonoCasual Nerd Font" :size 25 :weight 'semi-light)) + (setq doom-font (font-spec :family "RecMonoCasual Nerd Font" :size 17 :weight 'semi-light))) + + -(when (string= (system-name) "yukari") - (setq doom-font (font-spec :family "RecMonoCasual Nerd Font" :size 19 :weight 'semi-light))) ;; Load our cute color scheme (setq catppuccin-flavor 'mocha) diff --git a/home/features/desktop/emacs.nix b/home/features/desktop/emacs.nix index c9c5553..4b2042d 100644 --- a/home/features/desktop/emacs.nix +++ b/home/features/desktop/emacs.nix @@ -30,5 +30,7 @@ imagemagick zstd editorconfig-core-c + # for vterm + libtool ]; } diff --git a/servers/flake.lock b/servers/flake.lock index 02e67cf..62c0fa7 100644 --- a/servers/flake.lock +++ b/servers/flake.lock @@ -54,15 +54,18 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", - "path": "/nix/store/d9gbq853jvbccrz5g3y0irbwgc57w137-source", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", - "type": "path" + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "root": { diff --git a/servers/flake.nix b/servers/flake.nix index 34ec5aa..59f9c03 100644 --- a/servers/flake.nix +++ b/servers/flake.nix @@ -1,6 +1,7 @@ { description = "The flake that describes my server configurations"; + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.deploy-rs.url = "github:serokell/deploy-rs"; outputs = { self, nixpkgs, deploy-rs, }: { diff --git a/servers/lunasa/configuration.nix b/servers/lunasa/configuration.nix index 30c67f0..8063a9b 100644 --- a/servers/lunasa/configuration.nix +++ b/servers/lunasa/configuration.nix @@ -34,6 +34,11 @@ 25565 # minecraft ]; + services.syncplay = { + enable = true; + motd = "START SUCKING!!!!"; + }; + services.forgejo = { enable = true; lfs.enable = true; @@ -68,6 +73,12 @@ reverse_proxy localhost:3000 ''; }; + + "watch.with.al" = { + extraConfig = '' + reverse_proxy localhost:8999 + ''; + }; }; };