Compare commits
4 Commits
6b9d78bca9
...
e95ae14387
Author | SHA1 | Date |
---|---|---|
Nathan McCarty | e95ae14387 | |
Nathan McCarty | 84423b944f | |
Nathan McCarty | 7da34f3a2b | |
Nathan McCarty | ed7265a9ca |
24
flake.lock
24
flake.lock
|
@ -187,11 +187,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696465873,
|
"lastModified": 1696642103,
|
||||||
"narHash": "sha256-j26imSACLbJZNnR3ph6t4oq8fzpDJUxpTzuysGjysic=",
|
"narHash": "sha256-cbqYTfPrinbMSaljex1TmPNtmRP6f4uQjHngzg+oGws=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "3d1a1679604e9de18a46a9a0819daf2044b08fa6",
|
"rev": "38e242953df06b7b90a09fd7a1480a9cfcdd6ba8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -427,11 +427,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696161939,
|
"lastModified": 1696614066,
|
||||||
"narHash": "sha256-HI1DxS//s46/qv9dcW06TzXaBjxL2DVTQP8R1QsnHzM=",
|
"narHash": "sha256-nAyYhO7TCr1tikacP37O9FnGr2USOsVBD3IgvndUYjM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "0ab3ee718e964fb42dc57ace6170f19cb0b66532",
|
"rev": "bb2db418b616fea536b1be7f6ee72fb45c11afe0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -490,11 +490,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696193975,
|
"lastModified": 1696375444,
|
||||||
"narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=",
|
"narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242",
|
"rev": "81e8f48ebdecf07aab321182011b067aafc78896",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -909,11 +909,11 @@
|
||||||
"systems": "systems_5"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696465495,
|
"lastModified": 1696637457,
|
||||||
"narHash": "sha256-m4/A8JOyqZ8Aajx6L+hSt+taY4Yy/Wqcj1pZEVzWEfY=",
|
"narHash": "sha256-pimOQjYB7LAGWKIOS0GlrH1Axm//H5NmrjBK//aSANI=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "158b5892bd6057d812c3432b9043800063aef333",
|
"rev": "feb5df591cc1f17608532c7709d5fc349298fbc6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -26,6 +26,9 @@
|
||||||
nixfmt
|
nixfmt
|
||||||
# For email
|
# For email
|
||||||
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.mu
|
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.mu
|
||||||
|
meson
|
||||||
|
pkg-config
|
||||||
|
glib
|
||||||
# Desktop file for org-protocol
|
# Desktop file for org-protocol
|
||||||
(makeDesktopItem {
|
(makeDesktopItem {
|
||||||
name = "org-protocol";
|
name = "org-protocol";
|
||||||
|
@ -42,7 +45,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
package = config.nathan.programs.emacs.package;
|
package = config.nathan.programs.emacs.package;
|
||||||
extraPackages = epkgs: [
|
extraPackages = epkgs: [
|
||||||
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.mu
|
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.emacsPackages.mu4e
|
||||||
epkgs.vterm
|
epkgs.vterm
|
||||||
epkgs.pdf-tools
|
epkgs.pdf-tools
|
||||||
epkgs.emacsql
|
epkgs.emacsql
|
||||||
|
|
|
@ -22,27 +22,27 @@ with lib; {
|
||||||
"levitation" = {
|
"levitation" = {
|
||||||
forwardAgent = true;
|
forwardAgent = true;
|
||||||
user = "nathan";
|
user = "nathan";
|
||||||
hostname = "100.95.223.6";
|
hostname = "100.119.205.155";
|
||||||
};
|
};
|
||||||
"perception" = {
|
"perception" = {
|
||||||
forwardAgent = true;
|
forwardAgent = true;
|
||||||
user = "nathan";
|
user = "nathan";
|
||||||
hostname = "100.121.150.78";
|
hostname = "100.104.25.128";
|
||||||
};
|
};
|
||||||
"oracles" = {
|
"oracles" = {
|
||||||
forwardAgent = true;
|
forwardAgent = true;
|
||||||
user = "nathan";
|
user = "nathan";
|
||||||
hostname = "100.66.15.34";
|
hostname = "100.123.211.72";
|
||||||
};
|
};
|
||||||
"tounge" = {
|
"tounge" = {
|
||||||
forwardAgent = true;
|
forwardAgent = true;
|
||||||
user = "nathan";
|
user = "nathan";
|
||||||
hostname = "100.75.37.98";
|
hostname = "100.89.216.133";
|
||||||
};
|
};
|
||||||
"universe" = {
|
"universe" = {
|
||||||
forwardAgent = true;
|
forwardAgent = true;
|
||||||
user = "nathan";
|
user = "nathan";
|
||||||
hostname = "100.93.40.58";
|
hostname = "100.75.76.143";
|
||||||
};
|
};
|
||||||
"shadowchild" = {
|
"shadowchild" = {
|
||||||
forwardAgent = true;
|
forwardAgent = true;
|
||||||
|
@ -52,7 +52,7 @@ with lib; {
|
||||||
"fusion" = {
|
"fusion" = {
|
||||||
forwardAgent = true;
|
forwardAgent = true;
|
||||||
user = "nathan";
|
user = "nathan";
|
||||||
hostname = "100.99.69.14";
|
hostname = "100.91.102.137";
|
||||||
};
|
};
|
||||||
"pendulum" = {
|
"pendulum" = {
|
||||||
forwardAgent = true;
|
forwardAgent = true;
|
||||||
|
|
|
@ -123,7 +123,8 @@ with nLib; {
|
||||||
package = pkgs.firefox-beta-bin;
|
package = pkgs.firefox-beta-bin;
|
||||||
};
|
};
|
||||||
nathan.programs.emacs.package =
|
nathan.programs.emacs.package =
|
||||||
lib.mkDefault inputs.emacs.packages."${pkgs.system}".emacsUnstablePgtk;
|
#lib.mkDefault inputs.emacs.packages."${pkgs.system}".emacsUnstablePgtk;
|
||||||
|
lib.mkDefault inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".emacs29-pgtk;
|
||||||
# We should be managing xdg stuff
|
# We should be managing xdg stuff
|
||||||
xdg = {
|
xdg = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -47,7 +47,7 @@ let
|
||||||
|
|
||||||
in lib.mkMerge [
|
in lib.mkMerge [
|
||||||
{ # Setup hosts for gitea automation
|
{ # Setup hosts for gitea automation
|
||||||
networking.hosts = { "100.99.69.14" = [ "git.stranger.systems" ]; };
|
networking.hosts = { "100.91.102.137" = [ "git.stranger.systems" ]; };
|
||||||
# Setup the bot user
|
# Setup the bot user
|
||||||
users.users."strangerbot" = {
|
users.users."strangerbot" = {
|
||||||
home = "/home/strangerbot";
|
home = "/home/strangerbot";
|
||||||
|
|
|
@ -80,8 +80,8 @@
|
||||||
ports = [
|
ports = [
|
||||||
"10.0.0.10:53:53/tcp"
|
"10.0.0.10:53:53/tcp"
|
||||||
"10.0.0.10:53:53/udp"
|
"10.0.0.10:53:53/udp"
|
||||||
"100.75.37.98:53:53/tcp"
|
"100.89.216.133:53:53/tcp"
|
||||||
"100.75.37.98:53:53/udp"
|
"100.89.216.133:53:53/udp"
|
||||||
"3080:80"
|
"3080:80"
|
||||||
"30443:443"
|
"30443:443"
|
||||||
];
|
];
|
||||||
|
@ -138,7 +138,7 @@
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "mccarty.io";
|
useACMEHost = "mccarty.io";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://100.121.150.78:8989";
|
proxyPass = "http://100.104.25.128:8989";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow 100.64.0.0/10;
|
allow 100.64.0.0/10;
|
||||||
deny all;
|
deny all;
|
||||||
|
@ -149,7 +149,7 @@
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "mccarty.io";
|
useACMEHost = "mccarty.io";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://100.121.150.78:7878";
|
proxyPass = "http://100.104.25.128:7878";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow 100.64.0.0/10;
|
allow 100.64.0.0/10;
|
||||||
deny all;
|
deny all;
|
||||||
|
@ -160,7 +160,7 @@
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "mccarty.io";
|
useACMEHost = "mccarty.io";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://100.121.150.78:8080";
|
proxyPass = "http://100.104.25.128:8080";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow 100.64.0.0/10;
|
allow 100.64.0.0/10;
|
||||||
deny all;
|
deny all;
|
||||||
|
@ -171,7 +171,7 @@
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "mccarty.io";
|
useACMEHost = "mccarty.io";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://100.121.150.78:8686";
|
proxyPass = "http://100.104.25.128:8686";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow 100.64.0.0/10;
|
allow 100.64.0.0/10;
|
||||||
deny all;
|
deny all;
|
||||||
|
@ -182,7 +182,7 @@
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "mccarty.io";
|
useACMEHost = "mccarty.io";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://100.121.150.78:8181";
|
proxyPass = "http://100.104.25.128:8181";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow 100.64.0.0/10;
|
allow 100.64.0.0/10;
|
||||||
deny all;
|
deny all;
|
||||||
|
@ -193,7 +193,7 @@
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "mccarty.io";
|
useACMEHost = "mccarty.io";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://100.121.150.78:6767";
|
proxyPass = "http://100.104.25.128:6767";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow 100.64.0.0/10;
|
allow 100.64.0.0/10;
|
||||||
deny all;
|
deny all;
|
||||||
|
@ -204,7 +204,7 @@
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "mccarty.io";
|
useACMEHost = "mccarty.io";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://100.121.150.78:8096";
|
proxyPass = "http://100.104.25.128:8096";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow all;
|
allow all;
|
||||||
'';
|
'';
|
||||||
|
@ -214,7 +214,7 @@
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "mccarty.io";
|
useACMEHost = "mccarty.io";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://100.121.150.78:5055";
|
proxyPass = "http://100.104.25.128:5055";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow all;
|
allow all;
|
||||||
'';
|
'';
|
||||||
|
@ -224,7 +224,7 @@
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "mccarty.io";
|
useACMEHost = "mccarty.io";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://100.121.150.78:5690";
|
proxyPass = "http://100.104.25.128:5690";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow all;
|
allow all;
|
||||||
'';
|
'';
|
||||||
|
@ -234,7 +234,7 @@
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "mccarty.io";
|
useACMEHost = "mccarty.io";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://100.121.150.78:8265";
|
proxyPass = "http://100.104.25.128:8265";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow 100.64.0.0/10;
|
allow 100.64.0.0/10;
|
||||||
deny all;
|
deny all;
|
||||||
|
@ -245,7 +245,7 @@
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "mccarty.io";
|
useACMEHost = "mccarty.io";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://100.121.150.78:5000";
|
proxyPass = "http://100.104.25.128:5000";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow 100.64.0.0/10;
|
allow 100.64.0.0/10;
|
||||||
deny all;
|
deny all;
|
||||||
|
@ -256,7 +256,7 @@
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "mccarty.io";
|
useACMEHost = "mccarty.io";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://100.121.150.78:13378";
|
proxyPass = "http://100.104.25.128:13378";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow 100.64.0.0/10;
|
allow 100.64.0.0/10;
|
||||||
deny all;
|
deny all;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
tailscale-auth: ENC[AES256_GCM,data:J4pi60joCvfxtgH481G9ptTkiGptjGzCAihRVTIqnFUsYhRyVtypGUVIFXwpdJEjhWaNc33QFD9N,iv:8ldCUYVHnBD6fR9hwMap5OwM1NL4IvBtiYorMaddY34=,tag:9dpx7lGRDRoic1RzVdkXmw==,type:str]
|
tailscale-auth: ENC[AES256_GCM,data:nZrNpT34NydQ9D/a7VZaU8dwFWdIunirQMzNAGu9uUhVVNObUGnp9E1JoGBDxRw08zdoepQf1O0l,iv:eLX7d5DixCh5SPc05WBBGwN2aAcp1ryDwy0k0l1FwPg=,tag:kfOSKMaV5j9L0eUHmWdqsg==,type:str]
|
||||||
sops:
|
sops:
|
||||||
kms: []
|
kms: []
|
||||||
gcp_kms: []
|
gcp_kms: []
|
||||||
|
@ -95,8 +95,8 @@ sops:
|
||||||
QVNPdEN1bXI5OUo5ZHRnc3RwdHZNN00KlZ0bh4g4+xufO8WpglndHCbh84H729UV
|
QVNPdEN1bXI5OUo5ZHRnc3RwdHZNN00KlZ0bh4g4+xufO8WpglndHCbh84H729UV
|
||||||
BjuIN0w4eROuDLq1yaRw8SgT8e3kKllZKO2b4x8VzgUBsx5G3R4fIg==
|
BjuIN0w4eROuDLq1yaRw8SgT8e3kKllZKO2b4x8VzgUBsx5G3R4fIg==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2023-08-05T19:56:45Z"
|
lastmodified: "2023-10-07T08:08:06Z"
|
||||||
mac: ENC[AES256_GCM,data:ZxnXNcV+bfkHzbbR47Ho6Y4PZnqLkDOFNskqQrCQRMI9Pdeivrpgnv8lB+WUCJnsLFa3a2T5/KAzcB0F7ZjkCeNY9J3ryyR0OxrYWqrjdU9HZeIDOBaODh9k90w9BfP0dN7nGIu6KCNAxxuZm6rGqIdyeqnxvsYtudfseCrvEXQ=,iv:GQklRlSJGZXHjdwC6UIgtCkFErEOsxFDMbmNdwr3UGs=,tag:lr9I6aCLhWc9ZEZmIKWvbA==,type:str]
|
mac: ENC[AES256_GCM,data:Ch5edtdKiq5Kqt9RqxmRU6j6PM7dnftJkcKJwZWhVIYZ9kLiim63fBABTCSZzp1hobA/+rq3dilNTcvVGp2vQwK3ATxTkgiTYbnPUdtRUUdCX4IcqM82G8WXh7CSu79spwBcc3AuRf1cPuVke1qyLzhVbdky4ayeH4nfdiA2REc=,iv:tz2TxjwaDWPQXgLS13aAYIK7AV2mAHOWm+YnQNG+iOw=,tag:9edB2q77gsKBIBDz7Sojfw==,type:str]
|
||||||
pgp: []
|
pgp: []
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.7.3
|
version: 3.7.3
|
||||||
|
|
Loading…
Reference in New Issue