diff --git a/nixcfgs/modules/nixos/desktop/de/gnome.nix b/nixcfgs/modules/nixos/desktop/de/gnome.nix index 84285a1..2de5bd3 100644 --- a/nixcfgs/modules/nixos/desktop/de/gnome.nix +++ b/nixcfgs/modules/nixos/desktop/de/gnome.nix @@ -15,6 +15,7 @@ gobject-introspection ]; environment.gnome.excludePackages = with pkgs; [ + # LibAdwaita sucks evince # Document Viewer (Legacy) totem # GNOME Videos (legacy) papers # Document Viewer @@ -23,5 +24,10 @@ epiphany # GNOME Web gnome-system-monitor # use mission-center gnome-terminal + showtime # Media player + gnome-music + gnome-connections + gnome-font-viewer + gnome-maps ]; } diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 4814dec..c3c65f7 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -119,6 +119,7 @@ in { calibre dconf-editor fsearch # Everything-like search tool + kdePackages.elisa ] ++ (mkFcitxIM [ pkgs.neovim-qt diff --git a/nixcfgs/users/js0ny/packages/stylix.nix b/nixcfgs/users/js0ny/packages/stylix.nix index eab052c..c2bc9cf 100644 --- a/nixcfgs/users/js0ny/packages/stylix.nix +++ b/nixcfgs/users/js0ny/packages/stylix.nix @@ -71,8 +71,8 @@ in { }; }; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/deep-oceanic-next.yaml"; image = ./wallpaper.jpg; - polarity = "light"; + polarity = "dark"; }; } diff --git a/nixcfgs/users/js0ny/programs/aichat.nix b/nixcfgs/users/js0ny/programs/aichat.nix index 4f3ec6f..ef4eaee 100644 --- a/nixcfgs/users/js0ny/programs/aichat.nix +++ b/nixcfgs/users/js0ny/programs/aichat.nix @@ -12,6 +12,7 @@ {name = "google/gemini-2.5-flash";} {name = "google/gemini-2.5-pro";} {name = "google/gemini-3-pro-preview";} + {name = "google/gemini-3-flash-preview";} {name = "anthropic/claude-sonnet-4.5";} {name = "anthropic/claude-haiku-4.5";} {name = "anthropic/claude-opus-4.5";} diff --git a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/keymaps.nix b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/keymaps.nix index fc1c030..be5e236 100644 --- a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/keymaps.nix +++ b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/keymaps.nix @@ -33,6 +33,7 @@ in { # "Mod+E".action = spawn "${lib.getExe nirictl.focusOrLaunch}" "org.kde.dolphin" "dolphin"; "Mod+E".action = spawn-sh "xdg-open ~"; "Mod+Shift+E".action = spawn "fsearch"; + "Mod+Alt+E".action = spawn "${term} yazi"; "Mod+Shift+Return".action = spawn-sh "${term} --app-id=terminal-popup"; # "Mod+Shift+Alt+Return".action = spawn-sh "${term} --app-id=kitty--terminal-popup --working-directory='${config.home.homeDirectory}/.config/shells/nohist' -e nix develop"; @@ -111,8 +112,8 @@ in { "Mod+Up".action = focus-window-up; "Mod+Right".action = focus-column-right; "Mod+H".action = focus-column-left; - "Mod+J".action = focus-window-down; - "Mod+K".action = focus-window-up; + "Mod+J".action = focus-window-or-workspace-down; + "Mod+K".action = focus-window-or-workspace-up; "Mod+L".action = focus-column-right; "Mod+Shift+Left".action = move-column-left; @@ -120,8 +121,8 @@ in { "Mod+Shift+Up".action = move-window-up; "Mod+Shift+Right".action = move-column-right; "Mod+Shift+H".action = move-column-left; - "Mod+Shift+J".action = move-window-down; - "Mod+Shift+K".action = move-window-up; + "Mod+Shift+J".action = move-window-to-workspace-down; + "Mod+Shift+K".action = move-window-to-workspace-up; "Mod+Shift+L".action = move-column-right; "Mod+Home".action = focus-column-first; @@ -219,10 +220,11 @@ in { "Mod+G".hotkey-overlay.title = "Toggle Grouped Display"; "Mod+G".action = toggle-column-tabbed-display; - "Mod+Shift+S".action.screenshot = {show-pointer = true;}; - "Print".action.screenshot = {show-pointer = true;}; - "Ctrl+Print".action.screenshot-screen = {show-pointer = true;}; - "Mod+Alt+S".action.screenshot-screen = {show-pointer = true;}; + # Disable pointer by default, toggle with `p` key + "Mod+Shift+S".action.screenshot = {show-pointer = false;}; + "Print".action.screenshot = {show-pointer = false;}; + "Ctrl+Print".action.screenshot-screen = {show-pointer = false;}; + "Mod+Alt+S".action.screenshot-screen = {show-pointer = false;}; "Alt+Print".action.screenshot-window = {write-to-disk = true;}; "Mod+S".action.screenshot-window = {write-to-disk = true;}; diff --git a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/window-rules.nix b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/window-rules.nix index f16fc4a..486a4b3 100644 --- a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/window-rules.nix +++ b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/window-rules.nix @@ -24,6 +24,10 @@ app-id = "^org.gnome.Nautilus$"; title = "^Select Document$"; } + { + app-id = "^org.gnome.Settings.GlobalShortcutsProvider$"; + title = "^Add Keyboard Shortcuts$"; + } ]; open-floating = true; diff --git a/nixcfgs/users/js0ny/programs/elisa.nix b/nixcfgs/users/js0ny/programs/elisa.nix new file mode 100644 index 0000000..45eb648 --- /dev/null +++ b/nixcfgs/users/js0ny/programs/elisa.nix @@ -0,0 +1,23 @@ +{ + pkgs, + config, + lib, + ... +}: let + mergetools = import ../lib/mergetools.nix {inherit pkgs lib config;}; + mkMergeIni = mergetools.mkMergedIni; + elisarc = mkMergeIni { + name = "elisarc"; + target = ".config/elisarc"; + settings = { + ElisaFileIndexer = { + "RootPath[$e]" = "$HOME/Music"; + }; + }; + }; +in { + imports = [elisarc]; + home.packages = with pkgs.kdePackages; [ + elisa + ]; +} diff --git a/nixcfgs/users/js0ny/programs/firefox/search.nix b/nixcfgs/users/js0ny/programs/firefox/search.nix index 65c5c82..58b4793 100644 --- a/nixcfgs/users/js0ny/programs/firefox/search.nix +++ b/nixcfgs/users/js0ny/programs/firefox/search.nix @@ -123,7 +123,13 @@ in { name = "Flathub"; urls = [{template = "https://flathub.org/apps/search?q={searchTerms}";}]; icon = "https://flathub.org/favicon.ico"; - definedAliases = ["flatpak" "flathub"]; + definedAliases = ["@flatpak" "@flathub"]; + }; + open-webui = { + name = "LLM Query Search"; + urls = [{template = "https://ai.js0ny.net/?models=google%2Fgemini-3-flash-preview&q={searchTerms}";}]; + icon = "https://www.openwebui.com/favicon.ico"; + definedAliases = ["owu" "open-webui" "@ai"]; }; }; } diff --git a/nixcfgs/users/js0ny/programs/lollypop.nix b/nixcfgs/users/js0ny/programs/lollypop.nix new file mode 100644 index 0000000..80efbb5 --- /dev/null +++ b/nixcfgs/users/js0ny/programs/lollypop.nix @@ -0,0 +1,17 @@ +{ + pkgs, + config, + ... +}: let + username = config.home.username; +in { + home.packages = with pkgs; [lollypop]; + dconf.settings = { + "org/gnome/Lollypop" = { + music-uris = [ + "file:///home/${username}/Music" + ]; + notification-flag = 2; + }; + }; +} diff --git a/nixcfgs/users/js0ny/programs/pdf2zh/container.nix b/nixcfgs/users/js0ny/programs/pdf2zh/container.nix index 94f3e8d..f42b3e8 100644 --- a/nixcfgs/users/js0ny/programs/pdf2zh/container.nix +++ b/nixcfgs/users/js0ny/programs/pdf2zh/container.nix @@ -32,7 +32,7 @@ if withEnv then '' API_BASE="''${PDF2ZH_API_BASE:-https://openrouter.ai/api/v1}" - MODEL="''${PDF2ZH_MODEL:-google/gemini-2.5-flash}" + MODEL="''${PDF2ZH_MODEL:-google/gemini-3-flash-preview}" if [[ -n "''${PDF2ZH_API_KEY:-}" ]]; then API_KEY="$PDF2ZH_API_KEY" diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index b12a10d..58eff29 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -79,6 +79,7 @@ in { ./programs/telegram.nix ./programs/feishin.nix ./programs/fsearch.nix + ./programs/elisa.nix # Desktop Linux ./programs/desktop/gnome