ashe
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deploy-rs config, also put the rest of system in seance

Browse Source
main
Ashelyn Rose 8 months ago
parent c5f644a26a
commit 2e4551e0fc
4 changed files with 192 additions and 76 deletions
Show Stats Download Patch File Download Diff File

216
flake.lock
Unescape Escape View File

@ -20,12 +20,32 @@
"url": "ssh://git@git.tempest.dev/ashe/ashen-earth"
}
},
"drowning": {
"deploy-rs": {
"inputs": {
"nix-filter": "nix-filter_2",
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_2",
"utils": "utils_2"
},
"locked": {
"lastModified": 1694513707,
"narHash": "sha256-wE5kHco3+FQjc+MwTPwLVqYz4hM7uno2CgXDXUFMCpc=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "31c32fb2959103a796e07bbe47e0a5e287c343a8",
"type": "github"
},
"original": {
"owner": "serokell",
"repo": "deploy-rs",
"type": "github"
}
},
"drowning": {
"inputs": {
"nix-filter": "nix-filter_2",
"nixpkgs": "nixpkgs_3",
"utils": "utils_3"
},
"locked": {
"lastModified": 1692988995,
"narHash": "sha256-10eW6UHXSYrZ7koYtOx2Ue3XTpw1GU/AKCZfyfQNWoE=",
@ -40,11 +60,27 @@
"url": "http://git.tempest.dev/ashe/drowning-among-stars"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"gotosocial": {
"inputs": {
"nix-filter": "nix-filter_3",
"nixpkgs": "nixpkgs_3",
"utils": "utils_3"
"nixpkgs": "nixpkgs_4",
"utils": "utils_4"
},
"locked": {
"lastModified": 1686992620,
@ -65,7 +101,7 @@
"nixpkgs": [
"nixpkgs"
],
"utils": "utils_4"
"utils": "utils_5"
},
"locked": {
"lastModified": 1685325875,
@ -84,7 +120,7 @@
},
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs_10"
"nixpkgs": "nixpkgs_11"
},
"locked": {
"lastModified": 1679567394,
@ -222,6 +258,22 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1685005470,
"narHash": "sha256-Nw+4uivzCwyZcEB71YH58zYk4N5UgcNeqb+D52bjlhI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "60a2bc32e7369caf2f009f701ca98a8622abfdb3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1684759798,
"narHash": "sha256-Kpbf5yKvKcj/yPqE1zYC6gju4JwTsYxTIZEvOII0jr4=",
@ -235,7 +287,7 @@
"type": "indirect"
}
},
"nixpkgs_11": {
"nixpkgs_12": {
"locked": {
"lastModified": 1684759798,
"narHash": "sha256-Kpbf5yKvKcj/yPqE1zYC6gju4JwTsYxTIZEvOII0jr4=",
@ -252,6 +304,22 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1671417167,
"narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1686547151,
"narHash": "sha256-lnu+ziAXNa3iiPtFVg9Ex7ZUcsYCb7zZVpv9OiB1iac=",
@ -267,7 +335,7 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs_4": {
"locked": {
"lastModified": 1686433093,
"narHash": "sha256-mgsBp6ldpjYzw69fTDsGjbkRkDw+KEab8lYijNb/x5M=",
@ -283,7 +351,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_5": {
"locked": {
"lastModified": 1686929285,
"narHash": "sha256-WGtVzn+vGMPTXDO0DMNKVFtf+zUSqeW+KKk4Y/Ae99I=",
@ -299,7 +367,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_6": {
"locked": {
"lastModified": 1685394864,
"narHash": "sha256-kkWyAz7pFXn5g28vUjBTFOZafT0oCLr5s5Z/B13aPEI=",
@ -315,7 +383,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_7": {
"locked": {
"lastModified": 1694928810,
"narHash": "sha256-M/3+pRQmM+FeBeSKRp0b01pncbNiiC2ggJE4Wpi7c1Q=",
@ -331,7 +399,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_8": {
"locked": {
"lastModified": 1687026603,
"narHash": "sha256-4uVirBZbSgpVtkoRXD4IxTe9UXRcIKhxT4CUK+3Bby8=",
@ -347,7 +415,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_9": {
"locked": {
"lastModified": 1686979235,
"narHash": "sha256-gBlBtk+KrezFkfMrZw6uwTuA7YWtbFciiS14mEoTCo0=",
@ -363,33 +431,17 @@
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1685005470,
"narHash": "sha256-Nw+4uivzCwyZcEB71YH58zYk4N5UgcNeqb+D52bjlhI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "60a2bc32e7369caf2f009f701ca98a8622abfdb3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"private": {
"inputs": {
"nixpkgs": "nixpkgs_5",
"utils": "utils_5"
"nixpkgs": "nixpkgs_6",
"utils": "utils_6"
},
"locked": {
"lastModified": 1694970110,
"narHash": "sha256-k/AA4qK1H7m8Lwal6W1sY2+7iyjg6p7BJOctKtbD4O0=",
"lastModified": 1694976662,
"narHash": "sha256-7XA2h1GrNYF7iijIz0z7/JhOQvhq7MiLwQqMD9ljUt8=",
"ref": "refs/heads/main",
"rev": "86361e2fc09e0c288b212100008bd07434bd539a",
"revCount": 12,
"rev": "48d6af78431308b69bc3227f2d4b48d14b8572fd",
"revCount": 14,
"type": "git",
"url": "ssh://git@git.tempest.dev/ashe/nixos-config-private"
},
@ -401,10 +453,11 @@
"root": {
"inputs": {
"ashen-earth": "ashen-earth",
"deploy-rs": "deploy-rs",
"drowning": "drowning",
"gotosocial": "gotosocial",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_5",
"private": "private",
"seance": "seance",
"tempest-contact": "tempest-contact",
@ -416,15 +469,15 @@
"seance": {
"inputs": {
"nix-filter": "nix-filter_4",
"nixpkgs": "nixpkgs_6",
"utils": "utils_6"
"nixpkgs": "nixpkgs_7",
"utils": "utils_7"
},
"locked": {
"lastModified": 1694937094,
"narHash": "sha256-6Ce7Q7V+eo92eUPEMeQ+2dWGdqDtlXxCLiEYT4fp80U=",
"lastModified": 1694976446,
"narHash": "sha256-FsSSsoPZUsofee4Y2ruYM2URIAHe8Mv0TWb56uOa8Og=",
"ref": "refs/heads/nix",
"rev": "4ff992755fe5b4cfabad83f373cc1e4e912f5de6",
"revCount": 80,
"rev": "6be78f56e5dfa0ec22aa2251ddfa3dc53ac5eb33",
"revCount": 81,
"type": "git",
"url": "ssh://git@git.tempest.dev/ashe/seance"
},
@ -586,8 +639,8 @@
"tempest-contact": {
"inputs": {
"nix-filter": "nix-filter_5",
"nixpkgs": "nixpkgs_7",
"utils": "utils_7"
"nixpkgs": "nixpkgs_8",
"utils": "utils_8"
},
"locked": {
"lastModified": 1687029231,
@ -606,8 +659,8 @@
"tempest-secret": {
"inputs": {
"nix-filter": "nix-filter_6",
"nixpkgs": "nixpkgs_8",
"utils": "utils_8"
"nixpkgs": "nixpkgs_9",
"utils": "utils_9"
},
"locked": {
"lastModified": 1685398072,
@ -626,8 +679,8 @@
"tempestdev": {
"inputs": {
"nix-filter": "nix-filter_7",
"nixpkgs": "nixpkgs_9",
"utils": "utils_9"
"nixpkgs": "nixpkgs_10",
"utils": "utils_10"
},
"locked": {
"lastModified": 1692434292,
@ -646,8 +699,8 @@
"tmpfiles": {
"inputs": {
"naersk": "naersk",
"nixpkgs": "nixpkgs_11",
"utils": "utils_10"
"nixpkgs": "nixpkgs_12",
"utils": "utils_11"
},
"locked": {
"lastModified": 1684903753,
@ -682,6 +735,24 @@
}
},
"utils_10": {
"inputs": {
"systems": "systems_9"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_11": {
"inputs": {
"systems": "systems_10"
},
@ -700,6 +771,21 @@
}
},
"utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_3": {
"inputs": {
"systems": "systems_2"
},
@ -717,7 +803,7 @@
"type": "github"
}
},
"utils_3": {
"utils_4": {
"inputs": {
"systems": "systems_3"
},
@ -735,7 +821,7 @@
"type": "github"
}
},
"utils_4": {
"utils_5": {
"inputs": {
"systems": "systems_4"
},
@ -753,7 +839,7 @@
"type": "github"
}
},
"utils_5": {
"utils_6": {
"inputs": {
"systems": "systems_5"
},
@ -771,7 +857,7 @@
"type": "github"
}
},
"utils_6": {
"utils_7": {
"inputs": {
"systems": "systems_6"
},
@ -789,7 +875,7 @@
"type": "github"
}
},
"utils_7": {
"utils_8": {
"inputs": {
"systems": "systems_7"
},
@ -807,7 +893,7 @@
"type": "github"
}
},
"utils_8": {
"utils_9": {
"inputs": {
"systems": "systems_8"
},
@ -824,24 +910,6 @@
"repo": "flake-utils",
"type": "github"
}
},
"utils_9": {
"inputs": {
"systems": "systems_9"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",

31
flake.nix
Unescape Escape View File

@ -1,6 +1,7 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
deploy-rs.url = "github:serokell/deploy-rs";
home-manager.url = "github:nix-community/home-manager/release-22.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
private.url = "git+ssh://git@git.tempest.dev/ashe/nixos-config-private";
@ -14,9 +15,22 @@
seance.url = "git+ssh://git@git.tempest.dev/ashe/seance";
};
outputs = { self, nixpkgs, home-manager, private, tmpfiles, tempestdev, tempest-secret, tempest-contact, gotosocial, ashen-earth, drowning, seance }: {
outputs = {
self,
nixpkgs,
deploy-rs,
home-manager,
private,
tmpfiles,
tempestdev,
tempest-secret,
tempest-contact,
gotosocial,
ashen-earth,
drowning,
seance
}: {
nixosConfigurations = {
nyx = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
@ -51,5 +65,18 @@
];
};
};
deploy.nodes.nyx.hostname = "nyx.tempest.dev";
deploy.nodes.nyx.profiles.system = {
user = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.nyx;
sshUser = "rose";
sshOpts = [ "-t" ];
fastConnection = true;
magicRollback = false;
};
checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
};
}

1
hosts/nyx/configuration.nix
Unescape Escape View File

@ -17,6 +17,7 @@
"http://hemera.tempest.local"
];
nix.trustedUsers = [ "rose" ];
nix.settings.trusted-public-keys = [
"hemera.tempest.local:Tb4edCxlB4YNGJNnVYrpNkTmG82tCChVNXdes33y2kY="
];

20
hosts/nyx/include/seance.nix
Unescape Escape View File

@ -15,6 +15,26 @@
messagePattern = "[tT](#|,|:-) ?(?P<content>.*)";
commandPrefix = "t";
};
members.rose = {
messagePattern = "[rR](#|,|:-) ?(?P<content>.*)";
commandPrefix = "r";
};
members.echo = {
messagePattern = "[eE](#|,|:-) ?(?P<content>.*)";
commandPrefix = "e";
};
members.dawn = {
messagePattern = "[dD](#|,|:-) ?(?P<content>.*)";
commandPrefix = "d";
};
members.harrow = {
messagePattern = "[hH](#|,|:-) ?(?P<content>.*)";
commandPrefix = "h";
};
};
};
}

Write Preview
Loading…
Cancel
Save