feat: tuning up

This commit is contained in:
Nick 2025-02-01 00:26:39 -06:00
parent e7cac64fb7
commit 2c2c38225a
12 changed files with 85 additions and 40 deletions

View file

@ -35,7 +35,7 @@ in
}; };
fonts = { fonts = {
names = { names = {
name0 = "MonaspiceAr Nerd Font"; name0 = "MonaspiceNe Nerd Font";
name1 = ""; name1 = "";
}; };
sizes = { sizes = {

View file

@ -3,7 +3,7 @@ let
"git" "git"
"gitlab" "gitlab"
]; ];
gitlabURL = "https://gitlab.com/"; gitlabURL = "https://gitlab.com";
in in
{ {
name = "Development"; name = "Development";

View file

@ -139,29 +139,29 @@ in
tags = ollamaTags; tags = ollamaTags;
keyword = instances.ollama.label; keyword = instances.ollama.label;
} }
{ # {
name = "${instances.owncast.label} (Admin)"; # name = "${instances.owncast.label} (Admin)";
url = "http://${server.ip.address0}:${toString instances.owncast.ports.port0}/admin"; # url = "http://${server.ip.address0}:${toString instances.owncast.ports.port0}/admin";
tags = owncastTags; # tags = owncastTags;
keyword = instances.owncast.label; # keyword = instances.owncast.label;
} # }
{ # {
name = "${instances.owncast.label} (Server)"; # name = "${instances.owncast.label} (Server)";
url = "http://${instances.owncast.subdomain}.${instances.web.domains.url1}"; # url = "http://${instances.owncast.subdomain}.${instances.web.domains.url1}";
tags = owncastTags; # tags = owncastTags;
keyword = instances.owncast.label; # keyword = instances.owncast.label;
} # }
{ # {
name = instances.peertube.label; # name = instances.peertube.label;
url = "https://${instances.peertube.subdomain}.${instances.web.domains.url3}"; # url = "https://${instances.peertube.subdomain}.${instances.web.domains.url3}";
tags = [ # tags = [
instances.peertube.name # instances.peertube.name
"peer" # "peer"
"tube" # "tube"
"uprootnutrition" # "uprootnutrition"
]; # ];
keyword = instances.peertube.label; # keyword = instances.peertube.label;
} # }
{ {
name = "Router"; name = "Router";
url = "http://${instances.web.localhost.address2}"; url = "http://${instances.web.localhost.address2}";

View file

@ -41,7 +41,9 @@
]; ];
icon = ./icons/nx.png; icon = ./icons/nx.png;
urls = [ 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" = { "Nix Packages" = {
@ -50,7 +52,9 @@
]; ];
icon = ./icons/nx.png; icon = ./icons/nx.png;
urls = [ 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" = { "Nix Wiki" = {

View file

@ -23,12 +23,13 @@ in
"workbench.colorTheme" = "Catppuccin Macchiato"; "workbench.colorTheme" = "Catppuccin Macchiato";
"workbench.statusBar.visible" = false; "workbench.statusBar.visible" = false;
"editor.multiCursorLimit" = 700000; "editor.multiCursorLimit" = 700000;
"elmLS.disableElmLSDiagnostics" = true;
"elmLS.elmReviewDiagnostics" = "warning";
"editor.wordWrap" = "on"; "editor.wordWrap" = "on";
"editor.fontSize" = fonts.sizes.applications.size0; "editor.fontSize" = fonts.sizes.applications.size0;
"editor.fontFamily" = "'${fonts.names.name0}', 'monospace', monospace"; "editor.fontFamily" = "'${fonts.names.name0}', 'monospace', monospace";
"terminal.integrated.fontSize" = fonts.sizes.applications.size0; "terminal.integrated.fontSize" = fonts.sizes.applications.size0;
"terminal.integrated.fontFamily" = "'${fonts.names.name0}', 'monospace', monospace"; "terminal.integrated.fontFamily" = "'${fonts.names.name0}', 'monospace', monospace";
"editor.fontLigatures" = true; "editor.fontLigatures" = true;
"elmLS.disableElmLSDiagnostics" = true;
"elmLS.elmReviewDiagnostics" = "warning";
"elmLS.elmReviewPath" = "/etc/profiles/per-user/nick/bin/elm-review";
} }

