diff --git a/common.nix b/common.nix index 4c6e6f7..0cc32c8 100644 --- a/common.nix +++ b/common.nix @@ -34,6 +34,7 @@ with builtins; iw btop nodejs + nautilus cmatrix sl diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix index dbd0cec..54b8e44 100644 --- a/hosts/monosodium-glutamate-g/configuration.nix +++ b/hosts/monosodium-glutamate-g/configuration.nix @@ -54,6 +54,7 @@ # missing: menu-qalc picom-jonaburg environment.systemPackages = with pkgs; [ + uhk-agent # TODO: clean up. zenstates zenmonitor diff --git a/modules/desktop-legacy/social.nix b/modules/desktop-legacy/social.nix index 6325c97..895f41e 100644 --- a/modules/desktop-legacy/social.nix +++ b/modules/desktop-legacy/social.nix @@ -21,18 +21,46 @@ with lib; }: { programs.nixcord = { - enable = false; - vesktop = { - enable = true; - # autoScroll.enable = true; - }; + enable = true; + discord.enable = true; + discord.vencord.enable = true; + discord.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 diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index fb57132..6046083 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { imports = [ ./audio.nix @@ -18,4 +18,12 @@ enable = true; openFirewall = true; }; + + xdg.portal.extraPortals = [ + pkgs.xdg-desktop-portal-cosmic + ]; + xdg.portal.config.common.default = [ + # "cosmic" + "gnome" + ]; } diff --git a/modules/desktop/home/browser.nix b/modules/desktop/home/browser.nix index 6b45cc4..ae68429 100644 --- a/modules/desktop/home/browser.nix +++ b/modules/desktop/home/browser.nix @@ -35,6 +35,8 @@ "multi-account-containers" "tabby-cat-friend" "indie-wiki-buddy" + "kagi-search-for-firefox" + "view-page-archive" ]; Extensions.Uninstall = [ "google@search.mozilla.org" diff --git a/modules/editors/helix/default.nix b/modules/editors/helix/default.nix index 782e733..e0dd32f 100644 --- a/modules/editors/helix/default.nix +++ b/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,7 +133,14 @@ { name = "rust"; language-servers = [ - # "rust-analyzer" + "rust-analyzer" + "discord-presence-lsp" + ]; + } + { + name = "typst"; + language-servers = [ + "tinymist" "discord-presence-lsp" ]; } @@ -143,6 +150,7 @@ language-servers = [ "vscode-html-language-server" "emmet-language-server" + "discord-presence-lsp" ]; auto-format = false; } diff --git a/modules/media/default.nix b/modules/media/default.nix index 3726cda..e1e0069 100644 --- a/modules/media/default.nix +++ b/modules/media/default.nix @@ -31,9 +31,10 @@ with lib; rawtherapee scribus audacity + blockbench - openscad-unstable - openscad-lsp + # openscad-unstable + # openscad-lsp imagemagick ffmpeg_7-full diff --git a/modules/media/fonts.nix b/modules/media/fonts.nix index 2046198..77cd112 100644 --- a/modules/media/fonts.nix +++ b/modules/media/fonts.nix @@ -31,6 +31,7 @@ inter b612 departure-mono + yasashisa-gothic ]; fontDir.enable = true; }; diff --git a/modules/shell/nu/custom_commands.nu b/modules/shell/nu/custom_commands.nu index fc22cba..1f13059 100644 --- a/modules/shell/nu/custom_commands.nu +++ b/modules/shell/nu/custom_commands.nu @@ -16,10 +16,9 @@ def nr [ def lcr [ file_extension: string ] { - ls **/* - | where name ends-with $".($file_extension)" + glob **/*.($file_extension) | par-each {|file| - open $file.name + open $file | lines --skip-empty | length } | math sum @@ -45,7 +44,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" $"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" $"bash -c 'while inotifywait -e modify \'($name).pdf\' ; do pkill -HUP mupdf; done'" } # figure out when the next event is @@ -99,3 +98,8 @@ 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 +}