many updates :)

This commit is contained in:
Tyler Starr 2023-09-12 18:59:42 -07:00
parent 6911ac67f1
commit aa0790da22
14 changed files with 76 additions and 133 deletions

View File

@ -1,6 +0,0 @@
[Default Applications]
inode/directory=pcmanfm.desktop;
text/html=firefox.desktop;
x-scheme-handler/http=firefox.desktop;
x-scheme-handler/https=firefox.desktop;
application/pdf=firefox.desktop

View File

@ -0,0 +1 @@
/home/tstarr/.local/share/chezmoi

View File

@ -0,0 +1 @@
/home/tstarr/.local/share/chezmoi/home/dot_config/nvim

View File

@ -0,0 +1 @@
/home/tstarr/documents/zet

View File

@ -1,8 +0,0 @@
local wk = require("which-key")
wk.register({
g = {
name = "+git",
g = { "<cmd>LazyGit<CR>", "Lazygit" },
},
}, { prefix = "<leader>" })

View File

@ -1,5 +1,30 @@
local wk = require("which-key")
-- Move visual blocks up and down
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
-- Keep cursor in center while jumping half-pages
vim.keymap.set("n", "<C-d>", "<C-d>zz")
vim.keymap.set("n", "<C-u>", "<C-u>zz")
-- Keep cursor in center while searching
vim.keymap.set("n", "n", "nzzzv")
vim.keymap.set("n", "N", "Nzzzv")
-- Change clipboard to clip to
vim.keymap.set({"n", "v"}, "<leader>y", [["+y]])
vim.keymap.set("n", "<leader>Y", [["+Y]])
-- Quick fix controls
vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
-- Replace word under cursor
vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
wk.register({
-- tab commands
t = {

View File

@ -2,4 +2,3 @@ require("tstarr.set")
require("tstarr.packer")
require("tstarr.telescope")
require("tstarr.which-key")
require("tstarr.iron")

View File

@ -1,88 +0,0 @@
local iron = require("iron.core")
local wk = require("which-key")
iron.setup {
config = {
-- Whether a repl should be discarded or not
scratch_repl = true,
-- Your repl definitions come here
repl_definition = {
sh = {
-- Can be a table or a function that
-- returns a table (see below)
command = {"zsh"}
},
python = require("iron.fts.python").ipython
},
-- How the repl window will be displayed
-- See below for more information
repl_open_cmd = require('iron.view').right("35%"),
},
-- Iron doesn't set keymaps by default anymore.
-- You can set them here or manually add keymaps to the functions in iron.core
keymaps = {
send_motion = "<leader>rm",
visual_send = "<leader>rv",
send_file = "<leader>rf",
send_line = "<leader>rl",
send_mark = "<leader>rms",
mark_motion = "<leader>rmm",
mark_visual = "<leader>rmv",
remove_mark = "<leader>rmm",
cr = "<leader>r<cr>",
interrupt = "<leader>r<space>",
exit = "<leader>rq",
clear = "<leader>rc",
},
-- If the highlight is on, you can change how it looks
-- For the available options, check nvim_set_hl
highlight = {
italic = true
},
ignore_blank_lines = true, -- ignore blank lines when sending visual select lines
}
-- Iron also has a list of commands, see :h iron-commands for all available commands
vim.keymap.set('n', '<leader>rs', '<cmd>IronRepl<cr>')
vim.keymap.set('n', '<leader>rr', '<cmd>IronRestart<cr>')
vim.keymap.set('n', '<leader>rh', '<cmd>IronHide<cr>')
-- Define the function to exit terminal mode
local function exit_terminal_mode()
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes('<C-\\><C-n>', true, false, true), 'n', true)
end
-- Map the Escape key to the exit_terminal_mode function in terminal mode
vim.keymap.set('t', '<Esc>', function () exit_terminal_mode() end, {noremap = true})
wk.register({
r = {
name = "+iron",
m = "Send Motion",
v = "Send Visual",
f = "Send File",
l = "Send Line",
["<cr>"] = "Send Enter",
["<leader>"] = "Send Interrupt",
q = "Exit",
c = "Clear REPL",
m = {
name = "+mark",
s = "Send Mark",
m = "Mark Motion",
v = "Mark Visual",
r = "Remove Mark"
}
},
}, { prefix = "<leader>" })
wk.register({
r = {
name = "+iron",
v = "Send Visual",
m = {
name = "+mark",
v = "Mark Visual",
}
},
}, { prefix = "<leader>", mode = "v"})

View File

@ -4,8 +4,14 @@ return require('packer').startup(function(use)
-- Packer can manage itself
use 'wbthomason/packer.nvim'
-- Colors
-- Apperance
use ('dracula/vim')
use('norcalli/nvim-colorizer.lua')
require("colorizer").setup()
-- Syntax Hilight
use ('alker0/chezmoi.vim')
use ('nathangrigg/vim-beancount')
-- IDE
use('nvim-lua/plenary.nvim')
@ -15,15 +21,16 @@ return require('packer').startup(function(use)
use ('nvim-telescope/telescope.nvim')
use ('nvim-telescope/telescope-project.nvim')
-- Editing
use ('ThePrimeagen/harpoon')
use ('mbbill/undotree')
use ('kdheepak/lazygit.nvim')
use ('folke/which-key.nvim')
use("mickael-menu/zk-nvim")
-- External
require("zk").setup()
use('mcchrish/nnn.vim')
use({ "iamcco/markdown-preview.nvim",
run = "cd app && npm install",
setup = function() vim.g.mkdp_filetypes = { "markdown" } end,
ft = { "markdown" },
})
-- LSP
use ('neovim/nvim-lspconfig')
use ('hrsh7th/cmp-nvim-lsp')
@ -33,17 +40,5 @@ return require('packer').startup(function(use)
use ('hrsh7th/nvim-cmp')
use ('L3MON4D3/LuaSnip')
use ('saadparwaiz1/cmp_luasnip')
use ('alker0/chezmoi.vim')
use ('nathangrigg/vim-beancount')
use ('folke/which-key.nvim')
use ('hkupty/iron.nvim')
use("mickael-menu/zk-nvim")
require("zk").setup()
use('norcalli/nvim-colorizer.lua')
require("colorizer").setup()
use('loctvl842/monokai-pro.nvim')
require("monokai-pro").setup()
use('mcchrish/nnn.vim')
end)

View File

@ -41,3 +41,6 @@ vim.opt.shortmess:append("c")
vim.g.mapleader = " "
vim.opt.colorcolumn = "80"
-- Open web links with default system application
vim.g.netrw_browsex_viewer="gio open"

View File

@ -92,6 +92,7 @@ conf = 'chezmoi edit ~/.config/zk/config.toml"'
# Note Creation/Deletion/Editing
ei = "zk edit --interactive && zk commit"
view = "zk list --interactive --format {{path}} | xargs bat --color always"
daily = 'zk new --no-input "journal/daily" && zk commit'
del = 'zk list --interactive --format "{{path}}" | xargs rm && zk commit'
bookmark = '~/.config/zk/scripts/bookmark.sh $ZK_NOTEBOOK_DIR && zk commit'

View File

@ -64,12 +64,6 @@
shell = pkgs.zsh;
};
xdg.portal = {
enable = true;
xdgOpenUsePortal = true;
extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr ];
};
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [

View File

@ -71,11 +71,33 @@ in {
# The portal interfaces include APIs for file access, opening URIs,
# printing and others.
services.dbus.enable = true;
xdg.portal = {
enable = true;
wlr.enable = true;
# gtk portal needed to make gtk apps happy
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
xdg = {
portal = {
enable = true;
wlr.enable = true;
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
};
mime = {
enable = true;
defaultApplications = {
"text/plain" = [ "nvim.desktop" ];
"inode/directory" = [ "pcmanfm.desktop" ];
"text/html" = [ "brave-browser.desktop" ];
"x-scheme-handler/http" = [ "brave-browser.desktop" ];
"x-scheme-handler/https" = [ "brave-browser.desktop" ];
"x-scheme-handler/ftp" = [ "brave-browser.desktop" ];
"x-scheme-handler/chrome" = [ "brave-browser.desktop" ];
"x-scheme-handler/about" = [ "brave-browser.desktop" ];
"x-scheme-handler/unknown" = [ "brave-browser.desktop" ];
"application/x-extension-htm" = [ "brave-browser.desktop" ];
"application/x-extension-html" = [ "brave-browser.desktop" ];
"application/x-extension-shtml" = [ "brave-browser.desktop" ];
"application/xhtml+xml" = [ "brave-browser.desktop" ];
"application/x-extension-xhtml" = [ "brave-browser.desktop" ];
"application/x-extension-xht" = [ "brave-browser.desktop" ];
"application/pdf" = [ "brave-browser.desktop" ];
};
};
};
# enable sway window manager

View File

@ -18,6 +18,9 @@ in {
git-annex
pandoc
gollum
cmake
coreutils
gcc
];
};
}