diff --git a/gtktheme/.config/gtk-3.0/bookmarks b/gtktheme/.config/gtk-3.0/bookmarks index c0da157..74624be 100644 --- a/gtktheme/.config/gtk-3.0/bookmarks +++ b/gtktheme/.config/gtk-3.0/bookmarks @@ -1,2 +1,4 @@ -file:///home/n0x/Nextcloud Nextcloud file:///home/n0x/Downloads Downloads +file:///home/n0x/Nextcloud Nextcloud +file:///home/n0x/Pictures Pictures +file:///home/n0x/Workspace Workspace diff --git a/gtktheme/.config/gtk-3.0/settings.ini b/gtktheme/.config/gtk-3.0/settings.ini index 4f62398..8f7f85d 100644 --- a/gtktheme/.config/gtk-3.0/settings.ini +++ b/gtktheme/.config/gtk-3.0/settings.ini @@ -1,7 +1,7 @@ [Settings] -gtk-theme-name=Nordic-darker -gtk-icon-theme-name=Nordzy-green-dark -gtk-font-name=Cantarell 11 +gtk-theme-name=Everforest-Teal-Dark +gtk-icon-theme-name=Everforest-Light +gtk-font-name=Noto Sans 11 gtk-cursor-theme-name=default gtk-cursor-theme-size=24 gtk-toolbar-style=3 @@ -12,7 +12,7 @@ gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=0 gtk-xft-antialias=1 gtk-xft-hinting=1 -gtk-xft-hintstyle=hintslight +gtk-xft-hintstyle=hintmedium gtk-xft-rgba=rgb gtk-application-prefer-dark-theme=1 gtk-decoration-layout=close,minimize,maximize: diff --git a/gtktheme/.config/gtk-4.0/assets b/gtktheme/.config/gtk-4.0/assets new file mode 120000 index 0000000..986b6d6 --- /dev/null +++ b/gtktheme/.config/gtk-4.0/assets @@ -0,0 +1 @@ +/usr/share/themes/Everforest-Teal-Dark/gtk-4.0/assets \ No newline at end of file diff --git a/gtktheme/.config/gtk-4.0/gtk-dark.css b/gtktheme/.config/gtk-4.0/gtk-dark.css index 2e8f552..199d0e5 120000 --- a/gtktheme/.config/gtk-4.0/gtk-dark.css +++ b/gtktheme/.config/gtk-4.0/gtk-dark.css @@ -1 +1 @@ -/usr/share/themes/Nordic-darker/gtk-4.0/gtk-dark.css \ No newline at end of file +/usr/share/themes/Everforest-Teal-Dark/gtk-4.0/gtk-dark.css \ No newline at end of file diff --git a/gtktheme/.config/gtk-4.0/gtk.css b/gtktheme/.config/gtk-4.0/gtk.css index 9df3039..623343e 120000 --- a/gtktheme/.config/gtk-4.0/gtk.css +++ b/gtktheme/.config/gtk-4.0/gtk.css @@ -1 +1 @@ -/usr/share/themes/Nordic-darker/gtk-4.0/gtk.css \ No newline at end of file +/usr/share/themes/Everforest-Teal-Dark/gtk-4.0/gtk.css \ No newline at end of file diff --git a/gtktheme/.config/gtk-4.0/settings.ini b/gtktheme/.config/gtk-4.0/settings.ini index e5458c2..ac68a47 100644 --- a/gtktheme/.config/gtk-4.0/settings.ini +++ b/gtktheme/.config/gtk-4.0/settings.ini @@ -1,7 +1,7 @@ [Settings] -gtk-theme-name=Nordic-darker -gtk-icon-theme-name=Nordzy-green-dark -gtk-font-name=Noto Sans, 10 +gtk-theme-name=Everforest-Teal-Dark +gtk-icon-theme-name=Everforest-Light +gtk-font-name=Berkeley Mono Regular, 11 gtk-cursor-theme-name=Adwaita gtk-cursor-theme-size=24 gtk-decoration-layout=close,minimize,maximize: diff --git a/gtktheme/.gtkrc-2.0 b/gtktheme/.gtkrc-2.0 index 735d0b1..8dddf1e 100644 --- a/gtktheme/.gtkrc-2.0 +++ b/gtktheme/.gtkrc-2.0 @@ -2,9 +2,9 @@ # Any customization should be done in ~/.gtkrc-2.0.mine instead. include "/home/n0x/.gtkrc-2.0.mine" -gtk-theme-name="Nordic-darker" -gtk-icon-theme-name="Nordzy-green-dark" -gtk-font-name="Cantarell 11" +gtk-theme-name="Everforest-Teal-Dark" +gtk-icon-theme-name="Everforest-Light" +gtk-font-name="Noto Sans 11" gtk-cursor-theme-name="default" gtk-cursor-theme-size=24 gtk-toolbar-style=3 @@ -15,5 +15,5 @@ gtk-enable-event-sounds=1 gtk-enable-input-feedback-sounds=0 gtk-xft-antialias=1 gtk-xft-hinting=1 -gtk-xft-hintstyle="hintslight" +gtk-xft-hintstyle="hintmedium" gtk-xft-rgba="rgb" diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf index c0ebe51..e99ac58 100644 --- a/hypr/.config/hypr/hyprland.conf +++ b/hypr/.config/hypr/hyprland.conf @@ -23,8 +23,7 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ monitor = eDP-1,1920x1080@60,0x0,1 -monitor = , preferred, -320x-1440, 1 # Homeoffice -# monitor = , preferred, auto, 1 # For automatic discplay connection +monitor = , preferred, auto, 1 # For automatic discplay connection ################### ### MY PROGRAMS ### @@ -36,7 +35,6 @@ monitor = , preferred, -320x-1440, 1 # Homeoffice $terminal = kitty $fileManager = pcmanfm $menu = rofi -show drun -#$screenshot = slurp | grim -g - ~/Pictures/Screenshots/screenshot_$(date "+%Y-%m-%d_%T").png $screenshot = grim -g "$(slurp)" - | swappy -f - $pwmanager = bitwarden-desktop $lockscreen = hyprlock @@ -83,8 +81,8 @@ general { border_size = 2 # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) + col.active_border = rgba(7fbbb3ee) rgba(A7c080ee) 45deg + col.inactive_border = rgba(384b55aa) # Set to true enable resizing windows by clicking and dragging on borders and gaps resize_on_border = false @@ -179,13 +177,15 @@ input { # https://wiki.hyprland.org/Configuring/Variables/#gestures gestures { workspace_swipe = true + workspace_swipe_touch = true + workspace_swipe_forever = true } # Example per-device config # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more device { - name = epic-mouse-v1 - sensitivity = -0.5 + #name = epic-mouse-v1 + #sensitivity = -0.5 } @@ -258,8 +258,8 @@ bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle -bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+ -bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%- +bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 5%+ +bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 5%- ############################## ### WINDOWS AND WORKSPACES ### @@ -278,12 +278,6 @@ windowrulev2 = float,title:^(Bitwarden)$ windowrulev2 = suppressevent maximize, class:.* # You'll probably like this. -env = LIBVA_DRIVER_NAME,nvidia -env = XDG_SESSION_TYPE,wayland -env = GBM_BACKEND,nvidia-drm -env = __GLX_VENDOR_LIBRARY_NAME,nvidia -env = NVD_BACKEND,direct - cursor { no_hardware_cursors = true } diff --git a/hypr/.config/hypr/hyprlock.conf b/hypr/.config/hypr/hyprlock.conf index e52c03b..dacc519 100644 --- a/hypr/.config/hypr/hyprlock.conf +++ b/hypr/.config/hypr/hyprlock.conf @@ -1,6 +1,6 @@ background { monitor = - path = $HOME/Nextcloud/Pictures/Wallpapers/wp/dots.png + path = $HOME/.config/hypr/wp.png color = rgba(59,66,82,1) # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations diff --git a/hypr/.config/hypr/wp.png b/hypr/.config/hypr/wp.png index 8f78624..f49a0bb 100644 Binary files a/hypr/.config/hypr/wp.png and b/hypr/.config/hypr/wp.png differ diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf index 9dd4476..3a31235 100644 --- a/kitty/.config/kitty/kitty.conf +++ b/kitty/.config/kitty/kitty.conf @@ -1,6 +1,6 @@ # Font stuff -font_family family="Hack JBM Ligatured" +font_family family="Berkeley Mono Regular" italic_font auto bold_font auto bold_italic_font auto @@ -13,45 +13,65 @@ symbol_map U+e000-U+e00a,U+ea60-U+ebeb,U+e0a0-U+e0c8,U+e0ca,U+e0cc-U+e0d7,U+e200 # Transparency background_opacity 0.85 -# The foreground color -foreground #d8dee9 +foreground #d3c6aa +background #2b3339 +selection_foreground #9da9a0 +selection_background #503946 -# The background color -background #2e3440 +cursor #d3c6aa +cursor_text_color #323c41 -# The foreground for selections -selection_foreground #81a1c1 +url_color #7fbbb3 -# The background for selections -selection_background #eceff4 +active_border_color #a7c080 +inactive_border_color #53605c +bell_border_color #e69875 +visual_bell_color none -# The cursor color -cursor #e5e9f0 +wayland_titlebar_color system +macos_titlebar_color system + +active_tab_background #2b3339 +active_tab_foreground #d3c6aa +inactive_tab_background #3a454a +inactive_tab_foreground #9da9a0 +tab_bar_background #323c41 +tab_bar_margin_color none # Set up term-colors (Nord Theme) -color0 #3b4252 -color8 #4c566a -color1 #bf616a -color9 #bf616a +#: black +color0 #374247 +color8 #404c51 -color2 #a3be8c -color10 #a3be8c +#: red +color1 #e67e80 +color9 #e67e80 -color3 #ebcb8b -color11 #ebcb8b +#: green +color2 #a7c080 +color10 #a7c080 -color4 #81a1c1 -color12 #81a1c1 +#: yellow +color3 #dbbc7f +color11 #dbbc7f -color5 #b48ead -color13 #b48ead +#: blue +color4 #7fbbb3 +color12 #7fbbb3 -color6 #88c0d0 -color14 #8fbcbb +#: magenta +color5 #d699b6 +color13 #d699b6 + +#: cyan +color6 #83c092 +color14 #83c092 + +#: white +color7 #859289 +color15 #9da9a0 -color7 #e5e9f0 -color15 #eceff4 # The cursor shape can be one of (block, beam, underline) shell_integration no-cursor diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index da3aa94..ce3bf11 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -6,7 +6,7 @@ require "vars" -- Color Theme vim.cmd [[ try - colorscheme nord + colorscheme everforest endtry ]] @@ -123,20 +123,20 @@ cmp.setup({ -- Treesitter Plugin Setup -require('nvim-treesitter.configs').setup { - ensure_installed = { "bash", "c", "cpp", "javascript", "json", "lua", "python", "typescript", "tsx", "css", "rust", "java", "yaml", "markdown", "markdown_inline" }, - auto_install = true, - highlight = { - enable = true, - additional_vim_regex_highlighting=false, - }, - ident = { enable = true }, - rainbow = { - enable = true, - extended_mode = true, - max_file_lines = nil, - } -} +--require('nvim-treesitter.configs').setup { +-- ensure_installed = { "bash", "c", "cpp", "javascript", "json", "python", "css", "rust", "markdown", "markdown_inline" }, +-- auto_install = true, +-- highlight = { +-- enable = true, +-- additional_vim_regex_highlighting=false, +-- }, +-- ident = { enable = true }, +-- rainbow = { +-- enable = true, +-- extended_mode = true, +-- max_file_lines = nil, +-- } +--} -- nvim-tree Setup -- following options are the default @@ -252,7 +252,7 @@ nvimtree.setup { -- Statusline require('lualine').setup { - options = { theme = 'nord' } + options = { theme = 'everforest' } } local status_ok, bufferline = pcall(require, "bufferline") @@ -358,8 +358,3 @@ require("gitsigns").setup { col = 1 }, } - - -require("presence").setup({ - debounce_timeout = 5, -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(, true)`) -}) diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 13bfc4c..bd8ed07 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -43,12 +43,19 @@ return packer.startup(function(use) use "wbthomason/packer.nvim" -- Have packer manage itself -- Colorschemes - use "shaunsingh/nord.nvim" + --use "shaunsingh/nord.nvim" + use({ + "neanias/everforest-nvim", + -- Optional; default configuration will be used if setup isn't called. + config = function() + require("everforest").setup() + end, + }) -- LSP use "neovim/nvim-lspconfig" -- enable LSP - use "williamboman/mason.nvim" -- simple to use language server installer - use "williamboman/mason-lspconfig.nvim" -- simple to use language server installer + use "mason-org/mason.nvim" -- simple to use language server installer + use "mason-org/mason-lspconfig.nvim" -- simple to use language server installer use 'simrat39/rust-tools.nvim' @@ -61,12 +68,15 @@ return packer.startup(function(use) -- Useful completion sources: use 'hrsh7th/cmp-nvim-lua' use 'hrsh7th/cmp-nvim-lsp-signature-help' - use 'hrsh7th/cmp-vsnip' - use 'hrsh7th/cmp-path' - use 'hrsh7th/vim-vsnip' + use 'hrsh7th/cmp-vsnip' + use 'hrsh7th/cmp-path' + use 'hrsh7th/vim-vsnip' use "hrsh7th/cmp-cmdline" -- cmdline completions - use 'nvim-treesitter/nvim-treesitter' + use { + 'nvim-treesitter/nvim-treesitter', + run = ':TSUpdate' + } use 'nvim-tree/nvim-web-devicons' @@ -84,7 +94,7 @@ return packer.startup(function(use) use { 'vimwiki/vimwiki', branch='dev'} -- dicord fuckery - use 'andweeb/presence.nvim' +-- use 'andweeb/presence.nvim' -- floaterm use 'voldikss/vim-floaterm' @@ -93,7 +103,7 @@ return packer.startup(function(use) use 'lewis6991/gitsigns.nvim' -- LaTeX - use 'lervag/vimtex' +-- use 'lervag/vimtex' -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins diff --git a/rofi/.config/rofi/config.rasi b/rofi/.config/rofi/config.rasi index 8e663fc..0a25808 100644 --- a/rofi/.config/rofi/config.rasi +++ b/rofi/.config/rofi/config.rasi @@ -12,14 +12,14 @@ configuration { @theme "/dev/null" * { - bg0: #2E3440F2; - bg1: #3B4252; - bg2: #4C566A80; - bg3: #88C0D0F2; - fg0: #D8DEE9; - fg1: #ECEFF4; - fg2: #D8DEE9; - fg3: #4C566A; + bgdark: #272E33; + bgalt: #3C4841; + bggreen: #56635F; + fg0: #A7C080; + fgalt: #4f5b58; + + accent-color: #A7C080; + urgent-color: #DBBC7F; font: "Roboto 12"; @@ -32,7 +32,7 @@ configuration { } element selected { - text-color: @bg1; + text-color: @bgalt; } window { @@ -40,7 +40,7 @@ window { width: 720px; border-radius: 10px; - background-color: @bg0; + background-color: @bgdark; } mainbox { @@ -48,8 +48,8 @@ mainbox { } inputbar { - background-color: @bg1; - border-color: @bg3; + background-color: @bgalt; + border-color: @bggreen; border: 2px; border-radius: 8px; @@ -60,19 +60,19 @@ inputbar { } prompt { - text-color: @fg2; + text-color: @fg0; } entry { placeholder: "Search"; - placeholder-color: @fg3; + placeholder-color: @fgalt; } message { margin: 12px 0 0; border-radius: 8px; - border-color: @bg2; - background-color: @bg2; + border-color: @bggreen; + background-color: @bggreen; } textbox { @@ -96,15 +96,15 @@ element { } element normal active { - text-color: @bg3; + text-color: @fg0; } element alternate active { - text-color: @bg3; + text-color: @fg0; } element selected normal, element selected active { - background-color: @bg3; + background-color: @fg0; } element-icon { diff --git a/waybar/.config/waybar/colors.css b/waybar/.config/waybar/colors.css deleted file mode 100644 index 54a04ce..0000000 --- a/waybar/.config/waybar/colors.css +++ /dev/null @@ -1,5 +0,0 @@ -@define-color bg0 #211a17; -@define-color bg1 #362f2b; -@define-color tip #221e1b; -@define-color accent #ffbf9b; -@define-color text #ffffff; diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css index 24d169c..d17fd3f 100644 --- a/waybar/.config/waybar/style.css +++ b/waybar/.config/waybar/style.css @@ -1,19 +1,11 @@ -@define-color base00 #181818; -@define-color base01 #2b2e37; -@define-color base02 #3b3e47; -@define-color base03 #585858; -@define-color base04 #b8b8b8; -@define-color base05 #d8d8d8; -@define-color base06 #e8e8e8; -@define-color base07 #f8f8f8; -@define-color base08 #ab4642; -@define-color base09 #dc9656; -@define-color base0A #f7ca88; -@define-color base0B #a1b56c; -@define-color base0C #86c1b9; -@define-color base0D #7cafc2; -@define-color base0E #ba8baf; -@define-color base0F #a16946; +@define-color bg_dim #1e2326; +@define-color bg0 #272e33; +@define-color bg2 #374145; +@define-color fg #D3C6AA; +@define-color red #E67E80; +@define-color blue #7fbbb3; +@define-color orange #e69875; +@define-color bg4 #495156; * { transition: none; @@ -24,9 +16,9 @@ font-family: 'Hack JBM Ligatured', "Font Awesome 6 Free"; font-size: 1.2em; font-weight: 400; - color: @base04; + color: @fg; border-radius: 10px; - background: @base01; + background: @bg0; } #workspaces { @@ -36,7 +28,7 @@ #workspaces button { margin: 4px 0; padding: 0 4px; - color: @base05; + color: @fg; } #workspaces button.visible { @@ -44,22 +36,22 @@ #workspaces button.active { border-radius: 10px; - background-color: @base03; + background-color: @bg4; } #workspaces button.urgent { - color: rgba(238, 46, 36, 1); + color: @red; } #tray { margin: 4px 4px 4px 4px; border-radius: 4px; - background-color: @base02; + background-color: @bg2; } #tray * { padding: 0 6px; - border-left: 1px solid @base00; + border-left: 1px solid @bg_dim; } #tray *:first-child { @@ -69,17 +61,17 @@ #mode, #battery, #cpu, #memory, #network, #pulseaudio, #idle_inhibitor, #backlight, #custom-storage, #custom-updates, #custom-weather, #custom-mail, #clock, #temperature, #language{ margin: 4px 2px; padding: 0 6px; - background-color: @base02; + background-color: @bg2; border-radius: 4px; min-width: 20px; } #pulseaudio.muted { - color: @base0F; + color: @orange; } #pulseaudio.bluetooth { - color: @base0C; + color: @blue; } #clock { @@ -89,7 +81,7 @@ } #temperature.critical { - color: @base0F; + color: @orange; } #window {