diff --git a/modules/home/apps/default.nix b/modules/home/apps/default.nix index d79d294..ff196a8 100644 --- a/modules/home/apps/default.nix +++ b/modules/home/apps/default.nix @@ -30,14 +30,38 @@ in { swayidle ] ++ [lock]; + programs.kitty = { enable = true; extraConfig = '' enable_audio_bell no confirm_os_window_close 0 - map kitty_mod+r launch --type background --stdin-source=@screen_scrollback sh -c 'grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | sort -u | rofi -dmenu -p "Launch in browser" | xargs xdg-open' + disable_ligatures always + + clear_all_shortcuts yes + kitty_mod alt + map ctrl+shift+c copy_to_clipboard + map ctrl+shift+v paste_from_clipboard + + + # map kitty_mod+r launch --type background --stdin-source=@screen_scrollback sh -c 'grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | sort -u | rofi -dmenu -p "Launch in browser" | xargs xdg-open' + map kitty_mod+r open_url_with_hints + map kitty_mod+n launch --type=tab --cwd=current + + map kitty_mod+k scroll_line_up + map kitty_mod+j scroll_line_down + map kitty_mod+h previous_tab + map kitty_mod+l next_tab + + map kitty_mod+o scroll_to_prompt -1 + map kitty_mod+i scroll_to_prompt 1 + map kitty_mod+space show_last_command_output + ''; }; + programs.zsh.shellAliases = { + ssh = "kitty +kitten ssh"; + }; home.sessionVariables = { EDITOR = "nvim"; diff --git a/modules/home/fcitx5/default.nix b/modules/home/fcitx5/default.nix index ef4062f..4989dca 100644 --- a/modules/home/fcitx5/default.nix +++ b/modules/home/fcitx5/default.nix @@ -21,7 +21,7 @@ in { xdg.configFile."fcitx5/config".text = '' [Hotkey/TriggerKeys] - 0=Super+N + 0=Super+Shift+L [Behavior] ShowInputMethodInformation=False diff --git a/modules/home/hyprland/hyprland.conf b/modules/home/hyprland/hyprland.conf index 4b43db5..ed5e18e 100644 --- a/modules/home/hyprland/hyprland.conf +++ b/modules/home/hyprland/hyprland.conf @@ -5,6 +5,8 @@ exec-once=fusuma -c /home/zoriya/.config/fusuma/config.yaml exec-once=swayidle -w timeout 1200 lock before-sleep lock exec-once=/home/zoriya/.config/hypr/wallpaper.sh init exec-once=kitty --class=scratchpad +exec-once=fcitx5 -d + autogenerated = 0 diff --git a/modules/home/hyprland/start.sh b/modules/home/hyprland/start.sh index 49e5a14..928cf90 100755 --- a/modules/home/hyprland/start.sh +++ b/modules/home/hyprland/start.sh @@ -8,6 +8,4 @@ export XMODIFIERS=@im=fcitx export XIM_SERVERS=fcitx export GLFW_IM_MODULE=ibus -fcitx5 -d - exec Hyprland diff --git a/modules/home/nvim/lua/plugins/colorscheme.lua b/modules/home/nvim/lua/plugins/colorscheme.lua index e793c6b..2992b49 100644 --- a/modules/home/nvim/lua/plugins/colorscheme.lua +++ b/modules/home/nvim/lua/plugins/colorscheme.lua @@ -28,6 +28,27 @@ return { }, } }) + + local colors = require("catppuccin.palettes").get_palette() + local TelescopeColor = { + TelescopeMatching = { fg = colors.flamingo }, + TelescopeSelection = { fg = colors.text, bg = colors.surface0, bold = true }, + + TelescopePromptPrefix = { bg = colors.surface0 }, + TelescopePromptNormal = { bg = colors.surface0 }, + TelescopeResultsNormal = { bg = colors.mantle }, + TelescopePreviewNormal = { bg = colors.mantle }, + TelescopePromptBorder = { bg = colors.surface0, fg = colors.surface0 }, + TelescopeResultsBorder = { bg = colors.mantle, fg = colors.mantle }, + TelescopePreviewBorder = { bg = colors.mantle, fg = colors.mantle }, + TelescopePromptTitle = { bg = colors.pink, fg = colors.mantle }, + TelescopeResultsTitle = { fg = colors.mantle }, + TelescopePreviewTitle = { bg = colors.green, fg = colors.mantle }, + } + + for hl, col in pairs(TelescopeColor) do + vim.api.nvim_set_hl(0, hl, col) + end vim.cmd([[colorscheme catppuccin-mocha]]) end }, diff --git a/modules/home/nvim/lua/plugins/telescope.lua b/modules/home/nvim/lua/plugins/telescope.lua index 20a6d04..4089cef 100644 --- a/modules/home/nvim/lua/plugins/telescope.lua +++ b/modules/home/nvim/lua/plugins/telescope.lua @@ -14,11 +14,11 @@ return { cmd = "Telescope", version = false, -- telescope did only one release, so use HEAD for now keys = { - { "f", "Telescope find_files", desc = "Find Files" }, - { "F", "Telescope live_grep theme=ivy", desc = "Grep" }, - { "gl", "Telescope git_commits", desc = "Git log" }, - { "gb", "Telescope git_branches", desc = "Git branches" }, - { "gs", "Telescope git_status", desc = "Git status" }, + { "f", "Telescope find_files", desc = "Find Files" }, + { "F", "Telescope live_grep theme=ivy", desc = "Grep" }, + { "gl", "Telescope git_commits", desc = "Git log" }, + { "gb", "Telescope git_branches", desc = "Git branches" }, + { "gs", "Telescope git_status", desc = "Git status" }, }, opts = function() local actions = require "telescope.actions" @@ -37,12 +37,12 @@ return { path_display = { "truncate" }, mappings = { i = { - [""] = actions.close, - [""] = function () vim.api.nvim_input("") end, - [""] = function () vim.api.nvim_input("") end, - [""] = actions.move_selection_previous, - [""] = actions.move_selection_next, - [""] = function() + [""] = actions.close, + [""] = function() vim.api.nvim_input("") end, + [""] = function() vim.api.nvim_input("") end, + [""] = actions.move_selection_previous, + [""] = actions.move_selection_next, + [""] = function() local has_trouble, trouble_action = pcall(require, "trouble.providers.telescope") if has_trouble then trouble_action.open_with_trouble() @@ -53,9 +53,9 @@ return { }, extensions = { fzf = { - fuzzy = true, -- false will only do exact matching - override_generic_sorter = true, -- override the generic sorter - override_file_sorter = true, -- override the file sorter + fuzzy = true, -- false will only do exact matching + override_generic_sorter = true, -- override the generic sorter + override_file_sorter = true, -- override the file sorter } }, pickers = { @@ -72,6 +72,11 @@ return { }, }, } - end + end, + config = function(_, opts) + local telescope = require("telescope") + telescope.setup(opts) + telescope.load_extension("fzf") + end, } } diff --git a/modules/home/nvim/lua/plugins/treesiter.lua b/modules/home/nvim/lua/plugins/treesiter.lua index 4df5f6d..fe39c90 100644 --- a/modules/home/nvim/lua/plugins/treesiter.lua +++ b/modules/home/nvim/lua/plugins/treesiter.lua @@ -7,7 +7,6 @@ return { dependencies = { "nvim-treesitter/nvim-treesitter-textobjects" }, - ---@type TSConfig opts = { highlight = { enable = true }, indent = { enable = true }, @@ -29,7 +28,6 @@ return { }, }, }, - ---@param opts TSConfig config = function(_, opts) require("nvim-treesitter.configs").setup(opts) end,