Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Compare commits

base: Toast:0dbd1faaa637643939703fd566432cef0b52c17a
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05
..
compare: Toast:9b1e8798c0fb33b06b48b18206f0b23730903214
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05

No commits in common. "0dbd1faaa637643939703fd566432cef0b52c17a" and "9b1e8798c0fb33b06b48b18206f0b23730903214" have entirely different histories.
0dbd1faaa6 ... 9b1e8798c0

7 changed files with 3 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -28,8 +28,7 @@ inputs = {
nix-impermanence.url = "github:nix-community/impermanence"; nix-impermanence.url = "github:nix-community/impermanence";
}; };
outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nixos-hardware, nix-impermanence, ... } @inputs: { outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nixos-hardware, nix-impermanence, ... }: {
devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell { devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
name = "Environment for toast's nixos configurations"; name = "Environment for toast's nixos configurations";
# The agenix cli is not needed to activate a configuration, so instead of installing it # The agenix cli is not needed to activate a configuration, so instead of installing it
@ -47,7 +46,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
nixosConfigurations = { nixosConfigurations = {
Archie = nixpkgs-unstable.lib.nixosSystem { Archie = nixpkgs-unstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { systemPkgs = inputs.nixpkgs-unstable; };
/* /*
I used to set up nixpkgs in the flake, but doing that made I used to set up nixpkgs in the flake, but doing that made
defining overlays in modules impossible (or at least I could defining overlays in modules impossible (or at least I could
@ -69,7 +67,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
SurfaceGo = nixpkgs.lib.nixosSystem { SurfaceGo = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { systemPkgs = inputs.nixpkgs; };
modules = [ modules = [
# Needed for nix-index # Needed for nix-index
{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
@ -85,7 +82,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
Everest = nixpkgs.lib.nixosSystem { Everest = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { systemPkgs = inputs.nixpkgs; };
modules = [ modules = [
# Needed for nix-index # Needed for nix-index
{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }

2
roles/common/default.nix
View file

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
./programs ./programs
./services ./services/avahi.nix
./configuration.nix ./configuration.nix
]; ];
} }

5
roles/common/programs/nix.nix
View file

@ -1,4 +1,4 @@
{ config, systemPkgs, ... }: { config, ... }:
{ {
nix = { nix = {
@ -10,9 +10,6 @@ experimental-features = nix-command flakes
from = { id = "agenix"; type = "indirect"; }; from = { id = "agenix"; type = "indirect"; };
to = { owner = "ryantm"; repo = "agenix"; type = "github"; }; to = { owner = "ryantm"; repo = "agenix"; type = "github"; };
}; };
# Write the system's nixpkgs into the registry to avoid mixing nixpkgs versions
# https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html
system.flake = systemPkgs;
}; };
}; };
} }

8
roles/common/services/default.nix
View file

@ -1,8 +0,0 @@
{ ... }:
{
imports = [
./avahi.nix
./tailscale.nix
];
}

8
roles/common/services/tailscale.nix
View file

@ -1,8 +0,0 @@
{ config, lib, ... }:
{
services.tailscale = {
enable = true;
useRoutingFeatures = lib.mkDefault "client";
};
}

1
roles/server/default.nix
View file

@ -13,6 +13,5 @@
./ddclient.nix ./ddclient.nix
./beep.nix ./beep.nix
./wireguard.nix ./wireguard.nix
./tailscale.nix
]; ];
} }

8
roles/server/tailscale.nix
View file

@ -1,8 +0,0 @@
{ config, ... }:
{
services.tailscale = {
# This is needed for being an exit node
useRoutingFeatures = "server";
};
}