aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Marina Barros <azulmarina799@gmail.com> 2026-03-07 20:20:14 +0000
committerGravatar Marina Barros <azulmarina799@gmail.com> 2026-03-21 23:36:53 +0000
commit03485bd0ac00c582e0dccb9187866420666a2f42 (patch)
tree5c68d70c04404ee6c87530d99187fa14f9e32dcc
parent171ffed14d6796513e972829a378d723137b517b (diff)
adicionado ashell, ajustes
-rw-r--r--.gitignore1
-rw-r--r--ashell/config.toml19
-rw-r--r--fish/conf.d/eza.fish6
-rw-r--r--fish/config.fish9
-rw-r--r--fish/functions/cp.fish3
-rw-r--r--fish/functions/eza.fish4
-rw-r--r--fish/functions/mv.fish3
-rw-r--r--fish/functions/rm.fish3
-rw-r--r--hypr/hyprland.conf9
-rw-r--r--kanata/ideapad.kbd6
-rw-r--r--nvim/lazy-lock.json31
-rw-r--r--nvim/lua/config/lsp.lua56
-rw-r--r--nvim/lua/plugins/none-ls.lua20
13 files changed, 112 insertions, 58 deletions
diff --git a/.gitignore b/.gitignore
index 295fe38..9068a76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
fish/fish_variables
fish/functions/_*
fish/functions/fzf_*
+nvim/lazy-lock.json
diff --git a/ashell/config.toml b/ashell/config.toml
new file mode 100644
index 0000000..ceccd83
--- /dev/null
+++ b/ashell/config.toml
@@ -0,0 +1,19 @@
+[appearance]
+font_name = "0xProto Nerd Font"
+primary_color = "#799df6"
+workspace_colors = [ "#799df6", "#9479f6" ]
+
+[appearance.background_color]
+base = "#101112"
+text = "#ffffff"
+
+[media_player]
+max_title_length = 50
+
+[modules]
+center = ["WindowTitle"]
+left = ["Workspaces"]
+right = ["MediaPlayer", "SystemInfo", "Tray", ["Clock", "Settings"]]
+
+[window_title]
+truncate_title_after_length = 50
diff --git a/fish/conf.d/eza.fish b/fish/conf.d/eza.fish
new file mode 100644
index 0000000..63d8296
--- /dev/null
+++ b/fish/conf.d/eza.fish
@@ -0,0 +1,6 @@
+if command --query eza
+ abbr --add -- la 'eza -a'
+ abbr --add -- ll 'eza -l'
+ abbr --add -- lla 'eza -la'
+ abbr --add -- lt 'eza --tree'
+end
diff --git a/fish/config.fish b/fish/config.fish
index 2a3b984..d970f12 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -3,12 +3,6 @@ status is-login; and begin
end
status is-interactive; and begin
- # Abbreviations
- abbr --add -- la 'eza -a'
- abbr --add -- ll 'eza -l'
- abbr --add -- lla 'eza -la'
- abbr --add -- lt 'eza --tree'
-
fish_config theme choose modus_vivendi
# Interactive shell initialisation
@@ -17,8 +11,9 @@ status is-interactive; and begin
set --global hydro_color_git red
set --global hydro_cmd_duration_threshold 30000
- set --global LEDGER_FILE $HOME/finanças/dindin.journal
+ set --global --export LEDGER_FILE "$HOME/finanças/dindin.journal"
+ set --global --export PASSWORD_STORE_DIR "$HOME/.local/share/pass "
set --global --export GPG_TTY (tty)
gpg-connect-agent --quiet updatestartuptty /bye >/dev/null
diff --git a/fish/functions/cp.fish b/fish/functions/cp.fish
new file mode 100644
index 0000000..c1e199d
--- /dev/null
+++ b/fish/functions/cp.fish
@@ -0,0 +1,3 @@
+function cp --description 'cp(1) mais seguro'
+ command cp --interactive $argv
+end
diff --git a/fish/functions/eza.fish b/fish/functions/eza.fish
index e9a7395..5a8a0e6 100644
--- a/fish/functions/eza.fish
+++ b/fish/functions/eza.fish
@@ -1,8 +1,8 @@
function eza --wraps eza --description "A modern alternative to ls"
- if ! command -q eza
+ if ! command --query eza
echo "`eza` is not installed"
exit
end
- command eza --group-directories-first --header --icons=always $argv
+ command eza --group-directories-first --header --icons=auto --color=auto $argv
end
diff --git a/fish/functions/mv.fish b/fish/functions/mv.fish
new file mode 100644
index 0000000..ae46ed9
--- /dev/null
+++ b/fish/functions/mv.fish
@@ -0,0 +1,3 @@
+function mv --description 'mv(1) mais seguro'
+ command mv --interactive $argv
+end
diff --git a/fish/functions/rm.fish b/fish/functions/rm.fish
new file mode 100644
index 0000000..c0dcc8c
--- /dev/null
+++ b/fish/functions/rm.fish
@@ -0,0 +1,3 @@
+function rm --description 'rm(1) mais seguro'
+ command rm --interactive=once --verbose $argv
+end
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 4051210..8e2813d 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -18,6 +18,10 @@ input {
repeat_rate = 40
}
+xwayland {
+ force_zero_scaling = true
+}
+
master {
mfact = 0.600000
new_on_top = true
@@ -27,12 +31,14 @@ master {
$mod = SUPER
$terminal = kitty
-exec-once = {dbus-update-activation-environment --systemd --all MOZ_ENABLE_WAYLAND && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target}
+exec-once = xwayland-satellite
+exec-once = dbus-update-activation-environment --systemd --all WAYLAND_DISPLAY XDG_CURRENT_DESKTOP MOZ_ENABLE_WAYLAND PASSWORD_STORE_DIR && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target
exec-once = wpaperd
exec-once = wl-paste -t text --watch cliphist store
exec-once = ulauncher --hide-window
exec-once = kanshi
exec-once = ashell
+exec-once = hyprsunset
bind = $mod ALT , q , exec , hyprshutdown
bind = $mod , TAB , workspace , previous
@@ -90,4 +96,5 @@ windowrule = workspace 3, match:class steam
windowrule = workspace 3, match:class vesktop
windowrule = workspace 3, match:class FreeTube
windowrule = workspace 4, match:class firefox
+windowrule = workspace 4, match:class org.qutebrowser.qutebrowser
windowrule = workspace 3, match:title ^Steam
diff --git a/kanata/ideapad.kbd b/kanata/ideapad.kbd
index 95a6bbe..d1d5d57 100644
--- a/kanata/ideapad.kbd
+++ b/kanata/ideapad.kbd
@@ -31,6 +31,8 @@
lsft (one-shot-release 1000 lsft)
lctl (one-shot-release 1000 lctl)
+ ralt (one-shot-release 1000 ralt)
+
nav (layer-while-held nav)
sym (layer-while-held sym)
@@ -52,8 +54,8 @@
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12
\ 1 2 3 4 5 6 7 8 9 0 - = bspc
tab h n l g q . f e k ' ´ [ ret
- @lctl s m r t d , u o a i ~ ]
- @lsft z x j c b / v p w ; y @lsft
+ @lsft s m r t d , u o a i ~ ]
+ @lsft z x j c b / v p w ; y @ralt
@lctl @lmet @nav spc @sym /
)
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
deleted file mode 100644
index 966a58f..0000000
--- a/nvim/lazy-lock.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
- "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
- "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
- "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" },
- "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
- "lsp-format.nvim": { "branch": "master", "commit": "42d1d3e407c846d95f84ea3767e72ed6e08f7495" },
- "mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" },
- "mini.align": { "branch": "main", "commit": "60c61c8c63dca41b5ac6bfc36b52df69b1a03e6b" },
- "mini.bracketed": { "branch": "main", "commit": "e50e3abcf6a3a5d234f58e4a247dfb3035f30a65" },
- "mini.pairs": { "branch": "main", "commit": "d5a29b6254dad07757832db505ea5aeab9aad43a" },
- "mini.statusline": { "branch": "main", "commit": "14919901649d20d020e659c63c03baa75cd94f33" },
- "mini.surround": { "branch": "main", "commit": "88c52297ed3e69ecf9f8652837888ecc727a28ee" },
- "mini.tabline": { "branch": "main", "commit": "caf23615b9b99bacc79ecd60f61c4e6a8ec18c84" },
- "modus-themes.nvim": { "branch": "master", "commit": "c57c2c56c9f0af04f3b609d11caa840880074784" },
- "nix-develop.nvim": { "branch": "main", "commit": "bfba63d6c129d8b5073fe9eb965c9acee04becb0" },
- "none-ls.nvim": { "branch": "main", "commit": "f61f46ded0ca9edce7a09b674f8e162d10921426" },
- "nvim-lspconfig": { "branch": "master", "commit": "44acfe887d4056f704ccc4f17513ed41c9e2b2e6" },
- "nvim-neoclip.lua": { "branch": "main", "commit": "831a97c7697736411a05ff8b91e8798ea4c2d6fb" },
- "nvim-treesitter": { "branch": "main", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
- "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
- "oil-git.nvim": { "branch": "main", "commit": "c99db7b1dd8dd500c3ec530dc07000dfbeb6e080" },
- "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" },
- "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
- "quicker.nvim": { "branch": "master", "commit": "2d3f3276eab9352c7b212821c218aca986929f62" },
- "render-markdown.nvim": { "branch": "main", "commit": "1c958131c083c8557ea499fdb08c88b8afb05c4e" },
- "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
- "telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" },
- "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
- "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
-}
diff --git a/nvim/lua/config/lsp.lua b/nvim/lua/config/lsp.lua
index 6c30fc8..395e998 100644
--- a/nvim/lua/config/lsp.lua
+++ b/nvim/lua/config/lsp.lua
@@ -1,7 +1,55 @@
-vim.lsp.enable({"rust_analyzer", "nil_ls", "denols", "html", "cssls"})
+vim.lsp.enable({ "rust_analyzer", "nil_ls", "denols", "html", "cssls", "lua_ls" })
vim.lsp.config("*", {
- onAttach = function(client, _)
- client.server_capabilities.semanticTokensProvider = nil
- end,
+ onAttach = function(client, _)
+ client.server_capabilities.semanticTokensProvider = nil
+ end,
+})
+
+-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#lua_ls
+vim.lsp.config("lua_ls", {
+ on_init = function(client)
+ if client.workspace_folders then
+ local path = client.workspace_folders[1].name
+ if
+ path ~= vim.fn.stdpath("config")
+ and (vim.uv.fs_stat(path .. "/.luarc.json") or vim.uv.fs_stat(path .. "/.luarc.jsonc"))
+ then
+ return
+ end
+ end
+
+ client.config.settings.Lua = vim.tbl_deep_extend("force", client.config.settings.Lua, {
+ runtime = {
+ -- Tell the language server which version of Lua you're using (most
+ -- likely LuaJIT in the case of Neovim)
+ version = "LuaJIT",
+ -- Tell the language server how to find Lua modules same way as Neovim
+ -- (see `:h lua-module-load`)
+ path = {
+ "lua/?.lua",
+ "lua/?/init.lua",
+ },
+ },
+ -- Make the server aware of Neovim runtime files
+ workspace = {
+ checkThirdParty = false,
+ library = {
+ vim.env.VIMRUNTIME,
+ -- Depending on the usage, you might want to add additional paths
+ -- here.
+ -- '${3rd}/luv/library',
+ -- '${3rd}/busted/library',
+ },
+ -- Or pull in all of 'runtimepath'.
+ -- NOTE: this is a lot slower and will cause issues when working on
+ -- your own configuration.
+ -- See https://github.com/neovim/nvim-lspconfig/issues/3189
+ -- library = vim.api.nvim_get_runtime_file('', true),
+ },
+ })
+ end,
+ settings = {
+ Lua = {},
+ },
})
diff --git a/nvim/lua/plugins/none-ls.lua b/nvim/lua/plugins/none-ls.lua
index fd28379..176c8f5 100644
--- a/nvim/lua/plugins/none-ls.lua
+++ b/nvim/lua/plugins/none-ls.lua
@@ -1,14 +1,12 @@
-- ripped from https://www.lazyvim.org/extras/lsp/none-ls
return {
- "nvimtools/none-ls.nvim",
- opts = function(_, opts)
- local nls = require("null-ls")
- opts.root_dir = opts.root_dir
- or require("null-ls.utils").root_pattern(".null-ls-root", ".neoconf.json", "Makefile", ".git")
- opts.sources = vim.list_extend(opts.sources or {}, {
- nls.builtins.formatting.stylua,
- nls.builtins.formatting.alejandra,
- nls.builtins.formatting.prettier,
- })
- end,
+ "nvimtools/none-ls.nvim",
+ opts = function(_, opts)
+ local nls = require("null-ls")
+ opts.root_dir = opts.root_dir
+ or require("null-ls.utils").root_pattern(".null-ls-root", ".neoconf.json", "Makefile", ".git")
+ opts.sources = vim.list_extend(opts.sources or {}, {
+ nls.builtins.formatting.alejandra,
+ })
+ end,
}