From ca4b8704b787bafff62f884fccae5bf55db58353 Mon Sep 17 00:00:00 2001 From: Clay Gomera Date: Tue, 20 Jun 2023 18:34:41 -0400 Subject: [PATCH] fixing stuff --- user/.config/alacritty/alacritty.yml | 447 ------------ user/.config/awesome/apps.lua | 45 +- user/.config/awesome/keymaps/keyboard.lua | 783 +++++++++++---------- user/.config/awesome/ui/bar.lua | 366 +++++----- user/.config/awesome/ui/rules.lua | 75 +- user/.config/awesome/ui/theme.lua | 132 ++-- user/.config/awesome/ui/widgets/battery | 90 ++- user/.config/awesome/ui/widgets/brightness | 26 +- user/.config/awesome/ui/widgets/layout | 2 +- user/.config/awesome/ui/widgets/wifi | 29 +- user/.config/lvim/config.lua | 77 +- user/.config/picom/picom.conf | 57 +- user/.config/rofi/scripts/rofi_power | 6 +- user/.config/rofi/scripts/rofi_scrot | 59 +- user/.config/rofi/scripts/rofi_wall | 34 +- user/.config/rofi/scripts/rofi_wifi | 2 +- user/.config/vifm/scripts/README | 6 - user/.config/vifm/vifmrc | 4 +- 18 files changed, 1016 insertions(+), 1224 deletions(-) delete mode 100644 user/.config/alacritty/alacritty.yml delete mode 100644 user/.config/vifm/scripts/README diff --git a/user/.config/alacritty/alacritty.yml b/user/.config/alacritty/alacritty.yml deleted file mode 100644 index e010baa24..000000000 --- a/user/.config/alacritty/alacritty.yml +++ /dev/null @@ -1,447 +0,0 @@ -## ____ __ -## / __ \_________ _/ /_____ -## / / / / ___/ __ `/ //_/ _ \ -## / /_/ / / / /_/ / ,< / __/ Clay Gomera (Drake) -## /_____/_/ \__,_/_/|_|\___/ My custom alacritty config -## - -## Set colorschemes - -####################################### -## Alacritty colorschemes ## -####################################### -schemes: - ### Doom One ### - doom-one: &doom-one - primary: - background: '#282c34' - foreground: '#bbc2cf' - cursor: - text: CellBackground - cursor: '#528bff' - selection: - text: CellForeground - background: '#3e4451' - normal: - black: '#1c1f24' - red: '#ff6c6b' - green: '#98be65' - yellow: '#da8548' - blue: '#51afef' - magenta: '#c678dd' - cyan: '#5699af' - white: '#202328' - bright: - black: '#5b6268' - red: '#da8548' - green: '#4db5bd' - yellow: '#ecbe7b' - blue: '#3071db' # This is 2257a0 in Doom Emacs but I lightened it. - magenta: '#a9a1e1' - cyan: '#46d9ff' - white: '#dfdfdf' - - ### Tokyo Night ### - tokyo-night: &tokyo-night - # Default colors - primary: - background: '#1a1b26' - foreground: '#a9b1d6' - - # Normal colors - normal: - black: '#32344a' - red: '#f7768e' - green: '#9ece6a' - yellow: '#e0af68' - blue: '#34548a' - magenta: '#ad8ee6' - cyan: '#449dab' - white: '#9699a8' - - # Bright colors - bright: - black: '#444b6a' - red: '#ff7a93' - green: '#b9f27c' - yellow: '#ff9e64' - blue: '#7da6ff' - magenta: '#bb9af7' - cyan: '#0db9d7' - white: '#acb0d0' - - - ### Dracula ### - dracula: &dracula - primary: - background: '#282a36' - foreground: '#f8f8f2' - cursor: - text: CellBackground - cursor: CellForeground - vi_mode_cursor: - text: CellBackground - cursor: CellForeground - search: - matches: - foreground: '#44475a' - background: '#50fa7b' - focused_match: - foreground: '#44475a' - background: '#ffb86c' - bar: - background: '#282a36' - foreground: '#f8f8f2' - line_indicator: - foreground: None - background: None - selection: - text: CellForeground - background: '#44475a' - normal: - black: '#000000' - red: '#ff5555' - green: '#50fa7b' - yellow: '#f1fa8c' - blue: '#bd93f9' - magenta: '#ff79c6' - cyan: '#8be9fd' - white: '#bfbfbf' - bright: - black: '#4d4d4d' - red: '#ff6e67' - green: '#5af78e' - yellow: '#f4f99d' - blue: '#caa9fa' - magenta: '#ff92d0' - cyan: '#9aedfe' - white: '#e6e6e6' - dim: - black: '#14151b' - red: '#ff2222' - green: '#1ef956' - yellow: '#ebf85b' - blue: '#4d5b86' - magenta: '#ff46b0' - cyan: '#59dffc' - white: '#e6e6d1' - - ### Gruvbox dark ### - gruvbox-dark: &gruvbox-dark - # Default colors - primary: - # hard contrast: background = '0x1d2021' - background: '#1d2021' - # soft contrast: background = '0x32302f' - foreground: '#ebdbb2' - - # Normal colors - normal: - black: '#282828' - red: '#cc241d' - green: '#98971a' - yellow: '#d79921' - blue: '#458588' - magenta: '#b16286' - cyan: '#689d6a' - white: '#a89984' - - # Bright colors - bright: - black: '#928374' - red: '#fb4934' - green: '#b8bb26' - yellow: '#fabd2f' - blue: '#83a598' - magenta: '#d3869b' - cyan: '#8ec07c' - white: '#ebdbb2' - -### Monokai ### - monokai-pro: &monokai-pro - # Default colors - primary: - background: '#2D2A2E' - foreground: '#FCFCFA' - - # Normal colors - normal: - black: '#403E41' - red: '#FF6188' - green: '#A9DC76' - yellow: '#FFD866' - blue: '#FC9867' - magenta: '#AB9DF2' - cyan: '#78DCE8' - white: '#FCFCFA' - - # Bright colors - bright: - black: '#727072' - red: '#FF6188' - green: '#A9DC76' - yellow: '#FFD866' - blue: '#FC9867' - magenta: '#AB9DF2' - cyan: '#78DCE8' - white: '#FCFCFA' - - ### Nord ### - nord: &nord - # Default colors - primary: - background: '#2E3440' - foreground: '#D8DEE9' - - # Normal colors - normal: - black: '#3B4252' - red: '#BF616A' - green: '#A3BE8C' - yellow: '#EBCB8B' - blue: '#81A1C1' - magenta: '#B48EAD' - cyan: '#88C0D0' - white: '#E5E9F0' - - # Bright colors - bright: - black: '#4C566A' - red: '#BF616A' - green: '#A3BE8C' - yellow: '#EBCB8B' - blue: '#81A1C1' - magenta: '#B48EAD' - cyan: '#8FBCBB' - white: '#ECEFF4' - - ### Oceanic Next ### - oceanic-next: &oceanic-next - # Default colors - primary: - background: '#1b2b34' - foreground: '#d8dee9' - - # Colors the cursor will use if `custom_cursor_colors` is true - cursor: - text: '#1b2b34' - cursor: '#ffffff' - - # Normal colors - normal: - black: '#343d46' - red: '#EC5f67' - green: '#99C794' - yellow: '#FAC863' - blue: '#6699cc' - magenta: '#c594c5' - cyan: '#5fb3b3' - white: '#d8dee9' - - # Bright colors - bright: - black: '#343d46' - red: '#EC5f67' - green: '#99C794' - yellow: '#FAC863' - blue: '#6699cc' - magenta: '#c594c5' - cyan: '#5fb3b3' - white: '#d8dee9' - - ### Palenight ### - palenight: &palenight - # Default colors - primary: - background: '#292d3e' - foreground: '#d0d0d0' - - # Normal colors - normal: - black: '#292d3e' - red: '#f07178' - green: '#c3e88d' - yellow: '#ffcb6b' - blue: '#82aaff' - magenta: '#c792ea' - cyan: '#89ddff' - white: '#d0d0d0' - - # Bright colors - bright: - black: '#434758' - red: '#ff8b92' - green: '#ddffa7' - yellow: '#ffe585' - blue: '#9cc4ff' - magenta: '#e1acff' - cyan: '#a3f7ff' - white: '#ffffff' - - ### Solarized Dark ### - solarized-dark: &solarized-dark - # Default colors - primary: - background: '#002b36' # base03 - foreground: '#839496' # base0 - - # Cursor colors - cursor: - text: '#002b36' # base03 - cursor: '#839496' # base0 - - # Normal colors - normal: - black: '#073642' # base02 - red: '#dc322f' # red - green: '#859900' # green - yellow: '#b58900' # yellow - blue: '#268bd2' # blue - magenta: '#d33682' # magenta - cyan: '#2aa198' # cyan - white: '#eee8d5' # base2 - - # Bright colors - bright: - black: '#002b36' # base03 - red: '#cb4b16' # orange - green: '#586e75' # base01 - yellow: '#657b83' # base00 - blue: '#839496' # base0 - magenta: '#6c71c4' # violet - cyan: '#93a1a1' # base1 - white: '#fdf6e3' # base3 - - ### Solarized Light ### - solarized-light: &solarized-light - # Default colors - primary: - background: '#fdf6e3' # base3 - foreground: '#657b83' # base00 - - # Cursor colors - cursor: - text: '#fdf6e3' # base3 - cursor: '#657b83' # base00 - - # Normal colors - normal: - black: '#073642' # base02 - red: '#dc322f' # red - green: '#859900' # green - yellow: '#b58900' # yellow - blue: '#268bd2' # blue - magenta: '#d33682' # magenta - cyan: '#2aa198' # cyan - white: '#eee8d5' # base2 - - # Bright colors - bright: - black: '#002b36' # base03 - red: '#cb4b16' # orange - green: '#586e75' # base01 - yellow: '#657b83' # base00 - blue: '#839496' # base0 - magenta: '#6c71c4' # violet - cyan: '#93a1a1' # base1 - white: '#fdf6e3' # base3 - - ### Tomorrow Night ### - tomorrow-night: &tomorrow-night - # Default colors - primary: - background: '#1d1f21' - foreground: '#c5c8c6' - - # Colors the cursor will use if `custom_cursor_colors` is true - cursor: - text: '#1d1f21' - cursor: '#ffffff' - - # Normal colors - normal: - black: '#1d1f21' - red: '#cc6666' - green: '#b5bd68' - yellow: '#e6c547' - blue: '#81a2be' - magenta: '#b294bb' - cyan: '#70c0ba' - white: '#373b41' - - # Bright colors - bright: - black: '#666666' - red: '#ff3334' - green: '#9ec400' - yellow: '#f0c674' - blue: '#81a2be' - magenta: '#b77ee0' - cyan: '#54ced6' - white: '#282a2e' - -colors: *gruvbox-dark - -## Set environment variables -env: - TERM: xterm-256color - -## Window settigns -window: - opacity: 0.95 - padding: - x: 6 - y: 6 - dynamic_padding: false - title: Alacritty - class: - instance: Alacritty - general: Alacritty - dimensions: - columns: 160 - lines: 44 - -## Scrolling settings -scrolling: - history: 5000 - -## Font settings -font: - normal: - family: mononoki Nerd Font - style: Regular - bold: - family: mononoki Nerd Font - style: Bold - italic: - family: mononoki Nerd Font - style: Italic - bold_italic: - family: mononoki Nerd Font - style: Bold Italic - size: 8 - offset: - x: 0 - y: 1 -draw_bold_text_with_bright_colors: true - -cursor: - style: Underline - -shell: - program: /bin/fish - -key_bindings: - # (Windows, Linux, and BSD only) - - { key: V, mods: Control|Shift, action: Paste } - - { key: C, mods: Control|Shift, action: Copy } - - { key: Insert, mods: Shift, action: PasteSelection } - - { key: Key0, mods: Control, action: ResetFontSize } - - { key: Equals, mods: Control, action: IncreaseFontSize } - - { key: Plus, mods: Control, action: IncreaseFontSize } - - { key: Minus, mods: Control, action: DecreaseFontSize } - - { key: F11, mods: None, action: ToggleFullscreen } - - { key: L, mods: Control, action: ClearLogNotice } - - { key: L, mods: Control, chars: "\x0c" } - - { key: Home, mods: Shift, action: ScrollToTop, mode: ~Alt } - - { key: End, mods: Shift, action: ScrollToBottom, mode: ~Alt } diff --git a/user/.config/awesome/apps.lua b/user/.config/awesome/apps.lua index 5ef65103c..e8a2c28ed 100644 --- a/user/.config/awesome/apps.lua +++ b/user/.config/awesome/apps.lua @@ -1,28 +1,31 @@ -- Apps config, see keymaps/keyboard.lua to see how this is handled in keybindings local apps = { - terminal = "wezterm", -- Selected terminal emulator + terminal = "wezterm", -- Selected terminal emulator -- Rofi settings - drunner = "rofi -show drun -show-icons", -- Desktop runner - runner = "rofi -show run", -- Normal runner - runner_power = "$HOME/.config/rofi/scripts/rofi_power", -- Power manager - runner_wifi = "$HOME/.config/rofi/scripts/rofi_wifi", -- Wifi manager - runner_scrot = "$HOME/.config/rofi/scripts/rofi_scrot", -- Screenshots manager - runner_emoji = "$HOME/.config/rofi/scripts/rofi_emoji", -- Emojis manager - runner_wall = "$HOME/.config/rofi/scripts/rofi_wall", -- Wallpapers manager + drunner = "rofi -show drun -show-icons", -- Desktop runner + runner = "rofi -show run", -- Normal runner + runner_power = "$HOME/.config/rofi/scripts/rofi_power", -- Power manager + runner_mount = "$HOME/.config/rofi/scripts/rofi_mount", -- Drive mounter + runner_blue = "$HOME/.config/rofi/scripts/rofi_blue", -- Bluetooth manager + runner_wifi = "$HOME/.config/rofi/scripts/rofi_wifi", -- Wifi manager + runner_scrot = "$HOME/.config/rofi/scripts/rofi_scrot", -- Screenshots manager + runner_emoji = "$HOME/.config/rofi/scripts/rofi_emoji", -- Emojis manager + runner_wall = "$HOME/.config/rofi/scripts/rofi_wall", -- Wallpapers manager -- Other scripts - ytfzf = "wezterm start --class ytfzf -- ytfzf -flstT chafa", -- Youtube - ytfzf_music = "wezterm start --class ytfzf_music -- ytfzf -mlstT chafa", -- Youtube Music - ani_cli = "wezterm start --class ani-cli -- ani-cli", -- Anime - flix_cli = "wezterm start --class flix-cli -- flix-cli", -- Movies - tut = "wezterm start --class tut -- tut", -- Mastodon - newsboat = "wezterm start --class newsboat -- newsboat -u ~/.config/newsboat/urls", -- Newsboat + vidytfzf = "wezterm start --class vidytfzf -- ytfzf -flstT chafa", -- Youtube + musytfzf = "wezterm start --class musytfzf -- ytfzf -mlstT chafa", -- Youtube Music + ani_cli = "wezterm start --class ani-cli -- ani-cli", -- Anime + flix_cli = "wezterm start --class flix-cli -- flix-cli", -- Movies + newsboat = "wezterm start --class newsboat -- newsboat", -- Newsboat -- Selected apps - editor = "neovide --neovim-bin ./.local/bin/lvim", -- TAG 1 - file = "wezterm start --class vifm -- ./.config/vifm/scripts/vifmrun", -- TAG 2 - browser = "firefox", -- TAG 3 - chat = "revolt-desktop", -- TAG 4 - music = "wezterm start --class cmus -- cmus", -- TAG 5 - office = "libreoffice", -- TAG 8 - game = "retroarch" -- TAG 9 + editor = "neovide --neovim-bin .local/bin/lvim", -- TAG 1 + file = "wezterm start --class vifm -- vifm", -- TAG 2 + browser = "firefox", -- TAG 3 + chat = "signal-desktop", -- TAG 4 + music = "wezterm start --class cmus -- cmus", -- TAG 5 + videoeditor = "org.kde.kdenlive", -- TAG 6 + imageeditor = "org.kde.krita", -- TAG 7 + noteapp = "com.notesnook.Notesnook", -- TAG 8 + game = "retroarch" -- TAG 9 } return apps diff --git a/user/.config/awesome/keymaps/keyboard.lua b/user/.config/awesome/keymaps/keyboard.lua index 836b0267f..a004905b5 100644 --- a/user/.config/awesome/keymaps/keyboard.lua +++ b/user/.config/awesome/keymaps/keyboard.lua @@ -9,7 +9,8 @@ modkey = "Mod4" conkey = "Control" shikey = "Shift" ---[[ Main keybinds ]]-- +--[[ Main keybinds ]] +-- awful.keyboard.append_global_keybindings( { -- Show the help menu @@ -17,10 +18,11 @@ awful.keyboard.append_global_keybindings( { modkey }, "s", hotkeys_popup.show_help, - { description = - "Show Help Menu", + { + description = + "Show Help Menu", group = - "Main keybinds" + "Main keybinds" } ), -- Reload awesome @@ -28,30 +30,34 @@ awful.keyboard.append_global_keybindings( { modkey, conkey }, "r", awesome.restart, - { description = - "Reload Awesome", + { + description = + "Reload Awesome", group = - "Main keybinds" + "Main keybinds" } ), -- Open a terminal awful.key( { modkey }, "Return", - function () + function() awful.spawn(apps.terminal) end, - { description = - "Open a terminal", + { + description = + "Open a terminal", group = - "Main keybinds" + "Main keybinds" } ), } ) ---[[ ]]-- +--[[ ]] +-- ---[[ Tags related keybindings ]]-- +--[[ Tags related keybindings ]] +-- awful.keyboard.append_global_keybindings( { -- Switch to previous tag @@ -59,10 +65,11 @@ awful.keyboard.append_global_keybindings( { modkey }, "Left", awful.tag.viewprev, - { description = - "Quickly switch to previous tag", + { + description = + "Quickly switch to previous tag", group = - "Tag keybinds" + "Tag keybinds" } ), -- Switch to next tag @@ -70,10 +77,11 @@ awful.keyboard.append_global_keybindings( { modkey }, "Right", awful.tag.viewnext, - { description = - "Quickly switch to next tag", + { + description = + "Quickly switch to next tag", group = - "Tag keybinds" + "Tag keybinds" } ), -- Switch back to the previous tag @@ -81,300 +89,320 @@ awful.keyboard.append_global_keybindings( { modkey }, "Escape", awful.tag.history.restore, - { description = - "Go back to previus tag (from history)", + { + description = + "Go back to previus tag (from history)", group = - "Tag keybinds" + "Tag keybinds" } ), -- Switch tags by numbers 1-9 awful.key { - modifiers = { modkey }, - keygroup = "numrow", - description = "Switch tags with number keys from {1 to 9}", - group = "Tag keybinds", - on_press = function (index) - local screen = awful.screen.focused() - local tag = screen.tags[index] - if tag then - tag:view_only() - end - end, + modifiers = { modkey }, + keygroup = "numrow", + description = "Switch tags with number keys from {1 to 9}", + group = "Tag keybinds", + on_press = function(index) + local screen = awful.screen.focused() + local tag = screen.tags[index] + if tag then + tag:view_only() + end + end, }, -- Toggle tags by numbers 1-9 awful.key { - modifiers = { modkey, conkey }, - keygroup = "numrow", - description = "Quickly view contents in another tag with number keys from {1 to 9}", - group = "Tag keybinds", - on_press = function (index) - local screen = awful.screen.focused() - local tag = screen.tags[index] - if tag then - awful.tag.viewtoggle(tag) - end - end, + modifiers = { modkey, conkey }, + keygroup = "numrow", + description = "Quickly view contents in another tag with number keys from {1 to 9}", + group = "Tag keybinds", + on_press = function(index) + local screen = awful.screen.focused() + local tag = screen.tags[index] + if tag then + awful.tag.viewtoggle(tag) + end + end, }, -- Move focused window to tag by numbers 1-9 awful.key { - modifiers = { modkey, shikey }, - keygroup = "numrow", - description = "Move focused window to another tag with number keys from {1 to 9}", - group = "Tag keybinds", - on_press = function (index) - if client.focus then - local tag = client.focus.screen.tags[index] - if tag then - client.focus:move_to_tag(tag) - end + modifiers = { modkey, shikey }, + keygroup = "numrow", + description = "Move focused window to another tag with number keys from {1 to 9}", + group = "Tag keybinds", + on_press = function(index) + if client.focus then + local tag = client.focus.screen.tags[index] + if tag then + client.focus:move_to_tag(tag) end - end, + end + end, }, -- Toggle focused window on tag by numbers 1-9 awful.key { - modifiers = { modkey, conkey, shikey }, - keygroup = "numrow", - description = "View focused window on more than one tag with number keys from {1 to 9}", - group = "Tag keybinds", - on_press = function (index) - if client.focus then - local tag = client.focus.screen.tags[index] - if tag then - client.focus:toggle_tag(tag) - end + modifiers = { modkey, conkey, shikey }, + keygroup = "numrow", + description = "View focused window on more than one tag with number keys from {1 to 9}", + group = "Tag keybinds", + on_press = function(index) + if client.focus then + local tag = client.focus.screen.tags[index] + if tag then + client.focus:toggle_tag(tag) end - end, + end + end, }, } ) ---[[ ]]-- +--[[ ]] +-- ---[[ Focus related keybindings ]]-- +--[[ Focus related keybindings ]] +-- awful.keyboard.append_global_keybindings( { -- Focus next window by index awful.key( { modkey }, "j", - function () - awful.client.focus.byidx( 1) + function() + awful.client.focus.byidx(1) end, - { description = - "Focus the next window by index", + { + description = + "Focus the next window by index", group = - "Focus keybinds" + "Focus keybinds" } ), -- Focus previous window by index awful.key( { modkey }, "k", - function () + function() awful.client.focus.byidx(-1) end, - { description = - "Focus the previous window by index", + { + description = + "Focus the previous window by index", group = - "Focus keybinds" + "Focus keybinds" } ), -- Focus last focused window awful.key( { modkey }, "Tab", - function () + function() awful.client.focus.history.previous() if client.focus then client.focus:raise() end end, - { description = - "Focus back the previous focused window", + { + description = + "Focus back the previous focused window", group = - "Focus keybinds" + "Focus keybinds" } ), -- Focus next screen awful.key( { modkey, conkey }, "j", - function () + function() awful.screen.focus_relative(1) end, - { description = - "Focus the next screen", + { + description = + "Focus the next screen", group = - "Focus keybinds" + "Focus keybinds" } ), -- Focus previous screen awful.key( { modkey, conkey }, "k", - function () + function() awful.screen.focus_relative(-1) end, - { description = - "Focus the previous screen", + { + description = + "Focus the previous screen", group = - "Focus keybinds" + "Focus keybinds" } ), } ) ---[[ ]]-- +--[[ ]] +-- ---[[ Layout keybinds ]]-- +--[[ Layout keybinds ]] +-- awful.keyboard.append_global_keybindings( { -- Swap with next window by index awful.key( { modkey, shikey }, "j", - function () + function() awful.client.swap.byidx(1) end, - { description = - "Swap with next window in current layout by index", + { + description = + "Swap with next window in current layout by index", group = - "Layout keybinds" + "Layout keybinds" } ), -- Swap with previous window by index awful.key( { modkey, shikey }, "k", - function () + function() awful.client.swap.byidx(-1) end, - { description = - "Swap with previous window in current layout by index", + { + description = + "Swap with previous window in current layout by index", group = - "Layout keybinds" + "Layout keybinds" } ), -- Increase master width awful.key( { modkey }, "l", - function () + function() awful.tag.incmwfact(0.05) end, - { description = - "Increase master window width size", + { + description = + "Increase master window width size", group = - "Layout keybinds" + "Layout keybinds" } ), -- Decrease master width awful.key( { modkey }, "h", - function () + function() awful.tag.incmwfact(-0.05) end, - { description = - "Decrease master window width size", + { + description = + "Decrease master window width size", group = - "Layout keybinds" + "Layout keybinds" } ), -- Increase the number of master window awful.key( { modkey, shikey }, "h", - function () + function() awful.tag.incnmaster(1, nil, true) end, - { description = - "Increase the number of master windows", + { + description = + "Increase the number of master windows", group = - "Layout keybinds" + "Layout keybinds" } ), -- Decrease the number of master windows awful.key( { modkey, shikey }, "l", - function () + function() awful.tag.incnmaster(-1, nil, true) end, - { description = - "Decrease the number of master windows", + { + description = + "Decrease the number of master windows", group = - "Layout keybinds" + "Layout keybinds" } ), -- Increase the number of columns awful.key( { modkey, conkey }, "h", - function () + function() awful.tag.incncol(1, nil, true) end, - { description = - "Increase the number of columns in layout", + { + description = + "Increase the number of columns in layout", group = - "Layout keybinds" + "Layout keybinds" } ), -- Decrease the number of columns awful.key( { modkey, conkey }, "l", - function () + function() awful.tag.incncol(-1, nil, true) end, - { description = - "Decrease the number of columns in layout", + { + description = + "Decrease the number of columns in layout", group = - "Layout keybinds" + "Layout keybinds" } ), -- Switch to next layout awful.key( { modkey }, "space", - function () + function() awful.layout.inc(1) end, - { description = - "Switch to the next layout", + { + description = + "Switch to the next layout", group = - "Layout keybinds" + "Layout keybinds" } ), -- Switch to previous layout awful.key( { modkey, shikey }, "space", - function () + function() awful.layout.inc(-1) end, - { description = - "Switch to previous layout", + { + description = + "Switch to previous layout", group = - "Layout keybinds" + "Layout keybinds" } ), -- Select layouts directly awful.key { - modifiers = { modkey }, - keygroup = "numpad", - description = "Select layouts directly using the numpad", - group = "layout", - on_press = function (index) - local t = awful.screen.focused().selected_tag - if t then - t.layout = t.layouts[index] or t.layout - end - end, + modifiers = { modkey }, + keygroup = "numpad", + description = "Select layouts directly using the numpad", + group = "layout", + on_press = function(index) + local t = awful.screen.focused().selected_tag + if t then + t.layout = t.layouts[index] or t.layout + end + end, }, -- Show/Hide Wibox awful.key( { modkey }, "b", - function () + function() for s in screen do s.mywibox.visible = not s.mywibox.visible if s.mybottomwibox then @@ -382,203 +410,222 @@ awful.keyboard.append_global_keybindings( end end end, - { description = - "Toggle the bar", + { + description = + "Toggle the bar", group = - "Layout keybinds" + "Layout keybinds" } ), } ) ---[[ ]]-- +--[[ ]] +-- ---[[ Window keybinds ]]-- +--[[ Window keybinds ]] +-- client.connect_signal( - "request::default_keybindings", - function() - awful.keyboard.append_client_keybindings( - { - -- Set focused window to fullscreen - awful.key( - { modkey }, - "f", - function (c) - c.fullscreen = not c.fullscreen - c:raise() - end, - { description = - "Toggle fullscreen", - group = - "Window keybinds" - } - ), - -- Close focused window - awful.key( - { modkey }, - "q", - function (c) - c:kill() - end, - { description = - "Close focused window", - group = - "Window keybinds" } - ), - -- Toggle floating mode on focused window - awful.key( - { modkey, conkey }, - "space", - awful.client.floating.toggle, - { description = - "Toggle floating mode on focused window", - group = - "Window keybinds" - } - ), - -- Move focused window to master - awful.key( - { modkey, conkey }, - "Return", - function (c) - c:swap( - awful.client.getmaster() - ) - end, - { description = - "Move focused window to master", - group = - "Window keybinds" - } - ), - -- Move focused window to the other screen - awful.key( - { modkey }, - "o", - function (c) - c:move_to_screen() - end, - { description = - "Move focused window to the next screen", - group = - "Window keybinds" - } - ), - -- Toggle focused window to be on top - awful.key( - { modkey }, - "t", - function (c) - c.ontop = not c.ontop - end, - { description = - "Toggle keep on top for focused window", - group = - "Window keybinds" - } - ), - -- Jump to urgent window - awful.key( - { modkey }, - "u", - awful.client.urgent.jumpto, - { description = - "Quickly jump to urgent window", - group = - "Window keybinds" - } - ), - } - ) - end + "request::default_keybindings", + function() + awful.keyboard.append_client_keybindings( + { + -- Set focused window to fullscreen + awful.key( + { modkey }, + "f", + function(c) + c.fullscreen = not c.fullscreen + c:raise() + end, + { + description = + "Toggle fullscreen", + group = + "Window keybinds" + } + ), + -- Close focused window + awful.key( + { modkey }, + "q", + function(c) + c:kill() + end, + { + description = + "Close focused window", + group = + "Window keybinds" + } + ), + -- Toggle floating mode on focused window + awful.key( + { modkey, conkey }, + "space", + awful.client.floating.toggle, + { + description = + "Toggle floating mode on focused window", + group = + "Window keybinds" + } + ), + -- Move focused window to master + awful.key( + { modkey, conkey }, + "Return", + function(c) + c:swap( + awful.client.getmaster() + ) + end, + { + description = + "Move focused window to master", + group = + "Window keybinds" + } + ), + -- Move focused window to the other screen + awful.key( + { modkey }, + "o", + function(c) + c:move_to_screen() + end, + { + description = + "Move focused window to the next screen", + group = + "Window keybinds" + } + ), + -- Toggle focused window to be on top + awful.key( + { modkey }, + "t", + function(c) + c.ontop = not c.ontop + end, + { + description = + "Toggle keep on top for focused window", + group = + "Window keybinds" + } + ), + -- Jump to urgent window + awful.key( + { modkey }, + "u", + awful.client.urgent.jumpto, + { + description = + "Quickly jump to urgent window", + group = + "Window keybinds" + } + ), + } + ) + end ) ---[[ ]]-- +--[[ ]] +-- --[[ Quick keybinds ]] awful.keyboard.append_global_keybindings( { -- Volume awful.key( - { }, + {}, "XF86AudioRaiseVolume", function() awful.spawn("pamixer -i 5") end, - { description = - "Increase volume by +5%", + { + description = + "Increase volume by +5%", group = - "Quick keybinds" + "Quick keybinds" } ), awful.key( - { }, + {}, "XF86AudioLowerVolume", function() awful.spawn("pamixer -d 5") end, - { description = - "Decrease volume by +5%", + { + description = + "Decrease volume by +5%", group = - "Quick keybinds" + "Quick keybinds" } ), awful.key( - { }, + {}, "XF86AudioMute", function() awful.spawn("pamixer -t") end, - { description = - "Mute volume", + { + description = + "Mute volume", group = - "Quick keybinds" + "Quick keybinds" } ), awful.key( - { }, + {}, "XF86AudioMicMute", function() awful.spawn("pamixer --default-source -t") end, - { description = - "Mute microphone", + { + description = + "Mute microphone", group = - "Quick keybinds" + "Quick keybinds" } ), -- Brightness awful.key( - { }, + {}, "XF86MonBrightnessUp", - function () + function() awful.spawn("xbacklight -inc 10") end, - { description = - "Increase brightness by +10%", + { + description = + "Increase brightness by +10%", group = - "Quick keybinds" + "Quick keybinds" } ), awful.key( - { }, + {}, "XF86MonBrightnessDown", - function () + function() awful.spawn("xbacklight -dec 10") end, - { description = - "Decrease brightness by +10%", + { + description = + "Decrease brightness by +10%", group = - "Quick keybinds" + "Quick keybinds" } ), -- Display configuration awful.key( - { }, + {}, "XF86Display", - function () + function() awful.spawn("arandr") end, - { description = - "Configure the display using arandr", + { + description = + "Configure the display using arandr", group = "Quick keybinds" } ), @@ -589,34 +636,39 @@ awful.keyboard.append_global_keybindings( function() local grabber grabber = - awful.keygrabber.run( - function(_, key, event) - if event == "release" then - return + awful.keygrabber.run( + function(_, key, event) + if event == "release" then + return + end + if key == "1" then + awful.util.spawn(apps.editor) -- TAG 1 + elseif key == "2" then + awful.util.spawn(apps.file) -- TAG 2 + elseif key == "3" then + awful.util.spawn(apps.browser) -- TAG 3 + elseif key == "4" then + awful.util.spawn(apps.chat) -- TAG 4 + elseif key == "5" then + awful.util.spawn(apps.music) -- TAG 5 + elseif key == "6" then + awful.util.spawn(apps.videoeditor) -- TAG 5 + elseif key == "7" then + awful.util.spawn(apps.imageeditor) -- TAG 5 + elseif key == "8" then + awful.util.spawn(apps.noteapp) -- TAG 8 + elseif key == "9" then + awful.util.spawn(apps.game) -- TAG 9 + end + awful.keygrabber.stop(grabber) end - if key == "1" then - awful.util.spawn(apps.editor) -- TAG 1 - elseif key == "2" then - awful.util.spawn(apps.file) -- TAG 2 - elseif key == "3" then - awful.util.spawn(apps.browser) -- TAG 3 - elseif key == "4" then - awful.util.spawn(apps.chat) -- TAG 4 - elseif key == "5" then - awful.util.spawn(apps.music) -- TAG 5 - elseif key == "8" then - awful.util.spawn(apps.office) -- TAG 8 - elseif key == "9" then - awful.util.spawn(apps.game) -- TAG 9 - end - awful.keygrabber.stop(grabber) - end - ) + ) end, - { description = - "Launch apps with {Super + a} keychord and then numbers from {1 to 9}", + { + description = + "Launch apps with {Super + a} keychord and then numbers from {1 to 9}", group = - "Quick keybinds" + "Quick keybinds" } ), -- Keyboard layouts (Super + x followed by KEY) @@ -626,24 +678,25 @@ awful.keyboard.append_global_keybindings( function() local grabber grabber = - awful.keygrabber.run( - function(_, key, event) - if event == "release" then - return + awful.keygrabber.run( + function(_, key, event) + if event == "release" then + return + end + if key == "e" then + awful.util.spawn("setxkbmap es") + elseif key == "u" then + awful.util.spawn("setxkbmap us") + end + awful.keygrabber.stop(grabber) end - if key == "e" then - awful.util.spawn("setxkbmap es") - elseif key == "u" then - awful.util.spawn("setxkbmap us") - end - awful.keygrabber.stop(grabber) - end - ) + ) end, - { description = - "Change keyboard layout with {Super + x} keychord and then {e} for spanish and {u} for english", + { + description = + "Change keyboard layout with {Super + x} keychord and then {e} for spanish and {u} for english", group = - "Quick keybinds" + "Quick keybinds" } ), -- Runners (Super + p followed by KEY) @@ -653,34 +706,40 @@ awful.keyboard.append_global_keybindings( function() local grabber grabber = - awful.keygrabber.run( - function(_, key, event) - if event == "release" then - return + awful.keygrabber.run( + function(_, key, event) + if event == "release" then + return + end + if key == "d" then + awful.util.spawn(apps.drunner) + elseif key == "r" then + awful.util.spawn(apps.runner) + elseif key == "q" then + awful.spawn.with_shell(apps.runner_power) + elseif key == "i" then + awful.spawn.with_shell(apps.runner_wifi) + elseif key == "s" then + awful.spawn.with_shell(apps.runner_scrot) + elseif key == "e" then + awful.spawn.with_shell(apps.runner_emoji) + elseif key == "w" then + awful.spawn.with_shell(apps.runner_wall) + elseif key == "m" then + awful.spawn.with_shell(apps.runner_mount) + elseif key == "b" then + awful.spawn.with_shell(apps.runner_blue) + end + awful.keygrabber.stop(grabber) end - if key == "d" then - awful.util.spawn(apps.drunner) - elseif key == "r" then - awful.util.spawn(apps.runner) - elseif key == "q" then - awful.spawn.with_shell(apps.runner_power) - elseif key == "i" then - awful.spawn.with_shell(apps.runner_wifi) - elseif key == "s" then - awful.spawn.with_shell(apps.runner_scrot) - elseif key == "z" then - awful.spawn.with_shell(apps.runner_emoji) - elseif key == "w" then - awful.spawn.with_shell(apps.runner_wall) - end - awful.keygrabber.stop(grabber) - end - ) + ) end, - { description = - "Launch quick action menus with {Super + p} keychord and then {d, r, e, q, i, b, s, z, w}", + { + description = + "Launch quick action menus with {Super + p} keychord and then {d, r, e, q, i, b, s, z, w}", group = - "Quick keybinds" } + "Quick keybinds" + } ), -- Multimedia scripts (Super + t followed by KEY) awful.key( @@ -689,35 +748,33 @@ awful.keyboard.append_global_keybindings( function() local grabber grabber = - awful.keygrabber.run( - function(_, key, event) - if event == "release" then - return + awful.keygrabber.run( + function(_, key, event) + if event == "release" then + return + end + if key == "y" then + awful.util.spawn(apps.vidytfzf) + elseif key == "m" then + awful.util.spawn(apps.musytfzf) + elseif key == "a" then + awful.util.spawn(apps.ani_cli) + elseif key == "f" then + awful.util.spawn(apps.flix_cli) + elseif key == "r" then + awful.util.spawn(apps.newsboat) + end + awful.keygrabber.stop(grabber) end - if key == "y" then - awful.util.spawn(apps.ytfzf) - elseif key == "y" then - awful.util.spawn(apps.ytfzf_music) - elseif key == "a" then - awful.util.spawn(apps.ani_cli) - elseif key == "f" then - awful.util.spawn(apps.flix_cli) - elseif key == "t" then - awful.util.spawn(apps.tut) - elseif key == "n" then - awful.util.spawn(apps.newsboat) - end - awful.keygrabber.stop(grabber) - end - ) + ) end, - { description = - "Launch multimedia terminal scripts with {Super + t} and then {m, y, a, f}", + { + description = + "Launch multimedia terminal scripts with {Super + t} and then {m, y, a, f}", group = - "Quick keybinds" + "Quick keybinds" } ), } ) --[[ ]] - diff --git a/user/.config/awesome/ui/bar.lua b/user/.config/awesome/ui/bar.lua index 1ffb3b471..3b79a6592 100644 --- a/user/.config/awesome/ui/bar.lua +++ b/user/.config/awesome/ui/bar.lua @@ -6,219 +6,219 @@ local theme = require("ui.theme") -- Textclock widget local mytextclock = wibox.widget.textclock() screen.connect_signal("request::desktop_decoration", function(s) --- Tag names for each screen - awful.tag( - { - "", -- EDITOR - "", -- FILE MANAGER - "󰖟", -- WEB BROWSER - "󰻞", -- CHAT - "󰲹", -- MUSIC - "", -- VIDEO - "󰧰", -- IMAGE/EDIT TOOLS - "󰧮", -- OFFICE - "󰸶" -- GAMES - }, - s, - awful.layout.layouts[1] - ) + -- Tag names for each screen + awful.tag( + { + "󰅩", -- EDITOR + "󰉖", -- FILE MANAGER + "󰖟", -- WEB BROWSER + "󰻞", -- CHAT + "󰲹", -- MUSIC + "󰯜", -- VIDEO + "󱇤", -- IMAGE/EDIT TOOLS + "󰧮", -- OFFICE + "󰸶" -- GAMES + }, + s, + awful.layout.layouts[1] + ) --- Layoutbox widget - s.mylayoutbox = { - widget = wibox.container.background, - bg = theme.bg_normal, - shape = gears.shape.circle, - awful.widget.layoutbox { - screen = s, - buttons = { - awful.button( - { }, - 1, - function () - awful.layout.inc(1) - end - ), - awful.button( - { }, - 3, - function () - awful.layout.inc(-1) - end - ), - awful.button( - { }, - 4, - function () - awful.layout.inc(-1) - end - ), - awful.button( - { }, - 5, - function () - awful.layout.inc(1) - end - ), - } + -- Layoutbox widget + s.mylayoutbox = { + widget = wibox.container.background, + bg = theme.bg_normal, + shape = gears.shape.circle, + awful.widget.layoutbox { + screen = s, + buttons = { + awful.button( + {}, + 1, + function() + awful.layout.inc(1) + end + ), + awful.button( + {}, + 3, + function() + awful.layout.inc(-1) + end + ), + awful.button( + {}, + 4, + function() + awful.layout.inc(-1) + end + ), + awful.button( + {}, + 5, + function() + awful.layout.inc(1) + end + ), } } + } --- Taglist widget - s.mytaglist = { - widget = wibox.container.background, - bg = theme.taglist_bg, - shape = gears.shape.rounded_rect, - awful.widget.taglist { - screen = s, - filter = awful.widget.taglist.filter.all, - buttons = { - awful.button( - { }, - 1, - function(t) - t:view_only() + -- Taglist widget + s.mytaglist = { + widget = wibox.container.background, + bg = theme.taglist_bg, + shape = gears.shape.rounded_rect, + awful.widget.taglist { + screen = s, + filter = awful.widget.taglist.filter.all, + buttons = { + awful.button( + {}, + 1, + function(t) + t:view_only() + end + ), + awful.button( + { modkey }, + 1, + function(t) + if client.focus then + client.focus:move_to_tag(t) end - ), - awful.button( - { modkey }, - 1, - function(t) - if client.focus then - client.focus:move_to_tag(t) - end + end + ), + awful.button( + {}, + 3, + awful.tag.viewtoggle + ), + awful.button( + { modkey }, + 3, + function(t) + if client.focus then + client.focus:toggle_tag(t) end - ), - awful.button( - { }, - 3, - awful.tag.viewtoggle - ), - awful.button( - { modkey }, - 3, - function(t) - if client.focus then - client.focus:toggle_tag(t) - end - end - ), - awful.button( - { }, - 4, - function(t) - awful.tag.viewprev(t.screen) - end - ), - awful.button( - { }, - 5, - function(t) - awful.tag.viewnext(t.screen) - end - ), - } + end + ), + awful.button( + {}, + 4, + function(t) + awful.tag.viewprev(t.screen) + end + ), + awful.button( + {}, + 5, + function(t) + awful.tag.viewnext(t.screen) + end + ), } } + } --- Prepare custom widgets - -- Volume widget - s.volume = + -- Prepare custom widgets + -- Volume widget + s.volume = awful.widget.watch( ".config/awesome/ui/widgets/volume", - 1 -- Update time in seconds + 2 -- Update time in seconds ) - -- Battery widget - s.battery = + -- Battery widget + s.battery = awful.widget.watch( ".config/awesome/ui/widgets/battery", - 10 -- update time in seconds + 60 -- update time in seconds ) - -- Wifi widget - s.wifi = + -- Wifi widget + s.wifi = awful.widget.watch( ".config/awesome/ui/widgets/wifi", - 10 -- Update time in seconds + 30 -- Update time in seconds ) - -- Brightness widget - s.brightness = + -- Brightness widget + s.brightness = awful.widget.watch( ".config/awesome/ui/widgets/brightness", - 1 -- Update time in seconds + 5 -- Update time in seconds ) - -- Keyboard layout widget - s.layout = + -- Keyboard layout widget + s.layout = awful.widget.watch( ".config/awesome/ui/widgets/layout", - 1 -- Update time in seconds + 2 -- Update time in seconds ) --- Prepare custom widgets container - local custom_widget_container = { - -- Keyboard layout widget - wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_one), - wibox.container.background(s.layout, theme.bar_bg_one), - wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_one), - -- Volume widget - wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_two), - wibox.container.background(s.volume, theme.bar_bg_two), - wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_two), - -- Brightness widget - wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_tre), - wibox.container.background(s.brightness, theme.bar_bg_tre), - wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_tre), - -- Battery widget - wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_for), - wibox.container.background(s.battery, theme.bar_bg_for), - wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_for), - -- Wifi widget - wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_fiv), - wibox.container.background(s.wifi, theme.bar_bg_fiv), - layout = wibox.layout.fixed.horizontal, - } + -- Prepare custom widgets container + local custom_widget_container = { + -- Keyboard layout widget + wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_one), + wibox.container.background(s.layout, theme.bar_bg_one), + wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_one), + -- Volume widget + wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_two), + wibox.container.background(s.volume, theme.bar_bg_two), + wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_two), + -- Brightness widget + wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_tre), + wibox.container.background(s.brightness, theme.bar_bg_tre), + wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_tre), + -- Battery widget + wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_for), + wibox.container.background(s.battery, theme.bar_bg_for), + wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_for), + -- Wifi widget + wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_fiv), + wibox.container.background(s.wifi, theme.bar_bg_fiv), + layout = wibox.layout.fixed.horizontal, + } --- Main right widget container with pill shape - local right_widgets = { - custom_widget_container, - widget = wibox.container.background, - shape = gears.shape.rounded_rect, - } + -- Main right widget container with pill shape + local right_widgets = { + custom_widget_container, + widget = wibox.container.background, + shape = gears.shape.rounded_rect, + } --- Wibar - s.mywibox = awful.wibar { - position = "top", - height = (30), - border_width = (10), - border_color = theme.bg_normal, - screen = s, - widget = { - layout = wibox.layout.stack, + -- Wibar + s.mywibox = awful.wibar { + position = "top", + height = (30), + border_width = (8), + border_color = theme.bg_normal, + screen = s, + widget = { + layout = wibox.layout.stack, + { + layout = wibox.layout.align.horizontal, { - layout = wibox.layout.align.horizontal, - { - -- [[ Left widgets ]] - layout = wibox.layout.fixed.horizontal, - -- Layoubox widget - s.mylayoutbox, - wibox.container.background(wibox.widget.textbox(" "), theme.bg_normal), - -- Taglist widget - s.mytaglist, - }, - nil, - { - -- [[ Right widgets ]] - layout = wibox.layout.fixed.horizontal, - right_widgets - }, + -- [[ Left widgets ]] + layout = wibox.layout.fixed.horizontal, + -- Layoubox widget + s.mylayoutbox, + wibox.container.background(wibox.widget.textbox(" "), theme.bg_normal), + -- Taglist widget + s.mytaglist, }, + nil, { - -- [[ Center widgets ]] - -- Clock widget - wibox.container.background(mytextclock, theme.bar_clock, gears.shape.rounded_rect), - valign = "center", - halign = "center", - layout = wibox.container.place, - } + -- [[ Right widgets ]] + layout = wibox.layout.fixed.horizontal, + right_widgets + }, + }, + { + -- [[ Center widgets ]] + -- Clock widget + wibox.container.background(mytextclock, theme.bar_clock, gears.shape.rounded_rect), + valign = "center", + halign = "center", + layout = wibox.container.place, } } - end + } +end ) diff --git a/user/.config/awesome/ui/rules.lua b/user/.config/awesome/ui/rules.lua index 3173619ad..f45da09d0 100644 --- a/user/.config/awesome/ui/rules.lua +++ b/user/.config/awesome/ui/rules.lua @@ -8,7 +8,7 @@ ruled.client.connect_signal( -- All clients will match this rule. ruled.client.append_rule { id = "global", - rule = { }, + rule = {}, properties = { focus = awful.client.focus.filter, raise = true, @@ -20,10 +20,10 @@ ruled.client.connect_signal( -- Floating clients. ruled.client.append_rule { - id = "floating", - rule_any = { + id = "floating", + rule_any = { hinstance = { "copyq", "pinentry" }, - class = { + class = { "Galculator", "Blueman-manager", "Gpick", @@ -35,33 +35,34 @@ ruled.client.connect_signal( }, -- Note that the name property shown in xprop might be set slightly after creation of the client -- and the name shown there might not match defined rules here. - name = { - "Event Tester", -- xev. + name = { + "Event Tester", -- xev. }, - role = { - "AlarmWindow", -- Thunderbird's calendar. - "ConfigManager", -- Thunderbird's about:config. - "pop-up", -- e.g. Google Chrome's (detached) Developer Tools. + role = { + "AlarmWindow", -- Thunderbird's calendar. + "ConfigManager", -- Thunderbird's about:config. + "pop-up", -- e.g. Google Chrome's (detached) Developer Tools. } }, properties = { floating = true } } --- TAG 1 + -- TAG 1 ruled.client.append_rule { rule_any = { class = { - "Emacs", - "neovide", - "lvim", - "Godot", - "neovim", - "Virt-manager" - } + "Emacs", + "neovide", + "lvim", + "Godot", + "neovim", + "Virt-manager" + } }, - properties = { tag = "" }, + properties = { tag = "󰅩" }, } --- TAG 2 + + -- TAG 2 ruled.client.append_rule { rule_any = { class = { @@ -70,9 +71,10 @@ ruled.client.connect_signal( "nemo" } }, - properties = { tag = "" }, + properties = { tag = "󰉖" }, } --- TAG 3 + + -- TAG 3 ruled.client.append_rule { rule_any = { class = { @@ -89,7 +91,8 @@ ruled.client.connect_signal( }, properties = { tag = "󰖟" } } --- TAG 4 + + -- TAG 4 ruled.client.append_rule { rule_any = { class = { @@ -101,12 +104,13 @@ ruled.client.connect_signal( }, properties = { tag = "󰻞" } } --- TAG 5 + + -- TAG 5 ruled.client.append_rule { rule_any = { class = { "cmus", - "ytfzf_music", + "musytfzf", "Audacity", "Ardour", "Carla2", @@ -115,7 +119,8 @@ ruled.client.connect_signal( }, properties = { tag = "󰲹" } } --- TAG 6 + + -- TAG 6 ruled.client.append_rule { rule_any = { class = { @@ -128,12 +133,13 @@ ruled.client.connect_signal( "mpv", "ani-cli", "flix-cli", - "ytfzf" + "vidytfzf" } }, - properties = { tag = "" } + properties = { tag = "󰯜" } } --- TAG 7 + + -- TAG 7 ruled.client.append_rule { rule_any = { class = { @@ -146,21 +152,24 @@ ruled.client.connect_signal( "Xournalpp", } }, - properties = { tag = "󰧰" } + properties = { tag = "󱇤" } } --- TAG 8 + + -- TAG 8 ruled.client.append_rule { rule_any = { class = { "DesktopEditors", "Soffice", + "Notesnook", "libreoffice-startcenter", "Joplin" } }, properties = { tag = "󰧮" } } --- TAG 9 + + -- TAG 9 ruled.client.append_rule { rule_any = { class = { @@ -180,6 +189,6 @@ ruled.client.connect_signal( }, properties = { tag = "󰸶" } } ---}}} + --}}} end ) diff --git a/user/.config/awesome/ui/theme.lua b/user/.config/awesome/ui/theme.lua index 17bbcb290..6d70a0758 100644 --- a/user/.config/awesome/ui/theme.lua +++ b/user/.config/awesome/ui/theme.lua @@ -1,101 +1,101 @@ -- {{{ Imports -local gears = require("gears") -local dpi = require("beautiful.xresources").apply_dpi -local beautiful = require("beautiful") +local gears = require("gears") +local dpi = require("beautiful.xresources").apply_dpi +local beautiful = require("beautiful") -- }}} -local themes_path = string.format("%s/.config/awesome/ui/", os.getenv("HOME")) +local themes_path = string.format("%s/.config/awesome/ui/", os.getenv("HOME")) -- {{{ Main -local theme = {} +local theme = {} -- }}} -- {{{ theme font -theme.font = "mononoki Nerd Font 13" +theme.font = "mononoki Nerd Font 12" --- }}} -- {{{ bar colors -theme.bar_bg_one = "#427b58" -theme.bar_bg_two = "#076678" -theme.bar_bg_tre = "#b57614" -theme.bar_bg_for = "#9d0006" -theme.bar_bg_fiv = "#8f3f71" -theme.bar_clock = "#3c3836" +theme.bar_bg_one = "#427b58" +theme.bar_bg_two = "#076678" +theme.bar_bg_tre = "#b57614" +theme.bar_bg_for = "#9d0006" +theme.bar_bg_fiv = "#8f3f71" +theme.bar_clock = "#3c3836" --- }}} -- {{{ Colors -theme.fg_normal = "#ebdbb2" -theme.fg_focus = "#dfc4a1" -theme.fg_urgent = "#fb4934" -theme.bg_normal = "#1d2021" -theme.bg_focus = "#3c3836" -theme.bg_urgent = "#a89984" +theme.fg_normal = "#ebdbb2" +theme.fg_focus = "#dfc4a1" +theme.fg_urgent = "#fb4934" +theme.bg_normal = "#1d2021" +theme.bg_focus = "#3c3836" +theme.bg_urgent = "#a89984" -- }}} -- {{{ Borders -beautiful.gap_single_client = false -theme.useless_gap = dpi(4) -theme.border_width = dpi(1.5) -theme.border_normal = "#504945" -theme.border_focus = "#cc241d" -theme.border_marked = "#cc241d" +beautiful.gap_single_client = false +theme.useless_gap = dpi(4) +theme.border_width = dpi(1.5) +theme.border_normal = "#504945" +theme.border_focus = "#cc241d" +theme.border_marked = "#cc241d" -- }}} -- {{{ Taglist -theme.taglist_font = "mononoki Nerd Font Mono 28" -theme.taglist_bg = "#3c3836" -theme.taglist_fg_focus = "#fb4934" -theme.taglist_fg_occupied = "#8ec07c" -theme.taglist_fg_urgent = "#504945" -theme.taglist_fg_empty = "#a89984" -theme.taglist_spacing = 5 +theme.taglist_font = "Symbols Nerd Font Mono 14" +theme.taglist_bg = "#3c3836" +theme.taglist_fg_focus = "#fb4934" +theme.taglist_fg_occupied = "#8ec07c" +theme.taglist_fg_urgent = "#504945" +theme.taglist_fg_empty = "#a89984" +theme.taglist_spacing = 7 -- }}} -- {{{ Notifications -theme.notification_font = "mononoki Nerd Font 12" -theme.notification_bg = "#1d2021" -theme.notification_bg_alt = "#282828" -theme.notification_fg = "#ebdbb2" -theme.notification_fg_alt = "#282828" -theme.notification_critical = "#fb4934" -theme.notification_shape = gears.shape.rounded_rect +theme.notification_font = "mononoki Nerd Font 12" +theme.notification_bg = "#1d2021" +theme.notification_bg_alt = "#282828" +theme.notification_fg = "#ebdbb2" +theme.notification_fg_alt = "#282828" +theme.notification_critical = "#fb4934" +theme.notification_shape = gears.shape.rounded_rect -- }}} -- {{{ Hotkeys Popup -theme.hotkeys_bg = "#1d2021" -theme.hotkeys_fg = "#ebdbb2" -theme.hotkeys_modifiers_fg = "#458588" -theme.hotkeys_label_bg = "#d79921" -theme.hotkeys_label_fg = "#1d2021" -theme.hotkeys_group_margin = dpi(20) -theme.hotkeys_description_font = "mononoki Nerd Font 12" -theme.hotkeys_font = "mononoki Nerd Font 12" +theme.hotkeys_bg = "#1d2021" +theme.hotkeys_fg = "#ebdbb2" +theme.hotkeys_modifiers_fg = "#458588" +theme.hotkeys_label_bg = "#d79921" +theme.hotkeys_label_fg = "#1d2021" +theme.hotkeys_group_margin = dpi(20) +theme.hotkeys_description_font = "mononoki Nerd Font 12" +theme.hotkeys_font = "mononoki Nerd Font 12" -- }}} -- {{{ Mouse finder -theme.mouse_finder_color = "#fb4934" -theme.mouse_finder_radius = dpi(5) -theme.mouse_finder_timeout = 10 +theme.mouse_finder_color = "#fb4934" +theme.mouse_finder_radius = dpi(5) +theme.mouse_finder_timeout = 10 -- }}} -- {{{ Layout Icons -theme.layout_tile = gears.color.recolor_image(themes_path .. "icons/tilew.png", theme.fg_urgent) -theme.layout_centerwork = gears.color.recolor_image(themes_path .. "icons/centerworkw.png", theme.fg_urgent) -theme.layout_tileleft = gears.color.recolor_image(themes_path .. "icons/tileleftw.png", theme.fg_urgent) -theme.layout_tilebottom = gears.color.recolor_image(themes_path .. "icons/tilebottomw.png", theme.fg_urgent) -theme.layout_tiletop = gears.color.recolor_image(themes_path .. "icons/tiletopw.png", theme.fg_urgent) -theme.layout_fairv = gears.color.recolor_image(themes_path .. "icons/fairvw.png", theme.fg_urgent) -theme.layout_fairh = gears.color.recolor_image(themes_path .. "icons/fairhw.png", theme.fg_urgent) -theme.layout_spiral = gears.color.recolor_image(themes_path .. "icons/spiralw.png", theme.fg_urgent) -theme.layout_dwindle = gears.color.recolor_image(themes_path .. "icons/dwindlew.png", theme.fg_urgent) -theme.layout_max = gears.color.recolor_image(themes_path .. "icons/maxw.png", theme.fg_urgent) -theme.layout_fullscreen = gears.color.recolor_image(themes_path .. "icons/fullscreenw.png", theme.fg_urgent) -theme.layout_magnifier = gears.color.recolor_image(themes_path .. "icons/magnifierw.png", theme.fg_urgent) -theme.layout_floating = gears.color.recolor_image(themes_path .. "icons/floatingw.png", theme.fg_urgent) -theme.layout_cornernw = gears.color.recolor_image(themes_path .. "icons/cornernw.png", theme.fg_urgent) -theme.layout_cornerne = gears.color.recolor_image(themes_path .. "icons/cornerne.png", theme.fg_urgent) -theme.layout_cornersw = gears.color.recolor_image(themes_path .. "icons/cornersw.png", theme.fg_urgent) -theme.layout_cornerse = gears.color.recolor_image(themes_path .. "icons/cornerse.png", theme.fg_urgent) +theme.layout_tile = gears.color.recolor_image(themes_path .. "icons/tilew.png", theme.fg_urgent) +theme.layout_centerwork = gears.color.recolor_image(themes_path .. "icons/centerworkw.png", theme.fg_urgent) +theme.layout_tileleft = gears.color.recolor_image(themes_path .. "icons/tileleftw.png", theme.fg_urgent) +theme.layout_tilebottom = gears.color.recolor_image(themes_path .. "icons/tilebottomw.png", theme.fg_urgent) +theme.layout_tiletop = gears.color.recolor_image(themes_path .. "icons/tiletopw.png", theme.fg_urgent) +theme.layout_fairv = gears.color.recolor_image(themes_path .. "icons/fairvw.png", theme.fg_urgent) +theme.layout_fairh = gears.color.recolor_image(themes_path .. "icons/fairhw.png", theme.fg_urgent) +theme.layout_spiral = gears.color.recolor_image(themes_path .. "icons/spiralw.png", theme.fg_urgent) +theme.layout_dwindle = gears.color.recolor_image(themes_path .. "icons/dwindlew.png", theme.fg_urgent) +theme.layout_max = gears.color.recolor_image(themes_path .. "icons/maxw.png", theme.fg_urgent) +theme.layout_fullscreen = gears.color.recolor_image(themes_path .. "icons/fullscreenw.png", theme.fg_urgent) +theme.layout_magnifier = gears.color.recolor_image(themes_path .. "icons/magnifierw.png", theme.fg_urgent) +theme.layout_floating = gears.color.recolor_image(themes_path .. "icons/floatingw.png", theme.fg_urgent) +theme.layout_cornernw = gears.color.recolor_image(themes_path .. "icons/cornernw.png", theme.fg_urgent) +theme.layout_cornerne = gears.color.recolor_image(themes_path .. "icons/cornerne.png", theme.fg_urgent) +theme.layout_cornersw = gears.color.recolor_image(themes_path .. "icons/cornersw.png", theme.fg_urgent) +theme.layout_cornerse = gears.color.recolor_image(themes_path .. "icons/cornerse.png", theme.fg_urgent) -- }}} return theme diff --git a/user/.config/awesome/ui/widgets/battery b/user/.config/awesome/ui/widgets/battery index 98e9043b4..9716086bd 100755 --- a/user/.config/awesome/ui/widgets/battery +++ b/user/.config/awesome/ui/widgets/battery @@ -8,21 +8,95 @@ elif [ "${currntpwr}" = "balanced" ]; then elif [ "${currntpwr}" = "power-saver" ]; then pwr=" - 󰾆 PowerSaver" fi + for battery in /sys/class/power_supply/BAT?*; do # If non-first battery, print a space separator. [ -n "${capacity+x}" ] && printf " " + # Sets up the status and capacity case "$(cat "$battery/status" 2>&1)" in - "Full") status="󱊣" ;; - "Discharging") status="󱊢" ;; - "Charging") status="󱊥" ;; - "Not charging") status="󱊥" ;; - "Unknown") status="󰂎" ;; + "Full") + status=" 󰁹" + ;; + "Discharging") + # Calculates the percentage of remaining charge + percentage="$(cat "$battery/capacity" 2>&1)" + # Updates the status icon based on the battery percentage + if [ "$percentage" -le 20 ] + then + status="󰁻" + elif [ "$percentage" -le 30 ] + then + status="󰁼" + elif [ "$percentage" -le 40 ] + then + status="󰁽" + elif [ "$percentage" -le 50 ] + then + status="󰁾" + elif [ "$percentage" -le 60 ] + then + status="󰁿" + elif [ "$percentage" -le 70 ] + then + status="󰂀" + elif [ "$percentage" -le 80 ] + then + status="󰂁" + elif [ "$percentage" -le 90 ] + then + status="󰂂" + else + status="󰁹" + fi + ;; + "Charging") + # Calculates the percentage of remaining charge + percentage="$(cat "$battery/capacity" 2>&1)" + # Updates the status icon based on the battery percentage while charging + if [ "$percentage" -le 10 ] + then + status="󰢜" + elif [ "$percentage" -le 20 ] + then + status="󰂆" + elif [ "$percentage" -le 30 ] + then + status="󰂇" + elif [ "$percentage" -le 40 ] + then + status="󰂈" + elif [ "$percentage" -le 50 ] + then + status="󰢝" + elif [ "$percentage" -le 60 ] + then + status="󰂉" + elif [ "$percentage" -le 70 ] + then + status="󰢞" + elif [ "$percentage" -le 80 ] + then + status="󰂊" + elif [ "$percentage" -le 90 ] + then + status="󰂋" + else + status="󰂅" + fi + ;; + "Not charging") + status="󰂃" + ;; + "Unknown") + status="󰂃" + ;; *) exit 1 ;; esac - capacity="$(cat "$battery/capacity" 2>&1)" + # Will make a warn variable if discharging and low - [ "$status" = "󰂎" ] && [ "$capacity" -le 100 ] && warn="" + [ "$status" = "󰁺" ] && [ "$percentage" -le 10 ] && warn="󱈸" + # Prints the info - printf "%s%s%d%%%s" "$status" "$warn " "$capacity" "$pwr"; unset warn + printf "%s%s%d%%%s" "$status" "$warn " "$percentage" "$pwr"; unset warn done && printf "\\n" diff --git a/user/.config/awesome/ui/widgets/brightness b/user/.config/awesome/ui/widgets/brightness index 64ad5d95f..e0e74f042 100755 --- a/user/.config/awesome/ui/widgets/brightness +++ b/user/.config/awesome/ui/widgets/brightness @@ -1,10 +1,24 @@ #!/bin/bash brt=$(xbacklight -get) -if [ "$brt" = "100.000000" ]; then - icon="󰃠" -elif [ "$brt" \> "50%.*" ]; then - icon="󰃟" -elif [ "$brt" \< "49%.*" ]; then - icon="󰃞" +if [ "${brt%.*}" -eq 100 ]; then + icon="󰛨" +elif [ "${brt%.*}" -ge 90 ]; then + icon="󱩖" +elif [ "${brt%.*}" -ge 80 ]; then + icon="󱩕" +elif [ "${brt%.*}" -ge 70 ]; then + icon="󱩔" +elif [ "${brt%.*}" -ge 60 ]; then + icon="󱩓" +elif [ "${brt%.*}" -ge 50 ]; then + icon="󱩒" +elif [ "${brt%.*}" -ge 40 ]; then + icon="󱩑" +elif [ "${brt%.*}" -ge 30 ]; then + icon="󱩐" +elif [ "${brt%.*}" -ge 20 ]; then + icon="󱩏" +else + icon="󱩎" fi echo "$icon ${brt%.*}%" diff --git a/user/.config/awesome/ui/widgets/layout b/user/.config/awesome/ui/widgets/layout index 09af16d43..94650ee9c 100755 --- a/user/.config/awesome/ui/widgets/layout +++ b/user/.config/awesome/ui/widgets/layout @@ -1,3 +1,3 @@ #!/bin/bash layout=$(setxkbmap -query | grep -oP 'layout:\s*\K\w+'); -echo "󰥻 $layout" | tr '[:lower:]' '[:upper:]'; +echo "󰌌 $layout" | tr '[:lower:]' '[:upper:]'; diff --git a/user/.config/awesome/ui/widgets/wifi b/user/.config/awesome/ui/widgets/wifi index 2051dae01..c8d97e791 100755 --- a/user/.config/awesome/ui/widgets/wifi +++ b/user/.config/awesome/ui/widgets/wifi @@ -1,11 +1,34 @@ #!/bin/bash + +get_wifi_strength() { + # Retrieves the wifi signal strength in dBm + strength=$(nmcli -t -f active,ssid,signal dev wifi | grep yes | cut -d ":" -f3) + # Converts dBm to percentage (0% to 100%) + if [ "$strength" -le 30 ]; then + echo "1" + elif [ "$strength" -le 60 ]; then + echo "2" + elif [ "$strength" -le 90 ]; then + echo "3" + else + echo "4" + fi +} + constate=$(nmcli dev | grep wifi | sed 's/ \{2,\}/|/g' | cut -d '|' -f3 | head -1) currentwfi=$(nmcli dev | grep wifi | sed 's/ \{2,\}/|/g' | cut -d '|' -f4 | head -1) if [ "$constate" = "disconnected" ]; then - echo "󰤮 " + echo " 󰤮 " elif [ "$constate" = "connected" ]; then - echo "󰤥 $currentwfi" + strength=$(get_wifi_strength) + case "$strength" in + "1") icon="󰤟 " ;; + "2") icon="󰤢 " ;; + "3") icon="󰤥 " ;; + "4") icon="󰤨 " ;; + esac + echo "$icon$currentwfi" else - echo "󰤮 " + echo "󰤮 " fi diff --git a/user/.config/lvim/config.lua b/user/.config/lvim/config.lua index 99e347642..fac60da46 100644 --- a/user/.config/lvim/config.lua +++ b/user/.config/lvim/config.lua @@ -1,3 +1,32 @@ +-- neovide options +vim.o.guifont = "mononoki Nerd Font:h08" +vim.g.neovide_hide_mouse_when_typing = true +vim.g.neovide_input_macos_alt_is_meta = true +vim.g.neovide_hide_mouse_when_typing = false +vim.g.neovide_refresh_rate = 60 +vim.g.neovide_refresh_rate_idle = 5 +vim.g.neovide_no_idle = true +vim.g.neovide_confirm_quit = true +vim.g.neovide_input_use_logo = true + +vim.g.neovide_cursor_antialiasing = true +vim.g.neovide_cursor_animate_in_insert_mode = true +vim.g.neovide_cursor_vfx_mode = "pixiedust" +vim.g.neovide_cursor_vfx_particle_speed = 20.0 + +vim.g.neovide_padding_top = 0 +vim.g.neovide_padding_bottom = 0 +vim.g.neovide_padding_right = 0 +vim.g.neovide_padding_left = 0 + +-- Helper function for transparency formatting +local alpha = function() + return string.format("%x", math.floor(255 * (vim.g.transparency or 0.9))) +end +vim.g.neovide_transparency = 0.9 +vim.g.transparency = 0.9 +vim.g.neovide_background_color = "#1d2021" .. alpha() + -- nvim options vim.opt.shiftwidth = 2 vim.opt.tabstop = 2 @@ -18,7 +47,7 @@ lvim.format_on_save = { -- change theme settings lvim.colorscheme = "gruvbox" -lvim.transparent_window = true +lvim.transparent_window = false lvim.builtin.alpha.active = true lvim.builtin.alpha.mode = "dashboard" lvim.builtin.terminal.active = true @@ -38,6 +67,30 @@ lvim.plugins = { { "CRAG666/code_runner.nvim" }, } +-- configuring colorscheme +require("gruvbox").setup({ + undercurl = true, + underline = true, + bold = false, + italic = { + strings = true, + comments = true, + operators = false, + folds = true, + }, + strikethrough = true, + invert_selection = false, + invert_signs = false, + invert_tabline = false, + invert_intend_guides = false, + inverse = true, -- invert background for search, diffs, statuslines and errors + contrast = "hard", -- can be "hard", "soft" or empty string + palette_overrides = {}, + overrides = {}, + dim_inactive = false, + transparent_mode = false, +}) + -- vimspector options vim.g.vimspector_enable_mappings = 'HUMAN' vim.g.vimspector_enable_mappings_for_mode = { @@ -59,17 +112,17 @@ require('code_runner').setup({ "rustc $fileName &&", "$dir/$fileNameWithoutExt" }, - cs = function(...) - local root_dir = require("lspconfig").util.root_pattern "*.csproj" (vim.loop.cwd()) - return "cd " .. root_dir .. " && dotnet run$end" - end, + cs = { + "cd '$dir' &&", + "dotnet run" + } }, }) -vim.keymap.set('n', 'r', ':RunCode', { noremap = true, silent = false }) -vim.keymap.set('n', 'rf', ':RunFile', { noremap = true, silent = false }) -vim.keymap.set('n', 'rft', ':RunFile tab', { noremap = true, silent = false }) -vim.keymap.set('n', 'rp', ':RunProject', { noremap = true, silent = false }) -vim.keymap.set('n', 'rc', ':RunClose', { noremap = true, silent = false }) -vim.keymap.set('n', 'crf', ':CRFiletype', { noremap = true, silent = false }) -vim.keymap.set('n', 'crp', ':CRProjects', { noremap = true, silent = false }) +lvim.keys.normal_mode["r"] = ":RunCode" +lvim.keys.normal_mode["rf"] = ":RunFile" +lvim.keys.normal_mode["rft"] = ":RunFile tab" +lvim.keys.normal_mode["rp"] = ":RunProject" +lvim.keys.normal_mode["rc"] = ":RunClose" +lvim.keys.normal_mode["crf"] = ":CRFiletype" +lvim.keys.normal_mode["crp"] = ":CRProjects" diff --git a/user/.config/picom/picom.conf b/user/.config/picom/picom.conf index 93031661e..3508ec61f 100644 --- a/user/.config/picom/picom.conf +++ b/user/.config/picom/picom.conf @@ -13,8 +13,8 @@ animation-for-unmap-window = "zoom" animation-for-menu-window = "zoom" animation-for-workspace-switch-out = "zoom" animation-for-workspace-switch-in = "zoom" -animation-stiffness = 300; -animation-dampening = 16; +animation-stiffness = 500; +animation-dampening = 20; animation-window-mass = 1; animation-clamping = true; animation-delta = 16; @@ -23,30 +23,30 @@ animation-delta = 16; ## Shadows shadow = false; -#shadow-radius = 8; -#shadow-opacity = .90 -#shadow-offset-x = -10; -#shadow-offset-y = -10; -# shadow-red = 0 -# shadow-green = 0 -# shadow-blue = 0 -# shadow-color = "#000000" -#shadow-exclude = [ -# "name = 'Notification'", -# "class_g = 'Conky'", -# "class_g ?= 'Notify-osd'", -# "class_g = 'Cairo-clock'", -# "_GTK_FRAME_EXTENTS@:c" -#]; +# shadow-radius = 8; +# shadow-opacity = .90 +# shadow-offset-x = -10; +# shadow-offset-y = -10; +# shadow-red = 0 +# shadow-green = 0 +# shadow-blue = 0 +# shadow-color = "#000000" +# shadow-exclude = [ +# "name = 'Notification'", +# "class_g = 'Conky'", +# "class_g ?= 'Notify-osd'", +# "class_g = 'Cairo-clock'", +# "_GTK_FRAME_EXTENTS@:c" +# ]; ## Fading fading = false; -#fade-in-step = 0.05; -#fade-out-step = 0.05; -#fade-delta = 8 -#fade-exclude = [] -#no-fading-openclose = false -#no-fading-destroyed-argb = false +# fade-in-step = 0.05; +# fade-out-step = 0.05; +# fade-delta = 8 +# fade-exclude = [] +# no-fading-openclose = false +# no-fading-destroyed-argb = false ## Transparency and opacity inactive-opacity = 1.00; @@ -55,8 +55,17 @@ inactive-opacity-override = false; focus-exclude = [ "class_g = 'Cairo-clock'" ]; # opaity-rule = [] +## Blur +blur-background = true; +blur-background-frame = true; +blur-background-fixed = true; +#blur-method = "dual_kawase"; +blur-kern = "3x3box"; +blur-method = "kawase"; +blur-strength = 2; + ## General Settings -backend = "xrender"; +backend = "glx"; vsync = true; dbe = false; detect-client-opacity = true; diff --git a/user/.config/rofi/scripts/rofi_power b/user/.config/rofi/scripts/rofi_power index 3f5658903..d619dbaaa 100755 --- a/user/.config/rofi/scripts/rofi_power +++ b/user/.config/rofi/scripts/rofi_power @@ -32,17 +32,17 @@ pwrs="$pwr1\n$pwr2\n$pwr3\n$pwr4" action=$(echo -e "$options" | $menu "  Power Options ") case "$action" in $option1) - pkill Hyprland;; + pkill X;; $option2) systemctl reboot || loginctl reboot;; $option3) systemctl poweroff || loginctl poweroff;; $option4) - swaylock -i "$currwall" & + betterlockscreen -l & sleep 0.1 systemctl suspend;; $option5) - swaylock -i "$currwall";; + betterlockscreen -l;; $option6) currentpwr=$(powerprofilesctl get) if [ "$currentpwr" = "performance" ]; then diff --git a/user/.config/rofi/scripts/rofi_scrot b/user/.config/rofi/scripts/rofi_scrot index 6641b74c1..a9d188834 100755 --- a/user/.config/rofi/scripts/rofi_scrot +++ b/user/.config/rofi/scripts/rofi_scrot @@ -9,55 +9,58 @@ mkdir -p "$HOME/Pictures/Screenshots" cd "$HOME/Pictures/Screenshots" || exit 0 ## CHOICES ## -cho1=" Entire screen" -cho2=" Entire screen with delay" -cho3=" Focused window" -cho4=" Select area" -chos="$cho1\n$cho2\n$cho3\n$cho4" +cho1="󱣴 Entire screen" +cho2="󱎫 Entire screen with delay" +cho3=" Focused window" +cho4="󱕻 Select area" +cho5="󱎘 Exit" +chos="$cho1\n$cho2\n$cho3\n$cho4\n$cho5" ## DELAY OPTIONS ## -del1=" 3 sec delay" -del2=" 5 sec delay" -del3=" 10 sec delay" +del1="󱑀 3 sec delay" +del2="󱑂 5 sec delay" +del3="󱑇 10 sec delay" dels="$del1\n$del2\n$del3" ## DELAY FUNCTION ## delays() { - del=$(echo -e "$dels" | rofi -dmenu -i -p "  Select Delay "); - case $del in - "$del1") - scrot -d 3 && notify-send "Screenshot saved";; - "$del2") - scrot -d 5 && notify-send "Screenshot saved";; - "$del3") - scrot -d 10 && notify-send "Screenshot saved" - esac + del=$(echo -e "$dels" | rofi -dmenu -i -p "  Select Delay "); + case $del in + "$del1") + scrot -d 3 && notify-send "Screenshot saved";; + "$del2") + scrot -d 5 && notify-send "Screenshot saved";; + "$del3") + scrot -d 10 && notify-send "Screenshot saved" + esac } ## ENTIRE SCREEN FUNCTION ## screen() { - scrot && notify-send "Screenshot saved" + scrot && notify-send "Screenshot saved" } ## FOCUSED WINDOW FUNCTION window() { - scrot -u -b && notify-send "Screenshot saved." + scrot -u -b && notify-send "Screenshot saved." } ## SELECTED AREA FUNCTION ## area() { - scrot -s && notify-send "Screenshot saved." + scrot -s && notify-send "Screenshot saved." } ## MAIN ACTION ## choice=$(echo -e "$chos" | rofi -dmenu -i -p "  Sreenshot Menu ") case $choice in - "$cho1") - screen;; - "$cho2") - delays;; - "$cho3") - window;; - "$cho4") - area + "$cho1") + screen;; + "$cho2") + delays;; + "$cho3") + window;; + "$cho4") + area;; + "$cho5") + exit 0 esac diff --git a/user/.config/rofi/scripts/rofi_wall b/user/.config/rofi/scripts/rofi_wall index db3e3dc06..39a6136c4 100755 --- a/user/.config/rofi/scripts/rofi_wall +++ b/user/.config/rofi/scripts/rofi_wall @@ -10,12 +10,12 @@ cd "$walldir" || exit ## SELECT PICTURE FUNCTION ## selectpic() { - wallpaper=$(fd -p "$walldir" | rofi -dmenu -i -p "Select a wallpaper:") - if [ "$wallpaper" ]; then - chosenwall=$wallpaper - else - exit 0 - fi + wallpaper=$(fd -p "$walldir" | rofi -dmenu -i -p " 󰋩 Select a wallpaper ") + if [ "$wallpaper" ]; then + chosenwall=$wallpaper + else + exit 0 + fi } selectpic @@ -28,17 +28,17 @@ option5="Scale" options="$option1\n$option2\n$option3\n$option4\n$option5" ## MAIN ACTION ## -action=$(echo -e "$options" | rofi -dmenu -i -p "Chose the format:") +action=$(echo -e "$options" | rofi -dmenu -i -p "  Chose the format ") case "$action" in - $option1*) - feh --bg-fill "$chosenwall";; - $option2*) - feh --bg-center "$chosenwall";; - $option3*) - feh --bg-tile "$chosenwall";; - $option4*) - feh --bg-max "$chosenwall";; - $option5*) - feh --bg-scale "$chosenwall";; + $option1*) + feh --bg-fill "$chosenwall";; + $option2*) + feh --bg-center "$chosenwall";; + $option3*) + feh --bg-tile "$chosenwall";; + $option4*) + feh --bg-max "$chosenwall";; + $option5*) + feh --bg-scale "$chosenwall";; esac exit 0 diff --git a/user/.config/rofi/scripts/rofi_wifi b/user/.config/rofi/scripts/rofi_wifi index 92eb351c7..76d1f293e 100755 --- a/user/.config/rofi/scripts/rofi_wifi +++ b/user/.config/rofi/scripts/rofi_wifi @@ -90,7 +90,7 @@ if [ -n "$cases" ]; then exit 0; fi;; $option5) - io.elementary.capnet-assist;; + "$BROWSER" http://networkcheck.kde.org;; $option6) exit 0; esac diff --git a/user/.config/vifm/scripts/README b/user/.config/vifm/scripts/README deleted file mode 100644 index 769495228..000000000 --- a/user/.config/vifm/scripts/README +++ /dev/null @@ -1,6 +0,0 @@ -This directory is dedicated for user-supplied scripts/executables. -vifm modifies its PATH environment variable to let user run those -scripts without specifying full path. All subdirectories are added -as well. File in a subdirectory overrules file with the same name -in parent directories. Restart might be needed to recognize files -in newly created or renamed subdirectories. \ No newline at end of file diff --git a/user/.config/vifm/vifmrc b/user/.config/vifm/vifmrc index ca5c53ffa..6be34863e 100644 --- a/user/.config/vifm/vifmrc +++ b/user/.config/vifm/vifmrc @@ -172,8 +172,8 @@ command! reload :write | restart " You can also add %CLEAR if you want to clear screen before running FUSE " program. -" Pdf -filextype *.pdf zathura %c %i &, apvlv %c, xpdf %c +" Pdf and cbz +filextype *.cbz,*.pdf zathura %c %i &, apvlv %c, xpdf %c fileviewer *.pdf \ pdftotext -nopgbrk %c -