refractor

This commit is contained in:
js0ny 2025-10-29 23:27:12 +00:00
parent fbe299a28c
commit 4842ca3540
23 changed files with 92 additions and 70 deletions

View file

@ -0,0 +1,3 @@
#!/bin/sh
defaults write com.apple.desktopservices DSDontWriteNetworkStores -bool true

View file

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

View file

@ -37,5 +37,5 @@ return {
-- "Neogit", -- "Neogit",
-- }, -- },
-- }, -- },
{ import = "plugins.mod.neo-tree" }, -- { import = "plugins.mod.neo-tree" },
} }

View file

@ -4,7 +4,7 @@ return {
{ import = "plugins.mod.toggleterm" }, { import = "plugins.mod.toggleterm" },
{ import = "plugins.mod.which-keys-nvim" }, { import = "plugins.mod.which-keys-nvim" },
-- { import = "plugins.mod.copilot-lua" }, -- { import = "plugins.mod.copilot-lua" },
-- { import = "plugins.mod.avante-nvim" }, { import = "plugins.mod.avante-nvim" },
{ {
"kawre/leetcode.nvim", "kawre/leetcode.nvim",
build = ":TSUpdate html", -- if you have `nvim-treesitter` installed build = ":TSUpdate html", -- if you have `nvim-treesitter` installed

View file

@ -6,14 +6,11 @@ return {
opts = { opts = {
-- add any opts here -- add any opts here
-- for example -- for example
provider = "openai", providers = {
openai = { openai = {
endpoint = "https://aihubmix.com/v1", endpoint = "https://openrouter.ai/v1",
model = "claude-3-7-sonnet-20250219", -- your desired model (or use gpt-4o, etc.) model = "x-ai/grok-code-fast-1",
timeout = 30000, -- timeout in milliseconds },
temperature = 0, -- adjust if needed
max_tokens = 4096,
-- reasoning_effort = "high" -- only supported for "o" models
}, },
}, },
-- if you want to build from source then do `make BUILD_FROM_SOURCE=true` -- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
@ -27,9 +24,9 @@ return {
--- The below dependencies are optional, --- The below dependencies are optional,
-- "nvim-telescope/telescope.nvim", -- for file_selector provider telescope -- "nvim-telescope/telescope.nvim", -- for file_selector provider telescope
"ibhagwan/fzf-lua", "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 "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", "HakonHarnes/img-clip.nvim",
}, },
} }

View file

@ -14,7 +14,7 @@ Remote | Git Branch | Diagnostics | Command | | MID | | Line:Column | Indent | E
local config = { local config = {
options = { options = {
disabled_filetypes = { disabled_filetypes = {
statusline = { "NvimTree", "alpha", "grug-far", "snacks_dashboard" }, statusline = { "NvimTree", "alpha", "grug-far", "snacks_dashboard", "Avante", "AvanteInput" },
}, },
-- Disable sections and component separators -- Disable sections and component separators
component_separators = { left = "", right = "" }, component_separators = { left = "", right = "" },

View file

@ -71,14 +71,15 @@ return {
}, },
}, },
-- stylua: ignore end -- stylua: ignore end
-- explorer = { explorer = {
-- }, enabled = true,
},
indent = { enabled = true }, indent = { enabled = true },
input = { enabled = true }, input = { enabled = true },
notifier = { enabled = true }, notifier = { enabled = true },
quickfile = { enabled = true }, quickfile = { enabled = true },
scope = { enabled = true }, scope = { enabled = true },
scroll = { enabled = true }, scroll = { enabled = false },
statuscolumn = { enabled = true }, statuscolumn = { enabled = true },
-- words = { enabled = true }, -- words = { enabled = true },
image = { image = {
@ -88,12 +89,12 @@ return {
}, },
}, },
keys = { keys = {
-- { {
-- "<leader>ft", "<leader>ft",
-- function() function()
-- require("snacks").explorer() require("snacks").explorer()
-- end, end,
-- desc = "Toggle File Explorer", desc = "Toggle File Explorer",
-- }, },
}, },
} }

View file

@ -21,50 +21,58 @@
]; ];
casks = [ casks = [
"visual-studio-code" # Productivity
"kitty"
"vivaldi"
"neovide"
"clash-verge-rev"
"obsidian" "obsidian"
"alacritty" "raycast"
"alt-tab" "TickTick"
"apparency"
"betterdisplay" # 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" "discord"
"dotnet-sdk" "orbstack" # Docker runtime
"iina"
"iterm2" # System Enhancement
"karabiner-elements" "alt-tab" # Turn cmd-tab to windows behaviour
"keka" "karabiner-elements" # Keymapping
"localsend" "localsend"
"ltspice" "squirrel" # Input Method
"orbstack" "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" "qlcolorcode"
# "qlimagesize" discontinued.
"qlmarkdown" "qlmarkdown"
"qlstephen" "qlstephen"
"qlvideo" "qlvideo"
"qspace-pro" "qspace-pro"
"quicklook-json" "quicklook-json"
"quicklookase" "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"
]; ];
}; };
} }

View file

@ -15,4 +15,5 @@
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;
}; };
services.ollama.acceleration = "cuda";
} }

View file

@ -54,6 +54,7 @@
lutris lutris
vivaldi vivaldi
rustdesk rustdesk
kdePackages.krdc
# Email # Email
protonmail-bridge protonmail-bridge

View file

@ -0,0 +1,5 @@
{...}: {
services.ollama = {
enable = true;
};
}

View file

@ -16,6 +16,7 @@ in {
enableCompletion = true; enableCompletion = true;
dotDir = "${config.xdg.configHome}/zsh"; dotDir = "${config.xdg.configHome}/zsh";
shellAliases = aliases; shellAliases = aliases;
defaultKeymap = "emacs";
syntaxHighlighting = { syntaxHighlighting = {
enable = true; enable = true;
patterns = { patterns = {
@ -29,18 +30,18 @@ in {
]; ];
}; };
initContent = '' initContent = ''
# Emacs Hybrid # # Emacs Hybrid
bindkey '^A' beginning-of-line # bindkey '^A' beginning-of-line
bindkey '^E' end-of-line # bindkey '^E' end-of-line
bindkey '^F' forward-char # bindkey '^F' forward-char
bindkey '^B' backward-char # bindkey '^B' backward-char
bindkey '^P' up-line-or-history # bindkey '^P' up-line-or-history
bindkey '^N' down-line-or-history # bindkey '^N' down-line-or-history
# bindkey '^R' history-incremental-search-backward # Use fzf # # bindkey '^R' history-incremental-search-backward # Use fzf
bindkey '^K' kill-line # bindkey '^K' kill-line
#
bindkey -M viins '^?' backward-delete-char # bindkey -M viins '^?' backward-delete-char
bindkey -M viins '^H' backward-kill-word # bindkey -M viins '^H' backward-kill-word
source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh
''; '';
}; };

View file

@ -32,7 +32,7 @@
./programs/fzf.nix ./programs/fzf.nix
./programs/libreoffice.nix ./programs/libreoffice.nix
./programs/nvim.nix ./programs/nvim.nix
./programs/ollama.nix
# Desktop Linux # Desktop Linux
./programs/plasma.nix ./programs/plasma.nix