chandlerswift/machine-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: chandlerswift:83a61385410d9c3833d44011df376d0661f5ae1a
Branches Tags
chandlerswift:main
...
compare: chandlerswift:c10a3036c81f83add75b97c966df0cffec800fb2
Branches Tags
chandlerswift:main

4 commits
83a6138541 ... c10a3036c8

Author SHA1 Message Date
Chandler Swift c10a3036c8
oscar: Switch factorio -> factorio-space-age 
For a new version that hasn't hit `nixpkgs-unstable` yet, use this
instead of the second change below:

    # (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/<commit hash>.tar.gz") {
    #   config.allowUnfree = true;
    # }).factorio-space-age
 2024-11-30 21:35:26 -06:00
Chandler Swift fb48169985
oscar: Set up beets configuration 
Eventually, I want to get the subsonicupdate plugin working, but that'll
require credentials, and I don't want those to be committed in my config
here.
 2024-11-30 12:55:50 -06:00
Chandler Swift 85570010c6
oscar: Add .direnv to global gitignore 2024-11-30 12:55:43 -06:00
Chandler Swift 898a98ef1e
bert: Serve swiftgang.net on www instead 2024-11-30 12:55:38 -06:00
3 changed files with 47 additions and 4 deletions
Show stats Expand all files Collapse all files

25
bert/services/http/index.nix
View file

@ -23,5 +23,30 @@
metrics # Enable Prometheus monitoring metrics # Enable Prometheus monitoring
} }
''; '';
virtualHosts.":80" = {
serverAliases = [":443"];
extraConfig = ''
respond <<EOF
<!DOCTYPE html>
<html>
<head>
<title>not found - chandlerswift.com</title>
<style>
body {
width: 35em;
margin: 0 auto;
font-family: Tahoma, Verdana, Arial, sans-serif;
}
</style>
</head>
<body>
<h1>not found - chandlerswift.com</h1>
<p>This page is hosted with <a href="https://chandlerswift.com/">chandlerswift.com</a>,
but the site couldn't be found.</p>
</body>
</html>
EOF 404
'';
};
}; };
} }

5
bert/services/http/swiftgang.net.nix
View file

@ -1,6 +1,9 @@
{ {
services.caddy.virtualHosts."swiftgang.net".extraConfig = '' # GoDaddy can't do flattening to apply a CNAME to an apex record. So we use
# their "forwarding" (redirect-as-a-service) to redirect to www.…, which we
# _can_ CNAME.
services.caddy.virtualHosts."www.swiftgang.net".extraConfig = ''
encode zstd gzip encode zstd gzip
file_server file_server
root * /srv/www/swiftgang.net root * /srv/www/swiftgang.net

21
oscar/configuration.nix
View file

@ -124,8 +124,8 @@
home-manager.users.chandler = { pkgs, ... }: { home-manager.users.chandler = { pkgs, ... }: {
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"factorio-alpha"
"discord" "discord"
"factorio-space-age"
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -145,7 +145,6 @@
qgis qgis
# command line applications # command line applications
beets
iperf iperf
units units
@ -165,7 +164,7 @@
# Unfree: # Unfree:
discord discord
factorio factorio-space-age
]; ];
programs.thunderbird.enable = true; programs.thunderbird.enable = true;
@ -218,6 +217,7 @@
"*~" "*~"
"\\#*\\#" "\\#*\\#"
"venv" "venv"
".direnv"
]; ];
hooks = { hooks = {
pre-commit = ./git-pre-commit-hook; pre-commit = ./git-pre-commit-hook;
@ -251,6 +251,21 @@
# }; # };
}; };
programs.beets = {
enable = true;
settings = {
directory = "~/nas/chandler/public/media/music";
library = "~/nas/chandler/public/media/music/beets.db";
plugins = [
"fetchart"
# "lyrics"
# "subsonicupdate" # TODO
"mbsubmit"
"edit"
];
};
};
programs.chromium = { programs.chromium = {
enable = true; enable = true;
extensions = [ extensions = [