diff --git a/Readme.md b/Readme.md index a06f402..b7efc44 100644 --- a/Readme.md +++ b/Readme.md @@ -1,8 +1,41 @@ # Dotfiles +## Overview All my dotfiles, easily installable using the install script. The scripts checks if a file already exists there before overwriting ! -# Usage -`./script.sh` +## To do : +- [ ] git defaults +- [ ] kitty + - [x] theme + - [ ] remove annoying question on closing + - [ ] polish tab/panes shortcuts +- [ ] sessionizer (via kitty or lazyvim) +- [ ] hyprland + - [x] default functionality + - [x] borders + - [x] xdg-portal + - [ ] multi gpu on desktop ? +- [ ] hyprlock and hyprctl +- [ ] lazyvim + - [x] remove enter in blink + - [x] remove tabs + - [x] harpoon + - [ ] markdown +- [ ] add greeter + - [x] works + - [ ] theme +- [x] bar +- [ ] statusBar + - [x] works + - [ ] make battery conditional ? +- [ ] notifications +- [ ] add per folder sudo when needed on install script +- [ ] screen sharing works for zoom +- [ ] way to record videos with push to record for easy edits +- [ ] all dependencies in a list to install everything (via pacman or yay) at once easily +- [ ] add way to add export variables and aliases and scripts in bashrc/zshrc +- [ ] customize terminal a bit ? try fsh ? +## Usage +`./install.sh` diff --git a/backgrounds/uwp4468846.jpeg b/backgrounds/uwp4468846.jpeg new file mode 100644 index 0000000..f5957cc Binary files /dev/null and b/backgrounds/uwp4468846.jpeg differ diff --git a/backgrounds/wp11886253-bocchi-the-rock-hd-wallpapers.jpg b/backgrounds/wp11886253-bocchi-the-rock-hd-wallpapers.jpg new file mode 100644 index 0000000..0df49a1 Binary files /dev/null and b/backgrounds/wp11886253-bocchi-the-rock-hd-wallpapers.jpg differ diff --git a/backgrounds/wp14993271-bocchi-the-rock-4k-wallpapers.webp b/backgrounds/wp14993271-bocchi-the-rock-4k-wallpapers.webp new file mode 100644 index 0000000..4a6bdd1 Binary files /dev/null and b/backgrounds/wp14993271-bocchi-the-rock-4k-wallpapers.webp differ diff --git a/backgrounds/wp15008146-neon-genesis-evangelion-desktop-hd-wallpapers.webp b/backgrounds/wp15008146-neon-genesis-evangelion-desktop-hd-wallpapers.webp new file mode 100644 index 0000000..c096339 Binary files /dev/null and b/backgrounds/wp15008146-neon-genesis-evangelion-desktop-hd-wallpapers.webp differ diff --git a/backgrounds/wp1839005-fatezero-wallpapers.jpg b/backgrounds/wp1839005-fatezero-wallpapers.jpg new file mode 100644 index 0000000..144012c Binary files /dev/null and b/backgrounds/wp1839005-fatezero-wallpapers.jpg differ diff --git a/backgrounds/wp1858908-steinsgate-wallpapers.png b/backgrounds/wp1858908-steinsgate-wallpapers.png new file mode 100644 index 0000000..9959538 Binary files /dev/null and b/backgrounds/wp1858908-steinsgate-wallpapers.png differ diff --git a/backgrounds/wp3821285-kill-la-kill-wallpapers.jpg b/backgrounds/wp3821285-kill-la-kill-wallpapers.jpg new file mode 100644 index 0000000..1465865 Binary files /dev/null and b/backgrounds/wp3821285-kill-la-kill-wallpapers.jpg differ diff --git a/backgrounds/wp3821288-kill-la-kill-wallpapers.png b/backgrounds/wp3821288-kill-la-kill-wallpapers.png new file mode 100644 index 0000000..f77eec5 Binary files /dev/null and b/backgrounds/wp3821288-kill-la-kill-wallpapers.png differ diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index c93c0bc..9beac1f 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -1,7 +1,11 @@ -exec-once = /nix/store/lww2khz04qsc8prjp8l0haldwz15yivi-dbus-1.14.10/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target +exec-once=systemctl --user start hyprpolkitagent +exec-once=i3bar-river +exec-once=hyprpaper +exec-once="$HOME/dotfiles/scripts/background.sh" +#exec-once = /nix/store/lww2khz04qsc8prjp8l0haldwz15yivi-dbus-1.14.10/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target $mod=SUPER -source=/nix/store/zqfq9kzjv69rzaif98fjlhg7k0218pyh-catppuccin-hyprland-0-unstable-2024-06-19/mocha.conf -source=/nix/store/ll6lprw073fwdnqgn75s9csi4i4h1351-hyprland-pink-accent.conf +#source=/nix/store/zqfq9kzjv69rzaif98fjlhg7k0218pyh-catppuccin-hyprland-0-unstable-2024-06-19/mocha.conf +#source=/nix/store/ll6lprw073fwdnqgn75s9csi4i4h1351-hyprland-pink-accent.conf animations { enabled=false } @@ -19,6 +23,7 @@ decoration { general { gaps_in=0 gaps_out=0 + col.active_border = 0xfff5a7de } input { @@ -31,11 +36,18 @@ misc { middle_click_paste=false vfr=true } -bind=$mod, D, exec, bemenu-run + +monitor=, preferred, auto, 1 + +# Launchers +bind=$mod, D, exec, wmenu-run bind=$mod, RETURN, exec, kitty bind=$mod, Y, exec, foot yazi bind=$mod + SHIFT, Q, killactive bind=$mod, SPACE, togglefloating +bind=$mod, B, exec, "$HOME/dotfiles/scripts/background.sh" + +# Movement bind=$mod, F, fullscreen, 1 bind=$mod, H, movefocus, l bind=$mod, J, movefocus, d @@ -45,8 +57,6 @@ bind=$mod + SHIFT, H, movewindow, l bind=$mod + SHIFT, J, movewindow, d bind=$mod + SHIFT, K, movewindow, u bind=$mod + SHIFT, L, movewindow, r -bind=$mod, P, exec, tms -bind=$mod, P, exec, kitty --app-id="sessionizer" ~/dev/scripts/kitty-sessionizer bind=$mod, code:10, workspace, 1 bind=$mod SHIFT, code:10, movetoworkspace, 1 bind=$mod, code:11, workspace, 2 @@ -65,6 +75,8 @@ bind=$mod, code:17, workspace, 8 bind=$mod SHIFT, code:17, movetoworkspace, 8 bind=$mod, code:18, workspace, 9 bind=$mod SHIFT, code:18, movetoworkspace, 9 + +# Settings buttons binde=, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+ binde=, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%- binde=, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle @@ -72,8 +84,3 @@ binde=, XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle binde=, XF86MonBrightnessUp, exec, brightnessctl s +5% binde=, XF86MonBrightnessDown, exec, brightnessctl s 5%- bindl=, switch:off:3c3fceb90, exec, swaylock -exec-once=i3bar-river -exec-once=swaybg -i ~/.backgrounds/nixos-wallpaper-catppuccin-mocha.png -exec-once=systemctl --user start hyprpolkitagent -monitor=, preferred, auto, 1 -windowrule=float, class:sessionizer diff --git a/config/hypr/hyprpaper.conf b/config/hypr/hyprpaper.conf new file mode 100644 index 0000000..e69de29 diff --git a/config/i3bar-river/config.toml b/config/i3bar-river/config.toml index e0928e0..02a327a 100644 --- a/config/i3bar-river/config.toml +++ b/config/i3bar-river/config.toml @@ -1,6 +1,6 @@ background = "#11111b" color = "#00ff00" -command = "i3status-rs ~/.config/i3status-rust/config-default.toml" +command = "i3status-rs ~/.config/i3status-rust/config.toml" font = "pango:monospace 10" height = 20 tag_bg = "#313244" diff --git a/config/kitty/diff-mocha.conf b/config/kitty/diff-mocha.conf new file mode 100644 index 0000000..b627460 --- /dev/null +++ b/config/kitty/diff-mocha.conf @@ -0,0 +1,50 @@ +# vim:ft=kitty + +## name: Catppuccin Kitty Diff Mocha +## author: Catppuccin Org +## license: MIT +## upstream: https://github.com/catppuccin/kitty/blob/main/themes/diff-mocha.conf +## blurb: Soothing pastel theme for the high-spirited! + +# text +foreground #cdd6f4 +# base +background #1e1e2e +# subtext0 +title_fg #a6adc8 + +# mantle +title_bg #181825 +margin_bg #181825 + +# subtext1 +margin_fg #a6adc8 +# mantle +filler_bg #181825 + +# 30% red, 70% base +removed_bg #5e3f53 +# 50% red, 50% base +highlight_removed_bg #89556b +# 40% red, 60% base +removed_margin_bg #734a5f + +# 30% green, 70% base +added_bg #475a51 +# 50% green, 50% base +highlight_added_bg #628168 +# 40% green, 60% base +added_margin_bg #734a5f + +# mantle +hunk_margin_bg #181825 +hunk_bg #181825 + +# 40% yellow, 60% base +search_bg #766c62 +# text +search_fg #cdd6f4 +# 30% sky, 70% base +select_bg #3e5767 +# text +select_fg #cdd6f4 diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index aa0b37e..fb771ef 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1,11 +1,64 @@ -# Generated by Home Manager. # See https://sw.kovidgoyal.net/kitty/conf.html -include /nix/store/rjp2p9ndz1j74k074nnic900987pfwqv-kitty-themes-0-unstable-2024-08-14/share/kitty-themes/themes/Catppuccin-Mocha.conf - +include ./mocha.conf +include ./diff-mocha.conf # Shell integration is sourced and configured manually shell_integration no-rc +background_opacity 0.95 +font_family family "Iosevka" +# - Use additional nerd symbols +# See https://github.com/be5invis/Iosevka/issues/248 +# See https://github.com/ryanoasis/nerd-fonts/wiki/Glyph-Sets-and-Code-Points +# Seti-UI + Custom +symbol_map U+E5FA-U+E6AC Symbols Nerd Font Mono +# Devicons +symbol_map U+E700-U+E7C5 Symbols Nerd Font Mono + +# Font Awesome +symbol_map U+F000-U+F2E0 Symbols Nerd Font Mono + +# Font Awesome Extension +symbol_map U+E200-U+E2A9 Symbols Nerd Font Mono + +# Material Design Icons +symbol_map U+F0001-U+F1AF0 Symbols Nerd Font Mono + +# Weather +symbol_map U+E300-U+E3E3 Symbols Nerd Font Mono + +# Octicons +symbol_map U+F400-U+F532,U+2665,U+26A1 Symbols Nerd Font Mono + +# Powerline Symbols +symbol_map U+E0A0-U+E0A2,U+E0B0-U+E0B3 Symbols Nerd Font Mono + +# Powerline Extra Symbols +symbol_map U+E0A3,U+E0B4-U+E0C8,U+E0CA,U+E0CC-U+E0D4 Symbols Nerd Font Mono + +# IEC Power Symbols +symbol_map U+23FB-U+23FE,U+2B58 Symbols Nerd Font Mono + +# Font Logos +symbol_map U+F300-U+F32F Symbols Nerd Font Mono + +# Pomicons +symbol_map U+E000-U+E00A Symbols Nerd Font Mono + +# Codicons +symbol_map U+EA60-U+EBEB Symbols Nerd Font Mono + +# Additional sets +symbol_map U+E276C-U+E2771 Symbols Nerd Font Mono # Heavy Angle Brackets +symbol_map U+2500-U+259F Symbols Nerd Font Mono # Box Drawing + +# Some symbols not covered by Symbols Nerd Font +# nonicons contains icons in the range: U+F101-U+F27D +# U+F167 is HTML logo, but YouTube logo in Symbols Nerd Font +symbol_map U+F102,U+F116-U+F118,U+F12F,U+F13E,U+F1AF,U+F1BF,U+F1CF,U+F1FF,U+F20F,U+F21F-U+F220,U+F22E-U+F22F,U+F23F,U+F24F,U+F25F nonicons + +# Emojis +symbol_map U+1F600-U+1F64F Noto Color Emoji map alt+1 goto_tab 1 map alt+2 goto_tab 2 @@ -14,5 +67,3 @@ map alt+4 goto_tab 4 map alt+5 goto_tab 5 map alt+enter new_tab_with_cwd map alt+q close_tab - - diff --git a/config/kitty/kitty.conf.bak b/config/kitty/kitty.conf.bak new file mode 100644 index 0000000..b0f94ca --- /dev/null +++ b/config/kitty/kitty.conf.bak @@ -0,0 +1,80 @@ +# See https://sw.kovidgoyal.net/kitty/conf.html +include ./mocha.conf +include ./diff-mocha.conf +# Shell integration is sourced and configured manually +shell_integration no-rc +background_opacity 0.95 +# font_family family "Symbols Nerd Font Mono" +# - Use additional nerd symbols +# See https://github.com/be5invis/Iosevka/issues/248 +# See https://github.com/ryanoasis/nerd-fonts/wiki/Glyph-Sets-and-Code-Points + +# Seti-UI + Custom +symbol_map U+E5FA-U+E6AC Symbols Nerd Font Mono + +# Devicons +symbol_map U+E700-U+E7C5 Symbols Nerd Font Mono + +# Font Awesome +symbol_map U+F000-U+F2E0 Symbols Nerd Font Mono + +# Font Awesome Extension +symbol_map U+E200-U+E2A9 Symbols Nerd Font Mono + +# Material Design Icons +symbol_map U+F0001-U+F1AF0 Symbols Nerd Font Mono + +# Weather +symbol_map U+E300-U+E3E3 Symbols Nerd Font Mono + +# Octicons +symbol_map U+F400-U+F532,U+2665,U+26A1 Symbols Nerd Font Mono + +# Powerline Symbols +symbol_map U+E0A0-U+E0A2,U+E0B0-U+E0B3 Symbols Nerd Font Mono + +# Powerline Extra Symbols +symbol_map U+E0A3,U+E0B4-U+E0C8,U+E0CA,U+E0CC-U+E0D4 Symbols Nerd Font Mono + +# IEC Power Symbols +symbol_map U+23FB-U+23FE,U+2B58 Symbols Nerd Font Mono + +# Font Logos +symbol_map U+F300-U+F32F Symbols Nerd Font Mono + +# Pomicons +symbol_map U+E000-U+E00A Symbols Nerd Font Mono + +# Codicons +symbol_map U+EA60-U+EBEB Symbols Nerd Font Mono + +# Additional sets +symbol_map U+E276C-U+E2771 Symbols Nerd Font Mono # Heavy Angle Brackets +symbol_map U+2500-U+259F Symbols Nerd Font Mono # Box Drawing + +# Some symbols not covered by Symbols Nerd Font +# nonicons contains icons in the range: U+F101-U+F27D +# U+F167 is HTML logo, but YouTube logo in Symbols Nerd Font +symbol_map U+F102,U+F116-U+F118,U+F12F,U+F13E,U+F1AF,U+F1BF,U+F1CF,U+F1FF,U+F20F,U+F21F-U+F220,U+F22E-U+F22F,U+F23F,U+F24F,U+F25F nonicons + +# Emojis +symbol_map U+1F600-U+1F64F Noto Color Emoji + +map alt+1 goto_tab 1 +map alt+2 goto_tab 2 +map alt+3 goto_tab 3 +map alt+4 goto_tab 4 +map alt+5 goto_tab 5 +map alt+enter new_tab_with_cwd +map alt+q close_tab + + +# font_family family="Adwaita Mono" + + +# BEGIN_KITTY_FONTS +font_family family="FiraMono Nerd Font Mono" +bold_font auto +italic_font auto +bold_italic_font auto +# END_KITTY_FONTS \ No newline at end of file diff --git a/config/kitty/mocha.conf b/config/kitty/mocha.conf new file mode 100644 index 0000000..f37adf9 --- /dev/null +++ b/config/kitty/mocha.conf @@ -0,0 +1,80 @@ +# vim:ft=kitty + +## name: Catppuccin Kitty Mocha +## author: Catppuccin Org +## license: MIT +## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf +## blurb: Soothing pastel theme for the high-spirited! + + + +# The basic colors +foreground #cdd6f4 +background #1e1e2e +selection_foreground #1e1e2e +selection_background #f5e0dc + +# Cursor colors +cursor #f5e0dc +cursor_text_color #1e1e2e + +# URL underline color when hovering with mouse +url_color #f5e0dc + +# Kitty window border colors +active_border_color #b4befe +inactive_border_color #6c7086 +bell_border_color #f9e2af + +# OS Window titlebar colors +wayland_titlebar_color system +macos_titlebar_color system + +# Tab bar colors +active_tab_foreground #11111b +active_tab_background #cba6f7 +inactive_tab_foreground #cdd6f4 +inactive_tab_background #181825 +tab_bar_background #11111b + +# Colors for marks (marked text in the terminal) +mark1_foreground #1e1e2e +mark1_background #b4befe +mark2_foreground #1e1e2e +mark2_background #cba6f7 +mark3_foreground #1e1e2e +mark3_background #74c7ec + +# The 16 terminal colors + +# black +color0 #45475a +color8 #585b70 + +# red +color1 #f38ba8 +color9 #f38ba8 + +# green +color2 #a6e3a1 +color10 #a6e3a1 + +# yellow +color3 #f9e2af +color11 #f9e2af + +# blue +color4 #89b4fa +color12 #89b4fa + +# magenta +color5 #f5c2e7 +color13 #f5c2e7 + +# cyan +color6 #94e2d5 +color14 #94e2d5 + +# white +color7 #bac2de +color15 #a6adc8 diff --git a/config/nvim/.gitignore b/config/nvim/.gitignore new file mode 100644 index 0000000..cc5457a --- /dev/null +++ b/config/nvim/.gitignore @@ -0,0 +1,8 @@ +tt.* +.tests +doc/tags +debug +.repro +foo.* +*.log +data diff --git a/config/nvim/.neoconf.json b/config/nvim/.neoconf.json new file mode 100644 index 0000000..7c48087 --- /dev/null +++ b/config/nvim/.neoconf.json @@ -0,0 +1,15 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + } +} diff --git a/config/nvim/LICENSE b/config/nvim/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/config/nvim/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/config/nvim/README.md b/config/nvim/README.md new file mode 100644 index 0000000..185280b --- /dev/null +++ b/config/nvim/README.md @@ -0,0 +1,4 @@ +# 💤 LazyVim + +A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). +Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/config/nvim/init.lua b/config/nvim/init.lua new file mode 100644 index 0000000..2514f9e --- /dev/null +++ b/config/nvim/init.lua @@ -0,0 +1,2 @@ +-- bootstrap lazy.nvim, LazyVim and your plugins +require("config.lazy") diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json new file mode 100644 index 0000000..54f633c --- /dev/null +++ b/config/nvim/lazy-lock.json @@ -0,0 +1,37 @@ +{ + "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" }, + "blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" }, + "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, + "catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" }, + "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, + "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "gitsigns.nvim": { "branch": "main", "commit": "4666d040b60d1dc0e474ccd9a3fd3c4d67b4767c" }, + "grug-far.nvim": { "branch": "main", "commit": "b3f9412b1ed76f14cfc68e1ee899873544330c80" }, + "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, + "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mini.ai": { "branch": "main", "commit": "96cd250fdea1fec929a62c7432de73e0f59788cd" }, + "mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" }, + "mini.pairs": { "branch": "main", "commit": "42407ccb80ec59c84e7c91d815f42ed90a8cc093" }, + "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-lint": { "branch": "master", "commit": "3c5e34c24834a67b1cb37600ab7663eefd2b0390" }, + "nvim-lspconfig": { "branch": "master", "commit": "dbdb80d3bd311989d21029c63918d67a786d5013" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "render-markdown.nvim": { "branch": "main", "commit": "b977c94b32afdcadb8e53ba33d5934d1937d4eab" }, + "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, + "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, + "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, + "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } +} diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json new file mode 100644 index 0000000..9a9e70c --- /dev/null +++ b/config/nvim/lazyvim.json @@ -0,0 +1,11 @@ +{ + "extras": [ + "lazyvim.plugins.extras.editor.harpoon2", + "lazyvim.plugins.extras.lang.markdown" + ], + "install_version": 8, + "news": { + "NEWS.md": "10960" + }, + "version": 8 +} \ No newline at end of file diff --git a/config/nvim/lua/config/autocmds.lua b/config/nvim/lua/config/autocmds.lua new file mode 100644 index 0000000..4221e75 --- /dev/null +++ b/config/nvim/lua/config/autocmds.lua @@ -0,0 +1,8 @@ +-- Autocmds are automatically loaded on the VeryLazy event +-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua +-- +-- Add any additional autocmds here +-- with `vim.api.nvim_create_autocmd` +-- +-- Or remove existing autocmds by their group name (which is prefixed with `lazyvim_` for the defaults) +-- e.g. vim.api.nvim_del_augroup_by_name("lazyvim_wrap_spell") diff --git a/config/nvim/lua/config/keymaps.lua b/config/nvim/lua/config/keymaps.lua new file mode 100644 index 0000000..2c134f7 --- /dev/null +++ b/config/nvim/lua/config/keymaps.lua @@ -0,0 +1,3 @@ +-- Keymaps are automatically loaded on the VeryLazy event +-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua +-- Add any additional keymaps here diff --git a/config/nvim/lua/config/lazy.lua b/config/nvim/lua/config/lazy.lua new file mode 100644 index 0000000..d73bfa1 --- /dev/null +++ b/config/nvim/lua/config/lazy.lua @@ -0,0 +1,53 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup({ + spec = { + -- add LazyVim and import its plugins + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + -- import/override with your plugins + { import = "plugins" }, + }, + defaults = { + -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. + -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. + lazy = false, + -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, + -- have outdated releases, which may break your Neovim install. + version = false, -- always use the latest git commit + -- version = "*", -- try installing the latest stable version for plugins that support semver + }, + install = { colorscheme = { "tokyonight", "habamax" } }, + checker = { + enabled = true, -- check for plugin updates periodically + notify = false, -- notify on update + }, -- automatically check for plugin updates + performance = { + rtp = { + -- disable some rtp plugins + disabled_plugins = { + "gzip", + -- "matchit", + -- "matchparen", + -- "netrwPlugin", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, + }, + }, +}) diff --git a/config/nvim/lua/config/options.lua b/config/nvim/lua/config/options.lua new file mode 100644 index 0000000..3ea1454 --- /dev/null +++ b/config/nvim/lua/config/options.lua @@ -0,0 +1,3 @@ +-- Options are automatically loaded before lazy.nvim startup +-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua +-- Add any additional options here diff --git a/config/nvim/lua/plugins/blink.lua b/config/nvim/lua/plugins/blink.lua new file mode 100644 index 0000000..5714725 --- /dev/null +++ b/config/nvim/lua/plugins/blink.lua @@ -0,0 +1,11 @@ +return { + "saghen/blink.cmp", + enabled = true, + opts = { + keymap = { + preset = 'default', + [""] = {}, + ["enter"] = {}, + }, + }, +} diff --git a/config/nvim/lua/plugins/catppuccin.lua b/config/nvim/lua/plugins/catppuccin.lua new file mode 100644 index 0000000..c5f1525 --- /dev/null +++ b/config/nvim/lua/plugins/catppuccin.lua @@ -0,0 +1,8 @@ +return { + "catppuccin/nvim", + -- optional = true, + opts = { + integrations = { blink_cmp = true }, + transparent_background = true, + }, +} diff --git a/config/nvim/lua/plugins/core.lua b/config/nvim/lua/plugins/core.lua new file mode 100644 index 0000000..cd8f406 --- /dev/null +++ b/config/nvim/lua/plugins/core.lua @@ -0,0 +1,8 @@ +return { + { + "LazyVim/LazyVim", + opts = { + colorscheme = "catppuccin", + } + } +} diff --git a/config/nvim/lua/plugins/disabled.lua b/config/nvim/lua/plugins/disabled.lua new file mode 100644 index 0000000..6587ace --- /dev/null +++ b/config/nvim/lua/plugins/disabled.lua @@ -0,0 +1,13 @@ +-- { "akinsho/bufferline", enabled = false }, +return { + { + "akinsho/bufferline.nvim", + enabled = false, + }, + { + "folke/snacks.nvim", + opts = { + explorer = { enabled = false }, + }, + } +} diff --git a/config/nvim/lua/plugins/example.lua b/config/nvim/lua/plugins/example.lua new file mode 100644 index 0000000..17f53d6 --- /dev/null +++ b/config/nvim/lua/plugins/example.lua @@ -0,0 +1,197 @@ +-- since this is just an example spec, don't actually load anything here and return an empty spec +-- stylua: ignore +if true then return {} end + +-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim +-- +-- In your plugin files, you can: +-- * add extra plugins +-- * disable/enabled LazyVim plugins +-- * override the configuration of LazyVim plugins +return { + -- add gruvbox + { "ellisonleao/gruvbox.nvim" }, + + -- Configure LazyVim to load gruvbox + { + "LazyVim/LazyVim", + opts = { + colorscheme = "gruvbox", + }, + }, + + -- change trouble config + { + "folke/trouble.nvim", + -- opts will be merged with the parent spec + opts = { use_diagnostic_signs = true }, + }, + + -- disable trouble + { "folke/trouble.nvim", enabled = false }, + + -- override nvim-cmp and add cmp-emoji + { + "hrsh7th/nvim-cmp", + dependencies = { "hrsh7th/cmp-emoji" }, + ---@param opts cmp.ConfigSchema + opts = function(_, opts) + table.insert(opts.sources, { name = "emoji" }) + end, + }, + + -- change some telescope options and a keymap to browse plugin files + { + "nvim-telescope/telescope.nvim", + keys = { + -- add a keymap to browse plugin files + -- stylua: ignore + { + "fp", + function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, + desc = "Find Plugin File", + }, + }, + -- change some options + opts = { + defaults = { + layout_strategy = "horizontal", + layout_config = { prompt_position = "top" }, + sorting_strategy = "ascending", + winblend = 0, + }, + }, + }, + + -- add pyright to lspconfig + { + "neovim/nvim-lspconfig", + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- pyright will be automatically installed with mason and loaded with lspconfig + pyright = {}, + }, + }, + }, + + -- add tsserver and setup with typescript.nvim instead of lspconfig + { + "neovim/nvim-lspconfig", + dependencies = { + "jose-elias-alvarez/typescript.nvim", + init = function() + require("lazyvim.util").lsp.on_attach(function(_, buffer) + -- stylua: ignore + vim.keymap.set( "n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) + vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) + end) + end, + }, + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- tsserver will be automatically installed with mason and loaded with lspconfig + tsserver = {}, + }, + -- you can do any additional lsp server setup here + -- return true if you don't want this server to be setup with lspconfig + ---@type table + setup = { + -- example to setup with typescript.nvim + tsserver = function(_, opts) + require("typescript").setup({ server = opts }) + return true + end, + -- Specify * to use this function as a fallback for any server + -- ["*"] = function(server, opts) end, + }, + }, + }, + + -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, + -- treesitter, mason and typescript.nvim. So instead of the above, you can use: + { import = "lazyvim.plugins.extras.lang.typescript" }, + + -- add more treesitter parsers + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "bash", + "html", + "javascript", + "json", + "lua", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "tsx", + "typescript", + "vim", + "yaml", + }, + }, + }, + + -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above + -- would overwrite `ensure_installed` with the new value. + -- If you'd rather extend the default config, use the code below instead: + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + -- add tsx and treesitter + vim.list_extend(opts.ensure_installed, { + "tsx", + "typescript", + }) + end, + }, + + -- the opts function can also be used to change the default opts: + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function(_, opts) + table.insert(opts.sections.lualine_x, { + function() + return "😄" + end, + }) + end, + }, + + -- or you can return new options to override all the defaults + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function() + return { + --[[add your custom lualine config here]] + } + end, + }, + + -- use mini.starter instead of alpha + { import = "lazyvim.plugins.extras.ui.mini-starter" }, + + -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc + { import = "lazyvim.plugins.extras.lang.json" }, + + -- add any tools you want to have installed below + { + "williamboman/mason.nvim", + opts = { + ensure_installed = { + "stylua", + "shellcheck", + "shfmt", + "flake8", + }, + }, + }, +} diff --git a/config/nvim/stylua.toml b/config/nvim/stylua.toml new file mode 100644 index 0000000..5d6c50d --- /dev/null +++ b/config/nvim/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 2 +column_width = 120 \ No newline at end of file diff --git a/dependencies b/dependencies new file mode 100644 index 0000000..501bc9d --- /dev/null +++ b/dependencies @@ -0,0 +1 @@ +startctl greetd ! diff --git a/etc/greetd/config.toml b/etc/greetd/config.toml new file mode 100644 index 0000000..bce5f73 --- /dev/null +++ b/etc/greetd/config.toml @@ -0,0 +1,10 @@ +[terminal] +# The VT to run the greeter on. Can be "next", "current" or a number +# designating the VT. +vt = 1 + +# The default session, also known as the greeter. +[default_session] +command = "tuigreet --cmd 'uwsm start hyprland-uwsm.desktop'" + +user = "greeter" diff --git a/script.sh b/install.sh similarity index 52% rename from script.sh rename to install.sh index 4e7f71d..0ce6219 100755 --- a/script.sh +++ b/install.sh @@ -1,15 +1,16 @@ #!/usr/bin/env bash -sources=("./config/") -targets=("$HOME/.config/") - +sources=("$PWD/config/" "$PWD/etc/") +targets=("$HOME/.config/" "/etc/") length=${#sources[@]} + +# TODO: need to address need to run as sudo to add symlink to certain folders, maybe ask in outer loop when sudo is needed and set a variable + for ((i = 0; i < length; i++)); do - + source=${sources[i]} target=${targets[i]} - for folder in $(ls $source) - do + for folder in $(ls $source); do if [ -e "$target$folder" ]; then echo "The file '$target$folder' exists." else diff --git a/scripts/background.sh b/scripts/background.sh new file mode 100755 index 0000000..4fcd283 --- /dev/null +++ b/scripts/background.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +WALLPAPER_DIR="$HOME/dotfiles/backgrounds/" +CURRENT_WALL=$(hyprctl hyprpaper listloaded) + +# Get a random wallpaper that is not the current one +WALLPAPER=$(find "$WALLPAPER_DIR" -type f ! -name "$(basename "$CURRENT_WALL")" | shuf -n 1) + +# Apply the selected wallpaper +hyprctl hyprpaper reload ,"$WALLPAPER"