diff --git a/flake.lock b/flake.lock
index 8d632a6..b9957d5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,41 +19,6 @@
"url": "https://git.elnu.com/jichan.org/apis.git"
}
},
- "devshell": {
- "inputs": {
- "nixpkgs": [
- "nixvim",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1722113426,
- "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
- "owner": "numtide",
- "repo": "devshell",
- "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "devshell",
- "type": "github"
- }
- },
- "flake-compat": {
- "locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
- "revCount": 57,
- "type": "tarball",
- "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
- },
- "original": {
- "type": "tarball",
- "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
- }
- },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@@ -62,11 +27,11 @@
]
},
"locked": {
- "lastModified": 1726153070,
- "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
+ "lastModified": 1741352980,
+ "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
+ "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
@@ -98,11 +63,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@@ -111,58 +76,6 @@
"type": "github"
}
},
- "git-hooks": {
- "inputs": {
- "flake-compat": [
- "nixvim",
- "flake-compat"
- ],
- "gitignore": "gitignore",
- "nixpkgs": [
- "nixvim",
- "nixpkgs"
- ],
- "nixpkgs-stable": [
- "nixvim",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1726745158,
- "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
- "owner": "cachix",
- "repo": "git-hooks.nix",
- "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "git-hooks.nix",
- "type": "github"
- }
- },
- "gitignore": {
- "inputs": {
- "nixpkgs": [
- "nixvim",
- "git-hooks",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1709087332,
- "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -170,11 +83,11 @@
]
},
"locked": {
- "lastModified": 1726985855,
- "narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=",
+ "lastModified": 1742569620,
+ "narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d",
+ "rev": "8a68f18e96bcab13e4f97bece61e6602298a3141",
"type": "github"
},
"original": {
@@ -183,46 +96,51 @@
"type": "github"
}
},
- "home-manager_2": {
+ "ixx": {
"inputs": {
+ "flake-utils": [
+ "nixvim",
+ "nuschtosSearch",
+ "flake-utils"
+ ],
"nixpkgs": [
"nixvim",
+ "nuschtosSearch",
"nixpkgs"
]
},
"locked": {
- "lastModified": 1726902823,
- "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=",
- "owner": "nix-community",
- "repo": "home-manager",
- "rev": "14929f7089268481d86b83ed31ffd88713dcd415",
+ "lastModified": 1729958008,
+ "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
+ "owner": "NuschtOS",
+ "repo": "ixx",
+ "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
"type": "github"
},
"original": {
- "owner": "nix-community",
- "repo": "home-manager",
+ "owner": "NuschtOS",
+ "ref": "v0.0.6",
+ "repo": "ixx",
"type": "github"
}
},
- "nix-darwin": {
+ "ji-chan": {
"inputs": {
- "nixpkgs": [
- "nixvim",
- "nixpkgs"
- ]
+ "nixpkgs": "nixpkgs_3",
+ "rust-overlay": "rust-overlay_2"
},
"locked": {
- "lastModified": 1726742753,
- "narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=",
- "owner": "lnl7",
- "repo": "nix-darwin",
- "rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2",
- "type": "github"
+ "lastModified": 1743033002,
+ "narHash": "sha256-84TdCsIgDFDpgE9mXT/k0nxhTc7TgEfdfRia+hj//ow=",
+ "ref": "refs/heads/main",
+ "rev": "2e45f0205ae1d16a9b9b5b8417a262a558dc367f",
+ "revCount": 146,
+ "type": "git",
+ "url": "https://git.elnu.com/tegakituesday/ji-chan.git"
},
"original": {
- "owner": "lnl7",
- "repo": "nix-darwin",
- "type": "github"
+ "type": "git",
+ "url": "https://git.elnu.com/tegakituesday/ji-chan.git"
}
},
"nixpkgs": {
@@ -259,15 +177,15 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1726755586,
- "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
- "owner": "nixos",
+ "lastModified": 1742669843,
+ "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
+ "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
"type": "github"
},
"original": {
- "owner": "nixos",
+ "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
@@ -275,38 +193,64 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1726755586,
- "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
+ "lastModified": 1736320768,
+ "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
+ "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
"type": "github"
},
"original": {
"owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_5": {
+ "locked": {
+ "lastModified": 1742422364,
+ "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
+ "nixpkgs_6": {
+ "locked": {
+ "lastModified": 1742456341,
+ "narHash": "sha256-yvdnTnROddjHxoQqrakUQWDZSzVchczfsuuMOxg476c=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "7344a3b78128f7b1765dba89060b015fb75431a7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nixvim": {
"inputs": {
- "devshell": "devshell",
- "flake-compat": "flake-compat",
"flake-parts": "flake-parts",
- "git-hooks": "git-hooks",
- "home-manager": "home-manager_2",
- "nix-darwin": "nix-darwin",
- "nixpkgs": "nixpkgs_4",
- "nuschtosSearch": "nuschtosSearch",
- "treefmt-nix": "treefmt-nix"
+ "nixpkgs": "nixpkgs_6",
+ "nuschtosSearch": "nuschtosSearch"
},
"locked": {
- "lastModified": 1727031271,
- "narHash": "sha256-OvekOLCj7kEq6X8Ncgyda1ud4BMD+OxHu7bdIsCtl/g=",
+ "lastModified": 1742559284,
+ "narHash": "sha256-PSSjCCqpJPkCagkkdLODBVVonGxgwU5dN2CYlFPNVNw=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "b473bdc5ae1260296d0f43f8f1fba6248b1ee078",
+ "rev": "c980271267ef146a6c30394c611a97e077471cf2",
"type": "github"
},
"original": {
@@ -318,17 +262,18 @@
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_2",
+ "ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
- "lastModified": 1726816132,
- "narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=",
+ "lastModified": 1741886583,
+ "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=",
"owner": "NuschtOS",
"repo": "search",
- "rev": "7733a39a1321057172d87e6251ded7cdeb67171e",
+ "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467",
"type": "github"
},
"original": {
@@ -341,7 +286,8 @@
"inputs": {
"apis": "apis",
"home-manager": "home-manager",
- "nixpkgs": "nixpkgs_3",
+ "ji-chan": "ji-chan",
+ "nixpkgs": "nixpkgs_5",
"nixvim": "nixvim"
}
},
@@ -364,6 +310,24 @@
"type": "github"
}
},
+ "rust-overlay_2": {
+ "inputs": {
+ "nixpkgs": "nixpkgs_4"
+ },
+ "locked": {
+ "lastModified": 1742870002,
+ "narHash": "sha256-eQnw8ufyLmrboODU8RKVNh2Mv7SACzdoFrRUV5zdNNE=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "b4c18f262dbebecb855136c1ed8047b99a9c75b6",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
+ },
"systems": {
"locked": {
"lastModified": 1681028828,
@@ -393,27 +357,6 @@
"repo": "default",
"type": "github"
}
- },
- "treefmt-nix": {
- "inputs": {
- "nixpkgs": [
- "nixvim",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1726734507,
- "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=",
- "owner": "numtide",
- "repo": "treefmt-nix",
- "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "treefmt-nix",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index 800babe..62862a8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixvim.url = "github:nix-community/nixvim";
apis.url = "git+https://git.elnu.com/jichan.org/apis.git";
+ ji-chan.url = "git+https://git.elnu.com/tegakituesday/ji-chan.git";
home-manager = {
url = github:nix-community/home-manager;
inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/apps-desktop.nix b/hosts/apps-desktop.nix
index cde2fe7..9e27741 100644
--- a/hosts/apps-desktop.nix
+++ b/hosts/apps-desktop.nix
@@ -16,12 +16,15 @@
protonmail-bridge
# GNOME apps
- gnome.cheese
- gnome.nautilus
- gnome.file-roller
- gnome.gnome-calculator
- gnome.gnome-disk-utility
- gnome.simple-scan
+ cheese
+ file-roller
+ gnome-calculator
+ gnome-disk-utility
+ simple-scan
+ ghex
+
+ # KDE apps
+ kdePackages.dolphin
# Applications
anki
@@ -34,7 +37,6 @@
qbittorrent
pureref
libreoffice
- gnome.ghex
evince
pdfsam-basic
steam
diff --git a/hosts/apps.nix b/hosts/apps.nix
index d2e7ed3..845bbfe 100644
--- a/hosts/apps.nix
+++ b/hosts/apps.nix
@@ -10,5 +10,6 @@
trash-cli # aliased to rm in .bashrc
unzip
pipes
+ git-crypt
];
}
diff --git a/hosts/configuration.nix b/hosts/configuration.nix
index 808f24a..45e2d31 100644
--- a/hosts/configuration.nix
+++ b/hosts/configuration.nix
@@ -24,13 +24,8 @@
networking = {
networkmanager.enable = true;
- # networking.nameservers doesn't apply to resolvconf
- #nameservers = [ "9.9.9.9" "1.1.1.1" ];
- # resolvconf.extraConfig = "name_servers=\"9.9.9.9 1.1.1.1\"";
- # Temporary since MagicDNS is broken
- hosts = {
- "192.168.1.168" = [ "elnuhub.local" ];
- };
+ resolvconf.enable = true;
+ # DNS servers managed by tailscale
};
# This value determines the NixOS release from which the default
diff --git a/hosts/default.nix b/hosts/default.nix
index 7e562ae..3050f76 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -9,6 +9,7 @@ let
lib = nixpkgs.lib;
configImports = [
inputs.apis.nixosModules.default
+ inputs.ji-chan.nixosModules.default
./configuration.nix
];
hmImports = [
diff --git a/hosts/desktop.nix b/hosts/desktop.nix
index 2925a4b..7613383 100644
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -9,6 +9,11 @@ in
xserver = {
enable = true;
xkb.options = "caps:escape";
+ windowManager.i3 = {
+ enable = true;
+ # Don't install dmenu, i3status, and i3lock
+ extraPackages = lib.mkOverride 0 [];
+ };
displayManager = {
lightdm = {
enable = true;
@@ -18,14 +23,11 @@ in
};
background = theme.wallpaper;
};
- defaultSession = "none+i3";
- };
- windowManager.i3 = {
- enable = true;
- # Don't install dmenu, i3status, and i3lock
- extraPackages = lib.mkOverride 0 [];
};
};
+ displayManager = {
+ defaultSession = "none+i3";
+ };
udev.packages = [ pkgs.yubikey-personalization ];
pcscd.enable = true;
gnome.gnome-keyring.enable = true; # For remembering nextcloud login, among other things
@@ -76,15 +78,15 @@ in
fonts = {
enableDefaultPackages = false;
packages = with pkgs; [
- noto-fonts-cjk
+ noto-fonts-cjk-sans
noto-fonts
- (nerdfonts.override { fonts = [ "FiraCode" ]; }) # required for icons
+ nerd-fonts.fira-code # required for icons
twitter-color-emoji
];
};
- hardware.opengl = {
+ hardware.graphics = {
enable = true;
- driSupport32Bit = true; # Required for Touhou, Steam
+ enable32Bit = true; # Required for Touhou, Steam
};
}
diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix
index 18030f7..f615cbe 100644
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -14,6 +14,7 @@
hardware.enableAllFirmware = true;
hardware.enableRedistributableFirmware = true;
hardware.bluetooth.enable = true;
+ hardware.nvidia.open = true;
fileSystems = {
"/" = {
diff --git a/hosts/elnudrop/default.nix b/hosts/elnudrop/default.nix
index 6f6db61..fae9e96 100644
--- a/hosts/elnudrop/default.nix
+++ b/hosts/elnudrop/default.nix
@@ -1,22 +1,33 @@
-{ lib, user, ... }:
+{ lib, modulesPath, enableSSL, user, pkgs, ... }:
{
- imports = [
- ./hardware-configuration.nix
+ imports = lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [
+ (modulesPath + "/virtualisation/digital-ocean-config.nix")
+ #./hardware-configuration.nix
# Remember to update for new instances
- ./networking.nix # generated at runtime by nixos-infect
+ #./networking.nix # generated at runtime by nixos-infect
+ # root gets managed by digital-ocean-config for us
+ # but we want to override some things and let user login
./modules/ssh.nix
- ./modules/headscale.nix
+ #./modules/headscale.nix
./modules/tailscale.nix
- ./hosts/jichan.org
+ ./hosts/git.elnu.com
+ #./hosts/jichan.org
./hosts/tegakituesday.com
+ ./hosts/atlantapaversinc.com
+ ];
+ fileSystems."/mnt/data" = { device = "/dev/sda"; fsType = "ext4"; };
+
+ programs.git.enable = true;
+ environment.systemPackages = with pkgs; [
+ hugo
];
networking = {
# May cause some issues
- networkmanager.enable = lib.mkForce false;
+ #networkmanager.enable = lib.mkForce false;
firewall = {
enable = true;
allowedTCPPorts = [ 80 443 ];
@@ -30,13 +41,15 @@
services.nginx = {
enable = true;
+ user = "forgejo"; # prevent 403 Forbidden error
virtualHosts."default" = {
default = true;
+ rejectSSL = true;
serverName = null;
# https://stackoverflow.com/a/42802777
locations."/".return = "444";
};
};
- services.do-agent.enable = true;
+ #services.do-agent.enable = true;
}
\ No newline at end of file
diff --git a/hosts/elnudrop/hardware-configuration.nix b/hosts/elnudrop/hardware-configuration.nix
index 7623409..e43d1ac 100644
--- a/hosts/elnudrop/hardware-configuration.nix
+++ b/hosts/elnudrop/hardware-configuration.nix
@@ -6,4 +6,5 @@
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
boot.initrd.kernelModules = [ "nvme" ];
fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; };
+ fileSystems."/mnt/data" = { device = "/dev/sda"; fsType = "ext4" };
}
\ No newline at end of file
diff --git a/hosts/elnudrop/hosts/atlantapaversinc.com/default.nix b/hosts/elnudrop/hosts/atlantapaversinc.com/default.nix
new file mode 100644
index 0000000..816b67f
--- /dev/null
+++ b/hosts/elnudrop/hosts/atlantapaversinc.com/default.nix
@@ -0,0 +1,18 @@
+{ config, pkgs, lib, enableSSL, ... }:
+
+let
+ host = "atlantapaversinc.com";
+in {
+ services.nginx.virtualHosts."www.${host}" = {
+ forceSSL = enableSSL;
+ enableACME = enableSSL;
+ globalRedirect = host;
+ };
+ services.nginx.virtualHosts."${host}" = {
+ forceSSL = enableSSL;
+ enableACME = enableSSL;
+ locations = {
+ "/".root = "/mnt/data/forgejo/sites/atlantapaversinc.com/public";
+ };
+ };
+}
\ No newline at end of file
diff --git a/hosts/elnudrop/hosts/git.elnu.com/default.nix b/hosts/elnudrop/hosts/git.elnu.com/default.nix
new file mode 100644
index 0000000..12c6cdf
--- /dev/null
+++ b/hosts/elnudrop/hosts/git.elnu.com/default.nix
@@ -0,0 +1,41 @@
+{ config, pkgs, lib, enableSSL, ... }:
+
+let
+ host = "git.elnu.com";
+ port = 3000;
+in {
+ services.forgejo = {
+ package = pkgs.forgejo; # Don't use LTS
+ enable = true;
+ stateDir = "/mnt/data/forgejo";
+ settings = {
+ server = {
+ HTTP_PORT = port;
+ DOMAIN = host;
+ SSH_DOMAIN = host;
+ # security keys will get messed up if this isn't set exactly
+ # will default to http://git.elnu.com:3000/ otherwise
+ ROOT_URL = "https://${host}/";
+ # make gravatar etc work
+ OFFLINE_MODE = false;
+ };
+ service = {
+ DISABLE_REGISTRATION = true;
+ };
+ security = {
+ DISABLE_GIT_HOOKS = false;
+ };
+ git = {
+ # https://github.com/go-gitea/gitea/issues/10103#issuecomment-622222129
+ GC_ARGS = "--aggressive --auto";
+ };
+ };
+ };
+ services.nginx.virtualHosts."${host}" = {
+ forceSSL = enableSSL;
+ enableACME = enableSSL;
+ locations = {
+ "/".proxyPass = "http://localhost:${builtins.toString port}";
+ };
+ };
+}
\ No newline at end of file
diff --git a/hosts/elnudrop/hosts/tegakituesday.com/.gitattributes b/hosts/elnudrop/hosts/tegakituesday.com/.gitattributes
new file mode 100644
index 0000000..0f350f6
--- /dev/null
+++ b/hosts/elnudrop/hosts/tegakituesday.com/.gitattributes
@@ -0,0 +1 @@
+discord.key filter=git-crypt diff=git-crypt
\ No newline at end of file
diff --git a/hosts/elnudrop/hosts/tegakituesday.com/502/502.html b/hosts/elnudrop/hosts/tegakituesday.com/502/502.html
deleted file mode 100644
index fc16162..0000000
--- a/hosts/elnudrop/hosts/tegakituesday.com/502/502.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- Tegaki Tuesday is offline
-
-
-
-
- Tegaki Tuesday is currently offline for maintenance or due to an electrical outage.
- Thank you for your patience and please check back soon. Sorry for the inconvenience!
-
-
- 現在、手書きの火曜日 はメンテナンスのため、または停電のためオフラインとなっております。
- しばらくお待ちください。ご迷惑をおかけして申し訳ございません！
-
- Prolonged outage? Notify me on Discord.
-
-
-
\ No newline at end of file
diff --git a/hosts/elnudrop/hosts/tegakituesday.com/502/mascot.png b/hosts/elnudrop/hosts/tegakituesday.com/502/mascot.png
deleted file mode 100644
index d0c6ca0..0000000
Binary files a/hosts/elnudrop/hosts/tegakituesday.com/502/mascot.png and /dev/null differ
diff --git a/hosts/elnudrop/hosts/tegakituesday.com/default.nix b/hosts/elnudrop/hosts/tegakituesday.com/default.nix
index 726af23..e5e68e6 100644
--- a/hosts/elnudrop/hosts/tegakituesday.com/default.nix
+++ b/hosts/elnudrop/hosts/tegakituesday.com/default.nix
@@ -1,7 +1,9 @@
{ enableSSL, ... }:
-with import ../../../../modules/tailscale/default.nix;
let host = "tegakituesday.com"; in {
+ imports = [
+ ./ji-chan.nix
+ ];
services.nginx.virtualHosts."www.${host}" = {
forceSSL = enableSSL;
enableACME = enableSSL;
@@ -10,14 +12,8 @@ let host = "tegakituesday.com"; in {
services.nginx.virtualHosts."${host}" = {
forceSSL = enableSSL;
enableACME = enableSSL;
- extraConfig = ''
- error_page 502 /502.html;
- '';
locations = {
- "/".proxyPass = "http://elnuhub:3335";
- "/502.html".root = "${./502}";
- "/mascot.png".root = "${./502}";
- "/missing.min.css".root = "${../shared/502}";
+ "/".root = "/mnt/data/forgejo/sites/tegakituesday.com/public";
};
};
}
\ No newline at end of file
diff --git a/hosts/elnudrop/hosts/tegakituesday.com/discord.key b/hosts/elnudrop/hosts/tegakituesday.com/discord.key
new file mode 100644
index 0000000..ec82d2c
Binary files /dev/null and b/hosts/elnudrop/hosts/tegakituesday.com/discord.key differ
diff --git a/hosts/elnudrop/hosts/tegakituesday.com/guilds.json b/hosts/elnudrop/hosts/tegakituesday.com/guilds.json
new file mode 100644
index 0000000..130bf69
--- /dev/null
+++ b/hosts/elnudrop/hosts/tegakituesday.com/guilds.json
@@ -0,0 +1,28 @@
+{
+ "1133469685220901016": {
+ "submissionChannel": "1134566066538946640",
+ "invite": "pxGx8AfJxC"
+ },
+ "116379774825267202": {
+ "announcementRole": "836803162127335444",
+ "invite": "2Tf75M9",
+ "submissionChannel": "346809059376234497"
+ },
+ "189571157446492161": {
+ "announcementRole": "800140383455019050",
+ "invite": "japanese",
+ "submissionChannel": "352299136307036160"
+ },
+ "582147335476346880": {
+ "announcementRole": "839853170176032770",
+ "invite": "5e5je2PXeq",
+ "submissionChannel": "839852933377425488"
+ },
+ "814700630958276649": {
+ "submissionChannel": "819038172927098910"
+ },
+ "893457600719515719": {
+ "submissionChannel": "905589521264042004"
+ },
+ "suggestionChannel": "968217486443053067"
+}
\ No newline at end of file
diff --git a/hosts/elnudrop/hosts/tegakituesday.com/ji-chan.nix b/hosts/elnudrop/hosts/tegakituesday.com/ji-chan.nix
new file mode 100644
index 0000000..c46974d
--- /dev/null
+++ b/hosts/elnudrop/hosts/tegakituesday.com/ji-chan.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+ services.ji-chan = {
+ enable = true;
+ user = "forgejo";
+ token = builtins.readFile ./discord.key;
+ hugo = "/mnt/data/forgejo/sites/tegakituesday.com";
+ guildData = pkgs.writeTextFile {
+ name = "ji-chan-guilds";
+ text = builtins.readFile ./guilds.json;
+ };
+ };
+}
\ No newline at end of file
diff --git a/modules/firefox/default.nix b/modules/firefox/default.nix
index 018af3a..a2cd93c 100644
--- a/modules/firefox/default.nix
+++ b/modules/firefox/default.nix
@@ -11,6 +11,7 @@ let
};
in
{
+ # TODO broken as of 2025-03-21
nixpkgs = {
config.allowUnfree = true;
overlays = [
@@ -52,7 +53,8 @@ in
"browser.backspace_action" = 0;
"extensions.unifiedExtensions.enabled" = false;
};
- userChrome = builtins.readFile "${firefox-csshacks}/chrome/autohide_toolbox.css";
+ # TODO broken as of 2025-03-21
+ # userChrome = builtins.readFile "${firefox-csshacks}/chrome/autohide_toolbox.css";
};
};
}
diff --git a/modules/i3/default.nix b/modules/i3/default.nix
index bf1b520..605a739 100644
--- a/modules/i3/default.nix
+++ b/modules/i3/default.nix
@@ -9,7 +9,9 @@ in with theme.colors; {
playerctl # pactl comes with PulseAudio
wmctrl # For rofi power menu
xborders # Active window borders
- maim xdotool unclutter # Active window screenshots
+ maim xdotool
+ # TODO build failure https://github.com/NixOS/nixpkgs/issues/388196
+ # unclutter # Active window screenshots
#xsel # Disable middle mouse paste
];
diff --git a/modules/polybar/aozora.nix b/modules/polybar/aozora.nix
index 9915750..9169b67 100644
--- a/modules/polybar/aozora.nix
+++ b/modules/polybar/aozora.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "93MP1Iw1eklC+IEQXAhzLHJ+qsDASm53qw7vUEtEstI=";
};
- cargoSha256 = "fiDdk6c1rPS6L//KKqfp6ODxcLEzNKrpySCb9n8aGQ0=";
+ cargoHash = "sha256-aBuaXckalcBcfr/snUy+8W9ZITehoeMCsGt/4yb2BxA=";
meta = with lib; {
description = "A simple CLI for fetching Plume Labs air quality info.";
diff --git a/modules/terminal/default.nix b/modules/terminal/default.nix
index 67799b3..41f0006 100644
--- a/modules/terminal/default.nix
+++ b/modules/terminal/default.nix
@@ -7,7 +7,7 @@ in
programs.kitty = {
enable = true;
# https://github.com/kovidgoyal/kitty-themes/blob/master/themes.json
- theme = "${theme.kitty-theme}";
+ themeFile = "${theme.kitty-theme}";
font = {
name = "FiraCode Nerd Font Mono";
size = 12;
diff --git a/modules/theme/everforest/default.nix b/modules/theme/everforest/default.nix
index f2f69e9..9adf902 100644
--- a/modules/theme/everforest/default.nix
+++ b/modules/theme/everforest/default.nix
@@ -1,7 +1,7 @@
{
theme = "everforest";
- kitty-theme = "Everforest Dark Hard";
+ kitty-theme = "everforest_dark_hard";
gtkTheme = pkgs: {
package = pkgs.callPackage ./gtk.nix {};
name = "Everforest-Dark-BL";
-