many changes
This commit is contained in:
parent
3a1310684f
commit
4a1d182894
10 changed files with 104 additions and 25 deletions
5
home/dot_xinitrc
Normal file
5
home/dot_xinitrc
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
#exec dbus-launch
|
||||||
|
|
||||||
|
xinput --map-to-output 'ELAN901C:00 04F3:2C29' eDP1
|
||||||
|
|
||||||
|
exec dbus-launch leftwm
|
|
@ -1 +1,2 @@
|
||||||
xinput --map-to-output 'ELAN901C:00 04F3:2C29' eDP1
|
xinput --map-to-output 'ELAN901C:00 04F3:2C29' eDP1
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ window:
|
||||||
#position:
|
#position:
|
||||||
# x: 0
|
# x: 0
|
||||||
# y: 0
|
# y: 0
|
||||||
|
opacity: .80
|
||||||
# Window padding (changes require restart)
|
# Window padding (changes require restart)
|
||||||
#
|
#
|
||||||
# Blank space added around the window in pixels. This padding is scaled
|
# Blank space added around the window in pixels. This padding is scaled
|
||||||
|
@ -369,16 +369,16 @@ font:
|
||||||
# When set to `true`, selected text will be copied to the primary clipboard.
|
# When set to `true`, selected text will be copied to the primary clipboard.
|
||||||
#save_to_clipboard: false
|
#save_to_clipboard: false
|
||||||
|
|
||||||
#cursor:
|
cursor:
|
||||||
# Cursor style
|
# Cursor style
|
||||||
#style:
|
style:
|
||||||
# Cursor shape
|
# Cursor shape
|
||||||
#
|
#
|
||||||
# Values for `shape`:
|
# Values for `shape`:
|
||||||
# - ▇ Block
|
# - ▇ Block
|
||||||
# - _ Underline
|
# - _ Underline
|
||||||
# - | Beam
|
# - | Beam
|
||||||
#shape: Block
|
shape: Underline
|
||||||
|
|
||||||
# Cursor blinking state
|
# Cursor blinking state
|
||||||
#
|
#
|
||||||
|
@ -387,7 +387,7 @@ font:
|
||||||
# - Off: Disable blinking by default
|
# - Off: Disable blinking by default
|
||||||
# - On: Enable blinking by default
|
# - On: Enable blinking by default
|
||||||
# - Always: Force the cursor to always blink
|
# - Always: Force the cursor to always blink
|
||||||
#blinking: Off
|
blinking: on
|
||||||
|
|
||||||
# Vi mode cursor style
|
# Vi mode cursor style
|
||||||
#
|
#
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
helper = cache
|
helper = cache
|
||||||
[core]
|
[core]
|
||||||
editor = vim
|
editor = vim
|
||||||
|
excludesfile = /home/daylin/.config/git/ignore
|
||||||
[user]
|
[user]
|
||||||
name = Daylin Morgan
|
name = Daylin Morgan
|
||||||
email = daylinmorgan@gmail.com
|
email = daylinmorgan@gmail.com
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
modkey = "Mod4"
|
modkey = "Mod4"
|
||||||
mousekey = "Mod4"
|
mousekey = "Mod4"
|
||||||
workspaces = []
|
workspaces = []
|
||||||
tags = ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
|
tags = ["1", "2", "3", "4", "5", "6", "7", "8"]
|
||||||
# tags = ["", "", "", "", "", ""]
|
# tags = ["", "", "", "", "", ""]
|
||||||
layouts = ["MainAndVertStack", "Monocle", "EvenVertical", "CenterMainBalanced"]
|
layouts = ["MainAndVertStack", "Monocle", "EvenVertical", "CenterMainBalanced"]
|
||||||
layout_mode = "Workspace"
|
layout_mode = "Workspace"
|
||||||
|
@ -15,19 +15,19 @@ focus_new_windows = true
|
||||||
## Rofi
|
## Rofi
|
||||||
[[keybind]]
|
[[keybind]]
|
||||||
command = "Execute"
|
command = "Execute"
|
||||||
value = "~/.config/leftwm/themes/current/rofi/launcher.sh"
|
value = "~/.config/leftwm/themes/current/rofi/bin/launcher.sh"
|
||||||
modifier = ["modkey"]
|
modifier = ["modkey"]
|
||||||
key = "p"
|
key = "p"
|
||||||
|
|
||||||
[[keybind]]
|
[[keybind]]
|
||||||
command = "Execute"
|
command = "Execute"
|
||||||
value = "~/.config/leftwm/themes/current/rofi/powermenu.sh"
|
value = "~/.config/leftwm/themes/current/rofi/bin/powermenu.sh"
|
||||||
modifier = ["modkey", "Shift"]
|
modifier = ["modkey", "Shift"]
|
||||||
key = "p"
|
key = "p"
|
||||||
|
|
||||||
[[keybind]]
|
[[keybind]]
|
||||||
command = "Execute"
|
command = "Execute"
|
||||||
value = "~/.config/leftwm/themes/current/rofi/keymap.sh"
|
value = "~/.config/leftwm/themes/current/rofi/bin/keymap.sh"
|
||||||
modifier = ["modkey", "Shift"]
|
modifier = ["modkey", "Shift"]
|
||||||
key = "k"
|
key = "k"
|
||||||
|
|
||||||
|
@ -57,10 +57,17 @@ key = "Return"
|
||||||
|
|
||||||
[[keybind]]
|
[[keybind]]
|
||||||
command = "Execute"
|
command = "Execute"
|
||||||
value = "light-locker-command -l"
|
value = "~/bin/lock"
|
||||||
modifier = ["modkey", "Control"]
|
modifier = ["modkey", "Control"]
|
||||||
key = "l"
|
key = "l"
|
||||||
|
|
||||||
|
[[keybind]]
|
||||||
|
command = "Execute"
|
||||||
|
value = "flameshot gui"
|
||||||
|
modifier = ["modkey"]
|
||||||
|
key = "y"
|
||||||
|
|
||||||
|
|
||||||
[[scratchpad]]
|
[[scratchpad]]
|
||||||
name = "Alacritty" # This is the name which is referenced when calling (case-sensitive)
|
name = "Alacritty" # This is the name which is referenced when calling (case-sensitive)
|
||||||
value = "alacritty" # The command to load the application if it isn't started
|
value = "alacritty" # The command to load the application if it isn't started
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
require("keybindings")
|
|
||||||
require("plugins")
|
require("plugins")
|
||||||
|
require("keybindings")
|
||||||
|
|
||||||
-- general
|
-- general
|
||||||
lvim.log.level = "warn"
|
lvim.log.level = "warn"
|
||||||
|
@ -29,11 +29,15 @@ lvim.builtin.treesitter.ensure_installed = {
|
||||||
lvim.builtin.treesitter.ignore_install = { "haskell" }
|
lvim.builtin.treesitter.ignore_install = { "haskell" }
|
||||||
lvim.builtin.treesitter.highlight.enabled = true
|
lvim.builtin.treesitter.highlight.enabled = true
|
||||||
|
|
||||||
-- settings
|
|
||||||
local opt = vim.opt
|
|
||||||
opt.timeoutlen = 500
|
|
||||||
-- colorscheme
|
-- colorscheme
|
||||||
lvim.builtin.lualine.options.theme = "dracula"
|
lvim.builtin.lualine.options.theme = "dracula"
|
||||||
lvim.colorscheme = "dracula"
|
lvim.colorscheme = "dracula"
|
||||||
|
|
||||||
|
-- settings
|
||||||
|
local opt = vim.opt
|
||||||
|
opt.timeoutlen = 500
|
||||||
|
lvim.autocommands.custom_groups = {
|
||||||
|
-- On entering insert mode in any file, scroll the window so the cursor line is centered
|
||||||
|
{"InsertEnter", "*", ":normal zz"},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,44 @@
|
||||||
-- Map a key with optional options
|
-- Map a key with optional options
|
||||||
function map(mode, keys, action, options)
|
local function map(mode, keys, action, options)
|
||||||
if options == nil then
|
if options == nil then
|
||||||
options = {}
|
options = {noremap=true}
|
||||||
end
|
end
|
||||||
vim.api.nvim_set_keymap(mode,keys,action,options)
|
vim.api.nvim_set_keymap(mode,keys,action,options)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
vim.g.mapleader = " "
|
||||||
|
|
||||||
map('i','jk','<Esc>',{noremap=true})
|
map('i','jk','<Esc>',{noremap=true})
|
||||||
map('v','jk','<Esc>',{noremap=true})
|
map('v','jk','<Esc>',{noremap=true})
|
||||||
|
|
||||||
|
map('n', "H", "^",{noremap=true})
|
||||||
|
map('n', "L", "$",{noremap=true})
|
||||||
|
|
||||||
|
-- zettelkasten keybindings
|
||||||
|
|
||||||
|
|
||||||
|
-- Create a new note after asking for its title.
|
||||||
|
-- map("n", "<leader>zn", "<Cmd>ZkNew { title = vim.fn.input('Title: ') }<CR>")
|
||||||
|
|
||||||
|
-- -- Open notes.
|
||||||
|
-- map("n", "<leader>zo", "<Cmd>ZkNotes { sort = { 'modified' } }<CR>")
|
||||||
|
-- -- Open notes associated with the selected tags.
|
||||||
|
-- map("n", "<leader>zt", "<Cmd>ZkTags<CR>")
|
||||||
|
|
||||||
|
-- -- Search for the notes matching a given query.
|
||||||
|
-- map("n", "<leader>zf", "<Cmd>ZkNotes { sort = { 'modified' }, match = vim.fn.input('Search: ') }<CR>")
|
||||||
|
-- -- Search for the notes matching the current visual selection.
|
||||||
|
map("v", "<leader>zf", ":'<,'>ZkMatch<CR>")
|
||||||
|
|
||||||
|
lvim.builtin.which_key.mappings["z"] = {
|
||||||
|
name = "zk",
|
||||||
|
n = { "<Cmd>ZkNew { title = vim.fn.input('Title: ') }<CR>", "New"},
|
||||||
|
o = { "<Cmd>ZkNotes { sort = { 'modified' } }<CR>", "Open" },
|
||||||
|
t = { "<Cmd>ZkTags<CR>", "Tags"},
|
||||||
|
f = { "<Cmd>ZkNotes { sort = { 'modified' }, match = vim.fn.input('Search: ') }<CR>", "Fuzzy Search" },
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
-- keymappings [view all the defaults by pressing <leader>Lk]
|
-- keymappings [view all the defaults by pressing <leader>Lk]
|
||||||
-- lvim.leader = "space"
|
-- lvim.leader = "space"
|
||||||
-- add your own keymapping
|
-- add your own keymapping
|
||||||
|
|
|
@ -2,9 +2,30 @@
|
||||||
lvim.plugins = {
|
lvim.plugins = {
|
||||||
{ 'Mofiqul/dracula.nvim' },
|
{ 'Mofiqul/dracula.nvim' },
|
||||||
{ 'ggandor/lightspeed.nvim' },
|
{ 'ggandor/lightspeed.nvim' },
|
||||||
{ 'snakemake/snakemake',
|
{
|
||||||
rtp='misc/vim',
|
'mickael-menu/zk-nvim',
|
||||||
ft={"Snakefile,snk"}
|
config = function ()
|
||||||
|
require("zk").setup({
|
||||||
|
-- can be "telescope", "fzf" or "select" (`vim.ui.select`)
|
||||||
|
-- it's recommended to use "telescope" or "fzf"
|
||||||
|
picker = "telescope",
|
||||||
|
lsp = {
|
||||||
|
-- `config` is passed to `vim.lsp.start_client(config)`
|
||||||
|
config = {
|
||||||
|
cmd = { "zk", "lsp" },
|
||||||
|
name = "zk",
|
||||||
|
-- on_attach = ...
|
||||||
|
-- etc, see `:h vim.lsp.start_client()`
|
||||||
|
},
|
||||||
|
|
||||||
|
-- automatically attach buffers in a zk notebook that match the given filetypes
|
||||||
|
auto_attach = {
|
||||||
|
enabled = true,
|
||||||
|
filetypes = { "markdown" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@ function map(mode, keys, action, options)
|
||||||
vim.api.nvim_set_keymap(mode,keys,action,options)
|
vim.api.nvim_set_keymap(mode,keys,action,options)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
map('i','jk','<Esc>',{noremap=true})
|
map('i','jk','<Esc>',{noremap=true})
|
||||||
map('v','jk','<Esc>',{noremap=true})
|
map('v','jk','<Esc>',{noremap=true})
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,14 @@ return require('packer').startup(function(use)
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
-- use {
|
||||||
|
-- 'airblade/vim-gitgutter',
|
||||||
|
-- config = function()
|
||||||
|
-- local cmd = vim.cmd
|
||||||
|
-- cmd [[highlight! link SignColumn LineNr]]
|
||||||
|
-- end
|
||||||
|
-- }
|
||||||
|
--
|
||||||
use {
|
use {
|
||||||
'norcalli/nvim-colorizer.lua',
|
'norcalli/nvim-colorizer.lua',
|
||||||
conifg = function()
|
conifg = function()
|
||||||
|
@ -33,7 +41,8 @@ return require('packer').startup(function(use)
|
||||||
'numToStr/Comment.nvim',
|
'numToStr/Comment.nvim',
|
||||||
config = function()
|
config = function()
|
||||||
require('Comment').setup()
|
require('Comment').setup()
|
||||||
end }
|
end
|
||||||
|
}
|
||||||
|
|
||||||
use {
|
use {
|
||||||
"folke/which-key.nvim",
|
"folke/which-key.nvim",
|
||||||
|
@ -74,11 +83,11 @@ use {
|
||||||
ft={"Snakefile","snk"}
|
ft={"Snakefile","snk"}
|
||||||
}
|
}
|
||||||
|
|
||||||
-- toml
|
-- toml
|
||||||
use 'cespare/vim-toml'
|
use 'cespare/vim-toml'
|
||||||
vim.g.strip_whitespace_on_save = 1
|
vim.g.strip_whitespace_on_save = 1
|
||||||
|
|
||||||
-- if packer_bootstrap then
|
if packer_bootstrap then
|
||||||
-- require('packer').sync()
|
require('packer').sync()
|
||||||
-- end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
Loading…
Reference in a new issue