nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nix:e95ae14387522de5d9b42ae8a3b678902a5fe847
Branches Tags
nix:trunk
..
compare: nix:6b9d78bca99192147c06402dfd53500cb667b815
Branches Tags
nix:trunk

No commits in common. "e95ae14387522de5d9b42ae8a3b678902a5fe847" and "6b9d78bca99192147c06402dfd53500cb667b815" have entirely different histories.
e95ae14387 ... 6b9d78bca9

7 changed files with 38 additions and 42 deletions
Show Stats Expand all files Collapse all files

24
flake.lock
View File

@ -187,11 +187,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1696642103,
"narHash": "sha256-cbqYTfPrinbMSaljex1TmPNtmRP6f4uQjHngzg+oGws=",
"lastModified": 1696465873,
"narHash": "sha256-j26imSACLbJZNnR3ph6t4oq8fzpDJUxpTzuysGjysic=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "38e242953df06b7b90a09fd7a1480a9cfcdd6ba8",
"rev": "3d1a1679604e9de18a46a9a0819daf2044b08fa6",
"type": "github"
},
"original": {
@ -427,11 +427,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1696614066,
"narHash": "sha256-nAyYhO7TCr1tikacP37O9FnGr2USOsVBD3IgvndUYjM=",
"lastModified": 1696161939,
"narHash": "sha256-HI1DxS//s46/qv9dcW06TzXaBjxL2DVTQP8R1QsnHzM=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "bb2db418b616fea536b1be7f6ee72fb45c11afe0",
"rev": "0ab3ee718e964fb42dc57ace6170f19cb0b66532",
"type": "github"
},
"original": {
@ -490,11 +490,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1696375444,
"narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=",
"lastModified": 1696193975,
"narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "81e8f48ebdecf07aab321182011b067aafc78896",
"rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242",
"type": "github"
},
"original": {
@ -909,11 +909,11 @@
"systems": "systems_5"
},
"locked": {
"lastModified": 1696637457,
"narHash": "sha256-pimOQjYB7LAGWKIOS0GlrH1Axm//H5NmrjBK//aSANI=",
"lastModified": 1696465495,
"narHash": "sha256-m4/A8JOyqZ8Aajx6L+hSt+taY4Yy/Wqcj1pZEVzWEfY=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "feb5df591cc1f17608532c7709d5fc349298fbc6",
"rev": "158b5892bd6057d812c3432b9043800063aef333",
"type": "github"
},
"original": {

5
home-manager/common/programs/emacs.nix
View File

@ -26,9 +26,6 @@
nixfmt
# For email
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.mu
meson
pkg-config
glib
# Desktop file for org-protocol
(makeDesktopItem {
name = "org-protocol";
@ -45,7 +42,7 @@
enable = true;
package = config.nathan.programs.emacs.package;
extraPackages = epkgs: [
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.emacsPackages.mu4e
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.mu
epkgs.vterm
epkgs.pdf-tools
epkgs.emacsql

12
home-manager/common/programs/ssh.nix
View File

@ -22,27 +22,27 @@ with lib; {
"levitation" = {
forwardAgent = true;
user = "nathan";
hostname = "100.119.205.155";
hostname = "100.95.223.6";
};
"perception" = {
forwardAgent = true;
user = "nathan";
hostname = "100.104.25.128";
hostname = "100.121.150.78";
};
"oracles" = {
forwardAgent = true;
user = "nathan";
hostname = "100.123.211.72";
hostname = "100.66.15.34";
};
"tounge" = {
forwardAgent = true;
user = "nathan";
hostname = "100.89.216.133";
hostname = "100.75.37.98";
};
"universe" = {
forwardAgent = true;
user = "nathan";
hostname = "100.75.76.143";
hostname = "100.93.40.58";
};
"shadowchild" = {
forwardAgent = true;
@ -52,7 +52,7 @@ with lib; {
"fusion" = {
forwardAgent = true;
user = "nathan";
hostname = "100.91.102.137";
hostname = "100.99.69.14";
};
"pendulum" = {
forwardAgent = true;

3
home-manager/linux/default.nix
View File

@ -123,8 +123,7 @@ with nLib; {
package = pkgs.firefox-beta-bin;
};
nathan.programs.emacs.package =
#lib.mkDefault inputs.emacs.packages."${pkgs.system}".emacsUnstablePgtk;
lib.mkDefault inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".emacs29-pgtk;
lib.mkDefault inputs.emacs.packages."${pkgs.system}".emacsUnstablePgtk;
# We should be managing xdg stuff
xdg = {
enable = true;

2
machines/oracles/automation.nix
View File

@ -47,7 +47,7 @@ let
in lib.mkMerge [
{ # Setup hosts for gitea automation
networking.hosts = { "100.91.102.137" = [ "git.stranger.systems" ]; };
networking.hosts = { "100.99.69.14" = [ "git.stranger.systems" ]; };
# Setup the bot user
users.users."strangerbot" = {
home = "/home/strangerbot";

28
machines/tounge/configuration.nix
View File

@ -80,8 +80,8 @@
ports = [
"10.0.0.10:53:53/tcp"
"10.0.0.10:53:53/udp"
"100.89.216.133:53:53/tcp"
"100.89.216.133:53:53/udp"
"100.75.37.98:53:53/tcp"
"100.75.37.98:53:53/udp"
"3080:80"
"30443:443"
];
@ -138,7 +138,7 @@
forceSSL = true;
useACMEHost = "mccarty.io";
locations."/" = {
proxyPass = "http://100.104.25.128:8989";
proxyPass = "http://100.121.150.78:8989";
extraConfig = ''
allow 100.64.0.0/10;
deny all;
@ -149,7 +149,7 @@
forceSSL = true;
useACMEHost = "mccarty.io";
locations."/" = {
proxyPass = "http://100.104.25.128:7878";
proxyPass = "http://100.121.150.78:7878";
extraConfig = ''
allow 100.64.0.0/10;
deny all;
@ -160,7 +160,7 @@
forceSSL = true;
useACMEHost = "mccarty.io";
locations."/" = {
proxyPass = "http://100.104.25.128:8080";
proxyPass = "http://100.121.150.78:8080";
extraConfig = ''
allow 100.64.0.0/10;
deny all;
@ -171,7 +171,7 @@
forceSSL = true;
useACMEHost = "mccarty.io";
locations."/" = {
proxyPass = "http://100.104.25.128:8686";
proxyPass = "http://100.121.150.78:8686";
extraConfig = ''
allow 100.64.0.0/10;
deny all;
@ -182,7 +182,7 @@
forceSSL = true;
useACMEHost = "mccarty.io";
locations."/" = {
proxyPass = "http://100.104.25.128:8181";
proxyPass = "http://100.121.150.78:8181";
extraConfig = ''
allow 100.64.0.0/10;
deny all;
@ -193,7 +193,7 @@
forceSSL = true;
useACMEHost = "mccarty.io";
locations."/" = {
proxyPass = "http://100.104.25.128:6767";
proxyPass = "http://100.121.150.78:6767";
extraConfig = ''
allow 100.64.0.0/10;
deny all;
@ -204,7 +204,7 @@
forceSSL = true;
useACMEHost = "mccarty.io";
locations."/" = {
proxyPass = "http://100.104.25.128:8096";
proxyPass = "http://100.121.150.78:8096";
extraConfig = ''
allow all;
'';
@ -214,7 +214,7 @@
forceSSL = true;
useACMEHost = "mccarty.io";
locations."/" = {
proxyPass = "http://100.104.25.128:5055";
proxyPass = "http://100.121.150.78:5055";
extraConfig = ''
allow all;
'';
@ -224,7 +224,7 @@
forceSSL = true;
useACMEHost = "mccarty.io";
locations."/" = {
proxyPass = "http://100.104.25.128:5690";
proxyPass = "http://100.121.150.78:5690";
extraConfig = ''
allow all;
'';
@ -234,7 +234,7 @@
forceSSL = true;
useACMEHost = "mccarty.io";
locations."/" = {
proxyPass = "http://100.104.25.128:8265";
proxyPass = "http://100.121.150.78:8265";
extraConfig = ''
allow 100.64.0.0/10;
deny all;
@ -245,7 +245,7 @@
forceSSL = true;
useACMEHost = "mccarty.io";
locations."/" = {
proxyPass = "http://100.104.25.128:5000";
proxyPass = "http://100.121.150.78:5000";
extraConfig = ''
allow 100.64.0.0/10;
deny all;
@ -256,7 +256,7 @@
forceSSL = true;
useACMEHost = "mccarty.io";
locations."/" = {
proxyPass = "http://100.104.25.128:13378";
proxyPass = "http://100.121.150.78:13378";
extraConfig = ''
allow 100.64.0.0/10;
deny all;

6
secrets/all/tailscale.yaml
View File

@ -1,4 +1,4 @@
tailscale-auth: ENC[AES256_GCM,data:nZrNpT34NydQ9D/a7VZaU8dwFWdIunirQMzNAGu9uUhVVNObUGnp9E1JoGBDxRw08zdoepQf1O0l,iv:eLX7d5DixCh5SPc05WBBGwN2aAcp1ryDwy0k0l1FwPg=,tag:kfOSKMaV5j9L0eUHmWdqsg==,type:str]
tailscale-auth: ENC[AES256_GCM,data:J4pi60joCvfxtgH481G9ptTkiGptjGzCAihRVTIqnFUsYhRyVtypGUVIFXwpdJEjhWaNc33QFD9N,iv:8ldCUYVHnBD6fR9hwMap5OwM1NL4IvBtiYorMaddY34=,tag:9dpx7lGRDRoic1RzVdkXmw==,type:str]
sops:
kms: []
gcp_kms: []
@ -95,8 +95,8 @@ sops:
QVNPdEN1bXI5OUo5ZHRnc3RwdHZNN00KlZ0bh4g4+xufO8WpglndHCbh84H729UV
BjuIN0w4eROuDLq1yaRw8SgT8e3kKllZKO2b4x8VzgUBsx5G3R4fIg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2023-10-07T08:08:06Z"
mac: ENC[AES256_GCM,data:Ch5edtdKiq5Kqt9RqxmRU6j6PM7dnftJkcKJwZWhVIYZ9kLiim63fBABTCSZzp1hobA/+rq3dilNTcvVGp2vQwK3ATxTkgiTYbnPUdtRUUdCX4IcqM82G8WXh7CSu79spwBcc3AuRf1cPuVke1qyLzhVbdky4ayeH4nfdiA2REc=,iv:tz2TxjwaDWPQXgLS13aAYIK7AV2mAHOWm+YnQNG+iOw=,tag:9edB2q77gsKBIBDz7Sojfw==,type:str]
lastmodified: "2023-08-05T19:56:45Z"
mac: ENC[AES256_GCM,data:ZxnXNcV+bfkHzbbR47Ho6Y4PZnqLkDOFNskqQrCQRMI9Pdeivrpgnv8lB+WUCJnsLFa3a2T5/KAzcB0F7ZjkCeNY9J3ryyR0OxrYWqrjdU9HZeIDOBaODh9k90w9BfP0dN7nGIu6KCNAxxuZm6rGqIdyeqnxvsYtudfseCrvEXQ=,iv:GQklRlSJGZXHjdwC6UIgtCkFErEOsxFDMbmNdwr3UGs=,tag:lr9I6aCLhWc9ZEZmIKWvbA==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3