diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 47360ec..dcc614d 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -18,9 +18,6 @@ boot.kernelParams = [ "amdgpu.ppfeaturemask=0xfff7ffff" "amdgpu.gpu_recovery=1" ]; services.openssh = {enable = true;}; - virtualisation.docker.enable = true; - virtualisation.docker.storageDriver = "btrfs"; - networking = { hostName = "desktop"; @@ -37,14 +34,14 @@ services = { pipewire = { - enable = false; + enable = true; alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; jack.enable = true; }; wivrn = { - enable = false; + enable = true; defaultRuntime = true; autoStart = true; }; @@ -56,7 +53,7 @@ }; stylix = { - enable = false; + enable = true; autoEnable = true; polarity = "light"; image = ../laptop/wallpaper.png; @@ -110,16 +107,16 @@ programs = { zsh.enable = true; - steam.enable = false; - gamescope.enable = false; - envision.enable = false; - corectrl.enable = false; + steam.enable = true; + gamescope.enable = true; + envision.enable = true; + corectrl.enable = true; }; users.users.k = { isNormalUser = true; description = "k"; - extraGroups = ["networkmanager" "wheel" "docker"]; + extraGroups = ["networkmanager" "wheel"]; packages = with pkgs; [zsh]; shell = pkgs.zsh; }; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index ddcdb28..17626dc 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -6,42 +6,42 @@ }: { imports = [../home/home_common.nix]; nixpkgs.config.allowUnfree = true; - #home = { - # packages = with pkgs; [ - # steam - # neovim - # firefox - # wivrn - # opencomposite - # wlx-overlay-s - # glslang - # gst_all_1.gstreamer - # libdrm - # openxr-loader - # khronos-ocl-icd-loader - # ]; - #}; + home = { + packages = with pkgs; [ + steam + neovim + firefox + wivrn + opencomposite + wlx-overlay-s + glslang + gst_all_1.gstreamer + libdrm + openxr-loader + khronos-ocl-icd-loader + ]; + }; # For WiVRn: - #xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json"; + xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json"; - #xdg.configFile."openvr/openvrpaths.vrpath".text = '' - # { - # "config" : - # [ - # "${config.xdg.dataHome}/Steam/config" - # ], - # "external_drivers" : null, - # "jsonid" : "vrpathreg", - # "log" : - # [ - # "${config.xdg.dataHome}/Steam/logs" - # ], - # "runtime" : - # [ - # "${pkgs.opencomposite}/lib/opencomposite" - # ], - # "version" : 1 - # } - #''; + xdg.configFile."openvr/openvrpaths.vrpath".text = '' + { + "config" : + [ + "${config.xdg.dataHome}/Steam/config" + ], + "external_drivers" : null, + "jsonid" : "vrpathreg", + "log" : + [ + "${config.xdg.dataHome}/Steam/logs" + ], + "runtime" : + [ + "${pkgs.opencomposite}/lib/opencomposite" + ], + "version" : 1 + } + ''; }