Compare commits

...

8 commits

Author SHA1 Message Date
Anish Lakhwara 33bfb2c745 grasp stopped working :( 2023-01-13 21:22:46 +10:00
Anish Lakhwara bc60d64b5b add shortcuts to ssh into lituus and helix 2023-01-13 21:22:33 +10:00
Anish Lakhwara c0055bf8cc grasp stopped working :( 2023-01-13 21:22:24 +10:00
Anish Lakhwara b8d7e4117e update backup module to use /run/agenix/borg-key for key location 2023-01-13 21:22:10 +10:00
Anish Lakhwara 4bb578ac1a add borg key to secrets so we don't have to manually put keys into place
for backup
2023-01-13 21:21:48 +10:00
Anish Lakhwara bee12b2edf update grasp manually?? 2023-01-13 15:24:39 +10:00
Anish Lakhwara d0f906a6d6 somehow still didn't update wireguard-server with new curve pubkey 2023-01-13 15:11:10 +10:00
Anish Lakhwara 998d50288b bspSwallow lol 2023-01-13 15:00:03 +10:00
10 changed files with 13 additions and 14 deletions

View file

@ -226,9 +226,9 @@
}, },
"locked": { "locked": {
"lastModified": 1652615971, "lastModified": 1652615971,
"narHash": "sha256-e8fvTQCR/At2jgenuY71WXN13XawYRiMpKiHSGgGSkY=", "narHash": "sha256-7O3taCOtdn2icAqgza+k6/bfRZxsimoIE1D85TAHK/8=",
"ref": "main", "ref": "main",
"rev": "ef605857248ec1b60cece250f98d2964164d48db", "rev": "247c1d1acb6e07ef90418755501696a2d0c88211",
"revCount": 19, "revCount": 19,
"type": "git", "type": "git",
"url": "ssh://gitea@git.sealight.xyz/aynish/grasp.git" "url": "ssh://gitea@git.sealight.xyz/aynish/grasp.git"

View file

@ -218,7 +218,7 @@
self.nixosModules.wireguard self.nixosModules.wireguard
self.nixosModules.wallabag self.nixosModules.wallabag
self.nixosModules.gonic self.nixosModules.gonic
grasp.nixosModule # grasp.nixosModule
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

View file

@ -297,7 +297,7 @@
kssh = "kitten +kitty ssh"; kssh = "kitten +kitty ssh";
smm = "ssh 10.0.69.4"; # box over wireguard smm = "ssh 10.0.69.4"; # box over wireguard
sm = "ssh mossnet.lan"; # box regular sm = "ssh mossnet.lan"; # box regular
ss = "ssh sealight.xyz"; # helix sl = "ssh sealight.xyz"; # lituus
# sl = "ssh 69.61.38.225"; # lituus has become helix sh = "ssh git.sealight.xyz"; # helix
}; };
} }

View file

@ -116,7 +116,7 @@ in
".local/bin/powermenu".source = ./bin/powermenu; ".local/bin/powermenu".source = ./bin/powermenu;
".local/bin/screenshot".source = ./bin/screenshot; ".local/bin/screenshot".source = ./bin/screenshot;
".local/bin/mpv-ify".source = ./bin/mpv-ify; ".local/bin/mpv-ify".source = ./bin/mpv-ify;
".local/bin/bspwallow".source = ./bin/bspswallow; ".local/bin/bspswallow".source = ./bin/bspswallow;
".config/bspwm/terminals".text = "Kitty"; ".config/bspwm/terminals".text = "Kitty";
".config/eww/eww.yuck".source = ./eww/eww.yuck; ".config/eww/eww.yuck".source = ./eww/eww.yuck;
".config/eww/eww.scss".source = ./eww/eww.scss; ".config/eww/eww.scss".source = ./eww/eww.scss;

View file

@ -22,11 +22,10 @@
../profiles/woodpecker-agent ../profiles/woodpecker-agent
]; ];
# For some reason this doesn't work in the profile, but does over here?? # Something broke when manually updating grasp...
# Something weird in the way I'm importing nixpkgs in the profile or something # services.grasp.enable = true;
services.grasp.enable = true; # services.grasp.path = "/home/anish/kitaab/grasp/grasp.wiki";
services.grasp.path = "/home/anish/kitaab/grasp/grasp.wiki"; # services.grasp.user = "anish";
services.grasp.user = "anish";
# Backups # Backups
age.secrets.borg-password.file = "${self}/secrets/borg-password.age"; age.secrets.borg-password.file = "${self}/secrets/borg-password.age";

View file

@ -103,7 +103,6 @@ in
yt-dlp yt-dlp
]; ];
location.provider = "geoclue2"; location.provider = "geoclue2";
services = { services = {
redshift = { redshift = {

View file

@ -28,7 +28,7 @@
} }
{ {
# curve # curve
publicKey = "kzw+51vVYkitGmSMJPAj1jdhzmxhvmSrrIQ4Ar8wzlI="; publicKey = "zkC7IzXX16i2ixqnRrPlUq2fD2/4noe84FlZBFaDBEE=";
allowedIPs = [ "10.0.69.2/32" ]; allowedIPs = [ "10.0.69.2/32" ];
} }
{ {

View file

@ -43,7 +43,7 @@ in
mode = "repokey-blake2"; mode = "repokey-blake2";
passCommand = "cat /run/agenix/borg-password"; passCommand = "cat /run/agenix/borg-password";
}; };
environment = { BORG_RSH = "ssh -i /root/borg/borg-key"; }; # YOU NEED TO PUT THIS HERE MANUALLY environment = { BORG_RSH = "ssh -i /run/agenix/borg-key"; };
compression = "auto,lzma"; compression = "auto,lzma";
startAt = "daily"; startAt = "daily";
extraArgs = "--remote-path=borg1"; extraArgs = "--remote-path=borg1";

BIN
secrets/borg-key.age Normal file

Binary file not shown.

View file

@ -19,6 +19,7 @@ in
"wallabag-secret.age".publicKeys = [ mossnet ]; "wallabag-secret.age".publicKeys = [ mossnet ];
"borg-password.age".publicKeys = systemOnly; "borg-password.age".publicKeys = systemOnly;
"borg-key.age".publicKeys = systemOnly;
"freshrss-dbpass.age".publicKeys = [ helix ]; "freshrss-dbpass.age".publicKeys = [ helix ];
"synapse-config.age".publicKeys = [ lituus ]; "synapse-config.age".publicKeys = [ lituus ];
"synapse-database-password.age".publicKeys = [ lituus ]; "synapse-database-password.age".publicKeys = [ lituus ];