aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreric.marin <maarin.eric@gmail.com>2025-03-05 22:25:17 +0100
committereric.marin <maarin.eric@gmail.com>2025-03-05 22:26:26 +0100
commit6d95f092e30737d49b650891e93de518498523a3 (patch)
tree469db0917af455a1a354123f8d5ee27a228dae38
parent4de5a217c25fe83bb54063f8d842b78c9e6d7fb3 (diff)
downloaddotfiles-6d95f092e30737d49b650891e93de518498523a3.tar.gz
dotfiles-6d95f092e30737d49b650891e93de518498523a3.zip
neorg
-rw-r--r--ags/widget/Bar.tsx92
-rw-r--r--nvim/lua/config/keymaps.lua5
-rw-r--r--nvim/lua/config/options.lua2
-rw-r--r--nvim/lua/plugins/comment.lua6
-rw-r--r--nvim/lua/plugins/dashboard-nvim.lua83
-rw-r--r--nvim/lua/plugins/indent-blankline.lua1
-rw-r--r--nvim/lua/plugins/lualine.lua46
-rw-r--r--nvim/lua/plugins/nabla.lua17
-rw-r--r--nvim/lua/plugins/neopywal.lua13
-rw-r--r--nvim/lua/plugins/neorg.lua113
-rw-r--r--nvim/lua/plugins/noice.lua38
-rw-r--r--nvim/lua/plugins/nvim-lspconfig.lua18
-rw-r--r--nvim/lua/plugins/nvim-parinfer.lua4
-rw-r--r--nvim/lua/plugins/nvim-treesitter.lua1
-rw-r--r--nvim/lua/plugins/telescope.lua48
-rw-r--r--nvim/lua/plugins/todo-comments.lua44
-rwxr-xr-xscripts/set_background1
-rw-r--r--wallust/templates/foot2
-rw-r--r--wallust/templates/niri26
-rw-r--r--wallust/wallust.toml6
20 files changed, 307 insertions, 259 deletions
diff --git a/ags/widget/Bar.tsx b/ags/widget/Bar.tsx
index d994797..0e4f8bb 100644
--- a/ags/widget/Bar.tsx
+++ b/ags/widget/Bar.tsx
@@ -1,16 +1,18 @@
-import { App, Astal, Gtk, Gdk, Widget } from "astal/gtk3"
-import { Variable } from "astal"
+import { App, Astal, Gtk, Gdk } from "astal/gtk3"
+import { bind, Variable } from "astal"
import { BoxProps, CenterBoxProps } from "astal/gtk3/widget"
+import AstalBattery from "gi://AstalBattery"
+import AstalNetwork from "gi://AstalNetwork"
+import AstalBluetooth from "gi://AstalBluetooth"
const { TOP, LEFT, RIGHT, BOTTOM } = Astal.WindowAnchor
const { START, CENTER, END } = Gtk.Align
-const time = Variable("").poll(1000, "date")
-
function VerticalCenterBox(props: CenterBoxProps) {
return <centerbox
{...props}
vertical
+ halign={CENTER}
/>
}
@@ -18,36 +20,86 @@ function VerticalBox(props: BoxProps) {
return <box
{...props}
vertical
+ halign={CENTER}
+ />
+}
+
+function Clock() {
+ const hours = Variable("").poll(360000, "date +%_H")
+ const minutes = Variable("").poll(60000, "date +%_M")
+
+ return <VerticalBox
+ className="Clock"
+ onDestroy={() => {
+ hours.drop()
+ minutes.drop()
+ }}
+ >
+ {hours()}
+ {minutes()}
+ </VerticalBox>
+}
+
+function Battery() {
+ const bat = AstalBattery.get_default()
+
+ return <icon
+ className="Battery"
+ tooltipText={bind(bat, "percentage").as((v) => `${v * 100}%`)}
+ icon={bind(bat, "iconName")}
+ />
+}
+
+function Wifi() {
+ const wifi = AstalNetwork.get_default().get_wifi()!
+
+ return <icon
+ className="Wifi"
+ tooltipText={bind(wifi, "ssid").as(String)}
+ icon={bind(wifi, "iconName")}
+ />
+}
+
+function Bluetooth() {
+ const bluetooth = AstalBluetooth.get_default()
+
+ const isPowered = bind(bluetooth, "isPowered")
+
+ return <label
+ className="Bluetooth"
+ label={isPowered.as(String)}
/>
}
export default function Bar(gdkmonitor: Gdk.Monitor) {
return <window
name="Bar"
- className="Bar"
gdkmonitor={gdkmonitor}
exclusivity={Astal.Exclusivity.EXCLUSIVE}
anchor={TOP | LEFT | BOTTOM}
application={App}>
- <VerticalCenterBox>
- <button
- onClicked="echo hello"
- halign={CENTER}
+ <VerticalCenterBox
+ className="Bar"
+ >
+ <VerticalBox
+ className="ModulesTop"
valign={START}
>
- Welcome to AGS!
- </button>
- <VerticalBox>
- <label>CIAO</label>
- <label>CIAO</label>
</VerticalBox>
- <button
- onClicked={() => print("hello")}
- halign={CENTER}
+ <VerticalBox
+ className="ModulesMiddle"
+ valign={CENTER}
+ >
+ <Clock />
+ </VerticalBox>
+ <VerticalBox
+ className="ModulesBottom"
valign={END}
>
- <label label={time()} />
- </button>
+ <Bluetooth />
+ <Wifi />
+ <Battery />
+ </VerticalBox>
</VerticalCenterBox>
- </window>
+ </window >
}
diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua
index 766627b..d81308d 100644
--- a/nvim/lua/config/keymaps.lua
+++ b/nvim/lua/config/keymaps.lua
@@ -27,10 +27,13 @@ keymap.set("v", ">", ">gv")
-- Comments
vim.api.nvim_set_keymap("n", "<C-c>", "gcc", { noremap = false })
-vim.api.nvim_set_keymap("v", "<C-c>", "gcc<Esc>", { noremap = false })
+vim.api.nvim_set_keymap("v", "<C-c>", "gb", { noremap = false })
-- Buffer kill
-- keymap.set("n", "<C-q>", ":bunload<Enter>", opts)
-- Working
keymap.set("n", "<C-s>", ":w<Enter>", opts)
+
+-- Format All
+keymap.set("n", "fa", "ggVG=<C-o>", opts)
diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua
index bf92bb5..0802c48 100644
--- a/nvim/lua/config/options.lua
+++ b/nvim/lua/config/options.lua
@@ -34,7 +34,7 @@ opt.backup = false
opt.backspace = "indent,eol,start"
opt.splitright = true
opt.splitbelow = true
-opt.autochdir = false
+opt.autochdir = true
opt.mouse = "a"
opt.clipboard = "unnamedplus"
opt.modifiable = true
diff --git a/nvim/lua/plugins/comment.lua b/nvim/lua/plugins/comment.lua
new file mode 100644
index 0000000..559fd3c
--- /dev/null
+++ b/nvim/lua/plugins/comment.lua
@@ -0,0 +1,6 @@
+return {
+ "numToStr/Comment.nvim",
+ lazy = true,
+ event = { "BufReadPost", "BufWritePost", "BufNewFile" },
+ opts = {}
+}
diff --git a/nvim/lua/plugins/dashboard-nvim.lua b/nvim/lua/plugins/dashboard-nvim.lua
index 287bf21..481f0e7 100644
--- a/nvim/lua/plugins/dashboard-nvim.lua
+++ b/nvim/lua/plugins/dashboard-nvim.lua
@@ -1,5 +1,3 @@
-math.randomseed(os.time())
-
Headers = {
{
[[ ███╗ ██╗ ███████╗ ██████╗ ██╗ ██╗ ██╗ ███╗ ███╗ ]],
@@ -68,24 +66,6 @@ Headers = {
[[ ]],
},
{
- [[ _.oo. ]],
- [[ _.u[[/;:,. .odMMMMMM' ]],
- [[ .o888UU[[[/;:-. .o@P^ MMM^ ]],
- [[ oN88888UU[[[/;::-. dP^ ]],
- [[ dNMMNN888UU[[[/;:--. .o@P^ ]],
- [[ ,MMMMMMN888UU[[/;::-. o@^ ]],
- [[ NNMMMNN888UU[[[/~.o@P^ ]],
- [[ 888888888UU[[[/o@^-.. ]],
- [[ oI8888UU[[[/o@P^:--.. ]],
- [[ .@^ YUU[[[/o@^;::---.. ]],
- [[ oMP ^/o@P^;:::---.. ]],
- [[ .dMMM .o@^ ^;::---... ]],
- [[ dMMMMMMM@^` `^^^^ ]],
- [[ YMMMUP^ ]],
- [[ ^^ ]],
- [[ ]],
- },
- {
[[ ⣴⣶⣤⡤⠦⣤⣀⣤⠆ ⣈⣭⣿⣶⣿⣦⣼⣆ ]],
[[ ⠉⠻⢿⣿⠿⣿⣿⣶⣦⠤⠄⡠⢾⣿⣿⡿⠋⠉⠉⠻⣿⣿⡛⣦ ]],
[[ ⠈⢿⣿⣟⠦ ⣾⣿⣿⣷ ⠻⠿⢿⣿⣧⣄ ]],
@@ -120,23 +100,6 @@ Headers = {
[[ '---''(_/--' `-'\_) ]],
[[ ]],
},
- {
- [[ ____ ]],
- [[ /\ \ ]],
- [[ / \ \ ]],
- [[ / \ \ ]],
- [[ / \ \ ]],
- [[ / /\ \ \ ]],
- [[ / / \ \ \ ]],
- [[ / / \ \ \ ]],
- [[ / / / \ \ \ ]],
- [[ / / / \ \ \ ]],
- [[ / / /---------' \ ]],
- [[ / / /_______________\ ]],
- [[ \ / / ]],
- [[ \/_____________________/ ]],
- [[ ]],
- },
}
Quotes = {
@@ -197,6 +160,9 @@ Quotes = {
}
}
+
+math.randomseed(os.time())
+
local header = function()
return Headers[math.random(#Headers)]
end
@@ -211,33 +177,32 @@ local init = function()
{ noremap = true, silent = true, desc = "Dashboard" }) -- Dashboard
end
-local hyper = function()
- require("dashboard").setup {
- theme = "hyper",
- shortcut_type = "number",
- change_to_vcs_root = true,
- hide = {
- statusline = false
+local hyper = {
+ theme = "hyper",
+ shortcut_type = "number",
+ change_to_vcs_root = true,
+ hide = {
+ statusline = false
+ },
+ config = {
+ header = header(),
+ shortcut = {
+ { action = "ene | lua require('lualine')", desc = "New File", icon = " ", key = "n" },
+ { action = "Lazy", desc = "Plugin Manager", icon = "󰒲 ", key = "p" },
+ { action = "Oil --float", desc = "File browser", icon = " ", key = "b" },
+ { action = "Neorg index", desc = "Neorg Index", icon = "󰧮 ", key = "i" }
},
- config = {
- header = header(),
- shortcut = {
- { action = "ene | lua require('lualine')", desc = "New", icon = " ", key = "n" },
- { action = "Lazy", desc = "Lazy", icon = "󰒲 ", key = "l" },
- { action = "Oil --float", desc = "File browser", icon = " ", key = "o" },
- },
- packages = { enable = true },
- project = { enable = true },
- mru = { limit = 5 },
- footer = footer,
- },
- }
-end
+ packages = { enable = true },
+ project = { enable = true },
+ mru = { limit = 5 },
+ footer = footer,
+ },
+}
return {
"eric-marin/dashboard-nvim",
dependencies = { "nvim-tree/nvim-web-devicons" },
lazy = false,
init = init,
- config = hyper,
+ opts = hyper
}
diff --git a/nvim/lua/plugins/indent-blankline.lua b/nvim/lua/plugins/indent-blankline.lua
index 465d5a9..06298a0 100644
--- a/nvim/lua/plugins/indent-blankline.lua
+++ b/nvim/lua/plugins/indent-blankline.lua
@@ -7,6 +7,7 @@ return {
exclude = {
filetypes = {
"dashboard",
+ "norg"
},
},
},
diff --git a/nvim/lua/plugins/lualine.lua b/nvim/lua/plugins/lualine.lua
index d9a108b..f45a5a5 100644
--- a/nvim/lua/plugins/lualine.lua
+++ b/nvim/lua/plugins/lualine.lua
@@ -1,34 +1,32 @@
-local config = function()
- require("lualine").setup({
- options = {
- theme = "auto",
- globalstatus = true,
- disabled_filetypes = { "toggleterm", "lazy", "oil", "dashboard", "TelescopePrompt", "oil_preview" }
+local opts = {
+ options = {
+ theme = "auto",
+ globalstatus = true,
+ disabled_filetypes = { "toggleterm", "lazy", "oil", "dashboard", "TelescopePrompt", "oil_preview" }
+ },
+ sections = {
+ lualine_a = { "mode" },
+ lualine_b = { "branch", "diff",
+ {
+ "diagnostics",
+ sections = { "error", "warn", "info", "hint" },
+ symbols = { error = " ", warn = " ", info = " ", hint = " " },
+ }
},
- sections = {
- lualine_a = { "mode" },
- lualine_b = { "branch", "diff",
- {
- "diagnostics",
- sections = { "error", "warn", "info", "hint" },
- symbols = { error = " ", warn = " ", info = " ", hint = " " },
- }
- },
- lualine_c = {
- {
- require("lazy.status").updates,
- cond = require("lazy.status").has_updates,
- color = { fg = "#ff9e64" },
- },
+ lualine_c = {
+ {
+ require("lazy.status").updates,
+ cond = require("lazy.status").has_updates,
+ color = { fg = "#ff9e64" },
},
},
- })
-end
+ },
+}
return {
"nvim-lualine/lualine.nvim",
lazy = true,
event = "VeryLazy",
-- event = { "BufReadPost", "BufWritePost", "BufNewFile" },
- config = config,
+ opts = opts,
}
diff --git a/nvim/lua/plugins/nabla.lua b/nvim/lua/plugins/nabla.lua
new file mode 100644
index 0000000..ebf53a6
--- /dev/null
+++ b/nvim/lua/plugins/nabla.lua
@@ -0,0 +1,17 @@
+local config = function()
+ vim.keymap.set("n", "<Space>x", function()
+ require("nabla").popup({ border = "rounded" })
+ end, { desc = "Popup Math" })
+ vim.keymap.set("n", "<Space>xx", function()
+ require "nabla".toggle_virt({
+ autogen = true, -- auto-regenerate ASCII art when exiting insert mode
+ silent = true, -- silents error messages
+ })
+ end, { desc = "Toggle Math" })
+end
+
+return {
+ "jbyuki/nabla.nvim",
+ ft = "norg",
+ config = config
+}
diff --git a/nvim/lua/plugins/neopywal.lua b/nvim/lua/plugins/neopywal.lua
index e95686a..31a9b47 100644
--- a/nvim/lua/plugins/neopywal.lua
+++ b/nvim/lua/plugins/neopywal.lua
@@ -2,17 +2,18 @@ local init = function()
vim.cmd.colorscheme("neopywal")
end
-local config = function()
- require("neopywal").setup({
- use_wallust = true,
- })
-end
+local opts = {
+ use_wallust = true,
+ plugins = {
+ treesitter = true
+ }
+}
return {
"RedsXDD/neopywal.nvim",
lazy = false,
name = "neopywal",
init = init,
- config = config,
+ opts = opts,
priority = 1000,
}
diff --git a/nvim/lua/plugins/neorg.lua b/nvim/lua/plugins/neorg.lua
index 1e2d948..a36aff5 100644
--- a/nvim/lua/plugins/neorg.lua
+++ b/nvim/lua/plugins/neorg.lua
@@ -1,15 +1,41 @@
local config = function()
- -- remap keybinds
- vim.keymap.set("v", "<", "<Plug>(neorg.promo.demote.range)", { buffer = true })
- vim.keymap.set("v", ">", "<Plug>(neorg.promo.promote.range)", { buffer = true })
- vim.keymap.set("n", "<Space>ma", "<Plug>(neorg.qol.todo-items.todo.task-ambiguous)", { buffer = true })
- vim.keymap.set("n", "<Space>mc", "<Plug>(neorg.qol.todo-items.todo.task-cancelled)", { buffer = true })
- vim.keymap.set("n", "<Space>md", "<Plug>(neorg.qol.todo-items.todo.task-done)", { buffer = true })
- vim.keymap.set("n", "<Space>mh", "<Plug>(neorg.qol.todo-items.todo.task-on-hold)", { buffer = true })
- vim.keymap.set("n", "<Space>mi", "<Plug>(neorg.qol.todo-items.todo.task-important)", { buffer = true })
- vim.keymap.set("n", "<Space>mp", "<Plug>(neorg.qol.todo-items.todo.task-pending)", { buffer = true })
- vim.keymap.set("n", "<Space>mr", "<Plug>(neorg.qol.todo-items.todo.task-recurring)", { buffer = true })
- vim.keymap.set("n", "<Space>mu", "<Plug>(neorg.qol.todo-items.todo.task-undone)", { buffer = true })
+ vim.api.nvim_create_autocmd("Filetype", {
+ pattern = "norg",
+ callback = function()
+ -- remap keybinds
+ vim.keymap.set("n", "<Space>nn", "<Plug>(neorg.dirman.new-note)", { buffer = true })
+ vim.keymap.set("n", "<Space>tc", "<cmd>Neorg toc<CR>", { buffer = true })
+
+ vim.keymap.set("i", "<C-d>", "<Plug>(neorg.promo.demote)", { buffer = true })
+ vim.keymap.set("i", "<C-t>", "<Plug>(neorg.promo.promote)", { buffer = true })
+ vim.keymap.set("i", "<M-CR>", "<Plug>(neorg.itero.next-iteration)", { buffer = true })
+ vim.keymap.set("i", "<M-d>", "<Plug>(neorg.tempus.insert-date.insert-mode)", { buffer = true })
+
+ vim.keymap.set("n", "<.", "<Plug>(neorg.promo.demote)", { buffer = true })
+ vim.keymap.set("n", "<<", "<Plug>(neorg.promo.demote.nested)", { buffer = true })
+ vim.keymap.set("n", "<C-Space>", "<Plug>(neorg.qol.todo-items.todo.task-cycle)", { buffer = true })
+ vim.keymap.set("n", "<CR>", "<Plug>(neorg.esupports.hop.hop-link)", { buffer = true })
+ vim.keymap.set("n", "<Space>cm", "<Plug>(neorg.looking-glass.magnify-code-block)", { buffer = true })
+ vim.keymap.set("n", "<Space>id", "<Plug>(neorg.tempus.insert-date)", { buffer = true })
+ vim.keymap.set("n", "<Space>li", "<Plug>(neorg.pivot.list.invert)", { buffer = true })
+ vim.keymap.set("n", "<Space>lt", "<Plug>(neorg.pivot.list.toggle)", { buffer = true })
+ vim.keymap.set("n", "<Space>ma", "<Plug>(neorg.qol.todo-items.todo.task-ambiguous)", { buffer = true })
+ vim.keymap.set("n", "<Space>mc", "<Plug>(neorg.qol.todo-items.todo.task-cancelled)", { buffer = true })
+ vim.keymap.set("n", "<Space>md", "<Plug>(neorg.qol.todo-items.todo.task-done)", { buffer = true })
+ vim.keymap.set("n", "<Space>mh", "<Plug>(neorg.qol.todo-items.todo.task-on-hold)", { buffer = true })
+ vim.keymap.set("n", "<Space>mi", "<Plug>(neorg.qol.todo-items.todo.task-important)", { buffer = true })
+ vim.keymap.set("n", "<Space>mp", "<Plug>(neorg.qol.todo-items.todo.task-pending)", { buffer = true })
+ vim.keymap.set("n", "<Space>mr", "<Plug>(neorg.qol.todo-items.todo.task-recurring)", { buffer = true })
+ vim.keymap.set("n", "<Space>mu", "<Plug>(neorg.qol.todo-items.todo.task-undone)", { buffer = true })
+ vim.keymap.set("n", "<M-CR>", "<Plug>(neorg.esupports.hop.hop-link.vsplit)", { buffer = true })
+ vim.keymap.set("n", "<M-t>", "<Plug>(neorg.esupports.hop.hop-link.tab-drop)", { buffer = true })
+ vim.keymap.set("n", ">.", "Plug>(neorg.promo.promote)", { buffer = true })
+ vim.keymap.set("n", ">>", "Plug>(neorg.promo.promote.nested)", { buffer = true })
+
+ vim.keymap.set("v", "<", "<Plug>(neorg.promo.demote.range)", { buffer = true })
+ vim.keymap.set("v", ">", "<Plug>(neorg.promo.promote.range)", { buffer = true })
+ end,
+ })
require("neorg").setup({
load = {
@@ -21,14 +47,25 @@ local config = function()
}
}
},
- -- ["core.dirman"] = {
- -- config = {
- -- workspaces = {
- -- default = "~/neorg"
- -- },
- -- index = "index.norg"
- -- }
- -- },
+ ["core.keybinds"] = {
+ config = {
+ default_keybinds = false
+ }
+ },
+ ["core.summary"] = {},
+ -- ["core.latex.renderer"] = {},
+ ["core.export"] = {},
+ ["core.dirman"] = {
+ config = {
+ default_workspace = "documents",
+ workspaces = {
+ documents = "~/Documents/neorg",
+ physics = "~/Documents/neorg/uni/fisica",
+ asd = "~/Documents/neorg/uni/algoritmi-strutture-dati",
+ },
+ index = "index.norg"
+ }
+ },
["core.completion"] = {
config = {
engine = "nvim-cmp"
@@ -36,13 +73,14 @@ local config = function()
},
["core.journal"] = {
config = {
- journal_folder = "neorg/journal/"
+ journal_folder = "journal",
+ workspace = "documents"
}
},
["core.esupports.metagen"] = {
config = {
timezone = "implicit-local",
- type = "empty"
+ type = "auto"
}
},
["core.concealer"] = {
@@ -66,38 +104,6 @@ local config = function()
}
}
}
- },
- ["core.highlights"] = {
- config = {
- highlights = {
- headings = {
- ["1"] = {
- prefix = "+RenderMarkdownH1",
- title = "+RenderMarkdownH1"
- },
- ["2"] = {
- prefix = "+RenderMarkdownH2",
- title = "+RenderMarkdownH2"
- },
- ["3"] = {
- prefix = "+RenderMarkdownH3",
- title = "+RenderMarkdownH3"
- },
- ["4"] = {
- prefix = "+RenderMarkdownH4",
- title = "+RenderMarkdownH4"
- },
- ["5"] = {
- prefix = "+RenderMarkdownH5",
- title = "+RenderMarkdownH5"
- },
- ["6"] = {
- prefix = "+RenderMarkdownH6",
- title = "+RenderMarkdownH6"
- }
- }
- }
- }
}
}
})
@@ -110,4 +116,5 @@ return {
cmd = "Neorg",
version = "*", -- Pin Neorg to the latest stable release
config = config,
+ -- dependencies = { "3rd/image.nvim" }
}
diff --git a/nvim/lua/plugins/noice.lua b/nvim/lua/plugins/noice.lua
index aa4d482..43a12b2 100644
--- a/nvim/lua/plugins/noice.lua
+++ b/nvim/lua/plugins/noice.lua
@@ -1,29 +1,27 @@
-local config = function()
- require("noice").setup({
- lsp = {
- -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
- override = {
- ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
- ["vim.lsp.util.stylize_markdown"] = true,
- ["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
- },
+local opts = {
+ lsp = {
+ -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
+ override = {
+ ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+ ["vim.lsp.util.stylize_markdown"] = true,
+ ["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
},
- -- you can enable a preset for easier configuration
- presets = {
- bottom_search = true, -- use a classic bottom cmdline for search
- command_palette = true, -- position the cmdline and popupmenu together
- long_message_to_split = true, -- long messages will be sent to a split
- inc_rename = false, -- enables an input dialog for inc-rename.nvim
- lsp_doc_border = true, -- add a border to hover docs and signature help
- },
- })
-end
+ },
+ -- you can enable a preset for easier configuration
+ presets = {
+ bottom_search = true, -- use a classic bottom cmdline for search
+ command_palette = true, -- position the cmdline and popupmenu together
+ long_message_to_split = true, -- long messages will be sent to a split
+ inc_rename = false, -- enables an input dialog for inc-rename.nvim
+ lsp_doc_border = true, -- add a border to hover docs and signature help
+ },
+}
return {
"folke/noice.nvim",
lazy = true,
event = "VeryLazy",
- config = config,
+ opts = opts,
dependencies = {
"MunifTanjim/nui.nvim",
},
diff --git a/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/lua/plugins/nvim-lspconfig.lua
index c9b1326..9127c75 100644
--- a/nvim/lua/plugins/nvim-lspconfig.lua
+++ b/nvim/lua/plugins/nvim-lspconfig.lua
@@ -82,10 +82,10 @@ local config = function()
capabilities = capabilities,
})
-- nixd configuration
- lspconfig.nixd.setup({
- on_attach = on_attach,
- capabilities = capabilities,
- })
+ -- lspconfig.nixd.setup({
+ -- on_attach = on_attach,
+ -- capabilities = capabilities,
+ -- })
-- typescript-language-server configuration
lspconfig.ts_ls.setup({
on_attach = on_attach,
@@ -97,11 +97,11 @@ local config = function()
capabilities = capabilities,
})
-- vacuum configuration
- lspconfig.vacuum.setup({
- -- on_attach = on_attach,
- capabilities = capabilities,
- filetypes = { "yaml" }
- })
+ -- lspconfig.vacuum.setup({
+ -- -- on_attach = on_attach,
+ -- capabilities = capabilities,
+ -- filetypes = { "yaml" }
+ -- })
end
return {
diff --git a/nvim/lua/plugins/nvim-parinfer.lua b/nvim/lua/plugins/nvim-parinfer.lua
deleted file mode 100644
index 95d701d..0000000
--- a/nvim/lua/plugins/nvim-parinfer.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-return {
- "gpanders/nvim-parinfer",
- lazy = true,
-}
diff --git a/nvim/lua/plugins/nvim-treesitter.lua b/nvim/lua/plugins/nvim-treesitter.lua
index 1c9ecdc..84aa7cb 100644
--- a/nvim/lua/plugins/nvim-treesitter.lua
+++ b/nvim/lua/plugins/nvim-treesitter.lua
@@ -14,6 +14,7 @@ local config = function()
"markdown_inline",
"bash",
"toml",
+ "latex",
"cpp",
"rust",
diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
index 0796d4f..bc29d8c 100644
--- a/nvim/lua/plugins/telescope.lua
+++ b/nvim/lua/plugins/telescope.lua
@@ -15,33 +15,31 @@ local init = function()
keymap.set("n", "<Space>tb", ":Telescope buffers<Enter>", opts) -- Buffers
end
-local config = function()
- require("telescope").setup({
- defaults = {
- mappings = {
- i = {
- ["<C-j>"] = "move_selection_next",
- ["<C-k>"] = "move_selection_previous",
- },
+local opts = {
+ defaults = {
+ mappings = {
+ i = {
+ ["<C-j>"] = "move_selection_next",
+ ["<C-k>"] = "move_selection_previous",
},
},
- picker = {
- find_files = {
- theme = "dropdown",
- previewer = false,
- hidden = true,
- },
- live_grep = {
- theme = "dropdown",
- previewer = false,
- },
- find_buffers = {
- theme = "dropdown",
- previewer = false,
- },
+ },
+ picker = {
+ find_files = {
+ theme = "dropdown",
+ previewer = false,
+ hidden = true,
},
- })
-end
+ live_grep = {
+ theme = "dropdown",
+ previewer = false,
+ },
+ find_buffers = {
+ theme = "dropdown",
+ previewer = false,
+ },
+ },
+}
return {
"nvim-telescope/telescope.nvim",
@@ -49,5 +47,5 @@ return {
lazy = true,
cmd = "Telescope",
init = init,
- config = config
+ opts = opts,
}
diff --git a/nvim/lua/plugins/todo-comments.lua b/nvim/lua/plugins/todo-comments.lua
index 85e8090..1ae4a83 100644
--- a/nvim/lua/plugins/todo-comments.lua
+++ b/nvim/lua/plugins/todo-comments.lua
@@ -1,32 +1,30 @@
-local config = function()
- require("todo-comments").setup({
- keywords = {
- FIX = { icon = "", color = "error", alt = { "FIXME", "BUG", "FIXIT", "ISSUE" } },
- TODO = { icon = "", color = "info" },
- HACK = { icon = "", color = "hack" },
- WARN = { icon = "", color = "warning", alt = { "WARNING", "XXX" } },
- PERF = { icon = "󰅒", color = "perf", alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" } },
- NOTE = { icon = "", color = "hint", alt = { "INFO" } },
- TEST = { icon = "", color = "test", alt = { "TESTING", "PASSED", "FAILED" } },
- },
- colors = {
- error = { "DiagnosticError", "ErrorMsg", "#DC2626" },
- warning = { "DiagnosticWarn", "WarningMsg", "#FBBF24" },
- info = { "DiagnosticInfo", "#2563EB" },
- hint = { "DiagnosticHint", "#10B981" },
- test = { "Identifier", "#FF00FF" },
- hack = "#F5A97F",
- perf = "#C6A0F6"
- }
- })
-end
+local opts = {
+ keywords = {
+ FIX = { icon = "", color = "error", alt = { "FIXME", "BUG", "FIXIT", "ISSUE" } },
+ TODO = { icon = "", color = "info" },
+ HACK = { icon = "", color = "hack" },
+ WARN = { icon = "", color = "warning", alt = { "WARNING", "XXX" } },
+ PERF = { icon = "󰅒", color = "perf", alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" } },
+ NOTE = { icon = "", color = "hint", alt = { "INFO" } },
+ TEST = { icon = "", color = "test", alt = { "TESTING", "PASSED", "FAILED" } },
+ },
+ colors = {
+ error = "@text.title.1.markdown",
+ info = "DiagnosticInfo",
+ hack = "@text.title.2.markdown",
+ warning = "@text.title.3.markdown",
+ perf = "@text.title.4.markdown",
+ hint = "@text.title.5.markdown",
+ test = "@text.title.6.markdown",
+ }
+}
return {
"folke/todo-comments.nvim",
dependencies = { "nvim-lua/plenary.nvim" },
lazy = true,
event = { "BufReadPost", "BufWritePost", "BufNewFile" },
- config = config
+ opts = opts
}
-- FIX: ciao
diff --git a/scripts/set_background b/scripts/set_background
index 41522a0..ba7445a 100755
--- a/scripts/set_background
+++ b/scripts/set_background
@@ -13,4 +13,5 @@ niri msg action do-screen-transition
swww img $img
wallust run $img
makoctl reload
+notify-send -i $img "Wallust" "Changed wallpaper and palette."
diff --git a/wallust/templates/foot b/wallust/templates/foot
index cd12385..151ecae 100644
--- a/wallust/templates/foot
+++ b/wallust/templates/foot
@@ -1,4 +1,4 @@
-font=Hack Nerd Font:size=10,Noto Color Emoji:size=10,Sazanami Gothic:size=10
+font=Hack Nerd Font:size=10,Sazanami Gothic:size=10,Noto Color Emoji:size=10
pad=15x15
dpi-aware=yes
term=foot-extra
diff --git a/wallust/templates/niri b/wallust/templates/niri
index 1b88179..93310e7 100644
--- a/wallust/templates/niri
+++ b/wallust/templates/niri
@@ -59,7 +59,7 @@ output "HDMI-A-1" {
layout {
gaps 5
- center-focused-column "never"
+ center-focused-column "on-overflow"
// empty-workspace-above-first
preset-column-widths {
@@ -86,11 +86,9 @@ layout {
inactive-color "{{color0}}"
}
- struts {
- left 5
- right 5
- top 0
- bottom 5
+ tab-indicator {
+ place-within-column
+ gaps-between-tabs 5
}
}
@@ -111,16 +109,19 @@ window-rule {
//geometry-corner-radius 10
clip-to-geometry true
}
+window-rule {
+ match app-id="SFML"
+}
switch-events {}
binds {
Mod+Backslash { show-hotkey-overlay; }
- Mod+Return { spawn "foot"; }
- Mod+Space { spawn "fuzzel"; }
- Mod+Escape { spawn "~/.config/scripts/powermenu"; }
- Mod+W { spawn "~/.config/scripts/set_random" "/home/eric.marin/Pictures/Backgrounds/"; }
+ Mod+Return hotkey-overlay-title="Spawn Terminal" { spawn "foot"; }
+ Mod+Space hotkey-overlay-title="Spawn Applauncher" { spawn "fuzzel"; }
+ Mod+Escape hotkey-overlay-title="Spawn Powermenu" { spawn "~/.config/scripts/powermenu"; }
+ Mod+W repeat=false hotkey-overlay-title="Random Wallpaper" { spawn "~/.config/scripts/set_random" "/home/eric.marin/Pictures/Backgrounds/"; }
XF86AudioRaiseVolume allow-when-locked=true { spawn "pamixer" "-i" "5"; }
XF86AudioLowerVolume allow-when-locked=true { spawn "pamixer" "-d" "5"; }
@@ -204,5 +205,10 @@ binds {
Ctrl+Print { screenshot-screen; }
Alt+Print { screenshot-window; }
+ Mod+V { toggle-window-floating; }
+ Mod+Shift+V { switch-focus-between-floating-and-tiling; }
+
+ Mod+T { toggle-column-tabbed-display; }
+
Mod+Shift+E { quit; }
}
diff --git a/wallust/wallust.toml b/wallust/wallust.toml
index fa2e790..b535a6a 100644
--- a/wallust/wallust.toml
+++ b/wallust/wallust.toml
@@ -1,15 +1,15 @@
-backend = "kmeans"
+backend = "fastresize"
check_contrast = true
color_space = "lch"
fallback_generator = "complementary"
-palette = "ansidark"
+palette = "ansidark16"
[templates]
foot.template = "foot"
foot.target = "~/.config/foot/foot.ini"
nvim.template = "nvim"
-nvim.target = "~/.cache/wallust/colors_neopywal.vim"
+nvim.target = "~/.cache/wal/colors-wal.vim"
fuzzel.template = "fuzzel"
fuzzel.target = "~/.config/fuzzel/fuzzel.ini"