Compare commits
2 Commits
a7f1e587be
...
03c3ccec72
Author | SHA1 | Date | |
---|---|---|---|
03c3ccec72 | |||
8cf4f9d293 |
@ -32,7 +32,6 @@ require('packer').startup(function()
|
|||||||
'nvim-treesitter/nvim-treesitter', -- Syntax Highlighting
|
'nvim-treesitter/nvim-treesitter', -- Syntax Highlighting
|
||||||
run = ':TSUpdate'
|
run = ':TSUpdate'
|
||||||
}
|
}
|
||||||
use 'tpope/vim-commentary' -- Commentary
|
|
||||||
use 'tpope/vim-surround' -- Surrounding
|
use 'tpope/vim-surround' -- Surrounding
|
||||||
use 'tpope/vim-repeat' -- Repeat Surrounding
|
use 'tpope/vim-repeat' -- Repeat Surrounding
|
||||||
use 'tpope/vim-sleuth' -- Detect Spacing
|
use 'tpope/vim-sleuth' -- Detect Spacing
|
||||||
@ -58,7 +57,6 @@ require("zenburn").setup()
|
|||||||
|
|
||||||
vim.g.mapleader = ","
|
vim.g.mapleader = ","
|
||||||
opt.mouse = "nv"
|
opt.mouse = "nv"
|
||||||
opt.pastetoggle = "ZP"
|
|
||||||
|
|
||||||
opt.number = true
|
opt.number = true
|
||||||
opt.relativenumber = true
|
opt.relativenumber = true
|
||||||
@ -119,7 +117,7 @@ _G.enable_spell = function(lang)
|
|||||||
print("spellcheck disabled")
|
print("spellcheck disabled")
|
||||||
end
|
end
|
||||||
|
|
||||||
return vim.api.nvim_replace_termcodes('<cr>', true, true, true)
|
-- return vim.api.nvim_replace_termcodes('<cr>', true, true, true)
|
||||||
end
|
end
|
||||||
|
|
||||||
map('n', 'ZD', 'v:lua.enable_spell("de")', { expr = true, silent = true })
|
map('n', 'ZD', 'v:lua.enable_spell("de")', { expr = true, silent = true })
|
||||||
@ -193,7 +191,6 @@ lsp.lua_ls.setup {
|
|||||||
}
|
}
|
||||||
|
|
||||||
-- Autopairs
|
-- Autopairs
|
||||||
require 'nvim-ts-autotag'.setup()
|
|
||||||
require 'nvim-autopairs'.setup {}
|
require 'nvim-autopairs'.setup {}
|
||||||
|
|
||||||
-- Snippets
|
-- Snippets
|
||||||
@ -217,7 +214,7 @@ ls.config.set_config({
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/lua/snippets" })
|
require("luasnip.loaders.from_lua").load({ paths = { "~/.config/nvim/lua/snippets" } })
|
||||||
|
|
||||||
-- Completion
|
-- Completion
|
||||||
local cmp = require('cmp')
|
local cmp = require('cmp')
|
||||||
@ -289,7 +286,8 @@ require('nvim-treesitter.configs').setup {
|
|||||||
additional_vim_regex_highlighting = false,
|
additional_vim_regex_highlighting = false,
|
||||||
},
|
},
|
||||||
autotag = {
|
autotag = {
|
||||||
enable = true
|
enable = true,
|
||||||
|
filetypes = { 'html', 'htmldjango', 'xml', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'svelte', 'vue' }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -439,4 +437,4 @@ require("auto-session").setup {
|
|||||||
log_level = "error"
|
log_level = "error"
|
||||||
}
|
}
|
||||||
|
|
||||||
opt.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
|
-- opt.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal"
|
||||||
|
@ -7,9 +7,9 @@ import XMonad.Actions.Search (SearchEngine, openstreetmap, hackage, wikipedia, y
|
|||||||
|
|
||||||
import XMonad.Hooks.DynamicLog (PP(..), dynamicLogWithPP, filterOutWsPP, xmobarPP, xmobarColor, wrap, shorten)
|
import XMonad.Hooks.DynamicLog (PP(..), dynamicLogWithPP, filterOutWsPP, xmobarPP, xmobarColor, wrap, shorten)
|
||||||
import XMonad.Hooks.ManageDocks (ToggleStruts(..), avoidStruts, docks)
|
import XMonad.Hooks.ManageDocks (ToggleStruts(..), avoidStruts, docks)
|
||||||
import XMonad.Hooks.DynamicProperty (dynamicPropertyChange)
|
|
||||||
import XMonad.Hooks.SetWMName (setWMName)
|
import XMonad.Hooks.SetWMName (setWMName)
|
||||||
import XMonad.Hooks.WorkspaceHistory (workspaceHistoryHook)
|
import XMonad.Hooks.WorkspaceHistory (workspaceHistoryHook)
|
||||||
|
import XMonad.Hooks.OnPropertyChange (onXPropertyChange)
|
||||||
|
|
||||||
import XMonad.Layout.Spacing (Spacing, spacingRaw, Border (..))
|
import XMonad.Layout.Spacing (Spacing, spacingRaw, Border (..))
|
||||||
import XMonad.Layout.LayoutModifier (ModifiedLayout)
|
import XMonad.Layout.LayoutModifier (ModifiedLayout)
|
||||||
@ -249,7 +249,9 @@ myManageHook = composeAll . concat $
|
|||||||
myFloatingClasses = ["Gimp", "Origin"]
|
myFloatingClasses = ["Gimp", "Origin"]
|
||||||
myGames = ["Grim Dawn", "Der Herr der Ringe Online™", "Dota 2", "Project Zomboid", "Valheim", "Factorio", "Path of Exile", "Paradox Launcher", "Europa Universalis IV", "Bannerlord"]
|
myGames = ["Grim Dawn", "Der Herr der Ringe Online™", "Dota 2", "Project Zomboid", "Valheim", "Factorio", "Path of Exile", "Paradox Launcher", "Europa Universalis IV", "Bannerlord"]
|
||||||
|
|
||||||
myEventHook = dynamicPropertyChange "WM_NAME" (title =? "Database.kdbx - KeePassXC" <||> title =? "Database.kdbx [Gesperrt] - KeePassXC" --> floating)
|
myEventHook = mconcat
|
||||||
|
[ onXPropertyChange "WM_NAME" (title =? "Database.kdbx - KeePassXC" <||> title =? "Database.kdbx [Gesperrt] - KeePassXC" --> floating)
|
||||||
|
]
|
||||||
where floating = customFloating $ W.RationalRect (1/8) (1/8) (3/4) (3/4)
|
where floating = customFloating $ W.RationalRect (1/8) (1/8) (3/4) (3/4)
|
||||||
|
|
||||||
-- Startup hook
|
-- Startup hook
|
||||||
|
Loading…
Reference in New Issue
Block a user