From 2c2c38225adc368a6abbacd47b97218393b8912e Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 1 Feb 2025 00:26:39 -0600 Subject: [PATCH] feat: tuning up --- config/themes/default.nix | 2 +- .../config/bookmarks/config/development.nix | 2 +- .../bookmarks/config/flake/selfHosted.nix | 46 +++++++++---------- .../config/search/config/development.nix | 8 +++- .../apps/code/vsCode/config/userSettings.nix | 5 +- .../code/zed/config/userSettings/default.nix | 5 +- .../gui/desktop/dunst/config/settings.nix | 4 ++ .../modules/gui/desktop/flameshot/default.nix | 19 +++++++- home/modules/gui/desktop/wallet/default.nix | 18 ++++++++ nixos/modules/environment.nix | 5 -- nixos/modules/hyprland/default.nix | 9 ++++ nixos/modules/hyprland/wayland.nix | 2 - 12 files changed, 85 insertions(+), 40 deletions(-) create mode 100755 home/modules/gui/desktop/wallet/default.nix diff --git a/config/themes/default.nix b/config/themes/default.nix index 4db96d6..5bd606b 100755 --- a/config/themes/default.nix +++ b/config/themes/default.nix @@ -35,7 +35,7 @@ in }; fonts = { names = { - name0 = "MonaspiceAr Nerd Font"; + name0 = "MonaspiceNe Nerd Font"; name1 = ""; }; sizes = { diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix index 71269f2..85f01f0 100755 --- a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix +++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix @@ -3,7 +3,7 @@ let "git" "gitlab" ]; - gitlabURL = "https://gitlab.com/"; + gitlabURL = "https://gitlab.com"; in { name = "Development"; diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix index ec0a9ae..b9f26fd 100755 --- a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix +++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix @@ -139,29 +139,29 @@ in tags = ollamaTags; keyword = instances.ollama.label; } - { - name = "${instances.owncast.label} (Admin)"; - url = "http://${server.ip.address0}:${toString instances.owncast.ports.port0}/admin"; - tags = owncastTags; - keyword = instances.owncast.label; - } - { - name = "${instances.owncast.label} (Server)"; - url = "http://${instances.owncast.subdomain}.${instances.web.domains.url1}"; - tags = owncastTags; - keyword = instances.owncast.label; - } - { - name = instances.peertube.label; - url = "https://${instances.peertube.subdomain}.${instances.web.domains.url3}"; - tags = [ - instances.peertube.name - "peer" - "tube" - "uprootnutrition" - ]; - keyword = instances.peertube.label; - } + # { + # name = "${instances.owncast.label} (Admin)"; + # url = "http://${server.ip.address0}:${toString instances.owncast.ports.port0}/admin"; + # tags = owncastTags; + # keyword = instances.owncast.label; + # } + # { + # name = "${instances.owncast.label} (Server)"; + # url = "http://${instances.owncast.subdomain}.${instances.web.domains.url1}"; + # tags = owncastTags; + # keyword = instances.owncast.label; + # } + # { + # name = instances.peertube.label; + # url = "https://${instances.peertube.subdomain}.${instances.web.domains.url3}"; + # tags = [ + # instances.peertube.name + # "peer" + # "tube" + # "uprootnutrition" + # ]; + # keyword = instances.peertube.label; + # } { name = "Router"; url = "http://${instances.web.localhost.address2}"; diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/development.nix b/home/modules/gui/apps/browsers/firefox/config/search/config/development.nix index 9d4c03d..6e557b2 100755 --- a/home/modules/gui/apps/browsers/firefox/config/search/config/development.nix +++ b/home/modules/gui/apps/browsers/firefox/config/search/config/development.nix @@ -41,7 +41,9 @@ ]; icon = ./icons/nx.png; urls = [ - { template = "https://searchix.alanpearce.eu/options/nixos/search?query={searchTerms}"; } + { + template = "https://search.nixos.org/options?channel=unstable&size=50&sort=relevance&type=packages&query={searchTerms}"; + } ]; }; "Nix Packages" = { @@ -50,7 +52,9 @@ ]; icon = ./icons/nx.png; urls = [ - { template = "https://searchix.alanpearce.eu/packages/nixpkgs/search?query={searchTerms}"; } + { + template = "https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query={searchTerms}"; + } ]; }; "Nix Wiki" = { diff --git a/home/modules/gui/apps/code/vsCode/config/userSettings.nix b/home/modules/gui/apps/code/vsCode/config/userSettings.nix index 0b675e6..451d0b9 100755 --- a/home/modules/gui/apps/code/vsCode/config/userSettings.nix +++ b/home/modules/gui/apps/code/vsCode/config/userSettings.nix @@ -23,12 +23,13 @@ in "workbench.colorTheme" = "Catppuccin Macchiato"; "workbench.statusBar.visible" = false; "editor.multiCursorLimit" = 700000; - "elmLS.disableElmLSDiagnostics" = true; - "elmLS.elmReviewDiagnostics" = "warning"; "editor.wordWrap" = "on"; "editor.fontSize" = fonts.sizes.applications.size0; "editor.fontFamily" = "'${fonts.names.name0}', 'monospace', monospace"; "terminal.integrated.fontSize" = fonts.sizes.applications.size0; "terminal.integrated.fontFamily" = "'${fonts.names.name0}', 'monospace', monospace"; "editor.fontLigatures" = true; + "elmLS.disableElmLSDiagnostics" = true; + "elmLS.elmReviewDiagnostics" = "warning"; + "elmLS.elmReviewPath" = "/etc/profiles/per-user/nick/bin/elm-review"; } diff --git a/home/modules/gui/apps/code/zed/config/userSettings/default.nix b/home/modules/gui/apps/code/zed/config/userSettings/default.nix index 185ff12..8dd5b6f 100755 --- a/home/modules/gui/apps/code/zed/config/userSettings/default.nix +++ b/home/modules/gui/apps/code/zed/config/userSettings/default.nix @@ -1,6 +1,5 @@ { flake, - config, lib, pkgs, ... @@ -12,7 +11,7 @@ let languagesPath = import (configPath + /languages); lspPath = import (configPath + /lsp); terminalPath = import (configPath + /terminal) { inherit flake; }; - experimentalPath = import (configPath + /theme) { inherit config flake; }; + # experimentalPath = import (configPath + /theme) { inherit config flake; }; gitPath = import (configPath + /git); miscPath = import (configPath + /misc) { inherit lib pkgs; }; in @@ -21,7 +20,7 @@ in languages = languagesPath; lsp = lspPath; terminal = terminalPath; - experimental.theme_overrides = experimentalPath; + # experimental.theme_overrides = experimentalPath; } // assistantPath diff --git a/home/modules/gui/desktop/dunst/config/settings.nix b/home/modules/gui/desktop/dunst/config/settings.nix index 709372d..bed0f5e 100755 --- a/home/modules/gui/desktop/dunst/config/settings.nix +++ b/home/modules/gui/desktop/dunst/config/settings.nix @@ -52,4 +52,8 @@ in frame_color = makeColor el.base09; timeout = 0; }; + skip-rule = { + appname = "flameshot"; + skip_display = true; + }; } diff --git a/home/modules/gui/desktop/flameshot/default.nix b/home/modules/gui/desktop/flameshot/default.nix index 9752171..2de352c 100755 --- a/home/modules/gui/desktop/flameshot/default.nix +++ b/home/modules/gui/desktop/flameshot/default.nix @@ -1,11 +1,28 @@ +{ pkgs, ... }: +let + flameshotGrim = pkgs.flameshot.overrideAttrs (oldAttrs: { + src = pkgs.fetchFromGitHub { + owner = "flameshot-org"; + repo = "flameshot"; + rev = "3d21e4967b68e9ce80fb2238857aa1bf12c7b905"; + sha256 = "sha256-OLRtF/yjHDN+sIbgilBZ6sBZ3FO6K533kFC1L2peugc="; + }; + cmakeFlags = [ + "-DUSE_WAYLAND_CLIPBOARD=1" + "-DUSE_WAYLAND_GRIM=1" + ]; + buildInputs = oldAttrs.buildInputs ++ [ pkgs.libsForQt5.kguiaddons ]; + }); +in { services.flameshot = { enable = true; + package = flameshotGrim; settings = { General = { disabledTrayIcon = true; showStartupLaunchMessage = false; - disabledGrimWarning = true; + # disabledGrimWarning = true; }; }; }; diff --git a/home/modules/gui/desktop/wallet/default.nix b/home/modules/gui/desktop/wallet/default.nix new file mode 100755 index 0000000..14c62f0 --- /dev/null +++ b/home/modules/gui/desktop/wallet/default.nix @@ -0,0 +1,18 @@ +{ + pkgs, + ... +}: +{ + home.packages = builtins.attrValues { + inherit (pkgs.kdePackages) + kwallet-pam + # kwalletmanager + ; + }; + programs.gpg = { + enable = true; + }; +} + +# use this to make annoying shit go away: +# gpg --pinentry-mode loopback --full-generate-key diff --git a/nixos/modules/environment.nix b/nixos/modules/environment.nix index bd2bf9e..40ec512 100755 --- a/nixos/modules/environment.nix +++ b/nixos/modules/environment.nix @@ -21,13 +21,8 @@ VIDEO_PLAYER = "mpv"; EDITOR = "hx"; TERM = "ghostty"; - WLR_NO_HARDWARE_CURSORS = "1"; - WLR_DRM_NO_ATOMIC = "1"; NIXPKGS_ALLOW_INSECURE = "1"; NIXPKGS_ALLOW_UNFREE = "1"; - FLAMESHOT_ENABLE_WAYLAND = "1"; - USE_WAYLAND_GRIM = "1"; - USE_WAYLAND_CLIPBOARD = "1"; GTK_THEME = "catppuccin-macchiato-mauve-compact"; # ANTHROPIC_API_KEY = config.sops.secrets.claude-api-key.path; }; diff --git a/nixos/modules/hyprland/default.nix b/nixos/modules/hyprland/default.nix index 7389e7b..890b266 100755 --- a/nixos/modules/hyprland/default.nix +++ b/nixos/modules/hyprland/default.nix @@ -10,4 +10,13 @@ "thunar" "wayland" ]; + environment = { + variables = { + WLR_NO_HARDWARE_CURSORS = "1"; + WLR_DRM_NO_ATOMIC = "1"; + FLAMESHOT_ENABLE_WAYLAND = "1"; + USE_WAYLAND_GRIM = "1"; + USE_WAYLAND_CLIPBOARD = "1"; + }; + }; } diff --git a/nixos/modules/hyprland/wayland.nix b/nixos/modules/hyprland/wayland.nix index cc19e3e..a455fbe 100755 --- a/nixos/modules/hyprland/wayland.nix +++ b/nixos/modules/hyprland/wayland.nix @@ -5,7 +5,6 @@ xdg = { portal = { enable = true; - extraPortals = builtins.attrValues { inherit (pkgs) xdg-desktop-portal-hyprland @@ -14,7 +13,6 @@ xdg-desktop-portal-gtk ; }; - wlr.enable = true; xdgOpenUsePortal = true; };