From 4b12da69252c2e86d5ee2d04dfab7f259326e4e9 Mon Sep 17 00:00:00 2001 From: Kosh Date: Sat, 20 Apr 2024 23:45:18 +0530 Subject: [PATCH] / --- hypr/hyprland.conf | 22 +-- hypr/hyprlock.conf | 43 ++++++ nvim/lua/kosh/keymaps.lua | 2 + nvim/lua/kosh/options.lua | 12 ++ priv/priv | Bin 2139 -> 2159 bytes waybar/config.jsonc | 94 +++++++++++++ waybar/style.css | 276 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 440 insertions(+), 9 deletions(-) create mode 100644 hypr/hyprlock.conf create mode 100644 waybar/config.jsonc create mode 100644 waybar/style.css diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 74db50f..78b342c 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -19,15 +19,15 @@ monitor=,preferred,auto,auto # See https://wiki.hyprland.org/Configuring/Keywords/ for more # Execute your favorite apps at launch -exec-once = waybar # & hyprpaper & firefox +exec-once = waybar & mako # & hyprpaper & firefox # Source a file (multi-file configs) # source = ~/.config/hypr/myColors.conf # Set programs that you use -$terminal = kitty +$terminal = kitty --listen-on=unix:@"$(date +%s%N)" $fileManager = dolphin -$menu = dmenu +$menu = wofi --show drun # Some default env vars. env = XCURSOR_SIZE,24 @@ -47,6 +47,7 @@ input { natural_scroll = yes } + force_no_accel = true sensitivity = 0 # -1.0 to 1.0, 0 means no modification. } @@ -56,7 +57,7 @@ general { gaps_in = 5 gaps_out = 20 border_size = 2 - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg + col.active_border = rgba(BF40BFFF) rgba(33ccffee) 45deg col.inactive_border = rgba(595959aa) layout = dwindle @@ -115,14 +116,14 @@ gestures { misc { # See https://wiki.hyprland.org/Configuring/Variables/ for more - force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers + force_default_wallpaper = 2 # Set to 0 or 1 to disable the anime mascot wallpapers } # 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 = genius-optical-mouse + sensitivity = -1 } # Example windowrule v1 @@ -141,17 +142,20 @@ bind = $mainMod ALT, RETURN, exec, $terminal bind = ALT, F4, killactive, bind = $mainMod, M, exit, bind = $mainMod ALT, f, exec, firefox +bind = $mainMod CTRL ALT, f, exec, firefox -P "Porn" bind = $mainMod SHIFT, SPACE, togglefloating, bind = $mainMod, D, exec, $menu bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, E, togglesplit, # dwindle bind = $mainMod, ESCAPE, exec, wlogout # dwindle +bind = $mainMod, F11, fullscreen # dwindle +bind = , Print, exec, grim -g "$(slurp -d)" - | wl-copy # dwindle # Move focus with mainMod + arrow keys bind = $mainMod, h, movefocus, l bind = $mainMod, l, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d +bind = $mainMod, k, movefocus, u +bind = $mainMod, j, movefocus, d # Switch workspaces with mainMod + [0-9] bind = $mainMod, 1, workspace, 1 diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf new file mode 100644 index 0000000..190a717 --- /dev/null +++ b/hypr/hyprlock.conf @@ -0,0 +1,43 @@ +background { + monitor = + color = rgba(191, 64, 191, 0.25) + + # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations + blur_size = 7 + noise = 0.0117 + contrast = 0.8916 + brightness = 0.8172 + vibrancy = 0.1696 + vibrancy_darkness = 0.0 +} + +input-field { + monitor = + size = 200, 50 + outline_thickness = 3 + dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = false + dots_rounding = -1 # -1 default circle, -2 follow input-field rounding + outer_color = rgb(151515) + inner_color = rgb(200, 200, 200) + font_color = rgb(10, 10, 10) + fade_on_empty = true + fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered. + placeholder_text = Input Password... # Text rendered in the input box when it's empty. + hide_input = false + rounding = -1 # -1 means complete rounding (circle/oval) + check_color = rgb(204, 136, 34) + fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color + fail_text = $FAIL ($ATTEMPTS) # can be set to empty + fail_transition = 300 # transition time in ms between normal outer_color and fail_color + capslock_color = -1 + numlock_color = -1 + bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above) + invert_numlock = false # change color if numlock is off + swap_font_color = false # see below + + position = 0, -20 + halign = center + valign = center +} diff --git a/nvim/lua/kosh/keymaps.lua b/nvim/lua/kosh/keymaps.lua index 23dde8b..cd3b7b9 100644 --- a/nvim/lua/kosh/keymaps.lua +++ b/nvim/lua/kosh/keymaps.lua @@ -61,3 +61,5 @@ set_keymap("n", "mI", ":MagmaInit python", opts) set_keymap("n", "", ":call jukit#cells#jump_to_next_cell()", opts) set_keymap("n", "", ":call jukit#cells#jump_to_previous_cell()", opts) +set_keymap("n", "", ":call system('wl-copy', @\")", opts) +--nnoremap :call system("wl-copy", @") diff --git a/nvim/lua/kosh/options.lua b/nvim/lua/kosh/options.lua index 930a07f..5abfc6a 100644 --- a/nvim/lua/kosh/options.lua +++ b/nvim/lua/kosh/options.lua @@ -11,6 +11,18 @@ vim.opt.autoindent = true vim.opt.expandtab = true -- Converts tabs to spaces vim.opt.cb = unnamedplus -- Clipboard +vim.cmd [[ +let g:clipboard = { + \ 'copy': { + \ '+': ['wl-copy', '--trim-newline'], + \ '*': ['wl-copy', '--trim-newline'], + \ }, + \ 'paste': { + \ '+': ['wl-paste', '--no-newline'], + \ '*': ['wl-paste', '--no-newline'], + \ }, + \ } +]] vim.opt.mouse = "a" -- Mouse enable vim.opt.fileencoding = "utf-8" -- File encoding vim.opt.showtabline = 0 -- The top tabs diff --git a/priv/priv b/priv/priv index f67fa87b57d0ea93f0f776b8726bf6c6754fa70a..6c7d1e39c810cdd982119ed62ebc0a29741739fe 100644 GIT binary patch literal 2159 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 R&Lf-V(t`NkVN0G{)(wULDewRQ diff --git a/waybar/config.jsonc b/waybar/config.jsonc new file mode 100644 index 0000000..df38096 --- /dev/null +++ b/waybar/config.jsonc @@ -0,0 +1,94 @@ +{ + "layer": "top", + "position": "top", + "height": 35, + "spacing": 0, + "margin-top": 10, + "margin-bottom": 0, + + // Choose the order of the modules + + "modules-center": ["hyprland/workspaces", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "battery", "clock"], + + // Modules configuration + + "hyprland/workspaces": { + "disable-scroll": true, + "all-outputs": false, + "format": "{name}" + }, + "keyboard-state": { + "numlock": true, + "capslock": true, + "format": " {name} {icon}", + "format-icons": { + "locked": "", + "unlocked": "" + } + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "clock": { + // "timezone": "America/New_York", + "tooltip-format": "{:%Y %B}\n{calendar}", + "format-alt": "{:%Y-%m-%d}" + }, + "cpu": { + "format": "{usage}% ", + "tooltip": false + }, + "memory": { + "format": "{}% " + }, + "battery": { + "states": { + // "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% ", + "format-plugged": "{capacity}% ", + "format-alt": "{time} {icon}", + // "format-good": "", // An empty format will hide the module + // "format-full": "", + "format-icons": ["", "", "", "", ""] + }, + "battery#bat2": { + "bat": "BAT2" + }, + "network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "format-wifi": "{essid} ({signalStrength}%) ", + "format-ethernet": "Connected  ", + "tooltip-format": "{ifname} via {gwaddr} ", + "format-linked": "{ifname} (No IP) ", + "format-disconnected": "Disconnected ⚠", + "format-alt": "{ifname}: {ipaddr}/{cidr}", + "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu" + }, + "pulseaudio": { + // "scroll-step": 1, // %, can be a float + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}", + "format-bluetooth-muted": "{icon} {format_source}", + "format-muted": "{format_source}", + "format-source": "", + "format-source-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""] + }, + "on-click": "pavucontrol" + }, +} diff --git a/waybar/style.css b/waybar/style.css new file mode 100644 index 0000000..ea3b807 --- /dev/null +++ b/waybar/style.css @@ -0,0 +1,276 @@ +* { + border: none; + border-radius: 0px; + font-family: Roboto, Helvetica, Arial, sans-serif; + font-size: 10px; + min-height: 0; +} + +window#waybar { + background-color: transparent; + color: #ffffff; + transition-property: background-color; + transition-duration: .5s; +} + +window#waybar.hidden { + opacity: 0.2; +} + + +#workspaces button { + background: #1f1f1f; + color: #ffffff; + border-radius: 20px; + +} + +/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ +#workspaces button:hover { + background: lightblue; + color: black; + border-bottom: 3px solid #ffffff; + +} + +#workspaces button.active { + background: #ffffff; + color: black; +} + + +#workspaces button.active:hover { + background: lightblue; + color: black; + border-bottom: 3px solid #ffffff; + +} + + +#workspaces button.urgent { + background-color: #eb4d4b; +} + +#mode { + background-color: #64727D; + border-bottom: 3px solid #ffffff; +} + +#clock, +#battery, +#cpu, +#memory, +#disk, +#temperature, +#backlight, +#network, +#pulseaudio, +#custom-media, +#custom-launcher, +#custom-power, +#tray, +#mode, +#idle_inhibitor, +#mpd { + padding: 0 10px; + color: black; +} + +#window, +#workspaces { + margin: 0px 0px; +} + +/* If workspaces is the leftmost module, omit left margin */ +.modules-left > widget:first-child > #workspaces { + margin-left: 0px; +} + +/* If workspaces is the rightmost module, omit right margin */ +.modules-right > widget:last-child > #workspaces { + margin-right: 0px; +} + +#clock { + background-color: #FA8BFF; + background-image: linear-gradient(-45deg, #2BD2FF 0%, #FA8BFF 52%, #FA8BFF 90%); + color: black; + border-radius: 0px 20px 20px 0px; + margin-right: 4px; + +} + +#battery { + background-color: #FA8BFF; + color: #000000; +} + +#battery.charging, #battery.plugged { + color: #ffffff; + background-color: #26A65B; +} + +@keyframes blink { + to { + background-color: #ffffff; + color: #000000; + } +} + +#battery.critical:not(.charging) { + background-color: #f53c3c; + color: #ffffff; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} + +label:focus { + background-color: #000000; +} + +#cpu { + background-color: #FA8BFF; + color: black; +} + +#memory { + background-color: #FA8BFF; + color: black; +} + + +#network { + background-color: #FA8BFF; + color: black; +} + +#network.disconnected { + background-color: #FA8BFF; + color: red; +} + +#pulseaudio { + background-color: #FA8BFF; + color: black; +} + +#pulseaudio.muted { + background-color: #FA8BFF; + color: red; +} + +#custom-media { + background-color: #8EC5FC; + background-image: linear-gradient(62deg, #8EC5FC 0%, #E0C3FC 100%); + color: black; + border-radius: 20px; + margin-right: 5px; +} + +#custom-media.custom-spotify { + background-color: #8EC5FC; + background-image: linear-gradient(62deg, #8EC5FC 0%, #E0C3FC 100%); + color: black; + border-radius: 20px; + margin-right: 5px; + +} + +#custom-media.custom-vlc { + background-color: #8EC5FC; + background-image: linear-gradient(62deg, #8EC5FC 0%, #E0C3FC 100%); + color: black; + border-radius: 20px; + margin-right: 5px; +} + +#custom-power{ + background-color: #FA8BFF; + background-image: linear-gradient(45deg, #FA8BFF 0%, #2BD2FF 52%, #2BD2FF 90%); + font-size: 16px; + border-radius: 19px; + +} +#custom-launcher{ + background-color: #FA8BFF; + background-image: linear-gradient(-45deg, #FA8BFF 0%, #2BD2FF 52%, #2BD2FF 90%); + font-size: 18px; + border-radius: 20px; + +} + +#custom-updater { + background-color: #FA8BFF; + background-image: linear-gradient(45deg, #2BD2FF 0%, #2BD2FF 52%, #2BD2FF 90%); + color: black; +} + + +#temperature { + background-color: #FA8BFF; + background-image: linear-gradient(45deg, #2BD2FF 0%, #2BD2FF 52%, #2BD2FF 90%); + color: black; +} + +#temperature.critical { + background-color: #eb4d4b; +} + +#tray { + background-color: #FA8BFF; + background-image: linear-gradient(-45deg, #2BD2FF 0%, #2BD2FF 52%, #2BD2FF 90%); + color: black; +} + +#tray > .passive { + -gtk-icon-effect: dim; + background-color: #FA8BFF; + background-image: linear-gradient(-45deg, #FA8BFF 0%, #2BD2FF 52%, #2BD2FF 90%); + color: black; +} + +#tray > .needs-attention { + -gtk-icon-effect: highlight; + background-color: #FA8BFF; + background-image: linear-gradient(-45deg, #FA8BFF 0%, #2BD2FF 52%, #2BD2FF 90%); + color: black; +} + +#idle_inhibitor { + background-color: #FA8BFF; + background-image: linear-gradient(45deg, #2BD2FF 0%, #FA8BFF 52%, #FA8BFF 90%); + border-radius: 20px 0px 0px 20px; + +} + +#idle_inhibitor.activated { + background-color: #FA8BFF; + background-image: linear-gradient(45deg, #2BD2FF 0%, #FA8BFF 52%, #FA8BFF 90%); + color: black; + border-radius: 20px 0px 0px 20px; + +} + +#language { + background-color: #FA8BFF; + background-image: linear-gradient(45deg, #2BD2FF 0%, #2BD2FF 52%, #2BD2FF 90%); + color: black; + min-width: 16px; +} + +#keyboard-state { + background: #97e1ad; + color: #000000; + min-width: 16px; +} + +#keyboard-state > label { + padding: 0px 5px; +} + +#keyboard-state > label.locked { + background: rgba(0, 0, 0, 0.2); +}