minor updates
This commit is contained in:
parent
8a5f7b8a0a
commit
6944ab1e25
9 changed files with 275 additions and 266 deletions
|
|
@ -25,6 +25,7 @@
|
|||
[niri]
|
||||
depends = [ "wm", "terminals" ]
|
||||
[niri.files]
|
||||
"configs/hypr/base/hypridle.conf" = "~/.config/hypr/hypridle.conf"
|
||||
"configs/niri/base" = "~/.config/niri"
|
||||
"configs/noctalia" = "~/.config/noctalia"
|
||||
"configs/systemd/user/niri.service.wants" = "~/.config/systemd/user/niri.service.wants"
|
||||
|
|
@ -59,6 +60,7 @@
|
|||
depends = [ "cli-utils", "terminals" ]
|
||||
|
||||
[dev.files]
|
||||
"configs/containers" = "~/.config/containers"
|
||||
"configs/git" = "~/.config/git"
|
||||
"configs/lazygit" = "~/.config/lazygit"
|
||||
"configs/mise" = "~/.config/mise"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
function envsource
|
||||
for line in (cat $argv | grep -v '^#')
|
||||
for line in (cat $argv[1] | grep -v -e '^\([[:space:]]\|#.*\)*$')
|
||||
set item (string split -m 1 '=' $line)
|
||||
set -gx $item[1] $item[2]
|
||||
echo "Exported key $item[1]"
|
||||
|
|
|
|||
|
|
@ -2,3 +2,9 @@ set working-directory := "{{ dotter.current_dir }}"
|
|||
|
||||
deploy:
|
||||
dotter deploy
|
||||
|
||||
enable_tailscale:
|
||||
sudo tailscale set --operator=$USER
|
||||
tailscale configure systray --enable-startup=systemd
|
||||
systemctl --user daemon-reload
|
||||
systemctl --user enable --now tailscale-systray
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
#auth sufficient pam_fprintd.so max-tries=1
|
||||
# only uncomment this if you have a fingerprint reader
|
||||
auth sufficient pam_fprintd.so timeout=-1
|
||||
auth sufficient /run/current-system/sw/lib/security/pam_fprintd.so timeout=-1 # for NixOS
|
||||
auth required pam_unix.so
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@
|
|||
"customLaunchPrefixEnabled": false,
|
||||
"enableClipPreview": true,
|
||||
"enableClipboardHistory": true,
|
||||
"iconMode": "tabler",
|
||||
"enableSettingsSearch": true,
|
||||
"iconMode": "native",
|
||||
"ignoreMouseInput": false,
|
||||
"pinnedApps": [
|
||||
],
|
||||
|
|
@ -25,6 +26,7 @@
|
|||
],
|
||||
"preferredPlayer": "",
|
||||
"visualizerType": "mirrored",
|
||||
"volumeFeedback": false,
|
||||
"volumeOverdrive": false,
|
||||
"volumeStep": 5
|
||||
},
|
||||
|
|
@ -34,12 +36,15 @@
|
|||
"density": "default",
|
||||
"exclusive": true,
|
||||
"floating": true,
|
||||
"hideOnOverview": false,
|
||||
"marginHorizontal": 3,
|
||||
"marginVertical": 5,
|
||||
"monitors": [
|
||||
],
|
||||
"outerCorners": true,
|
||||
"position": "top",
|
||||
"screenOverrides": [
|
||||
],
|
||||
"showCapsule": true,
|
||||
"showOutline": false,
|
||||
"useSeparateOpacity": true,
|
||||
|
|
@ -107,6 +112,7 @@
|
|||
"hidePassive": false,
|
||||
"id": "Tray",
|
||||
"pinned": [
|
||||
"systray_17288"
|
||||
]
|
||||
},
|
||||
{
|
||||
|
|
@ -114,9 +120,14 @@
|
|||
},
|
||||
{
|
||||
"hideWhenZero": false,
|
||||
"hideWhenZeroUnread": false,
|
||||
"id": "NotificationHistory",
|
||||
"showUnreadBadge": true
|
||||
},
|
||||
{
|
||||
"displayMode": "onhover",
|
||||
"id": "Network"
|
||||
},
|
||||
{
|
||||
"displayMode": "onhover",
|
||||
"id": "Volume",
|
||||
|
|
@ -125,6 +136,7 @@
|
|||
{
|
||||
"deviceNativePath": "",
|
||||
"displayMode": "alwaysShow",
|
||||
"hideIfIdle": false,
|
||||
"hideIfNotDetected": true,
|
||||
"id": "Battery",
|
||||
"showNoctaliaPerformance": true,
|
||||
|
|
@ -161,18 +173,15 @@
|
|||
{
|
||||
"enabled": true,
|
||||
"id": "weather-card"
|
||||
},
|
||||
{
|
||||
"enabled": false,
|
||||
"id": "timer-card"
|
||||
}
|
||||
]
|
||||
},
|
||||
"colorSchemes": {
|
||||
"darkMode": true,
|
||||
"generationMethod": "tonal-spot",
|
||||
"manualSunrise": "06:30",
|
||||
"manualSunset": "18:30",
|
||||
"matugenSchemeType": "scheme-fruit-salad",
|
||||
"monitorForColors": "",
|
||||
"predefinedScheme": "Catppuccin Macchiato Teal",
|
||||
"schedulingMode": "off",
|
||||
"useWallpaperColors": false
|
||||
|
|
@ -268,11 +277,13 @@
|
|||
"boxRadiusRatio": 1,
|
||||
"compactLockScreen": false,
|
||||
"dimmerOpacity": 0.25,
|
||||
"enableLockScreenCountdown": true,
|
||||
"enableShadows": true,
|
||||
"forceBlackScreenCorners": false,
|
||||
"iRadiusRatio": 1,
|
||||
"language": "",
|
||||
"lockOnSuspend": true,
|
||||
"lockScreenCountdownDuration": 5000,
|
||||
"radiusRatio": 1,
|
||||
"scaleRatio": 1,
|
||||
"screenRadiusRatio": 1,
|
||||
|
|
@ -282,7 +293,8 @@
|
|||
"showChangelogOnStartup": true,
|
||||
"showHibernateOnLockScreen": false,
|
||||
"showScreenCorners": false,
|
||||
"showSessionButtonsOnLockScreen": true
|
||||
"showSessionButtonsOnLockScreen": true,
|
||||
"telemetryEnabled": false
|
||||
},
|
||||
"hooks": {
|
||||
"darkModeChange": "",
|
||||
|
|
@ -291,6 +303,8 @@
|
|||
"performanceModeEnabled": "",
|
||||
"screenLock": "",
|
||||
"screenUnlock": "",
|
||||
"session": "",
|
||||
"startup": "",
|
||||
"wallpaperChange": ""
|
||||
},
|
||||
"location": {
|
||||
|
|
@ -312,7 +326,7 @@
|
|||
"bluetoothHideUnnamedDevices": false,
|
||||
"bluetoothRssiPollIntervalMs": 10000,
|
||||
"bluetoothRssiPollingEnabled": false,
|
||||
"wifiDetailsViewMode": "grid",
|
||||
"wifiDetailsViewMode": "list",
|
||||
"wifiEnabled": true
|
||||
},
|
||||
"nightLight": {
|
||||
|
|
@ -328,6 +342,7 @@
|
|||
"backgroundOpacity": 1,
|
||||
"criticalUrgencyDuration": 15,
|
||||
"enableKeyboardLayoutToast": true,
|
||||
"enableMediaToast": false,
|
||||
"enabled": true,
|
||||
"location": "top",
|
||||
"lowUrgencyDuration": 3,
|
||||
|
|
@ -413,7 +428,7 @@
|
|||
"showHeader": true,
|
||||
"showNumberLabels": true
|
||||
},
|
||||
"settingsVersion": 39,
|
||||
"settingsVersion": 44,
|
||||
"systemMonitor": {
|
||||
"cpuCriticalThreshold": 90,
|
||||
"cpuPollingInterval": 3000,
|
||||
|
|
@ -432,6 +447,8 @@
|
|||
"memPollingInterval": 3000,
|
||||
"memWarningThreshold": 80,
|
||||
"networkPollingInterval": 3000,
|
||||
"swapCriticalThreshold": 90,
|
||||
"swapWarningThreshold": 80,
|
||||
"tempCriticalThreshold": 90,
|
||||
"tempPollingInterval": 3000,
|
||||
"tempWarningThreshold": 80,
|
||||
|
|
@ -439,32 +456,9 @@
|
|||
"warningColor": ""
|
||||
},
|
||||
"templates": {
|
||||
"alacritty": false,
|
||||
"cava": false,
|
||||
"code": false,
|
||||
"discord": false,
|
||||
"emacs": false,
|
||||
"enableUserTemplates": false,
|
||||
"foot": false,
|
||||
"fuzzel": false,
|
||||
"ghostty": false,
|
||||
"gtk": false,
|
||||
"helix": false,
|
||||
"hyprland": false,
|
||||
"kcolorscheme": false,
|
||||
"kitty": false,
|
||||
"mango": false,
|
||||
"niri": false,
|
||||
"pywalfox": false,
|
||||
"qt": false,
|
||||
"spicetify": false,
|
||||
"telegram": false,
|
||||
"vicinae": false,
|
||||
"walker": false,
|
||||
"wezterm": false,
|
||||
"yazi": false,
|
||||
"zed": false,
|
||||
"zenBrowser": false
|
||||
"activeTemplates": [
|
||||
],
|
||||
"enableUserTheming": false
|
||||
},
|
||||
"ui": {
|
||||
"bluetoothDetailsViewMode": "grid",
|
||||
|
|
@ -482,6 +476,7 @@
|
|||
"wifiDetailsViewMode": "grid"
|
||||
},
|
||||
"wallpaper": {
|
||||
"automationEnabled": true,
|
||||
"directory": "/home/aleidk/Pictures/Wallpapers",
|
||||
"enableMultiMonitorDirectories": false,
|
||||
"enabled": true,
|
||||
|
|
@ -492,16 +487,16 @@
|
|||
],
|
||||
"overviewEnabled": true,
|
||||
"panelPosition": "center",
|
||||
"randomEnabled": true,
|
||||
"randomIntervalSec": 900,
|
||||
"recursiveSearch": true,
|
||||
"setWallpaperOnAllMonitors": true,
|
||||
"showHiddenFiles": false,
|
||||
"solidColor": "#1a1a2e",
|
||||
"transitionDuration": 1500,
|
||||
"transitionEdgeSmoothness": 0.05,
|
||||
"transitionType": "random",
|
||||
"useSolidColor": false,
|
||||
"useWallhaven": false,
|
||||
"viewMode": "recursive",
|
||||
"wallhavenApiKey": "",
|
||||
"wallhavenCategories": "111",
|
||||
"wallhavenOrder": "desc",
|
||||
|
|
|
|||
|
|
@ -167,6 +167,7 @@ vim.g.markdown_fenced_languages = {
|
|||
}
|
||||
|
||||
vim.lsp.enable("denols")
|
||||
vim.lsp.enable("phpactor")
|
||||
|
||||
vim.lsp.inlay_hint.enable(true)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
return {
|
||||
'echasnovski/mini.nvim',
|
||||
version = '*',
|
||||
"echasnovski/mini.nvim",
|
||||
version = "*",
|
||||
dependencies = {
|
||||
"rafamadriz/friendly-snippets",
|
||||
},
|
||||
config = function()
|
||||
require('mini.icons').setup()
|
||||
require("mini.icons").setup()
|
||||
|
||||
vim.fn.sign_define("DapBreakpoint", { text = " ", texthl = "DapBreakpoint" })
|
||||
vim.fn.sign_define("DapBreakpointCondition", { text = " ", texthl = "DapBreakpointCondition" })
|
||||
|
|
@ -13,54 +13,60 @@ return {
|
|||
vim.fn.sign_define("DapLogPoint", { text = ".>", texthl = "DapLogPoint" })
|
||||
vim.fn.sign_define("DapStopped", { text = " ", texthl = "DapStopped", numhl = "debugPC" })
|
||||
|
||||
|
||||
require('mini.bracketed').setup({
|
||||
require("mini.bracketed").setup({
|
||||
diagnostic = { options = { severity = vim.diagnostic.severity.ERROR } },
|
||||
})
|
||||
require("mini.ai").setup({})
|
||||
require('mini.cursorword').setup() -- Highlight word under cursor
|
||||
require('mini.extra').setup()
|
||||
require('mini.jump').setup({
|
||||
require("mini.cursorword").setup() -- Highlight word under cursor
|
||||
require("mini.extra").setup()
|
||||
require("mini.jump").setup({
|
||||
mappings = {
|
||||
repeat_jump = ""
|
||||
}
|
||||
repeat_jump = "",
|
||||
},
|
||||
}) -- Extend f, F, t, T
|
||||
require('mini.jump2d').setup(
|
||||
{
|
||||
spotter = require('mini.jump2d').gen_pattern_spotter('[^%s%p]+', 'start'),
|
||||
require("mini.jump2d").setup({
|
||||
spotter = require("mini.jump2d").gen_pattern_spotter("[^%s%p]+", "start"),
|
||||
view = {
|
||||
dim = true,
|
||||
n_steps_ahead = 2
|
||||
n_steps_ahead = 2,
|
||||
},
|
||||
allowed_lines = {
|
||||
blank = false,
|
||||
cursor_at = false
|
||||
cursor_at = false,
|
||||
},
|
||||
}
|
||||
)
|
||||
require('mini.surround').setup()
|
||||
require('mini.operators').setup()
|
||||
require('mini.pairs').setup({
|
||||
modes = { command = true }
|
||||
})
|
||||
require("mini.surround").setup()
|
||||
require("mini.operators").setup()
|
||||
require("mini.pairs").setup({
|
||||
modes = { command = true },
|
||||
})
|
||||
|
||||
require('mini.splitjoin').setup()
|
||||
require("mini.splitjoin").setup()
|
||||
require("mini.align").setup({})
|
||||
-- require('mini.animate').setup()
|
||||
require('mini.notify').setup()
|
||||
vim.notify = require('mini.notify').make_notify()
|
||||
vim.keymap.set('n', '<Leader>un', require('mini.notify').show_history, { desc = 'Show notifications', silent = true })
|
||||
require('mini.statusline').setup()
|
||||
require('mini.diff').setup({ view = { style = 'sign' } })
|
||||
require("mini.notify").setup()
|
||||
vim.notify = require("mini.notify").make_notify()
|
||||
vim.keymap.set(
|
||||
"n",
|
||||
"<Leader>un",
|
||||
require("mini.notify").show_history,
|
||||
{ desc = "Show notifications", silent = true }
|
||||
)
|
||||
require("mini.statusline").setup()
|
||||
require("mini.diff").setup({ view = { style = "sign" } })
|
||||
|
||||
require('mini.git').setup({})
|
||||
require("mini.git").setup({})
|
||||
|
||||
vim.keymap.set({ 'n', 'x' }, '<Leader>gs', '<Cmd>lua MiniGit.show_at_cursor()<CR>',
|
||||
{ desc = 'Show at cursor', silent = true })
|
||||
vim.keymap.set(
|
||||
{ "n", "x" },
|
||||
"<Leader>gs",
|
||||
"<Cmd>lua MiniGit.show_at_cursor()<CR>",
|
||||
{ desc = "Show at cursor", silent = true }
|
||||
)
|
||||
|
||||
local starter = require('mini.starter')
|
||||
local starter = require("mini.starter")
|
||||
starter.setup({
|
||||
footer = '',
|
||||
footer = "",
|
||||
evaluate_single = true,
|
||||
items = {
|
||||
starter.sections.recent_files(10, true),
|
||||
|
|
@ -70,33 +76,33 @@ return {
|
|||
},
|
||||
content_hooks = {
|
||||
starter.gen_hook.adding_bullet(),
|
||||
starter.gen_hook.indexing('all', { 'Builtin actions' }),
|
||||
starter.gen_hook.indexing("all", { "Builtin actions" }),
|
||||
starter.gen_hook.aligning("center", "center"),
|
||||
},
|
||||
})
|
||||
|
||||
require('mini.indentscope').setup({
|
||||
require("mini.indentscope").setup({
|
||||
draw = {
|
||||
animation = require('mini.indentscope').gen_animation.none(),
|
||||
animation = require("mini.indentscope").gen_animation.none(),
|
||||
},
|
||||
})
|
||||
|
||||
require('mini.move').setup({
|
||||
require("mini.move").setup({
|
||||
mappings = {
|
||||
-- Move visual selection in Visual mode
|
||||
left = 'H',
|
||||
right = 'L',
|
||||
down = 'J',
|
||||
up = 'K',
|
||||
left = "H",
|
||||
right = "L",
|
||||
down = "J",
|
||||
up = "K",
|
||||
|
||||
-- Move current line in Normal mode
|
||||
line_left = '',
|
||||
line_right = '',
|
||||
line_down = '',
|
||||
line_up = '',
|
||||
line_left = "",
|
||||
line_right = "",
|
||||
line_down = "",
|
||||
line_up = "",
|
||||
},
|
||||
})
|
||||
require('mini.comment').setup({
|
||||
require("mini.comment").setup({
|
||||
options = {
|
||||
-- Whether to ignore blank lines when commenting
|
||||
ignore_blank_line = true,
|
||||
|
|
@ -105,11 +111,11 @@ return {
|
|||
},
|
||||
})
|
||||
|
||||
local gen_loader = require('mini.snippets').gen_loader
|
||||
require('mini.snippets').setup({
|
||||
local gen_loader = require("mini.snippets").gen_loader
|
||||
require("mini.snippets").setup({
|
||||
snippets = {
|
||||
-- Load custom file with global snippets first (adjust for Windows)
|
||||
gen_loader.from_file('~/.config/nvim-unstable/snippets/global.json'),
|
||||
gen_loader.from_file("~/.config/nvim-unstable/snippets/global.json"),
|
||||
|
||||
-- Load snippets based on current language by reading files from
|
||||
-- "snippets/" subdirectories from 'runtimepath' directories.
|
||||
|
|
@ -176,14 +182,10 @@ return {
|
|||
{ mode = "n", keys = "<Leader>f", desc = "+Find" },
|
||||
{ mode = "n", keys = "<Leader>g", desc = "+Git" },
|
||||
{ mode = "n", keys = "<Leader>l", desc = "+LSP" },
|
||||
{ mode = "n", keys = "<Leader>r", desc = "+Replace" },
|
||||
{ mode = "n", keys = "<Leader>u", desc = "+UI & Config" },
|
||||
{ mode = "n", keys = "<Leader>w", desc = "+Workspace" },
|
||||
{ mode = "n", keys = "<Leader>p", desc = "+Run stuff" },
|
||||
{ mode = "n", keys = "<Leader>z", desc = "+ZK" },
|
||||
{ mode = "v", keys = "<Leader>z", desc = "+ZK" },
|
||||
{ mode = "v", keys = "<Leader>a", desc = "+AI" },
|
||||
{ mode = "n", keys = "<Leader>a", desc = "+AI" },
|
||||
{ mode = "n", keys = "g?", desc = "+Print Debug" },
|
||||
},
|
||||
|
||||
|
|
@ -201,48 +203,44 @@ return {
|
|||
},
|
||||
})
|
||||
|
||||
local hipatterns = require('mini.hipatterns')
|
||||
local hipatterns = require("mini.hipatterns")
|
||||
hipatterns.setup({
|
||||
highlighters = {
|
||||
-- Highlight standalone 'FIXME', 'HACK', 'TODO', 'NOTE'
|
||||
fixme = { pattern = '%f[%w]()FIXME()%f[%W]', group = 'MiniHipatternsFixme' },
|
||||
hack = { pattern = '%f[%w]()HACK()%f[%W]', group = 'MiniHipatternsHack' },
|
||||
todo = { pattern = '%f[%w]()TODO()%f[%W]', group = 'MiniHipatternsTodo' },
|
||||
note = { pattern = '%f[%w]()NOTE()%f[%W]', group = 'MiniHipatternsNote' },
|
||||
fixme = { pattern = "%f[%w]()FIXME()%f[%W]", group = "MiniHipatternsFixme" },
|
||||
hack = { pattern = "%f[%w]()HACK()%f[%W]", group = "MiniHipatternsHack" },
|
||||
todo = { pattern = "%f[%w]()TODO()%f[%W]", group = "MiniHipatternsTodo" },
|
||||
note = { pattern = "%f[%w]()NOTE()%f[%W]", group = "MiniHipatternsNote" },
|
||||
|
||||
-- Highlight hex color strings (`#rrggbb`) using that color
|
||||
hex_color = hipatterns.gen_highlighter.hex_color(),
|
||||
},
|
||||
})
|
||||
|
||||
require('mini.sessions').setup({
|
||||
autowrite = false
|
||||
require("mini.sessions").setup({
|
||||
autowrite = false,
|
||||
})
|
||||
vim.keymap.set('n', '<Leader>us', function()
|
||||
local default_name = require('mini.sessions').get_latest() or "Session.vim"
|
||||
vim.keymap.set("n", "<Leader>us", function()
|
||||
local default_name = require("mini.sessions").get_latest() or "Session.vim"
|
||||
vim.ui.input({ prompt = "Session name: ", default = default_name }, function(input)
|
||||
if input == nil then
|
||||
return
|
||||
end
|
||||
require('mini.sessions').write(input)
|
||||
if input == nil then return end
|
||||
require("mini.sessions").write(input)
|
||||
end)
|
||||
end,
|
||||
{ desc = 'Save session', silent = true })
|
||||
vim.keymap.set('n', '<Leader>uS', function() require('mini.sessions').read() end,
|
||||
{ desc = 'Load session (latest)', silent = true })
|
||||
end, { desc = "Save session", silent = true })
|
||||
vim.keymap.set("n", "<Leader>uS", function()
|
||||
require("mini.sessions").read()
|
||||
end, { desc = "Load session (latest)", silent = true })
|
||||
|
||||
vim.api.nvim_create_user_command("SessionSelect", function()
|
||||
require('mini.sessions').select('read')
|
||||
require("mini.sessions").select("read")
|
||||
end, {})
|
||||
|
||||
vim.api.nvim_create_user_command("SessionDelete", function()
|
||||
require('mini.sessions').select('delete')
|
||||
require("mini.sessions").select("delete")
|
||||
end, {})
|
||||
|
||||
|
||||
vim.keymap.set('n', '<Leader>uz', function()
|
||||
require('mini.misc').zoom()
|
||||
vim.keymap.set("n", "<Leader>uz", function()
|
||||
require("mini.misc").zoom()
|
||||
end, { desc = "Toggle zoom", silent = true })
|
||||
end,
|
||||
{ desc = 'Toggle zoom', silent = true })
|
||||
end
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,11 +42,17 @@ return {
|
|||
})
|
||||
|
||||
vim.keymap.set({ "n", "x", "o" }, "]]", function()
|
||||
ts_obj.move.goto_next({ "@block.outer", "@function.outer", "@class.outer" }, "textobjects")
|
||||
require("nvim-treesitter-textobjects.move").goto_next(
|
||||
{ "@block.outer", "@function.outer", "@class.outer" },
|
||||
"textobjects"
|
||||
)
|
||||
end)
|
||||
|
||||
vim.keymap.set({ "n", "x", "o" }, "[[", function()
|
||||
ts_obj.move.goto_previous({ "@block.outer", "@function.outer", "@class.outer" }, "textobjects")
|
||||
require("nvim-treesitter-textobjects.move").goto_previous(
|
||||
{ "@block.outer", "@function.outer", "@class.outer" },
|
||||
"textobjects"
|
||||
)
|
||||
end)
|
||||
|
||||
local ts_repeat_move = require("nvim-treesitter-textobjects.repeatable_move")
|
||||
|
|
|
|||
1
configs/systemd/user/niri.service.wants/hypridle.service
Symbolic link
1
configs/systemd/user/niri.service.wants/hypridle.service
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
/usr/lib/systemd/user/hypridle.service
|
||||
Loading…
Add table
Add a link
Reference in a new issue