mirror of
https://github.com/MichaelFisher1997/nixos.git
synced 2025-06-15 01:53:11 +00:00
pre-restructor
This commit is contained in:
parent
c71674f97e
commit
3c37d9f335
61
docker.nix
61
docker.nix
@ -1,41 +1,28 @@
|
||||
{ pkgs, ... }:
|
||||
#let
|
||||
# # When using easyCerts=true the IP Address must resolve to the master on creation.
|
||||
# # So use simply 127.0.0.1 in that case. Otherwise you will have errors like this https://github.com/NixOS/nixpkgs/issues/59364
|
||||
# kubeMasterIP = "10.1.1.2";
|
||||
# kubeMasterHostname = "api.kube";
|
||||
# kubeMasterAPIServerPort = 6443;
|
||||
#in
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
# Enable Docker program itself
|
||||
virtualisation.docker.enable = true;
|
||||
virtualisation.docker.rootless = {
|
||||
enable = true;
|
||||
setSocketVariable = true;
|
||||
|
||||
# Create a socket to lazy-load Docker
|
||||
systemd.sockets.docker = {
|
||||
wantedBy = [ "sockets.target" ];
|
||||
listenStreams = [ "/run/docker.sock" ];
|
||||
socketConfig = {
|
||||
SocketMode = "0660";
|
||||
SocketUser = "root";
|
||||
SocketGroup = "docker";
|
||||
};
|
||||
};
|
||||
|
||||
# Override the Docker service to disable autostart
|
||||
systemd.services.docker = {
|
||||
enable = false;
|
||||
wants = [ "docker.socket" ];
|
||||
after = [ "docker.socket" ];
|
||||
serviceConfig = {
|
||||
ExecStartPre = "-/usr/bin/rm -f /run/docker.sock";
|
||||
};
|
||||
};
|
||||
# # resolve master hostname
|
||||
# networking.extraHosts = "${kubeMasterIP} ${kubeMasterHostname}";
|
||||
#
|
||||
# # packages for administration tasks
|
||||
# environment.systemPackages = with pkgs; [
|
||||
# kompose
|
||||
# kubectl
|
||||
# kubernetes
|
||||
# ];
|
||||
#
|
||||
# services.kubernetes = {
|
||||
# roles = ["master" "node"];
|
||||
# masterAddress = kubeMasterHostname;
|
||||
# apiserverAddress = "https://${kubeMasterHostname}:${toString kubeMasterAPIServerPort}";
|
||||
# easyCerts = true;
|
||||
# apiserver = {
|
||||
# securePort = kubeMasterAPIServerPort;
|
||||
# advertiseAddress = kubeMasterIP;
|
||||
# };
|
||||
#
|
||||
# # use coredns
|
||||
# addons.dns.enable = true;
|
||||
#
|
||||
# # needed if you use swap
|
||||
# kubelet.extraOpts = "--fail-swap-on=false";
|
||||
# };
|
||||
}
|
||||
|
||||
|
@ -17,4 +17,5 @@
|
||||
];
|
||||
};
|
||||
services.tailscale.enable = true;
|
||||
systemd.services.NetworkManager-wait-online.enable = false;
|
||||
}
|
||||
|
24
packages.nix
24
packages.nix
@ -8,7 +8,6 @@ in
|
||||
environment.systemPackages = with pkgs; [
|
||||
# Text Editors
|
||||
vim
|
||||
neovim
|
||||
libsForQt5.kate
|
||||
sublime
|
||||
lunarvim
|
||||
@ -38,7 +37,6 @@ in
|
||||
libsForQt5.kdenlive
|
||||
exercism
|
||||
betterdiscord-installer
|
||||
unstable.nodejs_23
|
||||
unstable.go
|
||||
unstable.bun
|
||||
air
|
||||
@ -127,7 +125,7 @@ in
|
||||
discord
|
||||
webcord
|
||||
slack
|
||||
telegram-desktop
|
||||
#telegram-desktop
|
||||
|
||||
# Media
|
||||
vlc
|
||||
@ -145,7 +143,6 @@ in
|
||||
bottles
|
||||
wine
|
||||
wine64
|
||||
minecraft
|
||||
|
||||
# Fonts
|
||||
noto-fonts-color-emoji
|
||||
@ -190,7 +187,7 @@ in
|
||||
svt-av1
|
||||
rav1e
|
||||
libaom
|
||||
sunshine
|
||||
unstable.sunshine
|
||||
|
||||
# Miscellaneous
|
||||
fastfetch
|
||||
@ -199,7 +196,24 @@ in
|
||||
guacamole-client
|
||||
rpi-imager
|
||||
kdePackages.filelight
|
||||
light
|
||||
|
||||
#games
|
||||
flightgear
|
||||
minetest
|
||||
openttd
|
||||
endless-sky
|
||||
cataclysm-dda
|
||||
xonotic
|
||||
superTux
|
||||
superTuxKart
|
||||
airshipper
|
||||
mindustry-wayland
|
||||
speed_dreams
|
||||
simutrans_binaries
|
||||
modrinth-app
|
||||
minecraft
|
||||
nsnake
|
||||
];
|
||||
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
services.sunshine = {
|
||||
enable = true;
|
||||
|
Loading…
x
Reference in New Issue
Block a user