update lock file remove tabs

This commit is contained in:
2026-09-12 20:33:30 -04:00
parent 7142cba4c2
commit f8e9d1ab30
14 changed files with 159 additions and 171 deletions
Generated
+16 -16
View File
@@ -9,11 +9,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1785518313, "lastModified": 1788879443,
"narHash": "sha256-anlq3YQDCsNrkNlu3HTg4dEIpRugwnyAVUxoPcBmA/U=", "narHash": "sha256-qb9sL86UCUEd3SYAda4ItN1NV0vhMSdbpA64WckvVI0=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "b974715a27b49fadbf3bf6d85e26bcb3109daa6d", "rev": "414ac5f35d79aabe5a0bf52451d8cf61eadf6c88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -58,11 +58,11 @@
"grasswren": { "grasswren": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1783801496, "lastModified": 1788394295,
"narHash": "sha256-awQZQVk5jz8ZyNCEnqarBZENKP7RvKHN8QRuDQJY7YA=", "narHash": "sha256-Fg8PUA0tG5/N8fYWpsOHo0j1+Bnez8G0d8Xd3K63zb8=",
"ref": "main", "ref": "main",
"rev": "4d505fe6467e14b6e37b89e2e9e3a3b2bbf6649f", "rev": "5123b8e9873b7f413c080ba97f01feb85be51808",
"revCount": 4, "revCount": 5,
"type": "git", "type": "git",
"url": "https://code.grasswren.net/Lilac/Grasswren.git" "url": "https://code.grasswren.net/Lilac/Grasswren.git"
}, },
@@ -79,11 +79,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1785119570, "lastModified": 1789182507,
"narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=", "narHash": "sha256-9nt4W0HNNP84B+b37yRs9Zxat1ZR5guJxEZDEjAgex4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d", "rev": "b1d1b60084970f9d1e2b72662639dab6d039be71",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -111,11 +111,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1785599192, "lastModified": 1789114715,
"narHash": "sha256-dg4RTtDxnXY13UkJNdhmgTUTl0n/IJBlCigfO7nutZw=", "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6d65bfc1bcef2ef39a239d38e577e92a89fb0f07", "rev": "21a67dc470149f337cecafbe965d8d252a390518",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -156,11 +156,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1783174389, "lastModified": 1788914643,
"narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", "rev": "13616fff713a9f94055c66f15687ebdc17a335df",
"type": "github" "type": "github"
}, },
"original": { "original": {
+13 -19
View File
@@ -41,6 +41,7 @@
./hosts/vps/default.nix ./hosts/vps/default.nix
]; ];
}; };
backup = nixpkgs.lib.nixosSystem { backup = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
@@ -51,18 +52,20 @@
}; };
}; };
homeConfigurations.lilac = home-manager.lib.homeManagerConfiguration { deploy.nodes = {
pkgs = import nixpkgs { system = "x86_64-linux"; }; desktop = {
modules = [ hostname = "10.0.0.2";
./home/lilac.nix sshUser = "root";
]; magicRollbackTimeout = 120;
profiles.system = {
user = "root";
remoteBuild = false;
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.desktop;
};
}; };
# nix run github:nix-community/nixos-anywhere -- --flake .#<CONFIGURATION> --phases install root@<ADDRESS>
# nix run github:serokell/deploy-rs
deploy.nodes = {
vps = { vps = {
hostname = "216.128.177.13"; hostname = "10.0.0.3";
sshUser = "root"; sshUser = "root";
magicRollbackTimeout = 120; magicRollbackTimeout = 120;
profiles.system = { profiles.system = {
@@ -72,16 +75,6 @@
}; };
}; };
desktop = {
hostname = "192.168.1.133";
sshUser = "root";
magicRollbackTimeout = 120;
profiles.system = {
user = "root";
remoteBuild = false;
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.desktop;
};
};
backup = { backup = {
hostname = "10.0.0.4"; hostname = "10.0.0.4";
sshUser = "root"; sshUser = "root";
@@ -93,6 +86,7 @@
}; };
}; };
}; };
checks = { checks = {
x86_64-linux = deploy-rs.lib.x86_64-linux.deployChecks self.deploy; x86_64-linux = deploy-rs.lib.x86_64-linux.deployChecks self.deploy;
}; };
+1 -7
View File
@@ -14,13 +14,7 @@ in
enable = true; enable = true;
virtualHosts."grasswren.net".extraConfig = '' virtualHosts."grasswren.net".extraConfig = ''
encode encode
root * ${website}/home root * ${website}
file_server
'';
virtualHosts."blog.grasswren.net".extraConfig = ''
encode
root * ${website}/blog
file_server file_server
''; '';
}; };