View file

@ -1,6 +1,5 @@
{ {
flake, flake,
config,
lib, lib,
pkgs, pkgs,
... ...
@ -12,7 +11,7 @@ let
languagesPath = import (configPath + /languages); languagesPath = import (configPath + /languages);
lspPath = import (configPath + /lsp); lspPath = import (configPath + /lsp);
terminalPath = import (configPath + /terminal) { inherit flake; }; terminalPath = import (configPath + /terminal) { inherit flake; };
experimentalPath = import (configPath + /theme) { inherit config flake; }; # experimentalPath = import (configPath + /theme) { inherit config flake; };
gitPath = import (configPath + /git); gitPath = import (configPath + /git);
miscPath = import (configPath + /misc) { inherit lib pkgs; }; miscPath = import (configPath + /misc) { inherit lib pkgs; };
in in
@ -21,7 +20,7 @@ in
languages = languagesPath; languages = languagesPath;
lsp = lspPath; lsp = lspPath;
terminal = terminalPath; terminal = terminalPath;
experimental.theme_overrides = experimentalPath; # experimental.theme_overrides = experimentalPath;
} }
// assistantPath // assistantPath

View file

@ -52,4 +52,8 @@ in
frame_color = makeColor el.base09; frame_color = makeColor el.base09;
timeout = 0; timeout = 0;
}; };
skip-rule = {
appname = "flameshot";
skip_display = true;
};
} }

View file

@ -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 = { services.flameshot = {
enable = true; enable = true;
package = flameshotGrim;
settings = { settings = {
General = { General = {
disabledTrayIcon = true; disabledTrayIcon = true;
showStartupLaunchMessage = false; showStartupLaunchMessage = false;
disabledGrimWarning = true; # disabledGrimWarning = true;
}; };
}; };
}; };

View file

@ -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

View file

@ -21,13 +21,8 @@
VIDEO_PLAYER = "mpv"; VIDEO_PLAYER = "mpv";
EDITOR = "hx"; EDITOR = "hx";
TERM = "ghostty"; TERM = "ghostty";
WLR_NO_HARDWARE_CURSORS = "1";
WLR_DRM_NO_ATOMIC = "1";
NIXPKGS_ALLOW_INSECURE = "1"; NIXPKGS_ALLOW_INSECURE = "1";
NIXPKGS_ALLOW_UNFREE = "1"; NIXPKGS_ALLOW_UNFREE = "1";
FLAMESHOT_ENABLE_WAYLAND = "1";
USE_WAYLAND_GRIM = "1";
USE_WAYLAND_CLIPBOARD = "1";
GTK_THEME = "catppuccin-macchiato-mauve-compact"; GTK_THEME = "catppuccin-macchiato-mauve-compact";
# ANTHROPIC_API_KEY = config.sops.secrets.claude-api-key.path; # ANTHROPIC_API_KEY = config.sops.secrets.claude-api-key.path;
}; };

View file

@ -10,4 +10,13 @@
"thunar" "thunar"
"wayland" "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";
};
};
} }

View file

@ -5,7 +5,6 @@
xdg = { xdg = {
portal = { portal = {
enable = true; enable = true;
extraPortals = builtins.attrValues { extraPortals = builtins.attrValues {
inherit (pkgs) inherit (pkgs)
xdg-desktop-portal-hyprland xdg-desktop-portal-hyprland
@ -14,7 +13,6 @@
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
; ;
}; };
wlr.enable = true; wlr.enable = true;
xdgOpenUsePortal = true; xdgOpenUsePortal = true;
}; };