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

♻️ back to standalone home-manager

Browse Source
This commit is contained in:
James Walker 2023-02-18 14:32:30 -05:00
parent fb0689b904
commit f8eac0c248
Signed by: walkah
GPG Key ID: 3C127179D6086E93
5 changed files with 58 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
flake.lock generated
View File

@ -53,11 +53,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1676442246, "lastModified": 1676713585,
"narHash": "sha256-MN/OaWZi4UHP9WxweTCUv7CFgam6ygCOT+SOGwM0QvU=", "narHash": "sha256-Twv56He0eosR3udUNG0ArrKBZeqpLepQRaz8BfWsuXA=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "b84d7bf58bbe0da0fb43ae7d88c90ce6a6eae3fe", "rev": "532f581a29590f785a6561525154c4789aefc0cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,13 +67,23 @@
} }
}, },
"dotfiles": { "dotfiles": {
"flake": false, "inputs": {
"flake-utils": [
"flake-utils"
],
"home-manager": [
"home-manager"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1676481078, "lastModified": 1676748253,
"narHash": "sha256-UWsT8nNU79bxBpsdB3BKPXdt1SQqVFKWAFh5EALh5E8=", "narHash": "sha256-l/5kdp323LypjE7abe0gWofE4t47+E5p3yDvNINDo40=",
"owner": "walkah", "owner": "walkah",
"repo": "dotfiles", "repo": "dotfiles",
"rev": "b3125f777af14325cce4e7342ba9824cd3e9a3b5", "rev": "10b7035a6c917db948323de6f86a3e7c928d37e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -203,11 +213,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1675935446, "lastModified": 1676367705,
"narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", "narHash": "sha256-un5UbRat9TwruyImtwUGcKF823rCEp4fQxnsaLFL7CM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2dce7f1a55e785a22d61668516df62899278c9e4", "rev": "da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +252,11 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1674055287, "lastModified": 1676545802,
"narHash": "sha256-WsF7VKn1ReGtDQbnB9dVUhWPAy/gR3zMBfnEnWs1gmo=", "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=",
"owner": "domenkozar", "owner": "domenkozar",
"repo": "nix", "repo": "nix",
"rev": "f1e23ed9b1acb28d6f8d226f69583b73df72bd02", "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -294,11 +304,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1675933606, "lastModified": 1676699914,
"narHash": "sha256-y427VhPQHOKkYvkc9MMsL/2R7M11rQxzsRdRLM3htx8=", "narHash": "sha256-cM2Hd+odgCYWSUiYPZGW/4B+OI64S0lrdf9YR9ts9I4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "44ae00e02e8036a66c08f4decdece7e3bbbefee2", "rev": "9bbcc37b011b0d925f3115888ea77f58487619b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -390,11 +400,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1676209454, "lastModified": 1676549890,
"narHash": "sha256-alj9mBkV9U6tTPDK026671D2pesLSYZZc9j5dBZJ9f0=", "narHash": "sha256-sq/WcOEAl7gWrrfGkWdnyYazRyTf+enEim/o6LOQzI8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8c619a1f3cedd16ea172146e30645e703d21bfc1", "rev": "8c66bd1b68f4708c90dcc97c6f7052a5a7b33257",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -419,11 +429,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1675337566, "lastModified": 1676513100,
"narHash": "sha256-jmLBTQcs1jFOn8h1Q5b5XwPfYgFOtcZ3+mU9KvfC6Js=", "narHash": "sha256-MK39nQV86L2ag4TmcK5/+r1ULpzRLPbbfvWbPvIoYJE=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "5668d079583a5b594cb4e0cc0e6d84f1b93da7ae", "rev": "5f0cba88ac4d6dd8cad5c6f6f1540b3d6a21a798",
"type": "github" "type": "github"
}, },
"original": { "original": {

24
flake.nix
View File

@ -37,7 +37,9 @@
# My stuff # My stuff
dotfiles = { dotfiles = {
url = "github:walkah/dotfiles"; url = "github:walkah/dotfiles";
flake = false; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
inputs.flake-utils.follows = "flake-utils";
}; };
workon = { workon = {
@ -55,6 +57,7 @@
, nixos-generators , nixos-generators
, home-manager , home-manager
, devenv , devenv
, dotfiles
, workon , workon
, ... , ...
}@inputs: }@inputs:
@ -74,6 +77,8 @@
(_: { (_: {
networking.hostName = hostName; networking.hostName = hostName;
nixpkgs.overlays = overlays; nixpkgs.overlays = overlays;
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
}) })
] ++ modules; ] ++ modules;
specialArgs = inputs; specialArgs = inputs;
@ -86,6 +91,8 @@
(_: { (_: {
networking.hostName = hostName; networking.hostName = hostName;
nixpkgs.overlays = overlays; nixpkgs.overlays = overlays;
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
}) })
] ++ modules; ] ++ modules;
specialArgs = inputs; specialArgs = inputs;
@ -119,6 +126,7 @@
scripts.darwin-local.exec = '' scripts.darwin-local.exec = ''
nix build .#darwinConfigurations.$(hostname -s).system nix build .#darwinConfigurations.$(hostname -s).system
./result/sw/bin/darwin-rebuild switch --flake . ./result/sw/bin/darwin-rebuild switch --flake .
home-manager switch --flake .
''; '';
languages.nix.enable = true; languages.nix.enable = true;
@ -150,6 +158,10 @@
epicurus = mkDarwin "epicurus" "aarch64-darwin" [ ./hosts/epicurus/darwin-configuration.nix ]; epicurus = mkDarwin "epicurus" "aarch64-darwin" [ ./hosts/epicurus/darwin-configuration.nix ];
heraclitus = mkDarwin "heraclitus" "aarch64-darwin" [ ./hosts/heraclitus/darwin-configuration.nix ]; heraclitus = mkDarwin "heraclitus" "aarch64-darwin" [ ./hosts/heraclitus/darwin-configuration.nix ];
}; };
homeConfigurations = {
"walkah@epicurus" = dotfiles.homeConfigurations.aarch64-darwin.walkah;
"walkah@heraclitus" = dotfiles.homeConfigurations.aarch64-darwin.walkah;
};
deploy.nodes = { deploy.nodes = {
agent = { agent = {
@ -200,6 +212,11 @@
path = deploy-rs.lib.x86_64-linux.activate.nixos path = deploy-rs.lib.x86_64-linux.activate.nixos
self.nixosConfigurations.plato; self.nixosConfigurations.plato;
}; };
walkah = {
user = "walkah";
path = deploy-rs.lib.x86_64-linux.activate.home-manager
dotfiles.homeConfigurations.x86_64-linux;
};
}; };
}; };
@ -211,6 +228,11 @@
path = deploy-rs.lib.x86_64-linux.activate.nixos path = deploy-rs.lib.x86_64-linux.activate.nixos
self.nixosConfigurations.socrates; self.nixosConfigurations.socrates;
}; };
walkah = {
user = "walkah";
path = deploy-rs.lib.x86_64-linux.activate.home-manager
dotfiles.homeConfigurations.x86_64-linux;
};
}; };
}; };
}; };

