made generic container module
This commit is contained in:
1 parent
ee7931107e
commit
4e13d912b0
11 files changed
+137
-101
No files matched your search
Generated
+8
-8
@@ -7,16 +7,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720734513,
|
"lastModified": 1720042825,
|
||||||
"narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
|
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
|
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "master",
|
"ref": "release-24.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -59,16 +59,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720768451,
|
"lastModified": 1720823163,
|
||||||
"narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
|
"narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
|
"rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-24.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||||
systems.url = "github:nix-systems/default";
|
systems.url = "github:nix-systems/default";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/master";
|
url = "github:nix-community/home-manager/release-24.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
nix-darwin = {
|
nix-darwin = {
|
||||||
@@ -67,6 +67,7 @@
|
|||||||
enableNetowrking = true;
|
enableNetowrking = true;
|
||||||
enableSSH = false;
|
enableSSH = false;
|
||||||
hardware = { enable = true; };
|
hardware = { enable = true; };
|
||||||
|
containerRuntime = "podman";
|
||||||
};
|
};
|
||||||
configuration = { ... }: {
|
configuration = { ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
|
|||||||
+15
-16
@@ -20,7 +20,7 @@ in
|
|||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.tmp.useTmpfs = true;
|
boot.tmp.useTmpfs = true;
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_zen;
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# Amd GPU Support
|
# Amd GPU Support
|
||||||
rocmPackages.rocm-smi
|
rocmPackages.rocm-smi
|
||||||
@@ -47,19 +47,18 @@ in
|
|||||||
services.ollama = {
|
services.ollama = {
|
||||||
enable = true;
|
enable = true;
|
||||||
acceleration = "rocm";
|
acceleration = "rocm";
|
||||||
# listenAddress = "0.0.0.0:11434";
|
listenAddress = "0.0.0.0:11434";
|
||||||
host = "0.0.0.0";
|
|
||||||
};
|
};
|
||||||
# Brother Printer
|
# Brother Printer
|
||||||
hardware.sane.brscan5.enable = true;
|
hardware.sane.brscan5.enable = true;
|
||||||
# Display Managers
|
# Display Managers
|
||||||
services.xserver.videoDrivers = [ "displaylink" "modesetting" ];
|
services.xserver.videoDrivers =
|
||||||
|
[ "displaylink" "modesetting" "amdgpu" "fbdev" ];
|
||||||
services.xserver.displayManager.sessionCommands = ''
|
services.xserver.displayManager.sessionCommands = ''
|
||||||
${lib.getBin pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource 2 0
|
${lib.getBin pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource 2 0
|
||||||
'';
|
'';
|
||||||
# Kernel
|
# Kernel
|
||||||
boot.initrd.kernelModules = [ "amdgpu" "evdi" ];
|
boot.initrd.kernelModules = [ "amdgpu" "evdi" ];
|
||||||
# hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd amdvlk ];
|
|
||||||
# Add Functions
|
# Add Functions
|
||||||
home-manager.users.${user.name}.programs.zsh.initExtra = ''
|
home-manager.users.${user.name}.programs.zsh.initExtra = ''
|
||||||
source ${zshFunctions}
|
source ${zshFunctions}
|
||||||
@@ -95,17 +94,17 @@ in
|
|||||||
STOP_CHARGE_THRESH_BAT0 = 97; # and above it stops charging
|
STOP_CHARGE_THRESH_BAT0 = 97; # and above it stops charging
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# services.auto-cpufreq.enable = true;
|
services.auto-cpufreq.enable = true;
|
||||||
# services.auto-cpufreq.settings = {
|
services.auto-cpufreq.settings = {
|
||||||
# battery = {
|
battery = {
|
||||||
# governor = "powersave";
|
governor = "powersave";
|
||||||
# turbo = "never";
|
turbo = "never";
|
||||||
# };
|
};
|
||||||
# charger = {
|
charger = {
|
||||||
# governor = "performance";
|
governor = "performance";
|
||||||
# turbo = "auto";
|
turbo = "auto";
|
||||||
# };
|
};
|
||||||
# };
|
};
|
||||||
# Logind
|
# Logind
|
||||||
services.logind = {
|
services.logind = {
|
||||||
lidSwitchExternalPower = "suspend-then-hibernate";
|
lidSwitchExternalPower = "suspend-then-hibernate";
|
||||||
|
|||||||
@@ -16,16 +16,16 @@
|
|||||||
services.ollama = {
|
services.ollama = {
|
||||||
enable = true;
|
enable = true;
|
||||||
acceleration = "cuda";
|
acceleration = "cuda";
|
||||||
host = "0.0.0.0";
|
# environmentVariables = {
|
||||||
environmentVariables = {
|
# OLLAMA_LLM_LIBRARY = "cuda";
|
||||||
OLLAMA_LLM_LIBRARY = "cuda";
|
# LD_LIBRARY_PATH = "run/opengl-driver/lib";
|
||||||
LD_LIBRARY_PATH = "run/opengl-driver/lib";
|
# NVARCH = "x86_64";
|
||||||
NVARCH = "x86_64";
|
# NV_CUDA_CUDART_VERSION = "11.3.1";
|
||||||
NV_CUDA_CUDART_VERSION = "11.3.1";
|
# NVIDIA_VISIBLE_DEVICES = "all";
|
||||||
NVIDIA_VISIBLE_DEVICES = "all";
|
# };
|
||||||
};
|
|
||||||
};
|
};
|
||||||
# Nvidia Settings
|
# Nvidia Settings
|
||||||
|
services.xserver.videoDrivers = [ "nvidia" "modesetting" "fbdev" ];
|
||||||
hardware.graphics = { enable = true; };
|
hardware.graphics = { enable = true; };
|
||||||
hardware.nvidia = {
|
hardware.nvidia = {
|
||||||
modesetting.enable = true;
|
modesetting.enable = true;
|
||||||
|
|||||||
@@ -53,4 +53,7 @@
|
|||||||
];
|
];
|
||||||
# udev rules for crypto wallets
|
# udev rules for crypto wallets
|
||||||
services.udev.packages = with pkgs; [ ledger-udev-rules trezor-udev-rules ];
|
services.udev.packages = with pkgs; [ ledger-udev-rules trezor-udev-rules ];
|
||||||
|
# trezor groups
|
||||||
|
users.groups.trezord = { };
|
||||||
|
users.groups.trezord.members = [ user.name ];
|
||||||
}
|
}
|
||||||
+37
-31
@@ -11,42 +11,48 @@
|
|||||||
enable = false;
|
enable = false;
|
||||||
}
|
}
|
||||||
# Home Manager
|
# Home Manager
|
||||||
, home-manager ? {
|
, home-manager ? { enable = false; }
|
||||||
enable = false;
|
|
||||||
}
|
|
||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
{ ... }:
|
{ ... }: {
|
||||||
{
|
|
||||||
imports = [
|
imports = [
|
||||||
(import ./nix {
|
(import ./nix {
|
||||||
user = user;
|
user = user;
|
||||||
systemStateVersion = systemStateVersion;
|
systemStateVersion = systemStateVersion;
|
||||||
})
|
})
|
||||||
] ++ (if desktop.enable then [
|
] ++ (if desktop.enable then
|
||||||
(import ./desktop {
|
[
|
||||||
user = user;
|
(import ./desktop {
|
||||||
enableKDE = desktop.enableKDE;
|
user = user;
|
||||||
enableHypr = desktop.enableHypr;
|
enableKDE = desktop.enableKDE;
|
||||||
enableX11 = desktop.enableX11;
|
enableHypr = desktop.enableHypr;
|
||||||
enableWine = desktop.enableWine;
|
enableX11 = desktop.enableX11;
|
||||||
})
|
enableWine = desktop.enableWine;
|
||||||
] else [ ]) ++ (if os.enable then [
|
})
|
||||||
(import ./os {
|
]
|
||||||
user = user;
|
else
|
||||||
hostName = hostName;
|
[ ]) ++ (if os.enable then
|
||||||
firewall = os.firewall;
|
[
|
||||||
enableFonts = os.enableFonts;
|
(import ./os {
|
||||||
enableNetowrking = os.enableNetowrking;
|
user = user;
|
||||||
enableSSH = os.enableSSH;
|
hostName = hostName;
|
||||||
hardware = os.hardware;
|
firewall = os.firewall;
|
||||||
})
|
enableFonts = os.enableFonts;
|
||||||
] else [ ]) ++ (if home-manager.enable then [
|
enableNetowrking = os.enableNetowrking;
|
||||||
(import ./home-manager/common.nix {
|
enableSSH = os.enableSSH;
|
||||||
user = user;
|
hardware = os.hardware;
|
||||||
homeMangerVersion = home-manager.version;
|
containerRuntime = os.containerRuntime;
|
||||||
hostName = hostName;
|
})
|
||||||
})
|
]
|
||||||
] else [ ])
|
else
|
||||||
;
|
[ ]) ++ (if home-manager.enable then
|
||||||
|
[
|
||||||
|
(import ./home-manager/common.nix {
|
||||||
|
user = user;
|
||||||
|
homeMangerVersion = home-manager.version;
|
||||||
|
hostName = hostName;
|
||||||
|
})
|
||||||
|
]
|
||||||
|
else
|
||||||
|
[ ]);
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
{ user, runtime ? null }:
|
||||||
|
{ pkgs, ... }: {
|
||||||
|
virtualisation.containers.enable = true;
|
||||||
|
environment.systemPackages = with pkgs; [ dive podman-tui ];
|
||||||
|
imports = (if runtime == "podman" then
|
||||||
|
[ (import ./podman.nix { user = user; }) ]
|
||||||
|
else if runtime == "docker" then
|
||||||
|
[ (import ./docker.nix { user = user; }) ]
|
||||||
|
else
|
||||||
|
[ ]);
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
{ user }:
|
||||||
|
{ pkgs, ... }: {
|
||||||
|
virtualisation.docker = {
|
||||||
|
enable = true;
|
||||||
|
autoPrune.enable = true;
|
||||||
|
enableOnBoot = false;
|
||||||
|
liveRestore = false;
|
||||||
|
};
|
||||||
|
environment.systemPackages = with pkgs; [ docker-compose ];
|
||||||
|
users.users.${user.name}.extraGroups = [ "docker" ];
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
{ user }:
|
||||||
|
{ pkgs, ... }: {
|
||||||
|
virtualisation.oci-containers.backend = "podman";
|
||||||
|
virtualisation = {
|
||||||
|
podman = {
|
||||||
|
enable = true;
|
||||||
|
dockerCompat = true;
|
||||||
|
defaultNetwork.settings.dns_enabled = true;
|
||||||
|
dockerSocket.enable = true;
|
||||||
|
autoPrune.enable = true;
|
||||||
|
networkSocket.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
environment.systemPackages = with pkgs; [ podman-compose ];
|
||||||
|
}
|
||||||
+26
-27
@@ -4,36 +4,35 @@
|
|||||||
, enableFonts ? true
|
, enableFonts ? true
|
||||||
, enableNetowrking ? true
|
, enableNetowrking ? true
|
||||||
, enableSSH ? true
|
, enableSSH ? true
|
||||||
, hardware ? {
|
, containerRuntime ? null
|
||||||
enable = false;
|
, hardware ? { enable = false; }
|
||||||
}
|
|
||||||
}:
|
}:
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }: {
|
||||||
{
|
|
||||||
imports = [
|
imports = [
|
||||||
(import ./core.nix {
|
(import ./core.nix { user = user; })
|
||||||
user = user;
|
|
||||||
})
|
|
||||||
./rootUser.nix
|
./rootUser.nix
|
||||||
(import ./user.nix {
|
(import ./user.nix { user = user; })
|
||||||
|
(import ./containers.nix {
|
||||||
user = user;
|
user = user;
|
||||||
|
runtime = containerRuntime;
|
||||||
})
|
})
|
||||||
(import ./docker.nix {
|
] ++ (if enableFonts then [ ./fonts.nix ] else [ ])
|
||||||
user = user;
|
++ (if hardware.enable then [ ./hardware.nix ] else [ ])
|
||||||
})
|
++ (if enableNetowrking then
|
||||||
] ++ (if enableFonts then [
|
[
|
||||||
./fonts.nix
|
(import ./networking.nix {
|
||||||
] else [ ]) ++ (if hardware.enable then [
|
hostName = hostName;
|
||||||
./hardware.nix
|
firewall = firewall;
|
||||||
] else [ ]) ++ (if enableNetowrking then [
|
})
|
||||||
(import ./networking.nix {
|
]
|
||||||
hostName = hostName;
|
else
|
||||||
firewall = firewall;
|
[ ]) ++ (if enableSSH then
|
||||||
})
|
[
|
||||||
] else [ ]) ++ (if enableSSH then [
|
(import ./ssh.nix {
|
||||||
(import ./ssh.nix {
|
enableSSHServer = true;
|
||||||
enableSSHServer = true;
|
user = user;
|
||||||
user = user;
|
})
|
||||||
})
|
]
|
||||||
] else [ ]);
|
else
|
||||||
|
[ ]);
|
||||||
}
|
}
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
{ user }:
|
|
||||||
{ pkgs, ... }: {
|
|
||||||
virtualisation.docker.enable = true;
|
|
||||||
virtualisation.docker.autoPrune.enable = true;
|
|
||||||
virtualisation.docker.enableOnBoot = false;
|
|
||||||
virtualisation.docker.liveRestore = false;
|
|
||||||
environment.systemPackages = with pkgs; [ docker-compose ];
|
|
||||||
users.users.${user.name}.extraGroups = [ "docker" ];
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user