qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flake,h: switch from startpage to gostart

Browse Source
This commit is contained in:
Aaron Bieber 2022-12-05 20:23:12 -07:00
parent 5d0caed601
commit fa7ed95114
No known key found for this signature in database
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
flake.nix
View File

@ -35,8 +35,8 @@
url = "github:qbit/microca";
inputs.nixpkgs.follows = "unstable";
};
startpage = {
url = "github:qbit/startpage";
gostart = {
url = "github:qbit/gostart";
inputs.nixpkgs.follows = "unstable";
};
taskobs = {
@ -69,7 +69,7 @@
};
outputs = { self, unstable, unstableSmall, stable, oldStable, nixos-hardware
, reform, sshKnownHosts, microca, startpage, xintray, tsvnstat, taskobs
, reform, sshKnownHosts, microca, gostart, xintray, tsvnstat, taskobs
, mcchunkie, gqrss, darwin, xin-secrets, peerix, ... }@inputs:
let
supportedSystems =
@ -95,7 +95,7 @@
inputs.microca.overlay
inputs.taskobs.overlay
inputs.reform.overlay
inputs.startpage.overlay
inputs.gostart.overlay
];
# Set our configurationRevison based on the status of our git repo.
@ -163,10 +163,8 @@
devShells.aarch64-darwin.default = buildShell darwinPkgs;
nixosConfigurations = {
europa = buildSys "x86_64-linux" unstable [
nixos-hardware.nixosModules.framework
startpage.nixosModule
] "europa";
europa = buildSys "x86_64-linux" unstable
[ nixos-hardware.nixosModules.framework ] "europa";
stan = buildSys "x86_64-linux" unstable [ ] "stan";
weather = buildSys "aarch64-linux" stable
[ nixos-hardware.nixosModules.raspberry-pi-4 ] "weather";
@ -175,7 +173,10 @@
box = buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "box";
luna = buildSys "x86_64-linux" stable
[ "${nixos-hardware}/common/cpu/intel" ] "luna";
h = buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "h";
h = buildSys "x86_64-linux" stable [
./configs/hardened.nix
gostart.nixosModule
] "h";
router =
buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "router";

1
hosts/europa/default.nix
View File

@ -103,7 +103,6 @@ in {
programs.steam.enable = true;
services = {
startpage.enable = false;
vnstat.enable = true;
clamav.updater.enable = true;
emacs = {

8
hosts/h/default.nix
View File

@ -88,6 +88,10 @@ in {
sopsFile = config.xin-secrets.h.services;
owner = config.users.users.golink.name;
};
gostart = {
sopsFile = config.xin-secrets.h.services;
owner = config.users.users.gostart.name;
};
wireguard_private_key = { sopsFile = config.xin-secrets.h.services; };
};
@ -192,6 +196,10 @@ in {
};
services = {
gostart = {
enable = true;
keyPath = "${config.sops.secrets.gostart.path}";
};
golink = {
enable = true;
keyFile = "${config.sops.secrets.golink.path}";