treewide: cleanup and fixes

Changed files
+8 -43
global
systems
koumakan
services
static-sites
users
cassie
+2 -4
flake.nix
···
inputs = {
mystia.url = "github:soopyc/mystia";
+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
-
nixpkgs.follows = "mystia/nixpkgs";
nixos-hardware.url = "github:soopyc/nixos-hardware";
catppuccin.url = "github:catppuccin/nix";
hydra.url = "github:NixOS/hydra";
···
checks = forAllSystems (pkgs: {
format-deadcode-check = pkgs.stdenvNoCC.mkDerivation {
-
name = "format_deadcode_check";
+
name = "deadcode_check";
src = ./.;
dontPatch = true;
dontConfigure = true;
···
buildInputs = with pkgs; [alejandra deadnix];
buildPhase = ''
set -euo pipefail
-
echo "######## Checking flake ########"
deadnix -f .
-
alejandra -c . 2>/dev/null
echo "All done!"
'';
+1 -1
global/core.nix
···
# FIXME: doesn't seem to actually update anything
system.autoUpgrade = lib.mkDefault {
enable = false;
-
flake = "https://patchy.soopy.moe/cassie/genso-nix/archive/main.tar.gz";
+
flake = "https://patchy.soopy.moe/cassie/gensokyo/archive/main.tar.gz";
dates = "*-*-* *:00/15:00";
flags = [
"--options"
+1 -1
justfile
···
# switch to the current configuration
switch system="": sudo_cache
-
sudo nixos-rebuild -v -L switch --flake .#{{system}} --accept-flake-config
+
sudo nixos-rebuild -v -L switch --flake .#{{system}} --accept-flake-config --keep-going
# literally nixos-rebuild boot with a different name
defer system="": sudo_cache
+1 -9
systems/koumakan/services/static-sites/default.nix
···
{...}: {
imports = [
-
./keine.nix
-
./photography.nix
./assets.nix
./nonbunary.nix
];
···
default = true;
useACMEHost = "global.c.soopy.moe";
forceSSL = true;
-
# locations."/".return = "301 https://gensokyo.soopy.moe";
-
# TODO: remove after bringing back up all the services.
locations = {
-
"/".return = "503";
-
"~ ^/(index.html|splash.png)".root = "/srv/www/maintenance";
+
"/".root = "/srv/www/fallback";
};
-
extraConfig = ''
-
error_page 503 /index.html;
-
'';
};
}
-25
systems/koumakan/services/static-sites/keine.nix
···
-
{_utils, ...}: {
-
services.nginx.virtualHosts."keine.soopy.moe" = _utils.mkVhost {
-
forceSSL = false;
-
addSSL = true; # Don't force SSL on a mirror (implications TBD)
-
-
root = "/srv/www/keine";
-
locations = {
-
"/".extraConfig = ''
-
fancyindex_header "/theme/index_header.html";
-
'';
-
"/theme/".alias = "/srv/www/misc/keine/theme/";
-
"/static/".alias = "/srv/www/misc/keine/theme/static/";
-
};
-
-
extraConfig = ''
-
fancyindex on;
-
fancyindex_header "/theme/header.html";
-
fancyindex_footer "/theme/footer.html";
-
fancyindex_show_path off;
-
fancyindex_name_length 255;
-
fancyindex_exact_size off;
-
fancyindex_localtime on;
-
'';
-
};
-
}
+2 -2
users/cassie/home/dev/editors.nix
···
};
theme = {
mode = "system";
-
light = "Catppuccin Latte";
-
dark = lib.mkForce "Catppuccin Mocha";
+
# light = "Catppuccin Latte";
+
dark = lib.mkForce "Catppuccin Mocha (pink)";
};
# editing settings
+1 -1
users/cassie/home/media.nix
···
}:
lib.mkIf traits.gui {
home.packages = [
-
pkgs.gimp-with-plugins
+
pkgs.gimp
pkgs.kdePackages.kdenlive
];
}