From ca39b169c2158a5cb07d4bb5634566e6b1e4a627 Mon Sep 17 00:00:00 2001
From: tristan <tristan@tristans.cloud>
Date: Thu, 24 Oct 2024 10:45:12 +0100
Subject: [PATCH] nixbook: tidying, add gopls

---
 home/programs/neovim/default.nix |  5 +++--
 home/workstation.nix             |  3 +--
 lib/nixvim.nix                   |  2 +-
 nixos/programs/pipewire.nix      |  3 +--
 nixos/workstation.nix            | 13 -------------
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/home/programs/neovim/default.nix b/home/programs/neovim/default.nix
index 4e99ede..4685486 100644
--- a/home/programs/neovim/default.nix
+++ b/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;
       };
diff --git a/home/workstation.nix b/home/workstation.nix
index 0a6c574..88ebdcf 100644
--- a/home/workstation.nix
+++ b/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
diff --git a/lib/nixvim.nix b/lib/nixvim.nix
index 2d44525..b94c0e9 100644
--- a/lib/nixvim.nix
+++ b/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;
   };
diff --git a/nixos/programs/pipewire.nix b/nixos/programs/pipewire.nix
index 2610134..57a8694 100644
--- a/nixos/programs/pipewire.nix
+++ b/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];
 }
diff --git a/nixos/workstation.nix b/nixos/workstation.nix
index ebb0c3a..b997b05 100644
--- a/nixos/workstation.nix
+++ b/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;