Remove sops & add acs service
This commit is contained in:
@@ -1,7 +0,0 @@
|
|||||||
keys:
|
|
||||||
- &server age1xhpcja6q6us9r44qvwxeqdq4y03n8l9xlq68uumew6gzm2tshgwq4ufd2l
|
|
||||||
creation_rules:
|
|
||||||
- path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
|
|
||||||
key_groups:
|
|
||||||
- age:
|
|
||||||
- *server
|
|
||||||
+29
-9
@@ -12,6 +12,11 @@
|
|||||||
|
|
||||||
networking.hostName = "syedm";
|
networking.hostName = "syedm";
|
||||||
|
|
||||||
|
nix.settings.experimental-features = [
|
||||||
|
"nix-command"
|
||||||
|
"flakes"
|
||||||
|
];
|
||||||
|
|
||||||
# Configure network connections interactively with nmcli or nmtui.
|
# Configure network connections interactively with nmcli or nmtui.
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
@@ -47,7 +52,7 @@
|
|||||||
# List packages installed in system profile.
|
# List packages installed in system profile.
|
||||||
# You can use https://search.nixos.org/ to find more packages (and options).
|
# You can use https://search.nixos.org/ to find more packages (and options).
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
sops
|
nodejs
|
||||||
age
|
age
|
||||||
eza
|
eza
|
||||||
yazi
|
yazi
|
||||||
@@ -60,13 +65,6 @@
|
|||||||
git
|
git
|
||||||
];
|
];
|
||||||
|
|
||||||
# Secrets file
|
|
||||||
sops.age.keyFile = "/home/me/.config/sops/age/keys.txt";
|
|
||||||
sops.secrets."main.env" = {
|
|
||||||
sopsFile = ../secrets/main.env;
|
|
||||||
format = "dotenv";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable the OpenSSH daemon.
|
# Enable the OpenSSH daemon.
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
||||||
@@ -78,6 +76,9 @@
|
|||||||
virtualHosts."git.syedm.dev".extraConfig = ''
|
virtualHosts."git.syedm.dev".extraConfig = ''
|
||||||
reverse_proxy localhost:3000
|
reverse_proxy localhost:3000
|
||||||
'';
|
'';
|
||||||
|
virtualHosts."acs.syedm.dev".extraConfig = ''
|
||||||
|
reverse_proxy localhost:3709
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
services.gitea = {
|
services.gitea = {
|
||||||
@@ -100,7 +101,26 @@
|
|||||||
session.COOKIE_SECURE = true;
|
session.COOKIE_SECURE = true;
|
||||||
log.LEVEL = "Info";
|
log.LEVEL = "Info";
|
||||||
};
|
};
|
||||||
lfs.enable = true;
|
};
|
||||||
|
|
||||||
|
systemd.services.msjd = {
|
||||||
|
description = "Msjd";
|
||||||
|
after = [ "network.target" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
WorkingDirectory = "/home/me/main/msjd";
|
||||||
|
ExecStart = "${pkgs.nodejs}/bin/node index.mjs";
|
||||||
|
|
||||||
|
User = "me";
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = 3;
|
||||||
|
|
||||||
|
Environment = [
|
||||||
|
"NODE_ENV=production"
|
||||||
|
"PORT=3709"
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Open ports in the firewall.
|
# Open ports in the firewall.
|
||||||
|
|||||||
Generated
+1
-36
@@ -16,44 +16,9 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1775888245,
|
|
||||||
"narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "13043924aaa7375ce482ebe2494338e058282925",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs"
|
||||||
"sops-nix": "sops-nix"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"sops-nix": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs_2"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1782165805,
|
|
||||||
"narHash": "sha256-478kKQBvK6SYTOdN2h9jhKJv94nbXRbFMfuL1WshErg=",
|
|
||||||
"owner": "Mic92",
|
|
||||||
"repo": "sops-nix",
|
|
||||||
"rev": "56b24064fdcaedca53553b1a6d607fd23b613a24",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "Mic92",
|
|
||||||
"repo": "sops-nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
+2
-4
@@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
|
||||||
sops-nix.url = "github:Mic92/sops-nix";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ self, nixpkgs, sops-nix, ... }:
|
outputs = inputs@{ self, nixpkgs, ... }:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
in {
|
in {
|
||||||
@@ -13,8 +12,7 @@
|
|||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
sops-nix.nixosModules.sops
|
# ./flakes/cloudflare-ddns.nix ! to be readded when fixed secret management
|
||||||
./flakes/cloudflare-ddns.nix
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -290,6 +290,13 @@ end)
|
|||||||
map("n", "<ScrollWheelDown>", function()
|
map("n", "<ScrollWheelDown>", function()
|
||||||
neoscroll.scroll(0.05, { move_cursor = false, duration = 20 })
|
neoscroll.scroll(0.05, { move_cursor = false, duration = 20 })
|
||||||
end)
|
end)
|
||||||
|
map("n", "<C-Up>", function()
|
||||||
|
neoscroll.scroll(-0.1, { move_cursor = false, duration = 50 })
|
||||||
|
end)
|
||||||
|
map("n", "<C-Down>", function()
|
||||||
|
neoscroll.scroll(0.1, { move_cursor = false, duration = 50 })
|
||||||
|
end)
|
||||||
|
|
||||||
|
|
||||||
-- Vimscript stuff
|
-- Vimscript stuff
|
||||||
vim.cmd([[
|
vim.cmd([[
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ source /run/secrets/main.env
|
|||||||
|
|
||||||
cache=/var/lib/cloudflare-ddns/old_ip
|
cache=/var/lib/cloudflare-ddns/old_ip
|
||||||
IP=$(@curl@/bin/curl -s 'https://api.ipify.org')
|
IP=$(@curl@/bin/curl -s 'https://api.ipify.org')
|
||||||
arr=("" "git." "www.")
|
arr=("" "git." "www." "acs.")
|
||||||
|
|
||||||
if [[ -f "$cache" ]]; then
|
if [[ -f "$cache" ]]; then
|
||||||
old_ip=$(cat "$cache")
|
old_ip=$(cat "$cache")
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
CLOUDFLARE_API_TOKEN=ENC[AES256_GCM,data:qUc5v0dwbAedM/uQ1s2A0/c8nU/NipWz79mkAkdm2l/pC+NcmCEhsA==,iv:u/G6hR32Xay8j23XGHcKWnZo/6q9mDfIMQOgG+KMO78=,tag:0hGvWe9Gj0PsYdRqnFKeBA==,type:str]
|
|
||||||
ZONE_ID=ENC[AES256_GCM,data:o3fUyWND1dE1I5nAiRYKyPZTqCvOTPl/r1i98PC0ZPk=,iv:pXb+IZblnePYmMxr9J4Y7Ie8DdzP0yI5JXRPr2C+kWE=,tag:7cjM891ard+GZoyiCqDoow==,type:str]
|
|
||||||
sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJVXJaQjU0eEErUU94NG1j\ndllZbjhNcW5qY0pueFJmWkZlb1dPcXBuS1hZCnZSMlJhRzhGWFJSTVNnWndOaHJP\nd3FzQXY5TGoxTmZiVFJhYy83RHI1dGcKLS0tIElGNktpZ0QrWXROcExqZEhPbVN1\nalJPS0tNQXY2N0NrZlNTT3FvMG1tSlkKrX+LWOibAN79q5kQiBqnRHpiGAqej/Co\nFm8GMQKFYK3UJGidIXDz2JfMy5I26kBXKBlup2hGwGIA7veghkskVQ==\n-----END AGE ENCRYPTED FILE-----\n
|
|
||||||
sops_age__list_0__map_recipient=age1xhpcja6q6us9r44qvwxeqdq4y03n8l9xlq68uumew6gzm2tshgwq4ufd2l
|
|
||||||
sops_lastmodified=2026-07-02T20:21:19Z
|
|
||||||
sops_mac=ENC[AES256_GCM,data:BsZxChuzgqTMnSgpRqe1UFqdhXPaA03hXnTXbzuQPal1OCTJ1YIAEbcjvkxf69dQ0zTm68vcl4nV2fS7pLmz5wkexiU5/tfuHEcVhRu1eAtHj5LpR9wBWOoOLH1BkZQWDOWPhCm91+K+3LQZg6dfOj5Vq0ukHHfXwSBPFiAEWcs=,iv:pK0I5ho6cN+lmAnhxugcTRoDZ2IiDyYemxP4jpnpkk0=,tag:MMIy8lPUKhhY2F4JRRN3Lw==,type:str]
|
|
||||||
sops_unencrypted_suffix=_unencrypted
|
|
||||||
sops_version=3.13.1
|
|
||||||
Reference in New Issue
Block a user