nixbook: tidying, add gopls

home/programs/neovim/default.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{config, pkgs, lib, ...}: {
   programs.nixvim =
     {
       enable = true;
@@ -8,7 +8,8 @@
   programs.vscode = {
     extensions = [pkgs.vscode-extensions.asvetliakov.vscode-neovim];
     userSettings = {
-      "vscode-neovim.neovimExecutablePaths.linux" = "${pkgs.neovim}/bin/nvim";
+      "vscode-neovim.neovimExecutablePaths.linux" =
+        lib.getExe config.programs.nixvim.package;
       "extensions.experimental.affinity" = {
         "asvetliakov.vscode-neovim" = 1;
       };

home/workstation.nix

@@ -36,8 +36,7 @@
 
   programs.rbw.settings.pinentry = pkgs.pinentry-gnome3;
 
-  home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ";
-  home.file.".config/pipewire/pipewire.conf.d/raop-discover.conf".text = ''
+  xdg.configFile."pipewire/pipewire.conf.d/raop-discover.conf".text = ''
     context.modules = [
       {
         name = libpipewire-module-raop-discover

lib/nixvim.nix

@@ -188,6 +188,7 @@
       servers = {
         ts-ls.enable = true;
         nil-ls.enable = true;
+        gopls.enable = true;
       };
       keymaps = {
         lspBuf = {
@@ -263,7 +264,6 @@
     };
 
     oil.enable = true;
-    autoclose.enable = true;
     ts-autotag.enable = true;
     guess-indent.enable = true;
   };

nixos/programs/pipewire.nix

@@ -7,9 +7,8 @@
     alsa.support32Bit = true;
     pulse.enable = true;
     jack.enable = true;
+    raopOpenFirewall = true;
   };
-  # pipewire raop
-  networking.firewall.allowedUDPPorts = [6002 6001];
   # network streaming
   networking.firewall.allowedTCPPorts = [4713];
 }

nixos/workstation.nix

@@ -10,19 +10,6 @@
   ];
 
   security.polkit.enable = true;
-  systemd.user.services.polkit-gnome-authentication-agent-1 = {
-    description = "polkit-gnome-authentication-agent-1";
-    wantedBy = ["graphical-session.target"];
-    wants = ["graphical-session.target"];
-    after = ["graphical-session.target"];
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-      Restart = "on-failure";
-      RestartSec = 1;
-      TimeoutStopSec = 10;
-    };
-  };
 
   hardware.opentabletdriver.enable = true;