Johan Rong 3 maanden geleden
bovenliggende
commit
1c204d833e

+ 1 - 0
home/features/desktop/sway/ui/waybar/default.nix

@@ -87,6 +87,7 @@
           format-ethernet = "lan";
           format-disconnected = "signal_wifi_off";
           format-disabled = "flight";
+          format-linked = "lan";
           tooltip-format = "{essid}\n{ipaddr}";
           on-click = "eww open network --toggle --screen $(swaymsg -t get_outputs | jq 'map(.focused) | index(true)')";
         };

+ 1 - 0
home/flavors/application/workstation/default.nix

@@ -18,5 +18,6 @@
     geogebra6
     ungoogled-chromium
     mediawriter
+    tailscale
   ];
 }

+ 1 - 1
hosts/desktop-nixos-workstation/configuration.nix

@@ -5,7 +5,7 @@
     ./networking.nix
     ./hardware-configuration.nix
 
-    ../../nixos/hardware/gpu/nvidia.nix
+    ../../nixos/hardware/gpu/nvidia-open.nix
     ../../nixos/hardware/wifi/bcm4360.nix
     ../../nixos/hardware/sound
     ../../nixos/hardware/bluetooth

+ 1 - 1
nixos/flavors/desktop/sway/greeter-default.nix

@@ -14,7 +14,7 @@ in
     enable = true;
     settings.default_session = {
       command = ''
-        ${pkgs.tuigreet}/bin/tuigreet --time --cmd "WLR_RENDERER=vulkan sway --unsupported-gpu"
+        ${pkgs.tuigreet}/bin/tuigreet --time --cmd "sway --unsupported-gpu"
       '';
       user = users.default;
     };

+ 31 - 0
nixos/hardware/gpu/nvidia-open.nix

@@ -0,0 +1,31 @@
+{ config, pkgs, ... }:
+
+{
+  services.xserver.videoDrivers = [ "nvidia" ];
+
+  boot.kernelParams = [
+    "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
+    "nvidia.NVreg_TemporaryFilePath=/var/tmp"
+    "nvidia_drm.modeset=1"
+    "mem_sleep_default=deep"
+  ];
+
+  hardware.graphics.enable = true;
+
+  hardware.nvidia = {
+    open = true;
+
+    modesetting.enable = true;
+
+    powerManagement = {
+      enable = false;
+      finegrained = false;
+    };
+
+    nvidiaSettings = true;
+
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
+  };
+
+  boot.blacklistedKernelModules = [ "nouveau" ];
+}

+ 2 - 0
nixos/hardware/wifi/bcm4360.nix

@@ -1,5 +1,7 @@
 { config, lib, pkgs, ... }:
 {
+  boot.kernelModules = [ "wl" ];
+
   boot.blacklistedKernelModules = [ "b43" "bcma" "brcmfmac" ];
   boot.extraModulePackages = with config.boot.kernelPackages; [ broadcom_sta ];