walkah/athens
1
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

🚨 formatting tweaks

Browse Source
This commit is contained in:
James Walker
2025-08-18 10:31:48 -04:00
parent ac03db4f87
commit 9fbe64a194
4 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751313918, "lastModified": 1755275010,
"narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", "narHash": "sha256-lEApCoWUEWh0Ifc3k1JdVjpMtFFXeL2gG1qvBnoRc2I=",
"owner": "nix-darwin", "owner": "nix-darwin",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", "rev": "7220b01d679e93ede8d7b25d6f392855b81dd475",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -40,11 +40,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1747046372,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -81,11 +81,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752814804, "lastModified": 1755491080,
"narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", "narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", "rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -166,11 +166,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1752900028, "lastModified": 1755268003,
"narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=", "narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6b4955211758ba47fac850c040a27f23b9b4008f", "rev": "32f313e49e42f715491e1ea7b306a87c16fe0388",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -205,11 +205,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750779888, "lastModified": 1755446520,
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "narHash": "sha256-I0Ok1OGDwc1jPd8cs2VvAYZsHriUVFGIUqW+7uSsOUM=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "rev": "4b04db83821b819bbbe32ed0a025b31e7971f22e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -384,11 +384,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752544651, "lastModified": 1754988908,
"narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2c8def626f54708a9c38a5861866660395bb3461", "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
nix/darwin.nix
View File

@@ -18,7 +18,8 @@ let
networking.hostName = hostName; networking.hostName = hostName;
nixpkgs.overlays = [ self.overlays.default ]; nixpkgs.overlays = [ self.overlays.default ];
}) })
] ++ modules; ]
++ modules;
specialArgs = { inherit home-manager; }; specialArgs = { inherit home-manager; };
}; };
in in

3
nix/nixos.nix
View File

@@ -21,7 +21,8 @@ let
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
}) })
{ nixpkgs.hostPlatform = hostSystem; } { nixpkgs.hostPlatform = hostSystem; }
] ++ modules; ]
++ modules;
specialArgs = { inherit raspberry-pi-nix sops-nix; }; specialArgs = { inherit raspberry-pi-nix sops-nix; };
}; };
in in

33
nix/users/walkah/default.nix
View File

@@ -1,23 +1,22 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
users.users.walkah = users.users.walkah = {
{ home = if pkgs.stdenv.isDarwin then "/Users/walkah" else "/home/walkah";
home = if pkgs.stdenv.isDarwin then "/Users/walkah" else "/home/walkah"; shell = pkgs.zsh;
shell = pkgs.zsh; openssh.authorizedKeys.keys = [
openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ0mE4MyMnfd1b2nlBJT7kpZ6Vov+ILuGNfzdp5ZBNQe walkah@walkah.net"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ0mE4MyMnfd1b2nlBJT7kpZ6Vov+ILuGNfzdp5ZBNQe walkah@walkah.net" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM8YMax7PGIrcPNIHkpuNRFgn3HJK6Wepm+ycZWO6jfR walkah@walkah-ipadpro11"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM8YMax7PGIrcPNIHkpuNRFgn3HJK6Wepm+ycZWO6jfR walkah@walkah-ipadpro11" ];
]; }
} // lib.optionalAttrs pkgs.stdenv.isLinux {
// lib.optionalAttrs pkgs.stdenv.isLinux { extraGroups = [
extraGroups = [ "wheel"
"wheel" "docker"
"docker" ];
]; group = "walkah";
group = "walkah"; isNormalUser = true;
isNormalUser = true; };
};
users.groups.walkah = { }; users.groups.walkah = { };
home-manager = { home-manager = {