common.nix

@@ -34,7 +34,6 @@ with builtins;
       iw
       btop
       nodejs
-      nautilus
 
       cmatrix
       sl

hosts/monosodium-glutamate-g/configuration.nix

@@ -54,7 +54,6 @@
 
   # missing: menu-qalc picom-jonaburg
   environment.systemPackages = with pkgs; [
-    uhk-agent
     # TODO: clean up.
     zenstates
     zenmonitor

modules/desktop-legacy/social.nix

@@ -21,46 +21,18 @@ with lib;
       }:
       {
         programs.nixcord = {
-          enable = true;
+          enable = false;
-          discord.enable = true;
+          vesktop = {
-          discord.vencord.enable = true;
+            enable = true;
-          discord.autoscroll.enable = true;
+            # autoScroll.enable = true;
-          # vesktop = {
+          };
-          #   enable = true;
-          # autoScroll.enable = true;
-          # };
           config = {
             frameless = true;
             disableMinSize = true;
-            plugins = {
-              alwaysTrust.enable = true;
-              betterFolders.enable = true;
-              betterGifAltText.enable = true;
-              callTimer.enable = true;
-              clearURLs.enable = true;
-              fakeNitro.enable = true;
-              forceOwnerCrown.enable = true;
-              friendsSince.enable = true;
-              fullSearchContext.enable = true;
-              gameActivityToggle.enable = true;
-              imageZoom.enable = true;
-              implicitRelationships.enable = true;
-              noDevtoolsWarning.enable = true;
-              oneko.enable = true;
-              petpet.enable = true;
-              pictureInPicture.enable = true;
-              previewMessage.enable = true;
-              pronounDB.enable = true;
-              relationshipNotifier.enable = true;
-              serverInfo.enable = true;
-              showMeYourName.enable = true;
-              volumeBooster.enable = true;
-              youtubeAdblock.enable = true;
-            };
           };
         };
         home.packages = with pkgs; [
-
+            vesktop
           signal-desktop
           mumble
           element-desktop

modules/desktop/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   imports = [
     ./audio.nix
@@ -18,12 +18,4 @@
     enable = true;
     openFirewall = true;
   };
-
-  xdg.portal.extraPortals = [
-    pkgs.xdg-desktop-portal-cosmic
-  ];
-  xdg.portal.config.common.default = [
-    # "cosmic"
-    "gnome"
-  ];
 }

modules/desktop/home/browser.nix

@@ -35,8 +35,6 @@
             "multi-account-containers"
             "tabby-cat-friend"
             "indie-wiki-buddy"
-            "kagi-search-for-firefox"
-            "view-page-archive"
           ];
       Extensions.Uninstall = [
         "google@search.mozilla.org"

modules/editors/helix/default.nix

@@ -117,13 +117,13 @@
             "discord-presence-lsp"
           ];
         }
+        {
+          name = "php";
+          language-servers = [ "psalm" ];
+        }
         {
           name = "nix";
-          language-servers = [
+          # language-servers = [""]
-            "nil"
-            "nixd"
-            "discord-presence-lsp"
-          ];
           formatter = {
             command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
             args = [ "--quiet" ];
@@ -133,14 +133,7 @@
         {
           name = "rust";
           language-servers = [
-            "rust-analyzer"
+            # "rust-analyzer"
-            "discord-presence-lsp"
-          ];
-        }
-        {
-          name = "typst";
-          language-servers = [
-            "tinymist"
             "discord-presence-lsp"
           ];
         }
@@ -150,7 +143,6 @@
           language-servers = [
             "vscode-html-language-server"
             "emmet-language-server"
-            "discord-presence-lsp"
           ];
           auto-format = false;
         }

modules/media/default.nix

@@ -31,10 +31,9 @@ with lib;
           rawtherapee
           scribus
           audacity
-          blockbench
 
-          # openscad-unstable
+          openscad-unstable
-          # openscad-lsp
+          openscad-lsp
 
           imagemagick
           ffmpeg_7-full

modules/media/fonts.nix

@@ -31,7 +31,6 @@
       inter
       b612
       departure-mono
-      yasashisa-gothic
     ];
     fontDir.enable = true;
   };

modules/shell/nu/custom_commands.nu

@@ -16,9 +16,10 @@ def nr [
 def lcr [
     file_extension: string
 ] {
-    glob **/*.($file_extension)
+    ls **/*
+    | where name ends-with $".($file_extension)" 
     | par-each {|file| 
-        open $file
+        open $file.name 
         | lines --skip-empty 
         | length } 
     | math sum
@@ -44,7 +45,7 @@ def typed [
     } else if ($"($name).pdf" | path exists) {
         typst compile $"($name).typ"
     } 
-    mprocs --names Editor,Viewer,Notify $"hx '($name).typ'" $"while true; do mupdf-x11 '($name).pdf' && break; done" $"bash -c 'while inotifywait -e modify \'($name).pdf\' ; do pkill -HUP mupdf; done'"
+    mprocs --names Editor,Viewer,Notify $"hx '($name).typ'" $"while true; do mupdf-x11 '($name).pdf' && break; done" $"while inotifywait -e modify '($name).pdf' ; do pkill -HUP mupdf; done"
 }
 
 # figure out when the next event is
@@ -98,8 +99,3 @@ def "dp gay" [] {
     swaymsg "output DP-3 position 0 0 scale 1 transform normal resolution 1920x1080@60Hz"
     bars "LEN G27c-10"
 }
-
-def oobs [] {
-    set-env SHELL /run/current-system/sw/bin/bash
-    obs
-}