diff --git a/home/dot_config/aichat/private_config.yaml b/home/dot_config/aichat/private_config.yaml index 1f9b8f7..f01f3fc 100644 --- a/home/dot_config/aichat/private_config.yaml +++ b/home/dot_config/aichat/private_config.yaml @@ -8,6 +8,7 @@ clients: models: - name: google/gemini-2.5-flash - name: google/gemini-2.5-pro + - name: google/gemini-3-pro-preview - name: anthropic/claude-sonnet-4.5 - name: anthropic/claude-haiku-4.5 - name: anthropic/claude-opus-4.1 diff --git a/home/dot_config/ideavim/ideavimrc b/home/dot_config/ideavim/ideavimrc index e011456..e30b99e 100644 --- a/home/dot_config/ideavim/ideavimrc +++ b/home/dot_config/ideavim/ideavimrc @@ -224,3 +224,5 @@ sethandler i:ide sethandler n-v:vim i:ide sethandler a:ide sethandler > a:ide + +nnoremap cd :action RenameElement \ No newline at end of file diff --git a/home/dot_config/nvim/lua/plugins/appearance.lua b/home/dot_config/nvim/lua/plugins/appearance.lua index 4ce104b..a932e20 100644 --- a/home/dot_config/nvim/lua/plugins/appearance.lua +++ b/home/dot_config/nvim/lua/plugins/appearance.lua @@ -4,7 +4,7 @@ vim.api.nvim_create_autocmd("TextYankPost", { desc = "Hightlight selection on yank", pattern = "*", callback = function() - vim.highlight.on_yank({ higroup = "IncSearch", timeout = 500 }) + vim.hl.on_yank({ higroup = "IncSearch", timeout = 250 }) end, }) diff --git a/home/dot_config/nvim/lua/plugins/misc.lua b/home/dot_config/nvim/lua/plugins/misc.lua index ba83c69..c4bcd02 100644 --- a/home/dot_config/nvim/lua/plugins/misc.lua +++ b/home/dot_config/nvim/lua/plugins/misc.lua @@ -3,7 +3,7 @@ return { { "wakatime/vim-wakatime", lazy = false }, { import = "plugins.mod.toggleterm" }, { import = "plugins.mod.which-keys-nvim" }, - -- { import = "plugins.mod.copilot-lua" }, + { import = "plugins.mod.copilot-lua" }, { import = "plugins.mod.avante-nvim" }, { "kawre/leetcode.nvim", @@ -25,4 +25,9 @@ return { }, -- { import = "plugins.mod.image-nvim" }, { import = "plugins.mod.snacks-nvim" }, + { + "vyfor/cord.nvim", + build = ":Cord update", + -- opts = {} + }, } diff --git a/home/dot_config/nvim/lua/plugins/mod/copilot-lua.lua b/home/dot_config/nvim/lua/plugins/mod/copilot-lua.lua index 12a9c5e..4714056 100644 --- a/home/dot_config/nvim/lua/plugins/mod/copilot-lua.lua +++ b/home/dot_config/nvim/lua/plugins/mod/copilot-lua.lua @@ -9,15 +9,17 @@ return { auto_trigger = true, hide_during_completion = vim.g.ai_cmp, keymap = { - accept = "", + accept = "", -- Inspired from zed next = "", prev = "", }, }, - panel = { enabled = false }, + panel = { enabled = true }, filetypes = { markdown = true, help = true, + beancount = false, + yaml = false, }, }, } diff --git a/home/dot_config/zed/keymap.json b/home/dot_config/zed/keymap.json index 272a785..2e27b08 100644 --- a/home/dot_config/zed/keymap.json +++ b/home/dot_config/zed/keymap.json @@ -71,10 +71,7 @@ "space f e c": "zed::OpenSettings", "space f t": "project_panel::ToggleFocus", "space c f": "editor::Format", - "ctrl-w h": "workspace::ActivatePaneLeft", - "ctrl-w l": "workspace::ActivatePaneRight", - "ctrl-w k": "workspace::ActivatePaneUp", - "ctrl-w j": "workspace::ActivatePaneDown", + "space b D": "workspace::CloseInactiveTabsAndPanes", "ctrl-w alt-h": "workspace::ToggleLeftDock", "ctrl-w alt-l": "workspace::ToggleRightDock", "ctrl-w alt-j": "workspace::ToggleBottomDock", diff --git a/nixcfgs/flake.lock b/nixcfgs/flake.lock index 6d93210..9fcef65 100644 --- a/nixcfgs/flake.lock +++ b/nixcfgs/flake.lock @@ -121,7 +121,7 @@ }, "devshell": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1741473158, @@ -159,6 +159,20 @@ } }, "flake-compat": { + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -196,6 +210,24 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1754091436, + "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nur", @@ -216,9 +248,9 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1751413152, @@ -296,7 +328,7 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1756842514, @@ -386,7 +418,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_3", "xdph": "xdph" @@ -700,6 +732,26 @@ "type": "github" } }, + "nixcord": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1763223362, + "narHash": "sha256-iH+tM4MmtYMfWuWoo6KIc7Al+zQL13f3ScJloqSKyAs=", + "owner": "kaylorben", + "repo": "nixcord", + "rev": "35c173408a25cae1c5af23b9d4fd80a181a395d4", + "type": "github" + }, + "original": { + "owner": "kaylorben", + "repo": "nixcord", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1762482733, @@ -717,6 +769,21 @@ } }, "nixpkgs-lib": { + "locked": { + "lastModified": 1753579242, + "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "lastModified": 1751159883, "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", @@ -763,6 +830,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1747958103, + "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1762844143, @@ -780,6 +863,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1762604901, "narHash": "sha256-Pr2jpryIaQr9Yx8p6QssS03wqB6UifnnLr3HJw9veDw=", @@ -795,7 +894,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1762844143, "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", @@ -811,7 +910,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1722073938, "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", @@ -827,7 +926,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1756542300, "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", @@ -843,7 +942,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1751792365, "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", @@ -859,7 +958,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1756819007, "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", @@ -875,26 +974,10 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1747958103, - "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4" + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1762951833, @@ -935,7 +1018,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "xremap-flake", @@ -987,7 +1070,8 @@ "niri-flake": "niri-flake", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_3", + "nixcord": "nixcord", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_2", "nur": "nur", "plasma-manager": "plasma-manager", @@ -1063,7 +1147,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1750931469, @@ -1147,10 +1231,10 @@ "inputs": { "crane": "crane", "devshell": "devshell", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "home-manager": "home-manager_2", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "treefmt-nix": "treefmt-nix", "xremap": "xremap" }, diff --git a/nixcfgs/flake.nix b/nixcfgs/flake.nix index f892523..8d8a8b6 100644 --- a/nixcfgs/flake.nix +++ b/nixcfgs/flake.nix @@ -45,6 +45,7 @@ url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixcord.url = "github:kaylorben/nixcord"; }; outputs = { @@ -63,6 +64,7 @@ betterfox-nix, firefox-addons, zen-browser, + nixcord, ... } @ inputs: let overlays = [ @@ -130,6 +132,7 @@ sops-nix.homeManagerModules.sops niri-flake.homeModules.niri betterfox-nix.modules.homeManager.betterfox + nixcord.homeModules.nixcord ]; }; "js0ny@nixvirt" = home-manager.lib.homeManagerConfiguration { diff --git a/nixcfgs/modules/home/dev/java.nix b/nixcfgs/modules/home/dev/java.nix index 9807cbf..97049e8 100644 --- a/nixcfgs/modules/home/dev/java.nix +++ b/nixcfgs/modules/home/dev/java.nix @@ -8,5 +8,10 @@ vscjava.vscode-spring-initializr vscjava.vscode-java-pack ]; - programs.zed-editor.extensions = ["java"]; + programs.zed-editor = { + extensions = ["java"]; + extraPackages = with pkgs; [ + jdt-language-server + ]; + }; } diff --git a/nixcfgs/users/js0ny/packages/cli.nix b/nixcfgs/users/js0ny/packages/cli.nix index 2dee8c3..9fa68ae 100644 --- a/nixcfgs/users/js0ny/packages/cli.nix +++ b/nixcfgs/users/js0ny/packages/cli.nix @@ -57,5 +57,6 @@ exiftool ddgr # DuckDuckGo CLI jujutsu + github-copilot-cli ]; } diff --git a/nixcfgs/users/js0ny/packages/flatpak.nix b/nixcfgs/users/js0ny/packages/flatpak.nix index ce2323d..5de3377 100644 --- a/nixcfgs/users/js0ny/packages/flatpak.nix +++ b/nixcfgs/users/js0ny/packages/flatpak.nix @@ -15,8 +15,7 @@ "com.tencent.WeChat" # "eu.betterbird.Betterbird" # "com.baidu.NetDisk" - "com.discordapp.Discord" - "com.spotify.Client" + # "com.discordapp.Discord" "com.google.EarthPro" "com.wps.Office" "md.obsidian.Obsidian" @@ -24,7 +23,7 @@ # "com.vivaldi.Vivaldi" "com.getpostman.Postman" "us.zoom.Zoom" - "com.ticktick.Ticktick" + "com.ticktick.TickTick" ]; services.flatpak.overrides = { global = { @@ -50,6 +49,9 @@ }; "md.obsidian.Obsidian".Context.sockets = ["wayland"]; "com.ticktick.Ticktick".Context.sockets = ["wayland"]; - "com.getpostman.Postman".Context.persistent = ["Postman"]; + "com.getpostman.Postman".Context = { + persistent = ["Postman"]; + sockets = ["wayland"]; + }; }; } diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index c64ea22..31b67f6 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -47,6 +47,7 @@ in { pcloud materialgram + ayugram-desktop steam signal-desktop # Use Wayland for Jetbrains @@ -71,13 +72,17 @@ in { steam-run bottles lutris - vivaldi rustdesk kdePackages.krdc kdePackages.breeze zotero anki-bin feishin + bruno + bruno-cli + cider-2 + kicad + blender ] ++ (mkFcitxIM [ pkgs.neovim-qt 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 1643df9..82ee91e 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 @@ -122,9 +122,11 @@ { matches = [ {app-id = "^org.telegram.desktop$";} + {app-id = "^io.github.kukuruzka165.materialgram$";} + {app-id = "^com.ayugram.desktop$";} {app-id = "^wechat$";} {app-id = "^QQ$";} - {app-id = "^io.github.kukuruzka165.materialgram$";} + {app-id = "^discord$";} {app-id = "^thunderbird$";} ]; open-on-workspace = "info"; @@ -132,6 +134,7 @@ { matches = [ {app-id = "^feishin$";} + {app-id = "^Cider$";} ]; open-on-workspace = "bg"; } diff --git a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/packages.nix b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/packages.nix index 3d38693..eab3aaf 100644 --- a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/packages.nix +++ b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/packages.nix @@ -47,9 +47,15 @@ in { brightnessctl playerctl powerprofiles-next + blueman ]; programs.swaylock = { enable = true; package = pkgs.swaylock-effects; }; + xdg.portal = { + enable = true; + extraPortals = with pkgs; [xdg-desktop-portal-wlr xdg-desktop-portal-gtk]; + }; + services.blueman-applet.enable = true; } diff --git a/nixcfgs/users/js0ny/programs/discord.nix b/nixcfgs/users/js0ny/programs/discord.nix new file mode 100644 index 0000000..37579f0 --- /dev/null +++ b/nixcfgs/users/js0ny/programs/discord.nix @@ -0,0 +1,39 @@ +{...}: { + programs.nixcord = { + enable = true; + + # Clients + discord = { + enable = true; + autoscroll.enable = true; + vencord.enable = true; + }; + + # Plugins + config = { + plugins = { + alwaysAnimate.enable = true; + alwaysTrust.enable = true; + clearURLs.enable = true; + copyFileContents.enable = true; + copyUserURLs.enable = true; + disableCallIdle.enable = true; + favoriteEmojiFirst.enable = true; + forceOwnerCrown.enable = true; + friendsSince.enable = true; + noDevtoolsWarning.enable = true; + readAllNotificationsButton.enable = true; + serverInfo.enable = true; + showMeYourName = { + enable = true; + mode = "nick-user"; + }; + silentMessageToggle.enable = true; + silentTyping.enable = true; + startupTimings.enable = true; + validReply.enable = true; + validUser.enable = true; + }; + }; + }; +} diff --git a/nixcfgs/users/js0ny/programs/firefox/addons.nix b/nixcfgs/users/js0ny/programs/firefox/addons.nix index d8dada8..973b74b 100644 --- a/nixcfgs/users/js0ny/programs/firefox/addons.nix +++ b/nixcfgs/users/js0ny/programs/firefox/addons.nix @@ -30,6 +30,7 @@ in { # Privacy google-container facebook-container + dont-track-me-google1 ### Site Specific # Steam diff --git a/nixcfgs/users/js0ny/programs/firefox/default.nix b/nixcfgs/users/js0ny/programs/firefox/default.nix index 477de48..77a30c7 100644 --- a/nixcfgs/users/js0ny/programs/firefox/default.nix +++ b/nixcfgs/users/js0ny/programs/firefox/default.nix @@ -20,6 +20,9 @@ # Disable Menu when pressing "ui.key.menuAccessKey" = -1; "ui.key.menuAccessKeyFocuses" = false; + # Disable Translations + "browser.translations.enable" = false; + "browser.translations.automaticallyPopup" = false; }; }; }; diff --git a/nixcfgs/users/js0ny/programs/firefox/search.nix b/nixcfgs/users/js0ny/programs/firefox/search.nix index d833ef0..117ba84 100644 --- a/nixcfgs/users/js0ny/programs/firefox/search.nix +++ b/nixcfgs/users/js0ny/programs/firefox/search.nix @@ -110,5 +110,11 @@ icon = "https://nixos.org/favicon.ico"; definedAliases = ["hm"]; }; + flathub = { + name = "Flathub"; + urls = [{template = "https://flathub.org/apps/search?q={searchTerms}";}]; + icon = "https://flathub.org/favicon.ico"; + definedAliases = ["flatpak" "flathub"]; + }; }; } diff --git a/nixcfgs/users/js0ny/programs/mime.nix b/nixcfgs/users/js0ny/programs/mime.nix index 23535ac..7ec83fa 100644 --- a/nixcfgs/users/js0ny/programs/mime.nix +++ b/nixcfgs/users/js0ny/programs/mime.nix @@ -2,7 +2,7 @@ # Why using nvim gui: # * when `rga-fzf`: nvim wrapper failed to launch # * nvim wrapper reports error on parsing filename with spaces - gvim = "nvim-qt.desktop"; + gvim = "neovide.desktop"; in { xdg.configFile."mimeapps.list".force = true; xdg.mime.enable = true; @@ -18,6 +18,7 @@ in { "text/x-csrc" = gvim; # .c "text/x-chdr" = gvim; # .h "text/javascript" = gvim; + "text/x-python" = gvim; # CSV "text/csv" = gvim; "text/markdown" = gvim; diff --git a/nixcfgs/users/js0ny/programs/nvim.nix b/nixcfgs/users/js0ny/programs/nvim.nix index 683bcef..2223f42 100644 --- a/nixcfgs/users/js0ny/programs/nvim.nix +++ b/nixcfgs/users/js0ny/programs/nvim.nix @@ -13,9 +13,12 @@ in { # image support pkg-config imagemagick + stylua + nodejs-slim_24 # for copilot-lua + lua-language-server ]; }; - home.packages = with pkgs; [lua-language-server]; + # home.packages = with pkgs; [lua-language-server]; programs.fish.shellAbbrs = nvimAlias; programs.bash.shellAliases = nvimAlias; programs.zsh.shellAliases = nvimAlias; diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index 6000272..0060be4 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -44,6 +44,7 @@ ./programs/retroarch.nix ./programs/neovide.nix ./programs/edit-clipboard.nix + ./programs/discord.nix # Desktop Linux ./programs/desktop/plasma @@ -58,6 +59,7 @@ # Development setup ../../modules/home/dev/nix.nix + ../../modules/home/dev/java.nix ]; nixpkgs.config.allowUnfree = true;