diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/navi/default.nix | 32 | ||||
| -rw-r--r-- | hosts/vps/default.nix | 2 | ||||
| -rw-r--r-- | hosts/vps/services/git.nix | 51 |
3 files changed, 58 insertions, 27 deletions
diff --git a/hosts/navi/default.nix b/hosts/navi/default.nix index 1bb573f..755d06b 100644 --- a/hosts/navi/default.nix +++ b/hosts/navi/default.nix @@ -89,7 +89,32 @@ }; home-manager.users.tzlil = { - home.packages = [pkgs.schildichat-desktop-wayland pkgs.keepassxc pkgs.gtkcord4]; + home.packages = [ + pkgs.schildichat-desktop-wayland + pkgs.keepassxc + pkgs.gtkcord4 + + (pkgs.stdenv.mkDerivation rec { + name = "pragmata"; + version = "1.0"; + src = ./pragmata; + + installPhase = '' + install -D ${src}/Pragmata_Pro_Bold_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Bold_Italic.otf + install -D ${src}/Pragmata_Pro_Bold.otf $out/share/fonts/opentype/Pragmata_Pro_Bold.otf + install -D ${src}/Pragmata_Pro_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Italic.otf + install -D ${src}/Pragmata_Pro_Mono_Bold_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Bold_Italic.otf + install -D ${src}/Pragmata_Pro_Mono_Bold.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Bold.otf + install -D ${src}/Pragmata_Pro_Mono_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Italic.otf + install -D ${src}/Pragmata_Pro_Mono_Regular.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Regular.otf + install -D ${src}/Pragmata_Pro_Regular.otf $out/share/fonts/opentype/Pragmata_Pro_Regular.otf + ''; + }) + + (inputs.rizin-nixpkgs.legacyPackages.${pkgs.system}.cutter.withPlugins (ps: with ps; [rz-ghidra sigdb])) + ]; + + programs.foot.settings.main.font = "Pragmata Pro Mono:size=20"; # programs.qutebrowser = { # enable = true; # settings.colors.webpage.darkmode.enabled = true; @@ -138,5 +163,10 @@ virtualisation.docker.enable = true; virtualisation.docker.storageDriver = "btrfs"; + + # pragmata + # home-manager.users.tzlil.home.packages = [ + + # ]; }; } diff --git a/hosts/vps/default.nix b/hosts/vps/default.nix index 87b195c..ba0fdb9 100644 --- a/hosts/vps/default.nix +++ b/hosts/vps/default.nix @@ -51,7 +51,7 @@ ]; services.terraria = { - enable = true; + enable = false; worldPath = "${config.services.terraria.dataDir}/14.wld"; password = "???"; openFirewall = true; diff --git a/hosts/vps/services/git.nix b/hosts/vps/services/git.nix index 7402a4b..2b6d0a2 100644 --- a/hosts/vps/services/git.nix +++ b/hosts/vps/services/git.nix @@ -3,7 +3,8 @@ config, ... }: { - config = { + config = let cgit = pkgs.cgit-pink; + in { users.groups.git = {}; users.users.git = { isSystemUser = true; @@ -36,43 +37,43 @@ bind 0.0.0.0 ${config.website.defaultHeaders} handle_path /cgit.png { - try_files ${pkgs.cgit}/cgit/cgit.png / + try_files ${cgit}/cgit/cgit.png / file_server } handle_path /cgit.css { try_files ${pkgs.fetchurl { - url = "https://jeremias.stotter.eu/cgi-bin/cgit.cgi/cgit-dark/plain/cgit.css"; - sha256 = "sha256-wqszujnWV5PRh3L23L1BFj/PKUElpyu1KhjqrHS8lCw="; - }} / + url = "https://jeremias.stotter.eu/cgi-bin/cgit.cgi/cgit-dark/plain/cgit.css"; + sha256 = "sha256-wqszujnWV5PRh3L23L1BFj/PKUElpyu1KhjqrHS8lCw="; + }} / file_server } handle_path /favicon.ico { - try_files ${pkgs.cgit}/cgit/favicon.ico / + try_files ${cgit}/cgit/favicon.ico / file_server } handle { reverse_proxy unix//run/fcgiwrap.sock { transport fastcgi { - env SCRIPT_FILENAME ${pkgs.cgit}/cgit/cgit.cgi + env SCRIPT_FILENAME ${cgit}/cgit/cgit.cgi env CGIT_CONFIG ${pkgs.writeText "cgitrc" (pkgs.lib.generators.toKeyValue {} { - css = "/cgit.css"; - logo = "/cgit.png"; - favicon = "/favicon.ico"; - clone-url = pkgs.lib.concatStringsSep " " [ - "http://git.tzlil.net/$CGIT_REPO_URL" - # "ssh://git@tzlil.net:$CGIT_REPO_URL" - ]; - enable-log-filecount = 1; - enable-log-linecount = 1; - enable-git-config = 1; - root-title = "tzlil.net"; - root-desc = "Tzlil's Git Repositories"; - scan-path = config.users.users.git.home; - about-filter = "${pkgs.cgit}/lib/cgit/filters/about-formatting.py"; - source-filter = "${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py"; - logo-link = "/"; - readme = ":README.md"; - })} + css = "/cgit.css"; + logo = "/cgit.png"; + favicon = "/favicon.ico"; + clone-url = pkgs.lib.concatStringsSep " " [ + "http://git.tzlil.net/$CGIT_REPO_URL" + # "ssh://git@tzlil.net:$CGIT_REPO_URL" + ]; + enable-log-filecount = 1; + enable-log-linecount = 1; + enable-git-config = 1; + root-title = "tzlil.net"; + root-desc = "Tzlil's Git Repositories"; + scan-path = config.users.users.git.home; + about-filter = "${cgit}/lib/cgit/filters/about-formatting.py"; + source-filter = "${cgit}/lib/cgit/filters/syntax-highlighting.py"; + logo-link = "/"; + readme = ":README.md"; + })} } } } |