6
hosts/epicurus/darwin-configuration.nix
View File

@ -1,4 +1,4 @@
{ pkgs, dotfiles, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
./homebrew.nix ./homebrew.nix
@ -23,10 +23,6 @@
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.walkah = import "${dotfiles}/home.nix";
services.lorri.enable = true; services.lorri.enable = true;
programs = { programs = {

6
hosts/heraclitus/darwin-configuration.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, dotfiles, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
./homebrew.nix ./homebrew.nix
@ -24,10 +24,6 @@
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.walkah = import "${dotfiles}/home.nix";
services.lorri.enable = true; services.lorri.enable = true;
services.ipfs.enable = true; services.ipfs.enable = true;

5
users/walkah.nix
View File

@ -1,4 +1,4 @@
{ pkgs, dotfiles, ... }: { pkgs, ... }:
{ {
users.users.walkah = { users.users.walkah = {
@ -10,7 +10,4 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM8YMax7PGIrcPNIHkpuNRFgn3HJK6Wepm+ycZWO6jfR walkah@walkah-ipadpro11" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM8YMax7PGIrcPNIHkpuNRFgn3HJK6Wepm+ycZWO6jfR walkah@walkah-ipadpro11"
]; ];
}; };
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.walkah = import "${dotfiles}/home.nix";
} }