diff options
-rwxr-xr-x | Omni/Dev/Beryllium.nix | 1 | ||||
-rw-r--r-- | Omni/Dev/Beryllium/Configuration.nix | 1 | ||||
-rw-r--r-- | Omni/Dev/Docker.nix | 13 | ||||
-rwxr-xr-x | Omni/Dev/Lithium.nix | 1 | ||||
-rw-r--r-- | Omni/Dev/Lithium/Configuration.nix | 8 |
5 files changed, 15 insertions, 9 deletions
diff --git a/Omni/Dev/Beryllium.nix b/Omni/Dev/Beryllium.nix index 50dd652..0327822 100755 --- a/Omni/Dev/Beryllium.nix +++ b/Omni/Dev/Beryllium.nix @@ -8,6 +8,7 @@ bild.os { ./Beryllium/Configuration.nix ./Beryllium/Hardware.nix ./Beryllium/Ollama.nix + ./Docker.nix ./Vpn.nix ]; networking.hostName = "beryllium"; diff --git a/Omni/Dev/Beryllium/Configuration.nix b/Omni/Dev/Beryllium/Configuration.nix index 4b7d785..69c83a6 100644 --- a/Omni/Dev/Beryllium/Configuration.nix +++ b/Omni/Dev/Beryllium/Configuration.nix @@ -67,7 +67,6 @@ in { }; hardware.opengl.enable = true; - hardware.opengl.driSupport = true; hardware.opengl.driSupport32Bit = true; services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia.nvidiaPersistenced = true; diff --git a/Omni/Dev/Docker.nix b/Omni/Dev/Docker.nix new file mode 100644 index 0000000..d510682 --- /dev/null +++ b/Omni/Dev/Docker.nix @@ -0,0 +1,13 @@ +{...}: +/* +Enable docker dev support +*/ +{ + virtualisation.docker.enable = true; + virtualisation.docker.liveRestore = false; + virtualisation.libvirtd.enable = false; + virtualisation.virtualbox.host.enable = false; + virtualisation.virtualbox.host.headless = false; + virtualisation.virtualbox.host.addNetworkInterface = false; + virtualisation.virtualbox.guest.enable = false; +} diff --git a/Omni/Dev/Lithium.nix b/Omni/Dev/Lithium.nix index 2b9f16a..7befc7d 100755 --- a/Omni/Dev/Lithium.nix +++ b/Omni/Dev/Lithium.nix @@ -10,6 +10,7 @@ bild.os { ./Lithium/Hardware.nix ./Lithium/Networking.nix ./Hoogle.nix + ./Docker.nix ./Dns.nix #./Guix.nix # I need to package a bunch of guile libs first ./Vpn.nix diff --git a/Omni/Dev/Lithium/Configuration.nix b/Omni/Dev/Lithium/Configuration.nix index e050d48..5a80a24 100644 --- a/Omni/Dev/Lithium/Configuration.nix +++ b/Omni/Dev/Lithium/Configuration.nix @@ -36,14 +36,6 @@ in { programs.gnupg.agent.enableSSHSupport = true; programs.mosh.enable = true; - virtualisation.docker.enable = true; - virtualisation.docker.liveRestore = false; - virtualisation.libvirtd.enable = false; - virtualisation.virtualbox.host.enable = false; - virtualisation.virtualbox.host.headless = false; - virtualisation.virtualbox.host.addNetworkInterface = false; - virtualisation.virtualbox.guest.enable = false; - services.my-hoogle.enable = true; services.my-hoogle.port = ports.hoogle; services.my-hoogle.home = "//hoogle.simatime.com"; |