Merge branch 'nixbook/cosmic' into zenix/hm-cosmic

hardware/fcs-tristan-nixbook.nix

@@ -60,7 +60,7 @@ in {
   boot.plymouth.enable = true;
   boot.initrd.verbose = false;
   boot.consoleLogLevel = 1;
-  boot.kernelParams = [ "quiet" "udev.log_level=3" ];
+  boot.kernelParams = ["quiet" "udev.log_level=3"];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -110,5 +110,4 @@ in {
       };
     }
   ];
-
 }

home/programs/graphical.nix

@@ -1,7 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}: {
   imports = [
     ./pcmanfm.nix
     ./mpv.nix
@@ -34,7 +31,6 @@
     bitwarden
   ];
 
-
   xdg.mimeApps.defaultApplications = {
     "application/pdf" = "sioyek.desktop";
   };

home/programs/neovim/default.nix

@@ -1,14 +1,20 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   programs.nixvim =
     {
       enable = true;
     }
-    // ( import ../../../lib/nixvim.nix {inherit pkgs;} );
+    // (import ../../../lib/nixvim.nix {inherit pkgs;});
 
   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/programs/work.nix

@@ -41,7 +41,6 @@ in {
       remoteWorkspaceFolder=$(echo $res | ${jq} -r '.remoteWorkspaceFolder')
       docker exec -it --workdir=$remoteWorkspaceFolder $containerId bash
     ''))
-
   ];
 
   home.sessionVariables = {

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";
+  xdg.configFile."pipewire/pipewire.conf.d/raop-discover.conf".text = ''
-  home.file.".config/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 = {
@@ -201,7 +202,7 @@
 
     cmp = {
       enable = true;
-      settings =  {
+      settings = {
         mapping = {
           "<C-Space>" = "cmp.mapping.complete()";
           "<C-u>" = "cmp.mapping.scroll_docs(4)";
@@ -212,9 +213,9 @@
           "<C-n>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
         };
         sources = [
-          { name = "nvim_lsp"; }
+          {name = "nvim_lsp";}
-          { name = "path"; }
+          {name = "path";}
-          { name = "buffer"; }
+          {name = "buffer";}
         ];
       };
     };
@@ -255,17 +256,24 @@
         enable = true;
         lookahead = true;
         keymaps = {
-          "af" = { query = "@function.outer"; desc = "Function Outer"; };
+          "af" = {
-          "ac" = { query = "@comment.outer"; desc = "Comment Outer"; };
+            query = "@function.outer";
-          "if" = { query = "@function.inner"; desc = "Function Inner"; };
+            desc = "Function Outer";
+          };
+          "ac" = {
+            query = "@comment.outer";
+            desc = "Comment Outer";
+          };
+          "if" = {
+            query = "@function.inner";
+            desc = "Function Inner";
+          };
         };
       };
     };
 
     oil.enable = true;
-    autoclose.enable = true;
     ts-autotag.enable = true;
     guess-indent.enable = true;
   };
-
 }

nixos/modules/work.nix

@@ -17,7 +17,6 @@ in {
     "openssl-1.1.1w" # required for mongodb
   ];
 
-
   networking = {
     networkmanager = {
       plugins = [pkgs.networkmanager-openvpn];

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;
 

pkgs/mongodb.nix

@@ -1,6 +1,9 @@
-{stdenv, pkgs, ...}:
+{
-let
+  stdenv,
-    version = "6.0.14";
+  pkgs,
+  ...
+}: let
+  version = "6.0.14";
 in
   stdenv.mkDerivation {
     name = "mongodb";
@@ -29,4 +32,3 @@ in
       runHook postInstall
     '';
   }
-