Work is now working

This commit is contained in:
greg-compass
2022-09-06 11:41:09 -05:00
parent 5234eaefb4
commit b3c3b00450
12 changed files with 82 additions and 5 deletions
+8
View File
@@ -0,0 +1,8 @@
{ ... }:
{
imports = [
profiles/darwin
hosts/work
];
}
Generated
+22
View File
@@ -18,6 +18,27 @@
"type": "github" "type": "github"
} }
}, },
"darwin": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1650976225,
"narHash": "sha256-PGM65SQHS63Dd5MmLJo3GJsZP9lJVZmpWxluQoG1Dt8=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "bb3baef6e115ae47bc2ab4973bd3a486488485b0",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -74,6 +95,7 @@
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
} }
+20 -1
View File
@@ -11,6 +11,10 @@
url = "github:nix-community/home-manager/release-21.11"; url = "github:nix-community/home-manager/release-21.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
darwin = {
url = "github:lnl7/nix-darwin/master";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = inputs: outputs = inputs:
@@ -18,7 +22,7 @@
mods = hostname: [ mods = hostname: [
inputs.agenix.nixosModule inputs.agenix.nixosModule
./modules ./modules
./profiles/base ./profiles/linux
./hosts/${hostname} ./hosts/${hostname}
inputs.home-manager.nixosModules.home-manager { inputs.home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@@ -33,6 +37,12 @@
modules = mods name; modules = mods name;
}; };
darwinMods = hostname: [
inputs.agenix.nixosModule
./profiles/darwin
./hosts/${hostname}
];
in { in {
nixosConfigurations = { nixosConfigurations = {
"2maccabees" = machine "aarch64-linux" "2maccabees"; "2maccabees" = machine "aarch64-linux" "2maccabees";
@@ -42,6 +52,15 @@
"iso" = machine "x86_64-linux" "iso"; "iso" = machine "x86_64-linux" "iso";
}; };
darwinConfigurations = {
"C02G48H8MD6R" = inputs.darwin.lib.darwinSystem {
system = "x86_64-darwin";
specialArgs = inputs;
modules = darwinMods "work";
};
};
defaultPackage."x86_64-linux" = inputs.self.nixosConfigurations.iso.config.system.build.isoImage; defaultPackage."x86_64-linux" = inputs.self.nixosConfigurations.iso.config.system.build.isoImage;
defaultPackage."x86_64-darwin" = inputs.self.darwinConfigurations.C02G48H8MD6R.system;
}; };
} }
+10
View File
@@ -0,0 +1,10 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
vim
wget
];
services.nix-daemon.enable = true;
}
+10
View File
@@ -0,0 +1,10 @@
{ ... }:
{
imports = [
../shared
];
system.stateVersion = 4;
programs.zsh.enable = true;
programs.bash.enable = true;
}
@@ -2,13 +2,16 @@
{ {
imports = [ imports = [
./nix.nix ../shared
./programs.nix ./programs.nix
./syncthing.nix ./syncthing.nix
./xonsh.nix ./xonsh.nix
]; ];
# Use hardlinking instead of copying when possible
nix.autoOptimiseStore = true;
# I am a fan of network manager, myself # I am a fan of network manager, myself
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
+7
View File
@@ -0,0 +1,7 @@
{ ... }:
{
imports = [
./nix.nix
];
}
@@ -11,9 +11,6 @@ experimental-features = nix-command flakes
min-free = ${toString (1024 * 1024 * 1024) } min-free = ${toString (1024 * 1024 * 1024) }
max-free = ${toString (5 * 1024 * 1024 * 1024) } max-free = ${toString (5 * 1024 * 1024 * 1024) }
''; '';
# Use hardlinking instead of copying when possible
autoOptimiseStore = true;
}; };
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
} }
Symlink
+1
View File
@@ -0,0 +1 @@
/nix/store/crvk81fyaw1jhqlylxnjcd2y90xpgalr-darwin-system-21.11.20220418.7b38b03+darwin4.bb3baef