diff --git a/configuration.nix b/configuration.nix index 5e04052..cbf8aa1 100644 --- a/configuration.nix +++ b/configuration.nix @@ -233,10 +233,8 @@ }; virtualisation = { - # containers.cdi.dynamic.nvidia.enable = true; docker = { enable = true; - enableNvidia = true; # extraOptions = "--storage-opt dm.basesize=20G"; storageDriver = "overlay2"; daemon.settings.bip = "192.168.9.0/22"; diff --git a/desktop-configuration.nix b/desktop-configuration.nix index 9e04799..cd0526f 100644 --- a/desktop-configuration.nix +++ b/desktop-configuration.nix @@ -44,18 +44,6 @@ nerd-fonts.droid-sans-mono ]; - hardware.pulseaudio = { - daemon.config.default-sample-channels = 6; - enable = false; - # extraConfig = '' - # load-module module-simple-protocol-tcp rate=48000 format=s16le channels=2 source=alsa_output.pci-0000_01_00.1.hdmi-stereo.monitor record=true port=8888 - # ''; - package = pkgs.pulseaudioFull; - # tcp = { - # enable = true; - # }; - }; - networking.firewall = { enable = false; allowedTCPPorts = [ 4713 8888 ]; @@ -84,6 +72,17 @@ enable = false; vSync = true; }; + pulseaudio = { + daemon.config.default-sample-channels = 6; + enable = false; + # extraConfig = '' + # load-module module-simple-protocol-tcp rate=48000 format=s16le channels=2 source=alsa_output.pci-0000_01_00.1.hdmi-stereo.monitor record=true port=8888 + # ''; + package = pkgs.pulseaudioFull; + # tcp = { + # enable = true; + # }; + }; xserver = { # defaultDepth = 30; # displayManager.defaultSession = "none+dwm"; diff --git a/flake.lock b/flake.lock index f9ca814..e536dd8 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1740392472, - "narHash": "sha256-w5KcTvst6ZvYFzuiHwiqQ74jjaOjR1A2W6zg8JDzNEw=", + "lastModified": 1740394183, + "narHash": "sha256-qQkR9YltMqt3OhFvUxDI59jVfyN18rBW7/NXwnkyEDY=", "owner": "illustris", "repo": "flake", - "rev": "c3ece0be02c02ddc042b5cc83fcca8789eb2572e", + "rev": "2d82c635e3a608ed80390cc394e0d73f6a48c152", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 546f483..bd6b154 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ suckless ]; } - home-manager.nixosModule + home-manager.nixosModules.default { home-manager = { useGlobalPkgs = true; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index e4f9a2b..a0c4c18 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -77,6 +77,6 @@ open = true; }; nvidia-container-toolkit.enable = true; - opengl.enable = true; + graphics.enable = true; }; }