From 4842ca3540024b7151b9f5ccdf0ad718d5c67149 Mon Sep 17 00:00:00 2001 From: js0ny Date: Wed, 29 Oct 2025 23:27:12 +0000 Subject: [PATCH] refractor --- .../darwin/run_once_desktopservices.sh | 3 + .../darwin/run_once_install-nix-darwin.sh | 5 ++ .../{ => todo}/run_once_bash.sh | 0 .../{ => todo}/run_once_bat.sh | 0 .../{ => todo}/run_once_fish.sh | 0 .../{ => todo}/run_once_fonts.sh | 0 .../{ => todo}/run_once_nvim.sh | 0 .../{ => todo}/run_once_rtorrent.sh | 0 .../{ => todo}/run_once_vim.sh | 0 .../{ => todo}/run_once_yazi.sh | 0 .../run_once_zsh-install-plugins.sh | 0 .../{ => todo}/run_once_zsh-set-env.sh | 0 .../dot_config/nvim/lua/plugins/fileutils.lua | 2 +- home/dot_config/nvim/lua/plugins/misc.lua | 2 +- .../nvim/lua/plugins/mod/avante-nvim.lua | 17 ++--- .../nvim/lua/plugins/mod/lualine/init.lua | 2 +- .../nvim/lua/plugins/mod/snacks-nvim.lua | 21 ++--- nixcfgs/hosts/zen/brew.nix | 76 ++++++++++--------- nixcfgs/modules/nixos/hardware/nvidia.nix | 1 + nixcfgs/users/js0ny/packages/gui.nix | 1 + nixcfgs/users/js0ny/programs/ollama.nix | 5 ++ nixcfgs/users/js0ny/programs/shell/zsh.nix | 25 +++--- nixcfgs/users/js0ny/zephyrus.nix | 2 +- 23 files changed, 92 insertions(+), 70 deletions(-) create mode 100644 home/.chezmoiscripts/darwin/run_once_desktopservices.sh create mode 100644 home/.chezmoiscripts/darwin/run_once_install-nix-darwin.sh rename home/.chezmoiscripts/{ => todo}/run_once_bash.sh (100%) rename home/.chezmoiscripts/{ => todo}/run_once_bat.sh (100%) rename home/.chezmoiscripts/{ => todo}/run_once_fish.sh (100%) rename home/.chezmoiscripts/{ => todo}/run_once_fonts.sh (100%) rename home/.chezmoiscripts/{ => todo}/run_once_nvim.sh (100%) rename home/.chezmoiscripts/{ => todo}/run_once_rtorrent.sh (100%) rename home/.chezmoiscripts/{ => todo}/run_once_vim.sh (100%) rename home/.chezmoiscripts/{ => todo}/run_once_yazi.sh (100%) rename home/.chezmoiscripts/{ => todo}/run_once_zsh-install-plugins.sh (100%) rename home/.chezmoiscripts/{ => todo}/run_once_zsh-set-env.sh (100%) create mode 100644 nixcfgs/users/js0ny/programs/ollama.nix diff --git a/home/.chezmoiscripts/darwin/run_once_desktopservices.sh b/home/.chezmoiscripts/darwin/run_once_desktopservices.sh new file mode 100644 index 0000000..b648589 --- /dev/null +++ b/home/.chezmoiscripts/darwin/run_once_desktopservices.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +defaults write com.apple.desktopservices DSDontWriteNetworkStores -bool true diff --git a/home/.chezmoiscripts/darwin/run_once_install-nix-darwin.sh b/home/.chezmoiscripts/darwin/run_once_install-nix-darwin.sh new file mode 100644 index 0000000..278e8d6 --- /dev/null +++ b/home/.chezmoiscripts/darwin/run_once_install-nix-darwin.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +curl -fsSL https://install.determinate.systems/nix | sh -s -- install + +sudo nix run nix-darwin/master#darwin-rebuild -- switch --flake ~/.dotfiles/nixcfgs diff --git a/home/.chezmoiscripts/run_once_bash.sh b/home/.chezmoiscripts/todo/run_once_bash.sh similarity index 100% rename from home/.chezmoiscripts/run_once_bash.sh rename to home/.chezmoiscripts/todo/run_once_bash.sh diff --git a/home/.chezmoiscripts/run_once_bat.sh b/home/.chezmoiscripts/todo/run_once_bat.sh similarity index 100% rename from home/.chezmoiscripts/run_once_bat.sh rename to home/.chezmoiscripts/todo/run_once_bat.sh diff --git a/home/.chezmoiscripts/run_once_fish.sh b/home/.chezmoiscripts/todo/run_once_fish.sh similarity index 100% rename from home/.chezmoiscripts/run_once_fish.sh rename to home/.chezmoiscripts/todo/run_once_fish.sh diff --git a/home/.chezmoiscripts/run_once_fonts.sh b/home/.chezmoiscripts/todo/run_once_fonts.sh similarity index 100% rename from home/.chezmoiscripts/run_once_fonts.sh rename to home/.chezmoiscripts/todo/run_once_fonts.sh diff --git a/home/.chezmoiscripts/run_once_nvim.sh b/home/.chezmoiscripts/todo/run_once_nvim.sh similarity index 100% rename from home/.chezmoiscripts/run_once_nvim.sh rename to home/.chezmoiscripts/todo/run_once_nvim.sh diff --git a/home/.chezmoiscripts/run_once_rtorrent.sh b/home/.chezmoiscripts/todo/run_once_rtorrent.sh similarity index 100% rename from home/.chezmoiscripts/run_once_rtorrent.sh rename to home/.chezmoiscripts/todo/run_once_rtorrent.sh diff --git a/home/.chezmoiscripts/run_once_vim.sh b/home/.chezmoiscripts/todo/run_once_vim.sh similarity index 100% rename from home/.chezmoiscripts/run_once_vim.sh rename to home/.chezmoiscripts/todo/run_once_vim.sh diff --git a/home/.chezmoiscripts/run_once_yazi.sh b/home/.chezmoiscripts/todo/run_once_yazi.sh similarity index 100% rename from home/.chezmoiscripts/run_once_yazi.sh rename to home/.chezmoiscripts/todo/run_once_yazi.sh diff --git a/home/.chezmoiscripts/run_once_zsh-install-plugins.sh b/home/.chezmoiscripts/todo/run_once_zsh-install-plugins.sh similarity index 100% rename from home/.chezmoiscripts/run_once_zsh-install-plugins.sh rename to home/.chezmoiscripts/todo/run_once_zsh-install-plugins.sh diff --git a/home/.chezmoiscripts/run_once_zsh-set-env.sh b/home/.chezmoiscripts/todo/run_once_zsh-set-env.sh similarity index 100% rename from home/.chezmoiscripts/run_once_zsh-set-env.sh rename to home/.chezmoiscripts/todo/run_once_zsh-set-env.sh diff --git a/home/dot_config/nvim/lua/plugins/fileutils.lua b/home/dot_config/nvim/lua/plugins/fileutils.lua index a9fe512..a43981d 100644 --- a/home/dot_config/nvim/lua/plugins/fileutils.lua +++ b/home/dot_config/nvim/lua/plugins/fileutils.lua @@ -37,5 +37,5 @@ return { -- "Neogit", -- }, -- }, - { import = "plugins.mod.neo-tree" }, + -- { import = "plugins.mod.neo-tree" }, } diff --git a/home/dot_config/nvim/lua/plugins/misc.lua b/home/dot_config/nvim/lua/plugins/misc.lua index ae4bc92..ba83c69 100644 --- a/home/dot_config/nvim/lua/plugins/misc.lua +++ b/home/dot_config/nvim/lua/plugins/misc.lua @@ -4,7 +4,7 @@ return { { import = "plugins.mod.toggleterm" }, { import = "plugins.mod.which-keys-nvim" }, -- { import = "plugins.mod.copilot-lua" }, - -- { import = "plugins.mod.avante-nvim" }, + { import = "plugins.mod.avante-nvim" }, { "kawre/leetcode.nvim", build = ":TSUpdate html", -- if you have `nvim-treesitter` installed diff --git a/home/dot_config/nvim/lua/plugins/mod/avante-nvim.lua b/home/dot_config/nvim/lua/plugins/mod/avante-nvim.lua index 708f663..93630c9 100644 --- a/home/dot_config/nvim/lua/plugins/mod/avante-nvim.lua +++ b/home/dot_config/nvim/lua/plugins/mod/avante-nvim.lua @@ -6,14 +6,11 @@ return { opts = { -- add any opts here -- for example - provider = "openai", - openai = { - endpoint = "https://aihubmix.com/v1", - model = "claude-3-7-sonnet-20250219", -- your desired model (or use gpt-4o, etc.) - timeout = 30000, -- timeout in milliseconds - temperature = 0, -- adjust if needed - max_tokens = 4096, - -- reasoning_effort = "high" -- only supported for "o" models + providers = { + openai = { + endpoint = "https://openrouter.ai/v1", + model = "x-ai/grok-code-fast-1", + }, }, }, -- if you want to build from source then do `make BUILD_FROM_SOURCE=true` @@ -27,9 +24,9 @@ return { --- The below dependencies are optional, -- "nvim-telescope/telescope.nvim", -- for file_selector provider telescope "ibhagwan/fzf-lua", - "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions + "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions "nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons - "zbirenbaum/copilot.lua", -- for providers='copilot' + "zbirenbaum/copilot.lua", -- for providers='copilot' "HakonHarnes/img-clip.nvim", }, } diff --git a/home/dot_config/nvim/lua/plugins/mod/lualine/init.lua b/home/dot_config/nvim/lua/plugins/mod/lualine/init.lua index 720559c..6253e08 100644 --- a/home/dot_config/nvim/lua/plugins/mod/lualine/init.lua +++ b/home/dot_config/nvim/lua/plugins/mod/lualine/init.lua @@ -14,7 +14,7 @@ Remote | Git Branch | Diagnostics | Command | | MID | | Line:Column | Indent | E local config = { options = { disabled_filetypes = { - statusline = { "NvimTree", "alpha", "grug-far", "snacks_dashboard" }, + statusline = { "NvimTree", "alpha", "grug-far", "snacks_dashboard", "Avante", "AvanteInput" }, }, -- Disable sections and component separators component_separators = { left = "", right = "" }, diff --git a/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua b/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua index 6b8f720..8b9920f 100644 --- a/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua +++ b/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua @@ -71,14 +71,15 @@ return { }, }, -- stylua: ignore end - -- explorer = { - -- }, + explorer = { + enabled = true, + }, indent = { enabled = true }, input = { enabled = true }, notifier = { enabled = true }, quickfile = { enabled = true }, scope = { enabled = true }, - scroll = { enabled = true }, + scroll = { enabled = false }, statuscolumn = { enabled = true }, -- words = { enabled = true }, image = { @@ -88,12 +89,12 @@ return { }, }, keys = { - -- { - -- "ft", - -- function() - -- require("snacks").explorer() - -- end, - -- desc = "Toggle File Explorer", - -- }, + { + "ft", + function() + require("snacks").explorer() + end, + desc = "Toggle File Explorer", + }, }, } diff --git a/nixcfgs/hosts/zen/brew.nix b/nixcfgs/hosts/zen/brew.nix index ff9ea84..9fa141d 100644 --- a/nixcfgs/hosts/zen/brew.nix +++ b/nixcfgs/hosts/zen/brew.nix @@ -21,50 +21,58 @@ ]; casks = [ - "visual-studio-code" - "kitty" - "vivaldi" - "neovide" - "clash-verge-rev" + # Productivity "obsidian" - "alacritty" - "alt-tab" - "apparency" - "betterdisplay" + "raycast" + "TickTick" + + # Networking + "wireshark-app" + "clash-verge-rev" + + # Editor + "visual-studio-code" + + # Browsers + "firefox" + + # Terminal Emulator + "ghostty" + "kitty" + + # Fonts + "font-maple-mono-nf-cn" + + # Misc + "telegram-desktop" + "cherry-studio" # LLM Client + "steam" "discord" - "dotnet-sdk" - "iina" - "iterm2" - "karabiner-elements" - "keka" + "orbstack" # Docker runtime + + # System Enhancement + "alt-tab" # Turn cmd-tab to windows behaviour + "karabiner-elements" # Keymapping "localsend" - "ltspice" - "orbstack" + "squirrel" # Input Method + "rustdesk" # Remote Desktop + "iina" # MPV Frontend + # TODO: I think karabiner is the superset + "scroll-reverser" # Natural scrolling for trackpad only + "sioyek" # Keyboard-driven PDF Reader + "skim" # PDF Reader + "keka" # GUI Unarchiver + "betterdisplay" + + # Quicklook addons + "apparency" "qlcolorcode" - # "qlimagesize" discontinued. "qlmarkdown" "qlstephen" "qlvideo" "qspace-pro" "quicklook-json" "quicklookase" - "raycast" - "rider" - "rustdesk" - "scroll-reverser" - "sioyek" - "skim" - "squirrel" - "steam" - "telegram-desktop" - "Filen" - "TickTick" - "cherry-studio" - "firefox" - "wireshark-app" - "LibreWolf" - "brave-browser" - "font-maple-mono-nf-cn" ]; }; } diff --git a/nixcfgs/modules/nixos/hardware/nvidia.nix b/nixcfgs/modules/nixos/hardware/nvidia.nix index 8940e0e..2070698 100644 --- a/nixcfgs/modules/nixos/hardware/nvidia.nix +++ b/nixcfgs/modules/nixos/hardware/nvidia.nix @@ -15,4 +15,5 @@ enable = true; enable32Bit = true; }; + services.ollama.acceleration = "cuda"; } diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 632afa1..f6745b3 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -54,6 +54,7 @@ lutris vivaldi rustdesk + kdePackages.krdc # Email protonmail-bridge diff --git a/nixcfgs/users/js0ny/programs/ollama.nix b/nixcfgs/users/js0ny/programs/ollama.nix new file mode 100644 index 0000000..80e7846 --- /dev/null +++ b/nixcfgs/users/js0ny/programs/ollama.nix @@ -0,0 +1,5 @@ +{...}: { + services.ollama = { + enable = true; + }; +} diff --git a/nixcfgs/users/js0ny/programs/shell/zsh.nix b/nixcfgs/users/js0ny/programs/shell/zsh.nix index ddad2a2..573d19e 100644 --- a/nixcfgs/users/js0ny/programs/shell/zsh.nix +++ b/nixcfgs/users/js0ny/programs/shell/zsh.nix @@ -16,6 +16,7 @@ in { enableCompletion = true; dotDir = "${config.xdg.configHome}/zsh"; shellAliases = aliases; + defaultKeymap = "emacs"; syntaxHighlighting = { enable = true; patterns = { @@ -29,18 +30,18 @@ in { ]; }; initContent = '' - # Emacs Hybrid - bindkey '^A' beginning-of-line - bindkey '^E' end-of-line - bindkey '^F' forward-char - bindkey '^B' backward-char - bindkey '^P' up-line-or-history - bindkey '^N' down-line-or-history - # bindkey '^R' history-incremental-search-backward # Use fzf - bindkey '^K' kill-line - - bindkey -M viins '^?' backward-delete-char - bindkey -M viins '^H' backward-kill-word + # # Emacs Hybrid + # bindkey '^A' beginning-of-line + # bindkey '^E' end-of-line + # bindkey '^F' forward-char + # bindkey '^B' backward-char + # bindkey '^P' up-line-or-history + # bindkey '^N' down-line-or-history + # # bindkey '^R' history-incremental-search-backward # Use fzf + # bindkey '^K' kill-line + # + # bindkey -M viins '^?' backward-delete-char + # bindkey -M viins '^H' backward-kill-word source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh ''; }; diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index 789d8c0..816cead 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -32,7 +32,7 @@ ./programs/fzf.nix ./programs/libreoffice.nix ./programs/nvim.nix - + ./programs/ollama.nix # Desktop Linux ./programs/plasma.nix