diff --git a/.config/aliases b/.config/aliases index e72afe0..01782f2 100644 --- a/.config/aliases +++ b/.config/aliases @@ -1,14 +1,16 @@ #!/usr/bin/fish alias rm="gio trash" alias tt="watson" +alias c="clear" +alias l="ls --color" alias pacin="sudo pacman -S" +alias pacse="sudo pacman -Ss" alias pacre="sudo pacman -R" alias pacup="sudo pacman -Syu" +alias nv="neovide" + alias hyprconf="nvim ~/dotfiles/.config/hypr/hyprland.conf" -alias swayconf="nvim ~/dotfiles/.config/sway/config" -alias labconf="nvim ~/dotfiles/.config/labwc/rc.xml" -alias kanshiconf="nvim ~/dotfiles/.config/kanshi/config" alias waybarconf="nvim ~/dotfiles/.config/waybar/config.jsonc" alias aliasconf="nvim ~/dotfiles/.config/aliases" alias acconf="nvim ~/dotfiles/.config/alacritty/alacritty.toml" diff --git a/.config/fish/config.fish b/.config/fish/config.fish index f5ca22e..0dc8551 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,7 +1,8 @@ +#if [ "$(tty)" = "/dev/tty1" ]; exec Hyprland >> /dev/null; end source ~/.config/aliases -zoxide init fish | source alias cd="z" set fish_greeting if status is-interactive # Commands to run in interactive sessions can go here end +zoxide init fish | source diff --git a/.config/ghostty/config b/.config/ghostty/config new file mode 100644 index 0000000..6e3dd42 --- /dev/null +++ b/.config/ghostty/config @@ -0,0 +1,5 @@ +font-family = "CaskaydiaMonoNerdFont" +font-size = 14 +theme = CLRS +font-thicken = true +window-colorspace = display-p3 diff --git a/.config/ghostty/themes/everforest-light b/.config/ghostty/themes/everforest-light new file mode 100644 index 0000000..3f9c913 --- /dev/null +++ b/.config/ghostty/themes/everforest-light @@ -0,0 +1,26 @@ +background = EFEBD4 +foreground = 5C6A72 +cursor-color = BDC3AF +selection-background = EAEDC8 +selection-foreground = 5C6A72 + +palette = 0=#EFEBD4 + +palette = 1=#F85552 +palette = 2=#8DA101 +palette = 3=#DFA000 +palette = 4=#8DA101 +palette = 5=#3A94C5 +palette = 6=#35A77C + +palette = 7=#DF69BA +palette = 8=#FDF6E3 + +palette = 9=#EAEDC8 +palette = 10=#F0F1D2 +palette = 11=#FAEDCD +palette = 12=#E9F0E9 +palette = 13=#FBE3DA +palette = 14=#35A77C + +palette = 15=#5C6A72 diff --git a/.config/hypr/conf/autostart.conf b/.config/hypr/conf/autostart.conf index 4c86b96..28f9fce 100644 --- a/.config/hypr/conf/autostart.conf +++ b/.config/hypr/conf/autostart.conf @@ -9,6 +9,7 @@ exec-once = hypridle exec-once = waypaper --restore exec-once = waybar exec-once = swaync +exec-once = ghostty --gtk-single-instance=true --quit-after-last-window-closed=false --initial-window=false #exec-once = ags -c ~/.config/ags-aylur/config.js #exec-once = [workspace special:media silent] steam -silent #exec-once = [workspace special:media silent] $terminal -e ncmpcpp diff --git a/.config/hypr/conf/binds.conf b/.config/hypr/conf/binds.conf index 948188c..45d639e 100644 --- a/.config/hypr/conf/binds.conf +++ b/.config/hypr/conf/binds.conf @@ -7,9 +7,13 @@ bind = $mainMod Shift, Return, exec, $distrobox bind = $mainMod, Return, exec, $terminal bind = $mainMod, Shift_R, exec, $fileManager bind = $mainMod, Control_R, exec, $browser +bind = $mainMod Shift, Control_R, exec, $altbrowser +bind = $mainMod, backslash, exec, obsidian bind = $mainMod, E, killactive, bind = Alt, F4, killactive, bind = $mainMod, END, exit, +bind = $mainMod Shift, END, exec, poweroff +bind = $mainMod R, END, exec, reboot bind = $mainMod, Escape, exec, hyprlock bind = $mainMod, F, fullscreen bind = Super Shift, Super_L, exec, pkill rofi || rofi -show run -theme skycontrast -monitor DP-1 @@ -63,7 +67,7 @@ bind = , print, exec, XDG_SCREENSHOTS_DIR="$HOME/Pictures/Screenshots" grimshot bindl = , XF86AudioPlay, exec, playerctl play-pause bindl = , XF86AudioPrev, exec, playerctl previous bindl = , XF86AudioNext, exec, playerctl next - bind = Control_L Shift_L Alt_L, Super_L, exec, hyprpicker + bind = Control_L Shift_L Alt_L, Super_L, exec, hyprpicker --autocopy # Mouse Binds bindm = $mainMod, mouse:272, movewindow diff --git a/.config/hypr/conf/programs.conf b/.config/hypr/conf/programs.conf index f780ac7..0be1d19 100644 --- a/.config/hypr/conf/programs.conf +++ b/.config/hypr/conf/programs.conf @@ -1,4 +1,5 @@ #---PROGRAMS---# $terminal = kitty -$fileManager = nautilus -w +$fileManager = nemo $browser = librewolf +$altbrowser = google-chrome-stable diff --git a/.config/hypr/conf/visual.conf b/.config/hypr/conf/visual.conf index 86bf8b3..8cd1ba4 100644 --- a/.config/hypr/conf/visual.conf +++ b/.config/hypr/conf/visual.conf @@ -26,7 +26,7 @@ gestures { decoration { rounding = 0 active_opacity = 1.0 - inactive_opacity = 1.0 + inactive_opacity = 0.98 shadow:enabled = true shadow:range = 4 blur { diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 0692de0..6acc9e0 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -1,5 +1,5 @@ # vim:fileencoding=utf-8:foldmethod=marker -background_opacity 0.85 +background_opacity 0.95 font_size 14 shell /usr/bin/fish cursor_trail 3 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 2c8a61f..a8425a1 100755 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -17,6 +17,9 @@ vim.o.swapfile = true vim.o.autochdir = true vim.o.scrolloff = 15 +--Neovide Options +vim.o.guifont = "CaskaydiaMono Nerd Font:h14" + -- Plugin Manager require("config.lazy") @@ -25,9 +28,6 @@ vim.cmd.colorscheme("everforest") vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) --- Binds -vim.keymap.set("n", "f", function() vim.lsp.buf.format() end) - -- Autocompletion vim.diagnostic.config({ virtual_text = { current_line = true } }) vim.lsp.enable({ "lua_ls", "rust_analyzer", "ts_ls", "pyright", "html", "cssls", "gopls", "lemminx" }); diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index cc5df76..cdc63de 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,28 +1,32 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" }, - "everforest-nvim": { "branch": "main", "commit": "135cc21a45756e688dd1a3cbeb1c80a04b569b46" }, - "friendly-snippets": { "branch": "main", "commit": "fc8f183479a472df60aa86f00e295462f2308178" }, + "blink.cmp": { "branch": "main", "commit": "4f38ce99a472932d5776337f08f7a8180f1f571a" }, + "everforest-nvim": { "branch": "main", "commit": "2eb7c348f880ba93de4d98cae049c9441f5d4d49" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lualine-macro-recording.nvim": { "branch": "main", "commit": "e2dcf63ba74e6111b53e1520a4f8a17a3d7427a1" }, "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, - "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, - "nui.nvim": { "branch": "main", "commit": "8d5b0b568517935d3c84f257f272ef004d9f5a59" }, + "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" }, - "nvim-lspconfig": { "branch": "master", "commit": "2e3f389aa06c7b7c29600ec2e67ee64c332077eb" }, - "nvim-treesitter": { "branch": "master", "commit": "3b308861a8d7d7bfbe9be51d52e54dcfd9fe3d38" }, + "nvim-lspconfig": { "branch": "master", "commit": "61e5109c8cf24807e4ae29813a3a82b31821dd45" }, + "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "nvim-web-devicons": { "branch": "master", "commit": "50b5b06bff13a9b4eab946de7c7033649a6618a1" }, + "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" }, "oil.nvim": { "branch": "master", "commit": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "solarized.nvim": { "branch": "main", "commit": "c0dfe1cbfabd93b546baf5f1408f5df7e02e2050" }, + "startup.nvim": { "branch": "master", "commit": "9ca3b9a55f2f2196ef90b39a52029b46fdde5226" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" }, "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "vim-illuminate": { "branch": "master", "commit": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, + "yazi.nvim": { "branch": "main", "commit": "b7c9b78f330216924dbef2dd2a78199083637ee2" } } diff --git a/.config/nvim/lua/plugins/startup.lua b/.config/nvim/lua/plugins/startup.lua new file mode 100644 index 0000000..cb8bdb2 --- /dev/null +++ b/.config/nvim/lua/plugins/startup.lua @@ -0,0 +1,7 @@ +return { + "startup-nvim/startup.nvim", + dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim", "nvim-telescope/telescope-file-browser.nvim" }, + config = function() + require "startup".setup() + end +} diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 476a905..e6fddaf 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -5,4 +5,5 @@ return { {'', "Telescope live_grep", desc = "Telescope live grep"} }, requires = { "nvim-lua/plenary.nvim", "BurntSushi/ripgrep" }, + opts = {} } diff --git a/.config/nvim/lua/plugins/yazi.lua b/.config/nvim/lua/plugins/yazi.lua new file mode 100644 index 0000000..9ed07e9 --- /dev/null +++ b/.config/nvim/lua/plugins/yazi.lua @@ -0,0 +1,43 @@ +return { + "mikavilpas/yazi.nvim", + event = "VeryLazy", + dependencies = { + -- check the installation instructions at + -- https://github.com/folke/snacks.nvim + "folke/snacks.nvim" + }, + keys = { + -- 👇 in this section, choose your own keymappings! + { + "", + mode = { "n", "v" }, + "Yazi", + desc = "Open yazi at the current file", + }, + { + -- Open in the current working directory + "cw", + "Yazi cwd", + desc = "Open the file manager in nvim's working directory", + }, + { + "", + "Yazi toggle", + desc = "Resume the last yazi session", + }, + }, + ---@type YaziConfig | {} + opts = { + -- if you want to open yazi instead of netrw, see below for more info + open_for_directories = false, + keymaps = { + show_help = "", + }, + }, + -- 👇 if you use `open_for_directories=true`, this is recommended + init = function() + -- More details: https://github.com/mikavilpas/yazi.nvim/issues/802 + -- vim.g.loaded_netrw = 1 + vim.g.loaded_netrwPlugin = 1 + end, +} diff --git a/.config/watson/frames b/.config/watson/frames index 2b005bd..2d7fdfd 100644 --- a/.config/watson/frames +++ b/.config/watson/frames @@ -6,5 +6,13 @@ "f5cc3ee491824433a5edd201cd42cdb5", [], 1746308348 + ], + [ + 1746375328, + 1746378359, + "rating", + "a34688eb7761472eaa0c5ffae47d7f1c", + [], + 1746378359 ] ] \ No newline at end of file diff --git a/.config/watson/frames.bak b/.config/watson/frames.bak new file mode 100644 index 0000000..2b005bd --- /dev/null +++ b/.config/watson/frames.bak @@ -0,0 +1,10 @@ +[ + [ + 1746308244, + 1746308348, + "rating", + "f5cc3ee491824433a5edd201cd42cdb5", + [], + 1746308348 + ] +] \ No newline at end of file diff --git a/.config/watson/state.bak b/.config/watson/state.bak index a52e3a9..950ce44 100644 --- a/.config/watson/state.bak +++ b/.config/watson/state.bak @@ -1,5 +1,5 @@ { "project": "rating", - "start": 1746308244, + "start": 1746375328, "tags": [] } \ No newline at end of file