diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index f10aac0..9dbbb33 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -188,11 +188,11 @@ #draw_bold_text_with_bright_colors: false # Colors (Tomorrow Night) -#colors: + colors: # Default colors - #primary: - # background: '#1d1f21' - # foreground: '#c5c8c6' + primary: + background: '#1d1f21' + foreground: '#c5c8c6' # Bright and dim foreground colors # @@ -209,9 +209,9 @@ # # Allowed values are CellForeground/CellBackground, which reference the # affected cell, or hexadecimal colors like #ff00ff. - #cursor: - # text: CellBackground - # cursor: CellForeground + cursor: + text: CellBackground + cursor: CellForeground # Vi mode cursor colors # @@ -219,100 +219,100 @@ # # Allowed values are CellForeground/CellBackground, which reference the # affected cell, or hexadecimal colors like #ff00ff. - #vi_mode_cursor: - # text: CellBackground - # cursor: CellForeground + vi_mode_cursor: + text: CellBackground + cursor: CellForeground - # Search colors - # - # Colors used for the search bar and match highlighting. - #search: - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. - #matches: - # foreground: '#000000' - # background: '#ffffff' - #focused_match: - # foreground: '#ffffff' - # background: '#000000' + # Search colors + # + # Colors used for the search bar and match highlighting. + search: + # Allowed values are CellForeground/CellBackground, which reference the + # affected cell, or hexadecimal colors like #ff00ff. + matches: + foreground: '#000000' + background: '#ffffff' + focused_match: + foreground: '#ffffff' + background: '#000000' - #bar: - # background: '#c5c8c6' - # foreground: '#1d1f21' + colors.footer_bar: + background: '#c5c8c6' + foreground: '#1d1f21' - # Keyboard regex hints - #hints: - # First character in the hint label + # Keyboard regex hints + hints: + # First character in the hint label + # + # Allowed values are CellForeground/CellBackground, which reference the + # affected cell, or hexadecimal colors like #ff00ff. + start: + foreground: '#1d1f21' + background: '#e9ff5e' + + # All characters after the first one in the hint label + # + # Allowed values are CellForeground/CellBackground, which reference the + # affected cell, or hexadecimal colors like #ff00ff. + end: + foreground: '#e9ff5e' + background: '#1d1f21' + + # Line indicator + # + # Color used for the indicator displaying the position in history during + # search and vi mode. + # + # By default, these will use the opposing primary color. + #line_indicator: + # foreground: None + # background: None + + # Selection colors + # + # Colors which should be used to draw the selection area. # # Allowed values are CellForeground/CellBackground, which reference the # affected cell, or hexadecimal colors like #ff00ff. - #start: - # foreground: '#1d1f21' - # background: '#e9ff5e' + selection: + text: CellBackground + background: CellForeground - # All characters after the first one in the hint label + # Normal colors + normal: + black: '#1d1f21' + red: '#cc6666' + green: '#b5bd68' + yellow: '#f0c674' + blue: '#81a2be' + magenta: '#b294bb' + cyan: '#8abeb7' + white: '#c5c8c6' + + # Bright colors + bright: + black: '#666666' + red: '#d54e53' + green: '#b9ca4a' + yellow: '#e7c547' + blue: '#7aa6da' + magenta: '#c397d8' + cyan: '#70c0b1' + white: '#eaeaea' + + # Dim colors # - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. - #end: - # foreground: '#e9ff5e' - # background: '#1d1f21' - - # Line indicator - # - # Color used for the indicator displaying the position in history during - # search and vi mode. - # - # By default, these will use the opposing primary color. - #line_indicator: - # foreground: None - # background: None - - # Selection colors - # - # Colors which should be used to draw the selection area. - # - # Allowed values are CellForeground/CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. - #selection: - # text: CellBackground - # background: CellForeground - - # Normal colors - #normal: - # black: '#1d1f21' - # red: '#cc6666' - # green: '#b5bd68' - # yellow: '#f0c674' - # blue: '#81a2be' - # magenta: '#b294bb' - # cyan: '#8abeb7' - # white: '#c5c8c6' - - # Bright colors - #bright: - # black: '#666666' - # red: '#d54e53' - # green: '#b9ca4a' - # yellow: '#e7c547' - # blue: '#7aa6da' - # magenta: '#c397d8' - # cyan: '#70c0b1' - # white: '#eaeaea' - - # Dim colors - # - # If the dim colors are not set, they will be calculated automatically based - # on the `normal` colors. - #dim: - # black: '#131415' - # red: '#864343' - # green: '#777c44' - # yellow: '#9e824c' - # blue: '#556a7d' - # magenta: '#75617b' - # cyan: '#5b7d78' - # white: '#828482' + # If the dim colors are not set, they will be calculated automatically based + # on the `normal` colors. + dim: + black: '#131415' + red: '#864343' + green: '#777c44' + yellow: '#9e824c' + blue: '#556a7d' + magenta: '#75617b' + cyan: '#5b7d78' + white: '#828482' # Indexed Colors # diff --git a/dunst/dunstrc b/dunst/dunstrc index 2e07a31..14e5885 100644 --- a/dunst/dunstrc +++ b/dunst/dunstrc @@ -4,7 +4,7 @@ ### Display ### # Which monitor should the notifications be displayed on. - monitor = 0 + monitor = 2 # Display notification on focused monitor. Possible modes are: # mouse: follow mouse pointer diff --git a/environment.d/envvars.conf b/environment.d/envvars.conf index ad8511b..159d8b4 100644 --- a/environment.d/envvars.conf +++ b/environment.d/envvars.conf @@ -1,4 +1,14 @@ +GTK_CSD=0 QT_QPA_PLATFORMTHEME=qt5ct +QT_WAYLAND_FORCE_DPI=96 +QT_AUTO_SCREEN_SCALE_FACTOR=0 +QT_WAYLAND_DISABLE_WINDOWDECORATION=1 +QT_SCALE_FACTOR=1 +QT_QPA_PLATFORM=wayland +XCURSOR_SIZE=24 WAYLAND_DISPLAY=wayland-1 XDG_CURRENT_DESKTOP=wlr GPG_TTY=$(tty) +PATH=$PATH:$HOME/.local/bin +TEXMFHOME=$HOME/.texmf +GTK_THEME=Adwaita:dark diff --git "a/eww/\\" "b/eww/\\" new file mode 100644 index 0000000..8734e74 --- /dev/null +++ "b/eww/\\" @@ -0,0 +1,541 @@ +/** EWW.SCSS +Created by saimoom **/ +*{ + all: unset; + font-family: feather; + font-family: DaddyTimeMono Nerd Font; +} + +/** General **/ +.bar_class { + background-color: #0f0f17; + border-radius: 10px; +} +.module { + margin: 0px 0px 0px 0px; + border-radius: 10px 10px 0px 10px; +} + +/** tooltip!! **/ +tooltip.background { + background-color: #0f0f17; + font-size: 14; + border-radius: 10px; + color: #bfc9db; +} + +tooltip label { + margin: 3px; +} + + +/** Widgets **/ + +.clock_time_sep { + font-size: 20; + color: #bfc9db; + margin: 0px 0px 1px 0px; +} +.clock_time_class, .clock_minute_class { + font-size: 24; +} +.clock_date_class { + font-size: 21; + margin: 0px 5px 0px 5px; + color: #d7beda; +} +.clock_minute_class { + margin: 0px 5px 0px 2px; + color: #bfc9db; +} +.clock_time_class { + color: #bfc9db; + font-weight: bold; + margin: 0px 0px 0px 8px; +} + + +.membar { + color: #e0b089; + background-color: #38384d; + border-radius: 10px; +} +.batbar { + color: #afbea2; + background-color: #38384d; + border-radius: 10px; +} +.brightbar trough highlight { + background-image: linear-gradient(to right, #e4c9af 30%, #f2cdcd 50%, #e0b089 100% *50); + border-radius: 10px; +} +.brightbar scale trough { + all: unset; + box-shadow: 0 6px 5px 2px #06060b; + background-color: #232232; + border-radius: 24px; + min-height: 10px; + min-width: 100px; + margin : 0px -15px 5px 0px; +} +.volbar trough highlight { + background-image: linear-gradient(to right, #afcee0 30%, #a1bdce 50%, #77a5bf 100% *50); + border-radius: 10px; +} + +.module_app_text { + font-size: 23; + margin: 2px 0px 0px 0px; +} +.bright_icon { + font-size: 22; + color: #e4c9af; + margin: 0px 10px 0px -10px; +} +.bright_icon_overlay { + font-size: 28; + color: #e4c9af; + background-size: cover; + background-position: center; + margin: 0px 27px 0px 3px; +} +.volume_icon { + font-size: 22; + color: #a1bdce; + margin: 0px 5px 0px 0px; +} +.module-wif { + font-size: 22; + color: #a1bdce; + border-radius: 100%; + margin: 0px 10px 0px 0px; +} +.module_essid { + font-size: 18; + color: #a1bdce; + margin: 0px 5px 0px -1px; +} + +.iconmem { + font-size: 23; + margin: 4px -3px 4px 0px; + color: #e0b089; +} +.mem_padding { + margin: 10px; +} +.iconbat { + font-size: 23; + color: #afbea2; +} + + +.separ { + color: #3e424f; + font-weight: bold; + font-size: 22px; + margin: 0px 0px 0px 0px; + } + +.mem_module { + background-color: #0f0f17; + border-radius: 16px; + margin: 0px 10px 0px 0px; + } +.bat_module { + background-color: #0f0f17; + border-radius: 16px; + margin: 0px 10px 0px 10px; + } + + +scale trough { + all: unset; + background-color: #22242b; + box-shadow: 0 2px 3px 2px #06060b; + border-radius: 16px; + min-height: 10px; + min-width: 70px; + margin: 0px 10px 0px 0px; +} + +.works { +font-size: 27px; +font-weight: normal; +margin: 0px 0px 0px 15px; +background-color: #0f0f17; +} + +.0 , .01, .02, .03, .04, .05, .06, +.011, .022, .033, .044, .055, .066{ + margin: 0px 10px 0px 0px; +} + +/* Unoccupied */ +.0 { +color: #3e424f; +} + +/* Occupied */ +.01, .02, .03, .04, .05, .06 { + color: #bfc9db; +} + +/* Focused */ +.011, .022, .033, .044, .055, .066 { + color: #a1bdce; +} + + +.song_cover_art { + background-size: cover; + background-position: center; + min-height: 24px; + min-width: 24px; + margin: 10px; + border-radius: 100px; +} + +.song { + color: #a1bdce; + font-size : 18px; + font-weight : bold; + margin : 3px 5px 0px 0px; +} + +.song_btn_play { + color: #a1bdce; + font-size : 28px; + margin : 3px 0px 0px 5px; + +} + + +.song_btn_prev, .song_btn_next { + color: #bfc9db; + font-size : 24px; + margin : 3px 0px 0px 5px; + +} +// Calendar +.cal { + border-radius: 10px; + background-color: #0f0f17; + font-family: JetBrainsMono Nerd Font; + font-size: 18px; + font-weight: normal; + +.cal-in { + padding: 0px 10px 0px 10px; + color: #bfc9db; + +.cal { + &.highlight { + padding: 20px; + } + + padding: 5px 5px 5px 5px; + margin-left: 10px; + } + } +} + +calender { + color: #bfc9db; +} +calendar:selected { + color: #a1bdce; +} + +calendar.header { +color: #a1bdce; +font-weight: bold; +} + +calendar.button { +color: #afbea2; +} + +calendar.highlight { +color: #a1bdce; +font-weight: bold; +} + +calendar:indeterminate { +color: #bfc9db; +} + + + + + + + +.sys_sep { + color: #38384d; + font-size: 18; + margin: 0px 10px 0px 10px; +} +.sys_text_bat_sub, .sys_text_mem_sub { + font-size: 16; + color: #bbc5d7; + margin: 5px 0px 0px 25px; +} +.sys_text_bat, .sys_text_mem { + font-size: 21; + font-weight: bold; + margin: 14px 0px 0px 25px; +} +.sys_icon_bat, .sys_icon_mem { + font-size: 30; + margin: 30px; +} +.sys_win { + border-radius: 10px; + background-color: #0f0f17; +} +.sys_bat { + color: #afbea2; + background-color: #38384d; + border-radius: 10px; +} +.sys_mem { + color: #e4c9af; + background-color: #38384d; + border-radius: 10px; +} +.sys_icon_bat, .sys_text_bat { + color: #afbea2; +} +.sys_icon_mem, .sys_text_mem { + color: #e4c9af; +} +.sys_bat_box { + border-radius: 16px; + margin: 15px 10px 10px 20px; + } +.sys_mem_box { + border-radius: 16px; + margin: 10px 10px 15px 20px; + } + + + + + + + +.music_pop { + background-color: #0f0f17; + border-radius: 16px; +} + .music_cover_art { + background-size: cover; + background-position: center; + min-height: 100px; + box-shadow: 5px 5px 5px 5px #06060b; + min-width: 170px; + margin: 20px; + border-radius: 20px; +} + +.music { + color: #a1bdce; + font-size : 20px; + font-weight : bold; + margin : 20px 0px 0px -15px; +} + +.music_artist { + color: #bbc5d7; + font-size : 16px; + font-weight : normal; + margin : 0px 0px 0px 0px; +} + +.music_btn_prev, .music_btn_play, .music_btn_next { + font-family: Iosevka Nerd Font; +} +.music_btn_prev { + color: #bbc5d7; + font-size : 32px; + font-weight : normal; + margin: 0px 0px 0px 0px; +} +.music_btn_play { + color: #a1bdce; + font-size : 48px; + font-weight : normal; + margin: 0px 0px 0px 0px; +} +.music_btn_next { + color: #bbc5d7; + font-size : 32px; + font-weight : normal; + margin: 0px 0px 0px 0px; +} + +.music_bar scale trough highlight { + all: unset; + background-image: linear-gradient(to right, #afcee0 30%, #a1bdce 50%, #77a5bf 100% *50); + border-radius: 24px; +} +.music_bar scale trough { + all: unset; + background-color: #232232; + box-shadow: 0 6px 5px 2px #06060b; + border-radius: 24px; + min-height: 13px; + min-width: 190px; + margin : -10px 10px 20px 0px; +} + +.audio-box { + background-color: #0f0f17; + border-radius: 16px; +} +.speaker_icon { + background-size: cover; + background-image: url('images/speaker.png'); + background-position: center; + min-height: 40px; + min-width: 45px; + margin: 10px 10px 5px 20px; + border-radius: 12px; +} + +.speaker_text { + color: #a1bdce; + font-size : 22px; + font-weight : bold; + margin: 5px 15px 0px 15px; +} +.bright_text { + color: #a1bdce; + font-size : 22px; + font-weight : bold; + margin: 5px 15px 0px 25px; +} + +.change_audio_box { + margin: 0px 0px 0px 10px; +} + +.change_audio { + color: #a1bdce; + margin: 0px 50px 0px 50px; + font-size: 30px; + font-weight: bold; +} + +.speaker_bar scale trough highlight { + all: unset; + background-image: linear-gradient(to right, #afcee0 30%, #a1bdce 50%, #77a5bf 100% *50); + border-radius: 24px; +} +.speaker_bar scale trough { + all: unset; + background-color: #232232; + box-shadow: 0 6px 5px 2px #06060b; + border-radius: 24px; + min-height: 10px; + min-width: 100px; + margin : 0px 0px 5px 0px; +} + + + + +.mic_icon { + background-size: cover; + background-image: url('images/mic.png'); + background-position: center; + min-height: 40px; + min-width: 45px; + margin: 5px 20px 20px 10px; + border-radius: 12px; +} + +.mic_text { + color: #a1bdce; + font-size : 26px; + font-weight : bold; + margin: 0px 0px 0px 0px; +} + +.mic_bar scale trough highlight { + all: unset; + background-image: linear-gradient(to right, #afcee0 30%, #a1bdce 50%, #77a5bf 100% *50); + border-radius: 24px; +} +.mic_bar scale trough { + all: unset; + box-shadow: 0 6px 5px 2px #06060b; + background-color: #232232; + border-radius: 24px; + min-height: 10px; + min-width: 100px; + margin :6px 0px 20px 0px; +} + +.audio_sep { + color: #38384d; + font-size: 18; + margin : 0px 0px 0px 0px; +} + +//cockpit stuff + +.cockpit_class { + all: unset; +} + +.cockpit_clock { + padding: 0px 30px 0px 30px; +} + +.cockpit_box { + background-color: #06060b; + border-radius: 10px; + margin: 5px; + padding: 0px 5px 0px 5px; + opacity: 0.85; +} + +.cockpit_button_shutdown { + color: red; + font-size: 30px; + margin: 5px; +} + +.cockpit_button_sleep { + color: blue; + font-size: 30px; + margin: 5px; +} + +.cockpit_button_restart { + color: green; + font-size: 30px; + margin: 5px; +} + +.song_info { + font-size: 20px; + color: grey; +} + +.album_cover { + margin: 30px 10px 30px 10px; + padding: 0px; + background-size: cover; + background-repeat: no-repeat; + background-position: 50% center; + border-radius: 10px; +} + +.cockpit_button_settings { + color: white; + font-size: 25px; + margin: 5px; +} diff --git a/eww/eww.scss b/eww/eww.scss index 4e77704..118deff 100644 --- a/eww/eww.scss +++ b/eww/eww.scss @@ -1,153 +1,109 @@ -/** EWW.SCSS -Created by saimoom **/ -*{ - all: unset; - font-family: feather; - font-family: DaddyTimeMono Nerd Font; +* { + all: unset; + font-family: feather; + font-family: DaddyTimeMono Nerd Font; } /** General **/ .bar_class { - background-color: #0f0f17; - border-radius: 10px; + background-color: #282828; + border-radius: 10px; } .module { - margin: 0px 0px 0px 0px; - border-radius: 10px 10px 0px 10px; + margin: 0px 0px 0px 0px; + border-radius: 10px 10px 0px 10px; } /** tooltip!! **/ tooltip.background { - background-color: #0f0f17; - font-size: 14; - border-radius: 10px; - color: #bfc9db; + background-color: #0f0f17; + font-size: 14; + border-radius: 10px; + color: #bfc9db; } tooltip label { - margin: 3px; + margin: 3px; } - /** Widgets **/ .clock_time_sep { - font-size: 20; - color: #bfc9db; - margin: 0px 0px 1px 0px; + font-size: 20; + color: #bfc9db; + margin: 0px 0px 1px 0px; } -.clock_time_class, .clock_minute_class { - font-size: 24; +.clock_time_class, +.clock_minute_class { + font-size: 24; } .clock_date_class { - font-size: 21; - margin: 0px 5px 0px 5px; - color: #d7beda; + font-size: 21; + margin: 0px 5px 0px 5px; + color: #d7beda; } .clock_minute_class { - margin: 0px 5px 0px 2px; - color: #bfc9db; + margin: 0px 5px 0px 2px; + color: #bfc9db; } .clock_time_class { - color: #bfc9db; - font-weight: bold; - margin: 0px 0px 0px 8px; + color: #bfc9db; + font-weight: bold; + margin: 0px 0px 0px 8px; } - .membar { color: #e0b089; background-color: #38384d; border-radius: 10px; } -.batbar { - color: #afbea2; - background-color: #38384d; - border-radius: 10px; -} -.brightbar trough highlight { - background-image: linear-gradient(to right, #e4c9af 30%, #f2cdcd 50%, #e0b089 100% *50); - border-radius: 10px; -} -.brightbar scale trough { - all: unset; - box-shadow: 0 6px 5px 2px #06060b; - background-color: #232232; - border-radius: 24px; - min-height: 10px; - min-width: 100px; - margin : 0px -15px 5px 0px; -} -.volbar trough highlight { - background-image: linear-gradient(to right, #afcee0 30%, #a1bdce 50%, #77a5bf 100% *50); - border-radius: 10px; -} .module_app_text { font-size: 23; margin: 2px 0px 0px 0px; } -.bright_icon { - font-size: 22; - color: #e4c9af; - margin: 0px 10px 0px -10px; -} + .bright_icon_overlay { font-size: 28; color: #e4c9af; - background-size: cover; - background-position: center; - margin: 0px 27px 0px 3px; + background-size: cover; + background-position: center; + margin: 0px 27px 0px 3px; } .volume_icon { - font-size: 22; - color: #a1bdce; + font-size: 22; + color: #a1bdce; margin: 0px 5px 0px 0px; } -.module-wif { - font-size: 22; - color: #a1bdce; - border-radius: 100%; +.module-blu { + font-size: 22; + color: #a1bdce; + border-radius: 100%; margin: 0px 10px 0px 0px; } -.module_essid { - font-size: 18; - color: #a1bdce; - margin: 0px 5px 0px -1px; -} .iconmem { - font-size: 23; - margin: 4px -3px 4px 0px; - color: #e0b089; -} -.mem_padding { - margin: 10px; -} -.iconbat { - font-size: 23; - color: #afbea2; + font-size: 23; + margin: 0px -3px 4px 8px; + color: #e0b089; } +.mem_padding { + margin: 10px; +} .separ { - color: #3e424f; - font-weight: bold; - font-size: 22px; - margin: 0px 0px 0px 0px; - } + color: #3e424f; + font-weight: bold; + font-size: 22px; + margin: 0px 0px 0px 0px; +} .mem_module { - background-color: #0f0f17; - border-radius: 16px; + background-color: #282828; + border-radius: 16px; margin: 0px 10px 0px 0px; - } -.bat_module { - background-color: #0f0f17; - border-radius: 16px; - margin: 0px 10px 0px 10px; - } - +} scale trough { all: unset; @@ -160,63 +116,62 @@ scale trough { } .works { -font-size: 27px; -font-weight: normal; -margin: 0px 0px 0px 15px; -background-color: #0f0f17; + font-size: 27px; + font-weight: normal; + margin: 0px 0px 0px 15px; + background-color: #282828; } -.0 , .01, .02, .03, .04, .05, .06, -.011, .022, .033, .044, .055, .066{ +.0, +.01, +.02, +.03, +.04, +.05, +.06, +.011, +.022, +.033, +.044, +.055, +.066 { margin: 0px 10px 0px 0px; } /* Unoccupied */ .0 { -color: #3e424f; + color: #3e424f; } /* Occupied */ -.01, .02, .03, .04, .05, .06 { +.01, +.02, +.03, +.04, +.05, +.06 { color: #bfc9db; } /* Focused */ -.011, .022, .033, .044, .055, .066 { +.011, +.022, +.033, +.044, +.055, +.066 { color: #a1bdce; } - .song_cover_art { - background-size: cover; - background-position: center; - min-height: 24px; - min-width: 24px; - margin: 10px; - border-radius: 100px; + background-size: cover; + background-position: center; + min-height: 24px; + min-width: 24px; + margin: 10px; + border-radius: 100px; } -.song { - color: #a1bdce; - font-size : 18px; - font-weight : bold; - margin : 3px 5px 0px 0px; -} - -.song_btn_play { - color: #a1bdce; - font-size : 28px; - margin : 3px 0px 0px 5px; - -} - - -.song_btn_prev, .song_btn_next { - color: #bfc9db; - font-size : 24px; - margin : 3px 0px 0px 5px; - -} // Calendar .cal { border-radius: 10px; @@ -225,13 +180,13 @@ color: #3e424f; font-size: 18px; font-weight: normal; -.cal-in { + .cal-in { padding: 0px 10px 0px 10px; color: #bfc9db; -.cal { - &.highlight { - padding: 20px; + .cal { + &.highlight { + padding: 20px; } padding: 5px 5px 5px 5px; @@ -241,180 +196,95 @@ color: #3e424f; } calender { - color: #bfc9db; + color: #bfc9db; } calendar:selected { color: #a1bdce; } calendar.header { -color: #a1bdce; -font-weight: bold; + color: #a1bdce; + font-weight: bold; } calendar.button { -color: #afbea2; + color: #afbea2; } calendar.highlight { -color: #a1bdce; -font-weight: bold; + color: #a1bdce; + font-weight: bold; } calendar:indeterminate { -color: #bfc9db; + color: #bfc9db; } - - - - - - .sys_sep { - color: #38384d; - font-size: 18; - margin: 0px 10px 0px 10px; + color: #38384d; + font-size: 18; + margin: 0px 10px 0px 10px; } -.sys_text_bat_sub, .sys_text_mem_sub { - font-size: 16; - color: #bbc5d7; - margin: 5px 0px 0px 25px; +.sys_text_mem_sub { + font-size: 16; + color: #bbc5d7; + margin: 5px 0px 0px 25px; } -.sys_text_bat, .sys_text_mem { - font-size: 21; - font-weight: bold; - margin: 14px 0px 0px 25px; +.sys_text_mem { + font-size: 21; + font-weight: bold; + margin: 14px 0px 0px 25px; } -.sys_icon_bat, .sys_icon_mem { - font-size: 30; - margin: 30px; +.sys_icon_mem { + font-size: 30; + margin: 30px; } .sys_win { border-radius: 10px; - background-color: #0f0f17; -} -.sys_bat { - color: #afbea2; - background-color: #38384d; - border-radius: 10px; + background-color: #0f0f17; } + .sys_mem { color: #e4c9af; - background-color: #38384d; + background-color: #38384d; border-radius: 10px; } -.sys_icon_bat, .sys_text_bat { - color: #afbea2; + +.sys_icon_mem, +.sys_text_mem { + color: #e4c9af; } -.sys_icon_mem, .sys_text_mem { - color: #e4c9af; -} -.sys_bat_box { - border-radius: 16px; - margin: 15px 10px 10px 20px; - } + .sys_mem_box { - border-radius: 16px; - margin: 10px 10px 15px 20px; - } - - - - - - - -.music_pop { - background-color: #0f0f17; - border-radius: 16px; -} - .music_cover_art { - background-size: cover; - background-position: center; - min-height: 100px; - box-shadow: 5px 5px 5px 5px #06060b; - min-width: 170px; - margin: 20px; - border-radius: 20px; -} - -.music { - color: #a1bdce; - font-size : 20px; - font-weight : bold; - margin : 20px 0px 0px -15px; -} - -.music_artist { - color: #bbc5d7; - font-size : 16px; - font-weight : normal; - margin : 0px 0px 0px 0px; -} - -.music_btn_prev, .music_btn_play, .music_btn_next { - font-family: Iosevka Nerd Font; -} -.music_btn_prev { - color: #bbc5d7; - font-size : 32px; - font-weight : normal; - margin: 0px 0px 0px 0px; -} -.music_btn_play { - color: #a1bdce; - font-size : 48px; - font-weight : normal; - margin: 0px 0px 0px 0px; -} -.music_btn_next { - color: #bbc5d7; - font-size : 32px; - font-weight : normal; - margin: 0px 0px 0px 0px; -} - -.music_bar scale trough highlight { - all: unset; - background-image: linear-gradient(to right, #afcee0 30%, #a1bdce 50%, #77a5bf 100% *50); - border-radius: 24px; -} -.music_bar scale trough { - all: unset; - background-color: #232232; - box-shadow: 0 6px 5px 2px #06060b; - border-radius: 24px; - min-height: 13px; - min-width: 190px; - margin : -10px 10px 20px 0px; + border-radius: 16px; + margin: 10px 10px 15px 20px; } .audio-box { - background-color: #0f0f17; - border-radius: 16px; + background-color: #0f0f17; + border-radius: 16px; } .speaker_icon { - background-size: cover; - background-image: url('images/speaker.png'); - background-position: center; - min-height: 40px; - min-width: 45px; - margin: 10px 10px 5px 20px; - border-radius: 12px; + background-size: cover; + background-image: url("images/speaker.png"); + background-position: center; + min-height: 40px; + min-width: 45px; + margin: 10px 10px 5px 20px; + border-radius: 12px; } .speaker_text { - color: #a1bdce; - font-size : 22px; - font-weight : bold; - margin: 5px 15px 0px 15px; + color: #a1bdce; + font-size: 22px; + font-weight: bold; + margin: 5px 15px 0px 15px; } .bright_text { - color: #a1bdce; - font-size : 22px; - font-weight : bold; - margin: 5px 15px 0px 25px; + color: #a1bdce; + font-size: 22px; + font-weight: bold; + margin: 5px 15px 0px 25px; } .change_audio_box { @@ -422,72 +292,79 @@ color: #bfc9db; } .change_audio { - color: #a1bdce; + color: #a1bdce; margin: 0px 50px 0px 50px; font-size: 30px; font-weight: bold; } .speaker_bar scale trough highlight { - all: unset; - background-image: linear-gradient(to right, #afcee0 30%, #a1bdce 50%, #77a5bf 100% *50); - border-radius: 24px; + all: unset; + background-image: linear-gradient( + to right, + #afcee0 30%, + #a1bdce 50%, + #77a5bf 100% * 50 + ); + border-radius: 24px; } .speaker_bar scale trough { - all: unset; - background-color: #232232; - box-shadow: 0 6px 5px 2px #06060b; - border-radius: 24px; - min-height: 10px; - min-width: 100px; - margin : 0px 0px 5px 0px; + all: unset; + background-color: #232232; + box-shadow: 0 6px 5px 2px #06060b; + border-radius: 24px; + min-height: 10px; + min-width: 100px; + margin: 0px 0px 5px 0px; } - - - .mic_icon { - background-size: cover; - background-image: url('images/mic.png'); - background-position: center; - min-height: 40px; - min-width: 45px; - margin: 5px 20px 20px 10px; - border-radius: 12px; + background-size: cover; + background-image: url("images/mic.png"); + background-position: center; + min-height: 40px; + min-width: 45px; + margin: 5px 20px 20px 10px; + border-radius: 12px; } .mic_text { - color: #a1bdce; - font-size : 26px; - font-weight : bold; - margin: 0px 0px 0px 0px; + color: #a1bdce; + font-size: 26px; + font-weight: bold; + margin: 0px 0px 0px 0px; } .mic_bar scale trough highlight { - all: unset; - background-image: linear-gradient(to right, #afcee0 30%, #a1bdce 50%, #77a5bf 100% *50); - border-radius: 24px; + all: unset; + background-image: linear-gradient( + to right, + #afcee0 30%, + #a1bdce 50%, + #77a5bf 100% * 50 + ); + border-radius: 24px; } .mic_bar scale trough { - all: unset; - box-shadow: 0 6px 5px 2px #06060b; - background-color: #232232; - border-radius: 24px; - min-height: 10px; - min-width: 100px; - margin :6px 0px 20px 0px; + all: unset; + box-shadow: 0 6px 5px 2px #06060b; + background-color: #232232; + border-radius: 24px; + min-height: 10px; + min-width: 100px; + margin: 6px 0px 20px 0px; } .audio_sep { - color: #38384d; - font-size: 18; - margin : 0px 0px 0px 0px; + color: #38384d; + font-size: 18; + margin: 0px 0px 0px 0px; } //cockpit stuff .cockpit_class { - all: unset; + all: unset; } .cockpit_clock { @@ -496,14 +373,14 @@ color: #bfc9db; .cockpit_box { background-color: #06060b; - border-radius: 10px; + border-radius: 10px; margin: 5px; padding: 0px 5px 0px 5px; opacity: 0.85; } .cockpit_button_shutdown { - color: red; + color: red; font-size: 40px; margin: 0px 5px -30px 5px; } @@ -521,7 +398,7 @@ color: #bfc9db; } .song_info { - margin: -50px 0px 0px 0px; + margin: -50px 0px 0px 0px; font-size: 20px; color: grey; } @@ -536,22 +413,22 @@ color: #bfc9db; } .cockpit_button_settings { - color: #D35D6E; + color: #d35d6e; font-size: 35px; margin: -30px 5px 0px 5px; } .weather-icon { font-size: 80px; - margin: 10px 0px 35px 25px; + margin: 10px 0px 5px 10px; font-family: Iosevka; } .weather-stat { font-size: 30px; font-weight: bold; - color: #D35D6E; - margin: -20px 0px 10px 0px; + color: #d35d6e; + margin: -5px 0px 10px 50px; } .temperature { @@ -561,41 +438,41 @@ color: #bfc9db; margin: 0px 0px 0px 20px; } .weather-quote { - margin: 30px -5px 0px 20px; + margin: 20px 10px 1000px 10px; font-size: 20px; - } -.weather-quote-head, .weather-quote-tail { +.weather-quote-head, +.weather-quote-tail { color: grey; font-size: 18px; - margin: 10px 0px 10px 10px; + margin: 0px 0px 10px 0px; } .cockpit_clock_left { font-size: 50px; font-weight: bold; - color: #D35D6E; + color: #d35d6e; margin: 5px -20px -30px 0px; } .cockpit_clock_right { font-size: 50px; font-weight: bold; - color: #D35D6E; + color: #d35d6e; margin: 5px 0px -30px -20px; } .cockpit_date { font-size: 50px; font-weight: bold; - color: #D35D6E; + color: #d35d6e; margin: -30px -20px 0px -20px; } .cockpit_clock_sep { font-size: 40px; font-weight: bold; - color: #D35D6E; + color: #d35d6e; margin: 0px -20px -30px -20px; } @@ -619,15 +496,15 @@ color: #bfc9db; } .cockpit_sep_bottom { - color: #38384d; - font-size: 18; - margin : -10px 0px 0px 0px; + color: #38384d; + font-size: 18; + margin: -10px 0px 0px 0px; padding: 0px; } .cockpit_sep_top { - color: #38384d; - font-size: 18; - margin : 0px 0px -10px 0px; + color: #38384d; + font-size: 18; + margin: 0px 0px -10px 0px; padding: 0px; } diff --git a/eww/eww.yuck b/eww/eww.yuck index 2bbd231..81080a2 100644 --- a/eww/eww.yuck +++ b/eww/eww.yuck @@ -1,17 +1,11 @@ ;; date definitions ;; -(defpoll clock_time :interval "5m" "date +\%I") +(defpoll clock_time :interval "1m" "date +\%I") (defpoll clock_minute :interval "5s" "date +\%M") -(defpoll clock_date :interval "10h" "date '+%d/%m'") +(defpoll clock_date :interval "1h" "date '+%d/%m'") ;; volume definitions ;; (defpoll volume_percent :interval "1s" "pactl get-sink-volume @DEFAULT_SINK@ | awk -F '/' ' { print $2 } ' | tr -d ' %'") (defpoll mic_percent :interval "1s" "pactl get-source-volume @DEFAULT_SOURCE@ | awk -F'/' '{ print $2 }' | tr -d ' %'") -(defpoll brightness_percent :interval "5s" "brightnessctl -m -d intel_backlight | awk -F, '{print substr($4, 0, length($4)-1)}' | tr -d '%'") - -;; battery definitions ;; -(defpoll battery_status :interval "5s" "./scripts/battery stat") -(defpoll battery-capacity :interval "5s" "scripts/battery percent") -(defpoll battery :interval "5s" "scripts/battery icon") ;; memory definitions ;; (defpoll memory :interval "15s" "scripts/memory") @@ -19,30 +13,22 @@ (defpoll memory_total_mb :interval "2m" "scripts/mem-ad total") (defpoll memory_free_mb :interval "2m" "scripts/mem-ad free") -;; wifi definitions ;; -(defpoll COL_WLAN :interval "1m" "~/.config/eww/scripts/wifi --COL") -(defpoll ESSID_WLAN :interval "1m" "~/.config/eww/scripts/wifi --ESSID") -(defpoll WLAN_ICON :interval "1m" "~/.config/eww/scripts/wifi --ICON") - ;; music definitions ;; (defpoll Song_info :interval "2s" "scripts/music_control") (defpoll Thumbnail :interval "2s" "scripts/music_control2") -;; current window ;; -;;(defpoll currentWindow :interval "100ms" "hyprctl activewindow | grep class | awk -F ':' '{ print $2 }'") - ;; calendar definitions ;; (defpoll calendar_day :interval "20h" "date '+%d'") (defpoll calendar_year :interval "20h" "date '+%Y'") ;; Weather vars - (defpoll weather-interval :interval "20m" "scripts/weather") - (defpoll weather-icon :interval "20m" "cat ~/.cache/weather/weather-icon") - (defpoll temperature :interval "20m" "cat ~/.cache/weather/weather-degree") - (defpoll weather-hex :interval "20m" "cat ~/.cache/weather/weather-hex") - (defpoll weather-stat :interval "20m" "cat ~/.cache/weather/weather-stat") - (defpoll weather-stat-side :interval "20m" "~/.config/eww/scripts/weather-trimmer") - (defpoll weather-quote :interval "20m" "~/.config/eww/scripts/getwethquote") +(defpoll weather-icon :interval "21m" "cat ~/.cache/weather/weather-icon") +(defpoll temperature :interval "21m" "cat ~/.cache/weather/weather-degree") +(defpoll weather-hex :interval "21m" "cat ~/.cache/weather/weather-hex") +(defpoll weather-stat :interval "21m" "cat ~/.cache/weather/weather-stat") +(defpoll weather-stat-side :interval "21m" "~/.config/eww/scripts/weather-trimmer") +(defpoll weather-quote :interval "21m" "~/.config/eww/scripts/getwethquote") +(defpoll weather-quote2 :interval "21m" "~/.config/eww/scripts/getwethquote2") ;; simple variables ;; (defvar eww "$HOME/.local/bin/eww -c $HOME/.config/eww") @@ -51,45 +37,21 @@ (defvar music_reveal false) (defvar wifi_rev false) (defvar time_rev false) +(defvar current_monitor 0) (deflisten workspace "scripts/workspace") (deflisten currentName "scripts/current_name") ;; widgets - - -;; wifi ;; -(defwidget wifi [] - (eventbox :onhover "${eww} update wifi_rev=true" - :onhoverlost "${eww} update wifi_rev=false" - (box :vexpand "false" :hexpand "false" :space-evenly "false" - (button :class "module-wif" :onclick "hyprctl dispatch exec 'alacritty -e nmtui'" :wrap "false" :limit-width 12 :style "color: ${COL_WLAN};" WLAN_ICON) - (revealer :transition "slideright" - :reveal wifi_rev - :duration "350ms" - (button :class "module_essid" :onclick "hyprctl dispatch exec 'alacritty -e nmtui'" :wrap "false" :limit-width 12 :style "color: ${COL_WLAN};" ESSID_WLAN))))) - (defwidget bluetooth [] (box :vexpand "false" :hexpand "false" :space-evenly "false" - (button :class "module-wif" :onclick "hyprctl dispatch exec 'blueman-manager'" :wrap "false" :limit-width 12 :style "color: ${COL_WLAN};" "") + (button :class "module-blu" :onclick "hyprctl dispatch exec 'blueman-manager'" :wrap "false" :limit-width 12 "") )) ;; workspaces ;; (defwidget workspaces [] (literal :content workspace)) - -;; Battery ;; -(defwidget bat [] - (box :class "bat_module" :vexpand "false" :hexpand "false" - (button - :class "iconbat" - :tooltip "Battery: ${battery-capacity}%" - :show_truncated false - :onclick "$HOME/.config/eww/scripts/pop system" - :wrap false - "${battery}"))) - ;; memory ;; (defwidget mem [] (box :class "mem_module" :vexpand "false" :hexpand "false" @@ -104,7 +66,6 @@ (label :class "mem_padding" :text "") )))) - ;; seperator ;; (defwidget sep [] (box :class "module-2" :vexpand "false" :hexpand "false" @@ -128,52 +89,8 @@ ;; speaker volume ;; (defwidget volume [] - ;;(eventbox :onhover "${eww} update vol_reveal=true" - ;; :onhoverlost "${eww} update vol_reveal=false" (box :class "module-2" :space-evenly "false" :orientation "h" :spacing "3" (button :onclick "scripts/pop audio" :class "volume_icon" ""))) - ;;(revealer :transition "slideleft" - ;; :reveal vol_reveal - ;; :duration "350ms" - ;;(scale :class "volbar" - ;; :value volume_percent - ;; :orientation "h" - ;; :tooltip "${volume_percent}%" - ;; :max 100 - ;; :min 0 - ;; :onchange "scripts/change-volume sink {}%" ))) - -;; screen brightness ;; -(defwidget bright [] - ;;(eventbox :onhover "${eww} update br_reveal=true" :onhoverlost "${eww} update br_reveal=false" - (box :class "module-2" :space-evenly "false" :orientation "h" :spacing "3" - (button :onclick "scripts/pop brightness" :class "bright_icon" ""))) - ;;(revealer :transition "slideleft" - ;; :reveal br_reveal - ;; :duration "350ms" -;; (scale :class "brightbar" -;; :value brightness_percent -;; :orientation "h" -;; :tooltip "${brightness_percent}%" -;; :max 100 -;; :min 0 -;; :onchange "brightnessctl set {}%" ))) - -;; brightness widget ;; -(defwidget brightness_overlay [] - (eventbox :onhover "scripts/pop hoverCreate" - :onhoverlost "scripts/pop hoverGet brightness_window" - (box :class "audio-box" :halign "center" :orientation "v" :vexpand "false" :hexpand "false" - (label :class "speaker_text" :text "brightness" :halign "left" ) - (box :class "brightbar" :halign "center" :vexpand "false" :hexpand "false" - (label :class "bright_icon_overlay" :text "") - (scale :value brightness_percent - :space-evenly "false" - :orientation "h" - :onchange "brightnessctl set {}%" - :tooltip "brightness on ${brightness_percent}%" - :max 100 - :min 0))))) ;; audio volume widget ;; (defwidget audio [] @@ -205,19 +122,6 @@ :onchange "pactl set-source-volume @DEFAULT_SOURCE@ {}%" :max 100 :min 0)))) - (label :text "" :class "audio_sep" :halign "center") - (box :halign "center" :space-evenly "false" :hexpand "false" :vexpand "false" - (label :class "bright_icon_overlay" :orientation "v" :text "") - (box :orientation "v" :halign "center" :vexpand "false" :hexpand "false" - (label :class "bright_text" :text "lux" :valign "center" :halign "right" ) - (box :class "brightbar" :halign "center" :vexpand "false" :hexpand "false" - (scale :value brightness_percent - :space-evenly "false" - :orientation "h" - :tooltip "brightness ${brightness_percent}%" - :onchange "brightnessctl set {}%" - :max 100 - :min 0)))) (label :text "" :class "audio_sep" :halign "center") (box :class "change_audio_box" :halign "center" :spac`e-evenly "false" :hexpand "false" :vexpand "false" (box :class "change_audio" :orientation "v" :halign "left" @@ -226,21 +130,6 @@ (button :onclick "scripts/change-audio bluetooth" "")) )))) -;; Music ;; -;;(defwidget music [] -;; (eventbox :onhover "${eww} update music_reveal=true" -;;;; :onhoverlost "${eww} update music_reveal=false" -;; (box :class "module-2" :orientation "h" :space-evenly "false" :vexpand "false" :hexpand "false" -;; (box :class "song_cover_art" :vexpand "false" :hexpand "false" :style "background-image: url('${cover_art}');") -;; (button :class "song" :wrap "true" :onclick "~/.config/eww/scripts/pop music" song) -;; (revealer :transition "slideright" -;; :reveal music_reveal -;; :duration "350ms" -;; (box :vexpand "false" :hexpand "false" :oreintation "h" -;; (button :class "song_btn_prev" :onclick "~/.config/eww/scripts/music_info --prev" "") -;; (button :class "song_btn_play" :onclick "~/.config/eww/scripts/music_info --toggle" song_status) -;; (button :class "song_btn_next" :onclick "~/.config/eww/scripts/music_info --next" "")))))) - (defwidget cname [] (literal :content currentName)) @@ -254,54 +143,10 @@ :day calendar_day :year calendar_year))))) -;; Music again.. ;; -;;(defwidget music_pop [] -;; (box :class "music_pop" :orientation "h" :space-evenly "false" :vexpand "false" :hexpand "false" -;; (box :class "music_cover_art" :vexpand "false" :hexpand "false" :style "background-image: url('${cover_art}');") -;; (box :orientation "v" :spacing 20 :space-evenly "false" :vexpand "false" :hexpand "false" -;; (label :halign "center" :class "music" :wrap "true" :limit-width 13 :text song) -;; (label :halign "center" :class "music_artist" :wrap "true" :limit-width 15 :text song_artist) -;; (box :orientation "h" :spacing 15 :halign "center" :space-evenly "false" :vexpand "false" :hexpand "false" -;; (button :class "music_btn_prev" :onclick "~/.config/eww/scripts/music_info --prev" "") -;; (button :class "music_btn_play" :onclick "~/.config/eww/scripts/music_info --toggle" song_status) -;; (button :class "music_btn_next" :onclick "~/.config/eww/scripts/music_info --next" "")) -;; (box :class "music_bar" :halign "center" :vexpand "false" :hexpand "false" :space-evenly "false" -;; (scale :onscroll "mpc -q seek {}" :min 0 :active "true" :max 100 :value current_status))))) - - (defwidget system [] (eventbox :onhover "scripts/pop hoverCreate" :onhoverlost "scripts/pop hoverGet system" (box :class "sys_win" :orientation "v" :space-evenly "false" :hexpand "false" :vexpand "false" :spacing 0 - (box :class "sys_bat_box" :orientation "h" :space-evenly "false" - (circular-progress :value battery-capacity - :class "sys_bat" - :thickness 9 - (label :text "" - :class "sys_icon_bat" - :limit-width 2 - :show_truncated false - :wrap false)) - (box :orientation "v" :space-evenly "false" :spacing 0 :hexpand "false" :vexpand "false" - (label :text "battery" - :halign "start" - :class "sys_text_bat" - :limit-width 9 - :show_truncated false - :wrap false) - (label :text "${battery-capacity}%" - :halign "start" - :class "sys_text_bat_sub" - :limit-width 22 - :show_truncated false - :wrap false) - (label :text "${battery_status}" - :halign "start" - :class "sys_text_bat_sub" - :limit-width 22 - :show_truncated false - :wrap false))) - (label :text "" :class "sys_sep" :halign "center") (box :class "sys_mem_box" :orientation "h" :space-evenly "false" :halign "start" (circular-progress :value memory :class "sys_mem" @@ -389,10 +234,8 @@ :halign "end" :class "left_modules" (volume) -(wifi) (bluetooth) (sep) -(bat) (mem) (sep) (clock_module))) @@ -421,6 +264,9 @@ (center) (left) )) + + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Drawing Windows ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -441,25 +287,10 @@ :y "2px" :anchor "top right" :width "250px" - :height "330px") + :height "230px") :stacking "overlay" (audio)) -(defwindow brightness_window - :monitor 0 - :geometry (geometry :x "250px" - :y "2px" - :anchor "top right" - :width "280px" - :height "60px") - :stacking "overlay" -(brightness_overlay)) - -;; music again .. ;; -;; (defwindow music_win :stacking "fg" :focusable "false" :screen 1 -;; :geometry (geometry :x "0" :y "7%" :width 428 :height 104 :anchor "top center") -;; (music_pop)) - (defwindow system :monitor 0 :geometry (geometry :x "50px" @@ -475,20 +306,47 @@ :monitor 0 :geometry (geometry :x "0%" :y "1px" - :width "99%" + :width "3417px" :height "20px" :anchor "top center") - :stacking "bg" + :stacking "bottom" :wm-ignore false :exclusive true (bar_1)) -;; draw the bar ;; -(defwindow cockpit_window +;; draw the cockpit monitor 0 ;; +(defwindow cockpit_window_0 :monitor 0 - :geometry (geometry + :geometry (geometry :x "1470px" + :y "420px" :width "600px" - :height "500px" + :height "400px" + :anchor "center") + :stacking "overlay" + :wm-ignore false + :exclusive true + (cockpit)) + + +;; draw the cockpit monitor 1 ;; +(defwindow cockpit_window_1 + :monitor 1 + :geometry (geometry + :width "600px" + :height "400px" + :anchor "center") + :stacking "overlay" + :wm-ignore false + :exclusive true + (cockpit)) + + +;; draw the cockpit monitor 2 ;; +(defwindow cockpit_window_2 + :monitor 2 + :geometry (geometry + :width "600px" + :height "400px" :anchor "center") :stacking "overlay" :wm-ignore false diff --git a/eww/scripts/cockpit_toggle b/eww/scripts/cockpit_toggle index df1c220..d23fb76 100755 --- a/eww/scripts/cockpit_toggle +++ b/eww/scripts/cockpit_toggle @@ -1,8 +1,11 @@ #! /bin/bash -ISOPEN=$(eww windows | grep "*cockpit") +ISOPEN=$(eww windows | grep "*cockpit" | tr -d '*') + + if [ "$ISOPEN" = "" ]; then - eww open cockpit_window +MONITOR=$(hyprctl monitors | grep -B 7 "focused: yes" | grep "ID" | awk -F '(' ' { print $2 } ' | tr -d 'ID ):') + eww open cockpit_window_"$MONITOR" else - eww close cockpit_window + eww close "$ISOPEN" fi diff --git a/eww/scripts/home/dashie/.cache/weather/weather-degree b/eww/scripts/home/dashie/.cache/weather/weather-degree new file mode 100644 index 0000000..b9dd641 --- /dev/null +++ b/eww/scripts/home/dashie/.cache/weather/weather-degree @@ -0,0 +1 @@ +8°C diff --git a/eww/scripts/home/dashie/.cache/weather/weather-hex b/eww/scripts/home/dashie/.cache/weather/weather-hex new file mode 100644 index 0000000..4473fae --- /dev/null +++ b/eww/scripts/home/dashie/.cache/weather/weather-hex @@ -0,0 +1 @@ +#adadff diff --git a/eww/scripts/home/dashie/.cache/weather/weather-icon b/eww/scripts/home/dashie/.cache/weather/weather-icon new file mode 100644 index 0000000..e93d772 --- /dev/null +++ b/eww/scripts/home/dashie/.cache/weather/weather-icon @@ -0,0 +1 @@ + diff --git a/eww/scripts/home/dashie/.cache/weather/weather-quote b/eww/scripts/home/dashie/.cache/weather/weather-quote new file mode 100644 index 0000000..1033f21 --- /dev/null +++ b/eww/scripts/home/dashie/.cache/weather/weather-quote @@ -0,0 +1 @@ +It's cloudy, sort of gloomy \nYou'd better get a book to read... diff --git a/eww/scripts/home/dashie/.cache/weather/weather-stat b/eww/scripts/home/dashie/.cache/weather/weather-stat new file mode 100644 index 0000000..c3806e2 --- /dev/null +++ b/eww/scripts/home/dashie/.cache/weather/weather-stat @@ -0,0 +1 @@ +Overcast Clouds diff --git a/eww/scripts/pop b/eww/scripts/pop index 133b55c..0a39794 100755 --- a/eww/scripts/pop +++ b/eww/scripts/pop @@ -29,7 +29,7 @@ run() { ${EWW_BIN} -c $HOME/.config/eww open system } -# Open widgets +# Open system if [[ ! -f "$LOCK_FILE_MEM" ]]; then ${EWW_BIN} -c $HOME/.config/eww close calendar music_win audio_ctl brightness touch "$LOCK_FILE_MEM" diff --git a/eww/scripts/spotifyd b/eww/scripts/spotifyd deleted file mode 100755 index fc35a11..0000000 --- a/eww/scripts/spotifyd +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -#if [ "$PLAYER_EVENT" = "start" ] || [ "$PLAYER_EVENT" = "change" ]; -#then - trackName=$(playerctl -p spotifyd,%any metadata title) - artistAndAlbumName=$(playerctl -p spotifyd,%any metadata --format "{{ artist }} ({{ album }})") - Thumbnail_url=$(playerctl -p spotifyd,%any metadata mpris:artUrl) - Thumbnail=$(curl "$Thumbnail_url") - notify-send -u low "$trackName" "$artistAndAlbumName " -i "$Thumbnail" -#fi diff --git a/eww/scripts/spotifyd.sh b/eww/scripts/spotifyd.sh deleted file mode 100755 index 86d89f3..0000000 --- a/eww/scripts/spotifyd.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -if [ "$PLAYER_EVENT" = "start" ] || [ "$PLAYER_EVENT" = "change" ]; -then - song=$(playerctl metadata -p spotifyd --format "{{ title }}\n{{ artist }}\n{{ album }}") - if [ ! -f "/home/dashie/.cache/icons/$song" ]; then - thumb=$(playerctl metadata -p spotifyd --format '{{lc(mpris:artUrl)}}') - convert "$thumb" -flatten -thumbnail 256x256 /home/dashie/.cache/icons/"$song" - fi - dunstify -I /home/dashie/.cache/icons/"$song" -t 3000 "Spotify" "$song" -fi diff --git a/eww/scripts/toggle-mute b/eww/scripts/toggle-mute deleted file mode 100755 index 7fcd17e..0000000 --- a/eww/scripts/toggle-mute +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/bash - -SINK=$(pactl info | grep "Default Sink"| awk -F 'Default Sink: ' ' { print $2 } ') -pactl set-sink-mute $SINK toggle -MUTE=$(pactl list sinks | grep -A 6 "$SINK" | grep "Mute: yes" | tr -d '\t') - -if [ "$MUTE" = "Mute: yes" ]; then - dunstify -a "toggleMute" -r 2 -u low "Muted" -else - dunstify -a "toggleMute" -r 2 -u low "Unmuted" -fi - diff --git a/eww/scripts/weather b/eww/scripts/weather index b217c29..35b5ac5 100755 --- a/eww/scripts/weather +++ b/eww/scripts/weather @@ -10,16 +10,16 @@ tmp_weather_icon=$tmp_weather/weather-icon if [ ! -d $tmp_weather ]; then mkdir -p $tmp_weather fi - +#notify-send -u critical "weather ping" "pangping" # Put in your api and stuff link here # If you dunno, head to openweathermap.org, and make and account #(completely free I swear, and then get your API Key and your City ID) # I wish I was smart enough to do it like Elena, but this is the top I could do lol -KEY="{your key}" -ID="{your city id}" +KEY="{key}" +ID="{location}" UNIT="{metric}" #Options are 'metric' and 'imperial' -weather=$(curl -sf "http://api.openweathermap.org/data/2.5/weather?APPID="$KEY"&id="$ID"&units="$UNIT"") -echo $weather +weather=$(curl -sf "http://api.openweathermap.org/data/2.5/weather?APPID="$KEY"&q="$ID"&units="$UNIT"") +#echo $weather if [ ! -z "$weather" ]; then weather_temp=$(echo "$weather" | jq ".main.temp" | cut -d "." -f 1) weather_icon_code=$(echo "$weather" | jq -r ".weather[].icon" | head -1) diff --git a/eww/scripts/workspace b/eww/scripts/workspace index a0379f2..92d2201 100755 --- a/eww/scripts/workspace +++ b/eww/scripts/workspace @@ -21,14 +21,14 @@ o7=$(hyprctl workspaces | grep "$ws7" ) o8=$(hyprctl workspaces | grep "$ws8" ) # check if Focused -f1=$(hyprctl monitors | grep "workspace: 1" ) -f2=$(hyprctl monitors | grep "workspace: 2" ) -f3=$(hyprctl monitors | grep "workspace: 3" ) -f4=$(hyprctl monitors | grep "workspace: 4" ) -f5=$(hyprctl monitors | grep "workspace: 5" ) -f6=$(hyprctl monitors | grep "workspace: 6" ) -f7=$(hyprctl monitors | grep "workspace: 7" ) -f8=$(hyprctl monitors | grep "workspace: 8" ) +f1=$(hyprctl monitors | grep "workspace: 1" -A 4 | grep "focused: yes" ) +f2=$(hyprctl monitors | grep "workspace: 2" -A 4 | grep "focused: yes" ) +f3=$(hyprctl monitors | grep "workspace: 3" -A 4 | grep "focused: yes" ) +f4=$(hyprctl monitors | grep "workspace: 4" -A 4 | grep "focused: yes" ) +f5=$(hyprctl monitors | grep "workspace: 5" -A 4 | grep "focused: yes" ) +f6=$(hyprctl monitors | grep "workspace: 6" -A 4 | grep "focused: yes" ) +f7=$(hyprctl monitors | grep "workspace: 7" -A 4 | grep "focused: yes" ) +f8=$(hyprctl monitors | grep "workspace: 8" -A 4 | grep "focused: yes" ) if [ "$o1" != "" ]; then ic_1="①" diff --git a/gtk-2.0/gtkfilechooser.ini b/gtk-2.0/gtkfilechooser.ini index 16e9df9..e12b439 100644 --- a/gtk-2.0/gtkfilechooser.ini +++ b/gtk-2.0/gtkfilechooser.ini @@ -2,8 +2,8 @@ LocationMode=path-bar ShowHidden=false ShowSizeColumn=true -GeometryX=912 -GeometryY=199 +GeometryX=3887 +GeometryY=88 GeometryWidth=1008 GeometryHeight=692 SortColumn=name diff --git a/gtk-3.0/bookmarks b/gtk-3.0/bookmarks index 7edf1e7..cb74c5c 100644 --- a/gtk-3.0/bookmarks +++ b/gtk-3.0/bookmarks @@ -1,2 +1,10 @@ -file:///home/dashie/Pictures/ -file:///home/dashie/Documents/ +file:///home/dashie/Pictures +file:///home/dashie/Documents +file:///home/dashie/gits gits +file:///home/dashie/Videos Videos +file:///home/dashie/Music Music +file:///home/dashie/Downloads Downloads +file:///drive2 drive2 +file:///home/dashie/Documents +file:///home/dashie/Pictures +file:///home/dashie/gits/ost-3semester ost-3semester diff --git a/gtk-3.0/servers b/gtk-3.0/servers new file mode 100644 index 0000000..ccaee6f --- /dev/null +++ b/gtk-3.0/servers @@ -0,0 +1,16 @@ + + + + files1 on 192.168.1.4 + + + + + + + + + \ No newline at end of file diff --git a/hypr/20220830_14h00m46s_grim.png b/hypr/20220830_14h00m46s_grim.png deleted file mode 100644 index 5660ef4..0000000 Binary files a/hypr/20220830_14h00m46s_grim.png and /dev/null differ diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf deleted file mode 100644 index ea24abc..0000000 --- a/hypr/hyprland.conf +++ /dev/null @@ -1,159 +0,0 @@ - -# -#fix the fucking portal -exec-once=systemctl --user import-environment -exec-once=dbus-update-activation-environment --all -# -# - -autogenerated=0 # remove this line to get rid of the warning on top. - -monitor=,preferred,auto,1 - -input { - kb_file=/home/dashie/.config/keymap.xkb #us with dead_diaeresis on shift + ' to get ä ö ü - kb_layout= - kb_variant= - kb_model= - kb_options= - kb_rules= - repeat_delay=200 - natural_scroll=true - follow_mouse=1 - force_no_accel=true - - touchpad { - natural_scroll=yes - tap-to-click=yes - } -} - -general { - sensitivity=1.0 # for mouse cursor - main_mod=SUPER - - gaps_in=5 - gaps_out=10 - border_size=3 - col.active_border=0x66ee1111 - col.inactive_border=0x66333333 - - apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse) - - damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer -} - -decoration { - rounding=10 - blur=1 - blur_size=3 # minimum 1 - blur_passes=1 # minimum 1 - blur_new_optimizations=true -} - -animations { - enabled=1 - animation=windows,1,7,default - animation=border,1,10,default - animation=fade,1,10,default - animation=workspaces,1,6,default -} - -dwindle { - preserve_split=true - pseudotile=0 # enable pseudotiling on dwindle -} - -gestures { - workspace_swipe=yes -} - -misc { - animate_manual_resizes=true - } - -#reserve place for bar -#monitor=eDP-1,addreserved,45,0,0,0 - -# example window rules -# for windows named/classed as abc and xyz -windowrule=opacity 80,^(.*)(dunst)(.*)$ -#windowrule=tile,xyz -#windowrule=float,abc -#windowrule=pseudo,abc -#windowrule=monitor 0,xyz - -# example binds -bind=SUPER,S,exec,grim -g "$(slurp)" - | wl-copy -bind=SUPER,F,exec,firefox -bind=SUPER,T,exec,alacritty -bind=SUPER,Q,killactive, -bind=SUPER,M,exit, -bind=SUPER,E,exec,nautilus --new-window -bind=SUPER,V,togglefloating, -bind=SUPER,R,exec,wofi -I -m -s $HOME/.config/wofi/style.css -t alacritty --show drun -o DP-3 -bind=SUPER,C,togglesplit -bind=SUPER,B,fullscreen -bind=SUPERSHIFT,L,exec, playerctl --player=ncspot,firefox -a pause & swaylock -c 000000 & systemctl suspend -bind=,XF86AudioMute,exec, $HOME/.config/eww/scripts/toggle-mute -bind=,XF86AudioLowerVolume,exec, $HOME/.config/eww/scripts/change-volume sink -5% -bind=,XF86AudioRaiseVolume,exec, $HOME/.config/eww/scripts/change-volume sink +5% -bind=,XF86AudioPlay,exec, playerctl --player=ncspot,firefox play-pause -bind=,XF86AudioNext,exec, playerctl --player=ncspot,firefox next -bind=,XF86AudioPrev,exec, playerctl --player=ncspot,firefox previous -bind=,XF86MonBrightnessDown,exec, $HOME/.config/eww/scripts/change-brightness brightness 10%- -bind=,XF86MonBrightnessUp,exec, $HOME/.config/eww/scripts/change-brightness brightness +10% -bind=SUPERSHIFTALT,S,exec, grim -o eDP-1 - | swappy -f - -bind=SUPER,D,exec, $HOME/.config/eww/scripts/cockpit_toggle -bind=,Print,exec, grim - | wl-copy - -bind=SUPER,bracketleft,movefocus,l -bind=SUPER,bracketright,movefocus,r -bind=SUPER,semicolon,movefocus,u -bind=SUPER,apostrophe,movefocus,d - -bind=SUPER,left,movewindow,l -bind=SUPER,right,movewindow,r -bind=SUPER,up,movewindow,u -bind=SUPER,down,movewindow,d - -bind=SUPER,1,workspace,1 -bind=SUPER,2,workspace,2 -bind=SUPER,3,workspace,3 -bind=SUPER,4,workspace,4 -bind=SUPER,5,workspace,5 -bind=SUPER,6,workspace,6 -bind=SUPER,7,workspace,7 -bind=SUPER,8,workspace,8 -bind=SUPER,9,workspace,9 -bind=SUPER,0,workspace,10 - -bind=SUPERSHIFT,1,movetoworkspace,1 -bind=SUPERSHIFT,2,movetoworkspace,2 -bind=SUPERSHIFT,3,movetoworkspace,3 -bind=SUPERSHIFT,4,movetoworkspace,4 -bind=SUPERSHIFT,5,movetoworkspace,5 -bind=SUPERSHIFT,6,movetoworkspace,6 -bind=SUPERSHIFT,7,movetoworkspace,7 -bind=SUPERSHIFT,8,movetoworkspace,8 -bind=SUPERSHIFT,9,movetoworkspace,9 -bind=SUPERSHIFT,0,movetoworkspace,10 - -bind=SUPER,mouse_down,workspace,e+1 -bind=SUPER,mouse_up,workspace,e-1 - -binde=SUPER,O,resizeactive,-20 0 -binde=SUPER,P,resizeactive,20 0 -binde=SUPER,K,resizeactive,0 -20 -binde=SUPER,L,resizeactive,0 20 - -#autostart programs -#exec=~/Documents/scripts/hyprstart.sh -#exec=hyprstart.sh -exec-once=hyprpaper -exec-once=eww daemon -exec-once=eww open bar -exec-once=flatpak run chat.schildi.desktop -exec-once=firefox -#exec-once=nextcloud -exec-once=alacritty -e ncspot diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf deleted file mode 100644 index 69e3da0..0000000 --- a/hypr/hyprpaper.conf +++ /dev/null @@ -1,4 +0,0 @@ - -# wallpaper -preload = /home/dashie/Pictures/backgrounds/Monitor3.jpg -wallpaper = eDP-1,/home/dashie/Pictures/backgrounds/Monitor3.jpg diff --git a/nvim/.luarc.json b/nvim/.luarc.json new file mode 100644 index 0000000..26f441d --- /dev/null +++ b/nvim/.luarc.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json", + "Lua.workspace.library": [ + "${3rd}/luassert/library" + ] +} \ No newline at end of file diff --git a/nvim/init.lua b/nvim/init.lua index ea8c8a2..65f14e1 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,5 +1,5 @@ -require("settings.options") require("settings.plugins") +require("settings.options") require("settings.cmp") require("settings.lsp") require("settings.devicons") @@ -25,8 +25,3 @@ require("telescope").load_extension("fzy_native") require("impatient").enable_profile() require("nightfox") require('Comment').setup() --- require('vgit').setup() - --- vim.o.updatetime = 3000 --- vim.o.incsearch = false --- vim.wo.signcolumn = 'yes' diff --git a/nvim/installer.sh b/nvim/installer.sh new file mode 100644 index 0000000..f3f80cb --- /dev/null +++ b/nvim/installer.sh @@ -0,0 +1,85 @@ +#!/bin/sh +# Standalone installer for Unixs +# Original version is created by shoma2da +# https://github.com/shoma2da/neobundle_installer + +set -e + +if [ $# -ne 1 ]; then + echo "You must specify the installation directory!" + exit 1 +fi + +# Convert the installation directory to absolute path +case $1 in + /*) PLUGIN_DIR=$1;; + *) PLUGIN_DIR=$PWD/$1;; +esac +INSTALL_DIR="${PLUGIN_DIR}/repos/github.com/Shougo/dein.vim" +echo "Install to \"$INSTALL_DIR\"..." +if [ -e "$INSTALL_DIR" ]; then + echo "\"$INSTALL_DIR\" already exists!" +fi + +echo "" + +# check git command +type git || { + echo 'Please install git or update your path to include the git executable!' + exit 1 +} +echo "" + +# make plugin dir and fetch dein +if ! [ -e "$INSTALL_DIR" ]; then + echo "Begin fetching dein..." + mkdir -p "$PLUGIN_DIR" + git clone --depth=1 https://github.com/Shougo/dein.vim "$INSTALL_DIR" + echo "Done." + echo "" +fi + +# write initial setting for .vimrc +echo "Please add the following settings for dein to the top of your vimrc (Vim) or init.vim (NeoVim) file:" +{ + echo "" + echo "" + echo "\"dein Scripts-----------------------------" + echo "if &compatible" + echo " set nocompatible \" Be iMproved" + echo "endif" + echo "" + echo "\" Required:" + echo "set runtimepath+=$INSTALL_DIR" + echo "" + echo "\" Required:" + echo "call dein#begin('$PLUGIN_DIR')" + echo "" + echo "\" Let dein manage dein" + echo "\" Required:" + echo "call dein#add('$INSTALL_DIR')" + echo "" + echo "\" Add or remove your plugins here like this:" + echo "\"call dein#add('Shougo/neosnippet.vim')" + echo "\"call dein#add('Shougo/neosnippet-snippets')" + echo "" + echo "\" Required:" + echo "call dein#end()" + echo "" + echo "\" Required:" + echo "filetype plugin indent on" + echo "syntax enable" + echo "" + echo "\" If you want to install not installed plugins on startup." + echo "\"if dein#check_install()" + echo "\" call dein#install()" + echo "\"endif" + echo "" + echo "\"End dein Scripts-------------------------" + echo "" + echo "" +} + +echo "Done." + +echo "Complete setup dein!" diff --git a/nvim/lua/settings/keymaps.lua b/nvim/lua/settings/keymaps.lua index 45bc265..ca0ee1d 100644 --- a/nvim/lua/settings/keymaps.lua +++ b/nvim/lua/settings/keymaps.lua @@ -1,19 +1,13 @@ local opts = { noremap = true, silent = true } - local term_opts = { silent = true } - --- Shorten function name local keymap = vim.api.nvim_set_keymap ---vim.lsp.handlers["textDocument/codeAction"] = require'lspactions'.codeaction ---vim.cmd [[ nnoremap af :lua require'lspactions'.code_action() ]] +local builtin = require("telescope.builtin") +-- space leader +vim.g.mapleader = " " +keymap("n", "", "", { silent = true, noremap = false }) --- keymap('n', '', '', { noremap = true, silent = true }) --- keymap('n', '', '', { noremap = true, silent = true }) --- keymap("n", "", "", opts) --- keymap("n", "", ":CodeActionMenu", opts) -keymap("n", "", "TroubleToggle", term_opts) ---keymap("n", "", ':lua require("vgit").buffer_stage()', opts) +-- debug keymap("n", "", ':lua require("dap").toggle_breakpoint()', opts) keymap("n", "", ':lua require("dap").step_over()', opts) keymap("n", "", ':lua require("dap").step_into()', opts) @@ -21,23 +15,41 @@ keymap("n", "", ':lua require("dap").continue() :lua require("dapui").to keymap("n", "", ':lua require("dap").continue()', opts) keymap("n", "", ':lua require("dap").close() :lua require("dapui").toggle()', opts) +-- file tree keymap("n", "t", ':lua require("nvim-tree").toggle()', opts) keymap("n", "f", ':lua require("nvim-tree").focus()', opts) +-- tab switching keymap("n", "", ":BufferPrev", opts) keymap("n", "", ":BufferNext", opts) +-- formatting keymap("n", "", ":lua vim.lsp.buf.format { async = true }", opts) -local builtin = require("telescope.builtin") -vim.keymap.set("n", "ff", builtin.find_files, {}) -vim.keymap.set("n", "fg", builtin.live_grep, {}) -vim.keymap.set("n", "fb", builtin.buffers, {}) -vim.keymap.set("n", "fh", builtin.help_tags, {}) +-- telescope +keymap("n", "ff", ":lua builtin.find_files", {}) +keymap("n", "fg", ":lua builtin.live_grep", {}) +keymap("n", "fb", ":lua builtin.buffers", {}) +keymap("n", "fh", ":lua builtin.help_tags", {}) +-- trouble +keymap("n", "", "TroubleToggle", term_opts) require("trouble").setup { action_keys = { --remove the fucking stupid keymap amk open_tab = {} } } + +-- LSP +local on_attach = function(client, bufnr) + vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc") + local opts = { noremap = true, silent = true, buffer=bufnr } + keymap("n", "h", "lua vim.lsp.buf.declaration()", opts) + keymap("n", "j", "lua vim.lsp.buf.definition()", opts) + keymap("n", "k", "lua vim.lsp.buf.implementation()", opts) + keymap("n", "l", "lua vim.lsp.buf.references()", opts) + keymap("n", ";", "lua vim.lsp.buf.code_action()", opts) + keymap("n", "u", "lua vim.lsp.buf.signature_help()", opts) + keymap("n", "g", "lua vim.lsp.buf.hover()", opts) +end diff --git a/nvim/lua/settings/lsp.lua b/nvim/lua/settings/lsp.lua index e5cd32e..e181615 100644 --- a/nvim/lua/settings/lsp.lua +++ b/nvim/lua/settings/lsp.lua @@ -19,39 +19,18 @@ require("mason-lspconfig").setup({ "html", -- html "clangd", -- cpp / c "tsserver", -- python - "texlab", -- latex "sumneko_lua", -- lua "pyright", -- python "rust_analyzer", -- rust - "jdtls", -- jdtls "cmake", -- cmake "bashls", -- shell "ansiblels", -- ansible - -- "omnisharp", -- dotnot - -- "hls", -- haskel }, automatic_installation = true, }) local capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()) -local on_attach = function(client, bufnr) - -- Enable completion triggered by - vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc") - local opts = { noremap = true, silent = true, buffer=bufnr } - vim.keymap.set("n", "h", "lua vim.lsp.buf.declaration()", opts) - vim.keymap.set("n", "j", "lua vim.lsp.buf.definition()", opts) - vim.keymap.set("n", "k", "lua vim.lsp.buf.implementation()", opts) - vim.keymap.set("n", "l", "lua vim.lsp.buf.references()", opts) - vim.keymap.set("n", ";", "lua vim.lsp.buf.code_action()", opts) - vim.keymap.set("n", "u", "lua vim.lsp.buf.signature_help()", opts) - vim.keymap.set("n", "g", "lua vim.lsp.buf.hover()", opts) - - - - -end - require("mason-lspconfig").setup_handlers({ function(server_name) -- default handler (optional) require("lspconfig")[server_name].setup({ diff --git a/nvim/lua/settings/options.lua b/nvim/lua/settings/options.lua index 316582b..c392bbc 100644 --- a/nvim/lua/settings/options.lua +++ b/nvim/lua/settings/options.lua @@ -3,8 +3,8 @@ local options = { mouse = "n", fileencoding = "utf-8", relativenumber = true, - cursorline = false, - number = true, + cursorline = false, + number = true, smartindent = true, smartcase = true, showmode = true, @@ -20,15 +20,12 @@ local options = { tabstop = 2, -- insert 2 spaces for a tab scrolloff = 8, -- is one of my fav sidescrolloff = 8, - spell = false, - syntax = "off", + spell = true, + syntax = "off", spelllang = "en_us", mousemodel = "popup_setpos", } -vim.keymap.set("n", "", "", { silent = true, remap = false }) -vim.g.mapleader = " " - --vim.opt.shortmess:append "c" for k, v in pairs(options) do diff --git a/nvim/snippets/tex.lua b/nvim/snippets/tex.lua index 194cce9..0436887 100644 --- a/nvim/snippets/tex.lua +++ b/nvim/snippets/tex.lua @@ -17,6 +17,32 @@ local file_pattern = "*.tex" ------------------------------------------------- boilerplate end -- snippers go here: +local formSnippet = s( + "form-", + fmt( + [[ +\, \newline +\large \textcolor{{purple}}{{\( {1} \)}}\newline +\, \newline +\normalsize Legend: \newline +\begin{{itemize}} +\item {2} +\item {3} +\item {4} +\item {5} +\end{{itemize}} + ]], + { + i(1, "formula"), + i(2, "item 1"), + i(3, "item 2"), + i(4, "item 3"), + i(5, "item 4"), + } + ) +) +table.insert(snippets, formSnippet) + local listSnippet = s( "list-", fmt( @@ -140,12 +166,14 @@ local minipgSnippet = s( [[ \minipg{{ {1} -}}{{{2}}}[{3}] +}}{{ +{2} +}}[{3}] ]], { i(1, "data..."), - rep(1), - i(2, "0.4,0.4"), + i(2, "data..."), + i(3, "0.25,0.25"), } ) ) diff --git a/qt5ct/qt5ct.conf b/qt5ct/qt5ct.conf index dcf029b..e58a880 100644 --- a/qt5ct/qt5ct.conf +++ b/qt5ct/qt5ct.conf @@ -3,7 +3,7 @@ color_scheme_path=/usr/share/qt5ct/colors/darker.conf custom_palette=true icon_theme=Adwaita standard_dialogs=default -style=Adwaita-Dark +style=Fusion [Fonts] fixed=@Variant(\0\0\0@\0\0\0\x12\0N\0o\0t\0o\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) @@ -13,9 +13,9 @@ general=@Variant(\0\0\0@\0\0\0\x12\0N\0o\0t\0o\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\x activate_item_on_single_click=1 buttonbox_layout=3 cursor_flash_time=1000 -dialog_buttons_have_icons=1 +dialog_buttons_have_icons=0 double_click_interval=400 -gui_effects=General, AnimateMenu, AnimateCombo, AnimateTooltip, AnimateToolBox +gui_effects=@Invalid() keyboard_scheme=4 menus_have_icons=true show_shortcuts_in_context_menus=true @@ -25,7 +25,7 @@ underline_shortcut=1 wheel_scroll_lines=3 [SettingsWindow] -geometry="@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\a[\0\0\x4\t\0\0\0\0\0\0\0\x14\0\0\x5;\0\0\x4\xa6\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\x14\0\0\a[\0\0\x4\t)" +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x3K\0\0\x2\xbc\0\0\0\0\0\0\0\x14\0\0\x3K\0\0\x2\xc1\0\0\0\x2\x2\0\0\0\n\0\0\0\0\0\0\0\0\x14\0\0\x3K\0\0\x2\xbc) [Troubleshooting] force_raster_widgets=1 diff --git a/qt6ct/qt6ct.conf b/qt6ct/qt6ct.conf new file mode 100644 index 0000000..f60d64a --- /dev/null +++ b/qt6ct/qt6ct.conf @@ -0,0 +1,32 @@ +[Appearance] +color_scheme_path=/usr/share/qt6ct/colors/darker.conf +custom_palette=true +icon_theme=Adwaita +standard_dialogs=default +style=Adwaita-Dark + +[Fonts] +fixed=@Variant(\0\0\0@\0\0\0\x12\0N\0o\0t\0o\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) +general=@Variant(\0\0\0@\0\0\0\x12\0N\0o\0t\0o\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) + +[Interface] +activate_item_on_single_click=1 +buttonbox_layout=3 +cursor_flash_time=1000 +dialog_buttons_have_icons=1 +double_click_interval=400 +gui_effects=General, AnimateMenu, AnimateCombo, AnimateTooltip, AnimateToolBox +keyboard_scheme=4 +menus_have_icons=true +show_shortcuts_in_context_menus=true +stylesheets=@Invalid() +toolbutton_style=4 +underline_shortcut=1 +wheel_scroll_lines=3 + +[SettingsWindow] +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x4\xea\0\0\x3\xbe\0\0\0\0\0\0\0\0\0\0\x4\xea\0\0\x3\xbe\0\0\0\x2\0\0\0\0\n\0\0\0\0\0\0\0\0\0\0\0\x4\xea\0\0\x3\xbe) + +[Troubleshooting] +force_raster_widgets=1 +ignored_applications=@Invalid() diff --git a/wofi/style.css b/wofi/style.css index f4cd177..ebe34ce 100644 --- a/wofi/style.css +++ b/wofi/style.css @@ -1,18 +1,19 @@ window { - margin: 5px; + margin: 0px; background-color: #0f0f17; border-radius: 10px; - opacity: 0.95; } #inner-box { - margin: 5px; background-color: #0f0f17; + margin: 5px; + border: none; border-radius: 10px; } #outer-box { - margin: 5px; background-color: #0f0f17; + margin: 5px; + border: none; border-radius: 10px; }