Merge branch 'main' of github.com:asosnovsky/nixos-setup

This commit is contained in:
ari committed 2024-07-18 11:24:23 -04:00
commit dab5d4f899
6 files changed
+39 -49

No files matched your search

+3 -6
View File
@@ -69,6 +69,7 @@
enableSSH = false;
hardware = { enable = true; };
containerRuntime = "docker";
enablePrometheusExporters = true;
};
configuration = { ... }: {
imports = [
@@ -111,9 +112,8 @@
enable = true;
firewall = { enable = false; };
enableFonts = true;
enableNetworking = true;
enableSSH = true;
hardware = { enable = true; };
enablePrometheusExporters = true;
};
configuration = (import ./hosts/hl-bigbox1.nix { user = user; });
};
@@ -135,10 +135,7 @@
os = {
enable = true;
firewall = { enable = false; };
enableFonts = true;
enableNetworking = true;
enableSSH = true;
hardware = { enable = false; };
enablePrometheusExporters = true;
};
configuration = (import ./hosts/hl-minipc1.nix { user = user; });
};
+1
View File
@@ -4,6 +4,7 @@
, enableKDE ? false
, enableHypr ? false
, enableWine ? false
, ...
}:
{ pkgs, ... }: {
imports = [ ./wayland.nix ] ++ (if enableX11 then [ ./x11.nix ] else [ ])
+16 -22
View File
@@ -1,8 +1,4 @@
{ hostName
, homeManagerVersion
, user
, enableDevelopmentKit ? false
}:
{ hostName, version, user, enableDevelopmentKit ? false, ... }:
{ pkgs, ... }:
let
gitconfigs =
@@ -11,7 +7,7 @@ let
in
{
home-manager.users.root = {
home.stateVersion = homeManagerVersion;
home.stateVersion = version;
programs.git = {
enable = true;
userName = "root";
@@ -26,25 +22,22 @@ in
home-manager.users.${user.name} = {
home = {
sessionVariables = { MAMBA_ROOT_PREFIX = "$HOME/.local/micromamba"; };
stateVersion = homeManagerVersion;
stateVersion = version;
shellAliases = {
cat = "bat";
conda = "micromamba";
};
packages = with pkgs; [
jq
nixfmt-classic
devenv
ipfetch
nixd
] ++ (if enableDevelopmentKit then [
rye
uv
devbox
micromamba
terraform
kubectl
] else [ ]);
packages = with pkgs;
[ jq nixfmt-classic devenv ipfetch nixd ]
++ (if enableDevelopmentKit then [
rye
uv
devbox
micromamba
terraform
kubectl
] else
[ ]);
};
programs = {
bat.enable = true;
@@ -85,7 +78,8 @@ in
initExtra = (if enableDevelopmentKit then ''
export MAMBA_ROOT_PREFIX="$HOME/.local/micromamba"
source <(micromamba shell hook --root-prefix=$MAMBA_ROOT_PREFIX)
'' else "");
'' else
"");
};
zsh.oh-my-zsh = {
enable = true;
+5 -20
View File
@@ -26,37 +26,22 @@
systemStateVersion = systemStateVersion;
})
] ++ (if desktop.enable then
[
(import ./desktop {
user = user;
enableKDE = desktop.enableKDE;
enableHypr = desktop.enableHypr;
enableX11 = desktop.enableX11;
enableWine = desktop.enableWine;
})
]
[ (import ./desktop ({ user = user; } // desktop)) ]
else
[ ]) ++ (if os.enable then
[
(import ./os {
(import ./os ({
user = user;
hostName = hostName;
firewall = os.firewall;
enableFonts = os.enableFonts;
enableNetworking = os.enableNetworking;
enableSSH = os.enableSSH;
hardware = os.hardware;
})
} // os))
]
else
[ ]) ++ (if home-manager.enable then
[
(import ./home-manager {
(import ./home-manager ({
user = user;
homeManagerVersion = home-manager.version;
enableDevelopmentKit = home-manager.enableDevelopmentKit;
hostName = hostName;
})
} // home-manager))
]
else
[ ])
+4 -1
View File
@@ -6,6 +6,8 @@
, enableSSH ? true
, containerRuntime ? null
, hardware ? { enable = false; }
, enablePrometheusExporters ? false
, ...
}:
{ pkgs, ... }: {
imports = [
@@ -34,5 +36,6 @@
})
]
else
[ ]);
[ ])
++ (if enablePrometheusExporters then [ ./exporters.nix ] else [ ]);
}
+10
View File
@@ -0,0 +1,10 @@
{ ... }: {
services.prometheus.exporters = {
node = {
enable = true;
enabledCollectors = [ "systemd" ];
openFirewall = true;
port = 9100;
};
};
}