Spring cleanup

instances/sif/hm.nix

@@ -13,9 +13,15 @@
     };
     packages = builtins.attrValues {
       inherit (pkgs)
+        # brave
+        # discord
+        # droidcam
         # element-desktop # matrix client
         # evolution
         # freecad
+        # gnome-font-viewer
+        # gucharmap
+        # keyboard-switch
         # krita
         # minecraft
         # mycrypto
@@ -23,37 +29,26 @@
         # retroarchFull
         # shotwell
         # signal-desktop
+        # skypeforlinux
         # slack
+        # transmission_4
         # wineFull
+        # wireguard-tools
         authenticator
         bluetui
-        # brave
         chromium
-        # discord
-        # droidcam
         eog
         evince
         file-roller
-        gallery-dl
-        # gnome-font-viewer
-        gnome-screenshot
-        gnome-system-monitor
-        # gucharmap
         heroic
-        inkscape
-        # keyboard-switch
         openvpn
         p7zip
         pavucontrol
         procps
         protonvpn-gui
-        # skypeforlinux
         spotify
         tdesktop
         teams-for-linux
-        thunderbird
-        # transmission_4
-        # wireguard-tools
         xournalpp
         ;
     };
@@ -66,12 +61,6 @@
   xsession = {
     enable = true;
     numlock.enable = true;
-    # initExtra = ''
-    #   ## Touchpad
-    #   ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Natural Scrolling Enabled' 1
-    #   ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Tapping Enabled' 1
-    #   ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Disable While Typing Enabled' 1
-    # '';
   };
 
   imports = [
@@ -81,8 +70,8 @@
     ../../modules/hm/development/cpp.nix
     ../../modules/hm/development/data.nix
     ../../modules/hm/development/docker.nix
-    ../../modules/hm/development/go.nix
-    ../../modules/hm/development/javascript.nix
+    # ../../modules/hm/development/go.nix
+    # ../../modules/hm/development/javascript.nix
     ../../modules/hm/development/kubernetes.nix
     ../../modules/hm/development/latex.nix
     ../../modules/hm/development/markdown.nix
@@ -93,6 +82,7 @@
 
     # ../../modules/hm/alacritty.nix
     # ../../modules/hm/autorandr.nix
+    # ../../modules/hm/biblio.nix
     # ../../modules/hm/bitwarden.nix
     # ../../modules/hm/blender.nix
     # ../../modules/hm/carapace.nix
@@ -118,7 +108,7 @@
     # ../../modules/hm/twmn.nix
     # ../../modules/hm/update_background.nix
     # ../../modules/hm/vivaldi.nix
-    ../../modules/hm/biblio.nix
+
     ../../modules/hm/cava.nix
     ../../modules/hm/easyeffects.nix
     ../../modules/hm/firefox.nix

modules/hm/development/docker.nix

@@ -8,7 +8,10 @@
     # (builtins.attrValues { inherit (pkgs) docker-compose; })
     # ++
     lib.optionals config.programs.helix.enable (
-      builtins.attrValues { inherit (pkgs.nodePackages) dockerfile-language-server-nodejs; }
+      builtins.attrValues {
+        inherit (pkgs.nodePackages) dockerfile-language-server-nodejs;
+        inherit (pkgs) docker-compose-language-service;
+      }
     );
   # home.shellAliases = {
   #   "dkcd" = "docker-compose down";

modules/hm/development/kubernetes.nix

@@ -1,24 +1,27 @@
 { pkgs, ... }:
-{
-  home = {
-    shellAliases = {
-      "k" = "kubectl";
-    };
-    packages = [
-      (pkgs.wrapHelm pkgs.kubernetes-helm {
+let
+  helm = pkgs.wrapHelm pkgs.kubernetes-helm {
     plugins = builtins.attrValues {
       inherit (pkgs.kubernetes-helmPlugins)
         helm-diff
         # helm-secrets
         ;
     };
-      })
+  };
+in
+{
+  home = {
+    shellAliases = {
+      "k" = "kubectl";
+    };
+    packages = [
+      # pkgs.kustomize
+      # pkgs.lens
+      helm
+      pkgs.awscli2
+      pkgs.k9s
       pkgs.kubectl
       pkgs.kubelogin-oidc
-      # pkgs.kustomize
-      pkgs.k9s
-      pkgs.awscli2
-      pkgs.lens
       pkgs.kubevirt
     ];
   };

modules/hm/development/latex.nix

@@ -23,7 +23,7 @@
     );
 
   home.file.".latexmkrc".text = ''
-    $pdf_previewer = 'zathura %O %S';
+    $pdf_previewer = '${pkgs.zathura}/bin/zathura %O %S';
     $pdf_update_method = 2
   '';
 }

modules/hm/development/markdown.nix

@@ -4,9 +4,6 @@
 , ...
 }:
 {
-  home.packages = [
-    pkgs.pandoc
-    # pkgs.pandoc-drawio-filter
-    # pkgs.pandoc-imagine
-  ] ++ lib.optionals config.programs.helix.enable [ pkgs.marksman ];
+  home.packages =
+    lib.optionals config.programs.helix.enable [ pkgs.marksman ];
 }

modules/hm/development/nix.nix

@@ -7,11 +7,11 @@
   home.packages =
     (builtins.attrValues {
       inherit (pkgs)
-        nixpkgs-fmt
-        nixfmt-classic
+        # nixpkgs-review
         nix-prefetch-scripts
-        nixpkgs-review
         nix-tree
+        nixfmt-classic
+        nixpkgs-fmt
         ;
     })
     ++ lib.optionals config.programs.helix.enable [ pkgs.nil ]

modules/hm/development/web.nix

@@ -1,4 +1,7 @@
 { pkgs, ... }:
 {
-  home.packages = [ pkgs.httpie ];
+  home.packages = [
+    pkgs.bruno
+    pkgs.httpie
+  ];
 }

modules/hm/helix.nix

@@ -15,12 +15,10 @@
   };
   programs.helix = {
     enable = true;
-    languages.language = [
-      {
+    languages.language = [{
       name = "nix";
       auto-format = true;
-      }
-    ];
+    }];
     languages.language-server = {
       nil.config.nil = {
         formatting.command = [ "nixpkgs-fmt" ];