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

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 = {