Merge branch 'main' of github.com:asosnovsky/nixos-setup
This commit is contained in:
commit
baeffc96cc
4 files changed
+23
-3
No files matched your search
@@ -42,6 +42,11 @@
|
|||||||
extraGitConfigs = [{ path = "${homepath}/.config/mysumo/gitconfig"; }];
|
extraGitConfigs = [{ path = "${homepath}/.config/mysumo/gitconfig"; }];
|
||||||
};
|
};
|
||||||
homeManagerVersion = "24.05";
|
homeManagerVersion = "24.05";
|
||||||
|
localNixCaches = [
|
||||||
|
"http://minipc1.lab.internal:5000"
|
||||||
|
"http://fwlaptop.devices.internal:5000"
|
||||||
|
];
|
||||||
|
# Libs
|
||||||
lib = (import modules/lib.nix {
|
lib = (import modules/lib.nix {
|
||||||
nixpkgs = nixpkgs;
|
nixpkgs = nixpkgs;
|
||||||
home-manager = home-manager;
|
home-manager = home-manager;
|
||||||
@@ -71,6 +76,7 @@
|
|||||||
user = user;
|
user = user;
|
||||||
systemStateVersion = "23.11";
|
systemStateVersion = "23.11";
|
||||||
hostName = "fwbook";
|
hostName = "fwbook";
|
||||||
|
localNixCaches = localNixCaches;
|
||||||
home-manager = {
|
home-manager = {
|
||||||
enable = true;
|
enable = true;
|
||||||
version = homeManagerVersion;
|
version = homeManagerVersion;
|
||||||
@@ -112,6 +118,7 @@
|
|||||||
darwinConfigurations."asosnovsky-mac" = lib.makeDarwinModule {
|
darwinConfigurations."asosnovsky-mac" = lib.makeDarwinModule {
|
||||||
user = sumoUser;
|
user = sumoUser;
|
||||||
systemStateVersion = 4;
|
systemStateVersion = 4;
|
||||||
|
localNixCaches = localNixCaches;
|
||||||
system = "x86_64-darwin";
|
system = "x86_64-darwin";
|
||||||
hostName = "asosnovsky-mac";
|
hostName = "asosnovsky-mac";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
@@ -128,6 +135,7 @@
|
|||||||
nixosConfigurations."hl-bigbox1" = unstableLib.makeNixOsModule {
|
nixosConfigurations."hl-bigbox1" = unstableLib.makeNixOsModule {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
user = user;
|
user = user;
|
||||||
|
localNixCaches = localNixCaches;
|
||||||
systemStateVersion = "24.05";
|
systemStateVersion = "24.05";
|
||||||
hostName = "hl-bigbox1";
|
hostName = "hl-bigbox1";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
@@ -154,6 +162,7 @@
|
|||||||
nixosConfigurations."hl-minipc1" = lib.makeNixOsModule {
|
nixosConfigurations."hl-minipc1" = lib.makeNixOsModule {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
user = user;
|
user = user;
|
||||||
|
localNixCaches = localNixCaches;
|
||||||
systemStateVersion = "23.11";
|
systemStateVersion = "23.11";
|
||||||
hostName = "hl-minipc1";
|
hostName = "hl-minipc1";
|
||||||
enableNetworkDrives = true;
|
enableNetworkDrives = true;
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
options = [ "nofail" ];
|
options = [ "nofail" ];
|
||||||
};
|
};
|
||||||
|
# Services
|
||||||
homelab.services.audiobookshelf = {
|
homelab.services.audiobookshelf = {
|
||||||
enable = true;
|
enable = true;
|
||||||
host = "0.0.0.0";
|
host = "0.0.0.0";
|
||||||
@@ -20,4 +21,12 @@
|
|||||||
configDir = "/mnt/Data/audiobookshelf/config";
|
configDir = "/mnt/Data/audiobookshelf/config";
|
||||||
metadtaDir = "/mnt/Data/audiobookshelf/metadata";
|
metadtaDir = "/mnt/Data/audiobookshelf/metadata";
|
||||||
};
|
};
|
||||||
|
services.dockerRegistry = {
|
||||||
|
enable = true;
|
||||||
|
storagePath = "/mnt/Data/docker-registry";
|
||||||
|
port = 5001;
|
||||||
|
openFirewall = true;
|
||||||
|
listenAddress = "0.0.0.0";
|
||||||
|
enableDelete = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
@@ -17,6 +17,7 @@
|
|||||||
enable = false;
|
enable = false;
|
||||||
enableDevelopmentKit = false;
|
enableDevelopmentKit = false;
|
||||||
}
|
}
|
||||||
|
, localNixCaches ? [ ]
|
||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
{ ... }: {
|
{ ... }: {
|
||||||
@@ -24,6 +25,7 @@
|
|||||||
(import ./nix {
|
(import ./nix {
|
||||||
user = user;
|
user = user;
|
||||||
systemStateVersion = systemStateVersion;
|
systemStateVersion = systemStateVersion;
|
||||||
|
localNixCaches = localNixCaches;
|
||||||
})
|
})
|
||||||
] ++ (if desktop.enable then
|
] ++ (if desktop.enable then
|
||||||
[ (import ./desktop ({ user = user; } // desktop)) ]
|
[ (import ./desktop ({ user = user; } // desktop)) ]
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ user, systemStateVersion }:
|
{ user, systemStateVersion, localNixCaches ? [ ] }:
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
# Nix core
|
# Nix core
|
||||||
@@ -10,11 +10,11 @@
|
|||||||
"https://cache.nixos.org"
|
"https://cache.nixos.org"
|
||||||
"https://cache.flox.dev"
|
"https://cache.flox.dev"
|
||||||
"https://devenv.cachix.org"
|
"https://devenv.cachix.org"
|
||||||
];
|
] ++ localNixCaches;
|
||||||
trusted-substituters = [
|
trusted-substituters = [
|
||||||
"https://cache.flox.dev"
|
"https://cache.flox.dev"
|
||||||
"https://devenv.cachix.org"
|
"https://devenv.cachix.org"
|
||||||
];
|
] ++ localNixCaches;
|
||||||
trusted-users = [ "root" user.name ];
|
trusted-users = [ "root" user.name ];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs="
|
"flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs="
|
||||||
|
|||||||
Reference in new issue
Block a user