Compare commits

..

1 commit

Author SHA1 Message Date
d4e12d46b3
Flake, flake-part+easy-host, remove unused inputs
IF YOU ARE NOT ME: I would not use this configuration. In the past I
would feel confident telling you to drop in your own host and be off to
the races, but right now users are in a state which required hard coding
some of my nominal preferences. Read on for more specifics

Completely refactors the flake.nix part of the repo. This removes my
strange legacy code for directory-based hosts+users in favor of using
easy-host and flake-parts.

As a result of this some specialArgs were lost, namely the list of users
and the username being passed. I think this is the right way to go in
the short term, but it has lead to some hardcoded values. Namely "pan"
is created as a user regardless of configuration

In tandem with this is the deprecation of some modules which had inputs
in flake which I wasn't using. I'm sure there is a better way to do
this, but I didn't like downloading and caching them every time when I
knew I wasn't using them.

I'm currently very unhappy with the users part of this change, but that
wasn't the goal of this branch. I will revisit in a larger commit.
2025-11-19 09:38:33 -08:00
6 changed files with 40 additions and 26 deletions

View file

@ -27,8 +27,7 @@
tuigreet.enable = true;
niri.enable = true;
tailscale.enable = true;
postgres.enable = true;
shell.enabledShells = [ "fish" ];

View file

@ -1,4 +1,4 @@
[Kabal]
["TheKabal2.4"]
["DropboxGuest3.0"]

View file

@ -1,5 +1,9 @@
wireless: ENC[AES256_GCM,data:VU8tpeCgEFSUC490q1hGgBrdFFscL2QybywlpiFG3suofj2Q2VVXKLK4EpF2ebpf/nBf/ggHv/uoSFxuQYYvIsMIo1bYOKvM5QNMi9HO2KmfFbmQYYzmt5CNNh9tno9wmiekeDOnKjQDGK5CoGLD4+y+VW1IVrN9XL+xRxAszgYM4qdSim7CJ1hgU89OgzVL9poVsmqxbiuWY88+ZErIspSHO0QwGOJ5Pc4OixEK2N3EtcYDhV5fBvlFv7t4b8P6BJZIn2NVXCVaW4UcEsefcxHqohd5AuYXJH7wt9aPwJRJehxd9GhVJeQ6QtPXuqZaEspd+dSvlYrvdO8pFTrIklrty30CJg3WberWmI111T8ZNFlNBghSu6nXzO9YkKfDuAYUEPVERL9jG9xF8tGb1JxhOmg33Kg6fg==,iv:07Reckni7LSfDL3qVUv4v80IOVQSbFpz49UsyiIDGWk=,tag:iMgCspLUWNCjjYT0pkMwDw==,type:str]
wireless: ENC[AES256_GCM,data:pQv+gdAW8W9nSEJkbXWex47iuuqgJMEELldFsmgk2Y08MDZ1ytXqlphTK/jbewD3tpz4v29fSuWamv1uZpxM2+c2zCuMVTdrhAf0i/Sjqd9CWP8NQvTDI3v8ps9REFzR7n7hywnkfOkDNwRkmavSfCxK5k9SQLNC7De6P811/Fundb9r6oeIH2OEDBkZEHw8gYndjy6cLDUE2SY/cmxRsKWhATsCLcWKOpQa86zlT9dr9nMtYVF1AN5T4JR/7QKqJ8UT4mvhAA0OEfKv0Cf3euH24vtBrv5YxwDT6tQpOABOyOy9mWLc+bXDID/HX4akeU1O6+eBSpNeRgpAcMfD6b/eqKAvDvnixHubu9GemVspmeoA/91i5B70u3kjm0EKup7KLXCp5RutLnLRczDPdfbCB7bEipeRyF8P+UCuhQ==,iv:WN7mGyHpaMDdLRpFGyDUQ2D9a0t/rucfyKroJYqaHPs=,tag:7KTzBEt30nqCJclDgiWuKg==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age:
- recipient: age1ey3wr2wnkgny3dfgvnyrf0cptwzr7s5x464p2y9ya58lpay8lfrsds3y68
enc: |
@ -19,7 +23,8 @@ sops:
Ky83VFhiVE9wK01UMDlSbnIrd2d2SHcKp6mF8PaR0ItrvLHpEgMe6fwuboyrrs9y
7Ct6qZ1SN/4f/xJpDP2qiaQ4KTZzY1BlC3isT3CWeajOQhL/y5JCOw==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-08-27T05:30:04Z"
mac: ENC[AES256_GCM,data:hoSykxuHPAofdbXNJCyozeQYYhg3yXLOVx+K9PsSctUMrIc9ii76SDGY2h+6gFNy1rGkPxmYHueqHEJHvvoxLHcwkwoN8AddOVrnXNoIpOvwcn0GfpPIPf5rCvxSxvcsZwPW+affMMVRyRR8aJ3llj7ojuuuyTnm+HL9H9vY1PQ=,iv:pUXl49AqRerTlGoOzoWt0NrEo8rqPmBF7yiB4ZufC3M=,tag:1mP3jsP2O6yKlJVmaA7EMQ==,type:str]
lastmodified: "2024-11-07T21:12:36Z"
mac: ENC[AES256_GCM,data:z0ePEvsEKvcMca2x2qjTsSBwk+qI3jd8h2uAnSsGtJL5UI1OdBL8oVIGKty0pGaCvtrF01UN1ncKBGe5y12Vij2yuyv7LK4ANArxQ4+O583NdYHYeD+T75yGu4SAYjcoM23RD1h+W0SLQpCen2J3WYmJaOjtqMBv/gaFYl/DV7I=,iv:VJjZTd1g4oJCDLEp8+jH15Y2svTNtQUE1vc3WQoJJZU=,tag:4U7uh6U5PwHJ2r6/WFUbnw==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.10.2
version: 3.9.1

View file

@ -38,24 +38,24 @@
# XDG Compliance
nix.settings.use-xdg-base-directories = true;
users = {
users = builtins.listToAttrs (map (
user: {
name = user;
value = {
name = user;
isNormalUser = true;
extraGroups = [ "network" ];
};
}
) [ "pan" ]);
groups = {
wheel = {
members = config.system.users.bigWheels;
};
network = { };
};
};
# users = {
# users = builtins.listToAttrs (map (
# user: {
# name = user;
# value = {
# name = user;
# isNormalUser = true;
# extraGroups = [ "network" ];
# };
# }
# ) usernameList);
# groups = {
# wheel = {
# members = config.system.users.bigWheels;
# };
# network = { };
# };
# };
fonts = {
enableDefaultPackages = true;

View file

@ -20,7 +20,7 @@
'';
package = pkgs.caddy.withPlugins {
plugins = [ "github.com/caddy-dns/porkbun@v0.3.1" ];
hash = "sha256-NlZY/EEY9TbqrMAkSHK2aGm5AjFTvpvBXV1GW1PnXCc=";
hash = "sha256-j/GODingW5BhfjQRajinivX/9zpiLGgyxvAjX0+amRU=";
};
virtualHosts = config.caddy.vhosts;
email = config.caddy.adminEmail;

10
users/badtz@juri/user.nix Normal file
View file

@ -0,0 +1,10 @@
{ config, pkgs, ... }:
{
fish.enable = true;
git = {
enable = true;
username = "Badtz";
email = "may@badtz.dev";
};
}