diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index b58792d..087c152 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -293,3 +293,31 @@ colors: # magenta: '0x888ba5' # cyan: '0x599caa' # white: '0xd3ebe9' +# BEGIN ACE +colors: + primary: + background: '0x0C0F11' + foreground: '0xdfecee' + cursor: + text: '0x0C0F11' + cursor: '0xdfecee' + normal: + black: '0x0C0F11' + red: '0x23837B' + green: '0x297889' + yellow: '0x507785' + blue: '0x38B3BF' + magenta: '0x539DA8' + cyan: '0xA5CCD5' + white: '0xdfecee' + bright: + black: '0x9ca5a6' + red: '0x23837B' + green: '0x297889' + yellow: '0x507785' + blue: '0x38B3BF' + magenta: '0x539DA8' + cyan: '0xA5CCD5' + white: '0xdfecee' + +# END ACE diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/.config/gtk-2.0/gtkfilechooser.ini index 7694304..430a6bc 100644 --- a/.config/gtk-2.0/gtkfilechooser.ini +++ b/.config/gtk-2.0/gtkfilechooser.ini @@ -2,8 +2,8 @@ LocationMode=path-bar ShowHidden=false ShowSizeColumn=true -GeometryX=1920 -GeometryY=62 +GeometryX=2376 +GeometryY=194 GeometryWidth=1008 GeometryHeight=690 SortColumn=name diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks new file mode 100644 index 0000000..5c88852 --- /dev/null +++ b/.config/gtk-3.0/bookmarks @@ -0,0 +1 @@ +file:///home/paramah/Nextcloud diff --git a/.config/gtk-3.0/gtk.css b/.config/gtk-3.0/gtk.css new file mode 100644 index 0000000..3ac12c0 --- /dev/null +++ b/.config/gtk-3.0/gtk.css @@ -0,0 +1,191 @@ +/* Custom styles */ + +/* select-off +@define-color selected_bg_color #398ee7; +@define-color selected_fg_color #eeeeee; +@define-color theme_selected_bg_color @selected_bg_color; +@define-color theme_selected_fg_color @selected_fg_color; +select-off */ + +/* panel-off +@define-color panel_bg_color #cccccc; +@define-color panel_fg_color #333333; + +PanelWidget, +PanelApplet, +PanelToplevel, +PanelSeparator, +PanelApplet > GtkMenuBar.menubar, +PanelApplet > GtkMenuBar.menubar.menuitem, +PanelMenuBar.menubar, +PanelMenuBar.menubar.menuitem, +PanelAppletFrame, +UnityPanelWidget, +.gnome-panel-menu-bar, +.unity-panel { + background-image: -gtk-gradient(linear,left top,left bottom,from(shade(@panel_bg_color,1.2)),to(shade(@panel_bg_color,0.8))); + color: @panel_fg_color; +} + +.unity-panel.menuitem, +.unity-panel .menuitem { + color: @panel_fg_color; +} + +.unity-panel.menubar.menuitem:hover, +.unity-panel.menubar .menuitem *:hover { + border-color: shade(@panel_bg_color, 0.7); + border-image: none; + background-image: -gtk-gradient(linear,left top,left bottom,from(shade(@panel_bg_color, 0.97)),to(shade(@panel_bg_color, 0.82))); + color: @panel_fg_color; +} + +PanelApplet .button { + border-color: transparent; + border-image: none; + background-image: -gtk-gradient(linear,left top,left bottom,from(shade(@panel_bg_color,1.2)),to(shade(@panel_bg_color,0.8))); + color: @panel_fg_color; + box-shadow: none; + text-shadow: none; + -unico-inner-stroke-width: 0; +} + +PanelApplet .button:active { + border-color: shade(@panel_bg_color,0.8); + border-image: none; + background-image: -gtk-gradient(linear,left top,left bottom,from(shade(shade(@panel_bg_color,1.02),0.9)),to(shade(shade(@panel_bg_color,1.02),0.95))); + color: @panel_fg_color; + box-shadow: none; + text-shadow: none; + -unico-inner-stroke-width: 0; +} + +PanelApplet .button:prelight { + border-color: transparent; + border-image: none; + background-image: -gtk-gradient(linear,left top,left bottom,from(shade(@panel_bg_color,1.2)),to(shade(@panel_bg_color,1.0))); + color: @panel_fg_color; + box-shadow: none; + text-shadow: none; + -unico-inner-stroke-width: 0; +} + +PanelApplet .button:active:prelight { + border-color: shade(@panel_bg_color,0.8); + border-image: none; + background-image: -gtk-gradient(linear,left top,left bottom,from(shade(shade(@panel_bg_color,1.02),1.0)),to(shade(shade(@panel_bg_color,1.02),1.05))); + color: @panel_fg_color; + box-shadow: none; + text-shadow: none; + -unico-inner-stroke-width: 0; +} + +WnckPager, +WnckTasklist { + background-color: @panel_bg_color; +} + +panel-off */ + +/* menu-off +@define-color menu_bg_color #eeeeee; +@define-color menu_fg_color #333333; + +GtkTreeMenu.menu, +GtkMenuToolButton.menu, +GtkComboBox .menu { + background-color: @menu_bg_color; +} + +.primary-toolbar .button .menu, +.toolbar .menu, +.toolbar .primary-toolbar .menu, +.menu { + border-style: none; + background-image: none; + background-color: @menu_bg_color; + color: @menu_fg_color; + box-shadow: none; + text-shadow: none; + -unico-inner-stroke-width: 0; +} + +.menu.button:hover, +.menu.button:active, +.menu.button:active:insensitive, +.menu.button:insensitive, +.menu.button { + background-color: @menu_bg_color; + background-image: none; +} + +GtkTreeMenu .menuitem * { + color: @menu_fg_color; +} + +.menuitem, +.menu .menuitem { + background-color: transparent; +} + +.menu .menuitem:active, +.menu .menuitem:hover { + background-color: @theme_selected_bg_color; +} + +.menuitem.check, +.menuitem.radio, +.menuitem.check:hover, +.menuitem.radio:hover, +.menuitem.check:active, +.menuitem.radio:active { + background-color: transparent; +} + +.menu .menuitem:insensitive, +.menu .menuitem *:insensitive { + color: mix(@menu_fg_color,@menu_bg_color,0.5); +} + +.menuitem.arrow { + color: alpha(@menu_fg_color, 0.6); +} + +.menuitem .entry { + border-color: shade(@menu_bg_color,0.7); + border-image: none; + background-color: @menu_bg_color; + background-image: none; + color: @menu_fg_color; +} + +.menuitem .accelerator { + color: alpha(@menu_fg_color,0.6); +} + +.menuitem .accelerator:insensitive { + color: alpha(mix(@menu_fg_color,@menu_bg_color,0.5),0.6); + text-shadow: none; +} + +.menuitem.separator { + background-color: transparent; + color: shade(@menu_bg_color, 0.9); +} + +.menuitem GtkCalendar, +.menuitem GtkCalendar.button, +.menuitem GtkCalendar.header, +.menuitem GtkCalendar.view { + border-color: shade(@menu_bg_color,0.8); + border-image: none; + background-color: @menu_bg_color; + background-image: none; + color: @menu_fg_color; +} + +.menuitem GtkCalendar:inconsistent { + color: mix(@menu_fg_color,@menu_bg_color,0.5); +} + +menu-off */ diff --git a/.config/gtk-4.0/servers b/.config/gtk-4.0/servers new file mode 100644 index 0000000..017f2d2 --- /dev/null +++ b/.config/gtk-4.0/servers @@ -0,0 +1,16 @@ + + + + Windows shares on skrzat + + + + + + + + + \ No newline at end of file diff --git a/.config/gtk-4.0/settings.ini b/.config/gtk-4.0/settings.ini index 29322c1..c2b609b 100644 --- a/.config/gtk-4.0/settings.ini +++ b/.config/gtk-4.0/settings.ini @@ -1,2 +1,3 @@ [Settings] +gtk-hint-font-metrics=true gtk-application-prefer-dark-theme=1 diff --git a/.config/kanshi/config b/.config/kanshi/config index 4898e67..086e34b 100644 --- a/.config/kanshi/config +++ b/.config/kanshi/config @@ -15,3 +15,9 @@ profile StreamSage { output DP-7 mode 1920x1080@60Hz position 3830,0 output DP-6 mode 1920x1080@60Hz position 0,0 } + +profile StreamSage_duzy { + output eDP-1 mode 1920x1080 position 1930,0 + output DP-4 mode 1920x1080 position 0,0 + output DP-5 mode 1920x1080 position 3870,0 +} diff --git a/.config/polybar/config b/.config/polybar/config index 49b4524..a7386bc 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -64,7 +64,7 @@ font-1 = RobotoMono Nerd Font:antialias=true:size=12;2 font-2 = RobotoMono Nerd Font:antialias=false:size=14;2 font-3 = RobotoMono Nerd Font:antialias=true:size=18;0 -modules-left = i3 +modules-left = biurko_on modules-center = xwindow modules-right = cpu memory temperature date @@ -263,6 +263,9 @@ format-prefix="%{T1}%{T-} " format-background = ${colors.primary} exec = python /home/paramah/.config/polybar/polybar-spotify/spotify_status.py -f '{song} by {artist}' +[module/biurko_on] +type = custom/script +exec = /home/paramah/.config/polybar/webhooks/biurko_on.sh [module/memory] type = internal/memory diff --git a/.config/polybar/webhooks/biurko_on.sh b/.config/polybar/webhooks/biurko_on.sh new file mode 100755 index 0000000..8dfb7dc --- /dev/null +++ b/.config/polybar/webhooks/biurko_on.sh @@ -0,0 +1,2 @@ +#!/bin/bash +curl -X POST -d '' http://192.168.88.169:8123/api/webhook/ledy_on diff --git a/.config/sway/bin/mysway.py b/.config/sway/bin/mysway.py index ca34615..197cf0e 100755 --- a/.config/sway/bin/mysway.py +++ b/.config/sway/bin/mysway.py @@ -15,16 +15,16 @@ def glyph(ws_number): """ # glyphs = ["", "", "", "", "", "", "", ""] glyphs = [ - ".::term:::.", - ".:::web:::.", - ".:::work::.", - ".::((4))::.", - ".::debug::.", - ".::((6))::.", - ".::books::.", - ".::meets::.", - ".::music::.", - ".::mail:::." + ".::term[1]:::.", + ".::web.[2]:::.", + ".::work[3]::.", + ".::code[4]::.", + ".::debu[5]::.", + ".::note[6]:::.", + ".::read[7]::.", + ".::meet[8]::.", + ".::musi[9]::.", + ".::mail[0]:::." ] try: return glyphs[ws_number - 1] diff --git a/.config/sway/config b/.config/sway/config index a7df90f..9b02543 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -24,6 +24,8 @@ set $term alacritty set $menu dmenu_path | dmenu | xargs swaymsg exec -- font Terminus 9 +#font pango:SourceCodePro Medium 11 + gaps inner 10 default_border none default_border normal 0 diff --git a/.config/sway/sway.d/02-layout.conf b/.config/sway/sway.d/02-layout.conf index 92043f5..e543f7a 100644 --- a/.config/sway/sway.d/02-layout.conf +++ b/.config/sway/sway.d/02-layout.conf @@ -27,4 +27,4 @@ client.unfocused $color2 $background $color1 $color2 $color2 client.urgent $foreground $background $color7 $foreground $foreground - output * bg $wallpaper fill +output * bg $wallpaper fill diff --git a/.config/sway/sway.d/03-workspace.conf b/.config/sway/sway.d/03-workspace.conf index 55d447b..27740b3 100644 --- a/.config/sway/sway.d/03-workspace.conf +++ b/.config/sway/sway.d/03-workspace.conf @@ -1,13 +1,13 @@ # Define names for workspaces -set $ws1 "1: .>" -set $ws2 "2: (web)" -set $ws3 "3: (work)" -set $ws4 "4: (frontend)" -set $ws5 "5: (debug)" +set $ws1 "1: .::term[1]:::." +set $ws2 "2: .::web.[2]:::." +set $ws3 "3: .::work[3]:::." +set $ws4 "4: .::code[4]::." +set $ws5 "5: .::debu[5]::." -set $ws9 "9: (music)" -set $ws10 "10: (mail)" +set $ws9 "9: .::musi[9]::." +set $ws10 "10: .::mail[0]:::." workspace 1 output eDP-1 workspace 2 output eDP-1 diff --git a/.config/sway/sway.d/04-input.conf b/.config/sway/sway.d/04-input.conf index 4ab32ca..06723fa 100644 --- a/.config/sway/sway.d/04-input.conf +++ b/.config/sway/sway.d/04-input.conf @@ -18,3 +18,8 @@ input "1:1:AT_Translated_Set_2_keyboard" { xkb_layout pl } + +input "2:10:TPPS/2_Elan_TrackPoint" { + accel_profile "flat" + pointer_accel 0.2 +} diff --git a/.config/sway/sway.d/06-floating.conf b/.config/sway/sway.d/06-floating.conf index 6664064..12d524a 100644 --- a/.config/sway/sway.d/06-floating.conf +++ b/.config/sway/sway.d/06-floating.conf @@ -1,10 +1,12 @@ #for_window [class="^.*"] title_format "%title [%class]" #for_window [class="^.*"] border pixel 0 -for_window [app_id="(.*)Telegram(.*)"] resize set 900 600, move scratchpad, border pixel 1 +for_window [app_id="(.*)telegram(.*)"] resize set 900 600, move scratchpad, border pixel 1 for_window [class="Mattermost"] resize set 900 600, move scratchpad, border pixel 1 +for_window [title="WhatsApp"] move scratchpad, border pixel 1 for_window [class="discord"] move scratchpad, border pixel 1 for_window [window_role="floating"] floating enable for_window [class="QSyncthingTray"] floating enable +for_window [app_id="(.*)Calendar"] resize set 900 600, move scratchpad for_window [class="Thunderbird" window_type="normal"] move scratchpad, floating enable, resize set 1600 1050, border pixel 2 for_window [class="Nautilus"] floating enable for_window [class="Gnome-calculator"] floating enable @@ -17,4 +19,7 @@ for_window [app_id="zenity"] floating enable for_window [app_id="gnome-calendar"] floating enable -for_window [class="Joplin"] move scratchpad, floating enable \ No newline at end of file +for_window [class="Joplin"] move scratchpad, floating enable + +for_window [class="Rofi"] output eDP-1 +for_window [title="Firefox — Sharing Indicator"] kill diff --git a/.config/sway/sway.d/07-hotkeys.conf b/.config/sway/sway.d/07-hotkeys.conf index 2111dea..448ac6f 100644 --- a/.config/sway/sway.d/07-hotkeys.conf +++ b/.config/sway/sway.d/07-hotkeys.conf @@ -10,7 +10,7 @@ # Start your launcher # bindsym $mod+d exec $menu - bindsym $mod+d exec --no-startup-id rofi -show drun + bindsym $mod+d exec --no-startup-id /home/paramah/.config/rofi/launchers/type-3/launcher.sh # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. @@ -43,6 +43,7 @@ bindsym $mod+Shift+$down move down bindsym $mod+Shift+$up move up bindsym $mod+Shift+$right move right + # Ditto, with arrow keys bindsym $mod+Shift+Left move left bindsym $mod+Shift+Down move down @@ -164,6 +165,7 @@ bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%- ## Modify // Volume up // ## #bindsym XF86AudioRaiseVolume exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') +5% bindsym --locked XF86AudioRaiseVolume exec volumectl up +bindsym --locked $mod+Shift+i exec volumectl up ## Modify // Volume down // ## #bindsym XF86AudioLowerVolume exec pactl set-sink-volume $(pacmd list-sinks |awk '/* index:/{print $3}') -5% @@ -199,7 +201,7 @@ bindsym $mod+x exec $BIN_DIR/dmenuscreenshare.sh bindsym $mod+p [class="Mattermost"] scratchpad show bindsym $mod+Shift+m [class="Thunderbird"] scratchpad show -bindsym $mod+i exec --no-startup-id rofi -show window -theme /usr/share/rofi-menus-git/themes/appsmenu.rasi +bindsym $mod+i exec --no-startup-id /home/paramah/.config/rofi/launchers/type-4/launcher.sh -show window bindsym $mod+Shift+o exec --no-startup-id ~/.config/rofi/scripts/nmvpnmenu.sh bindsym $mod+o exec --no-startup-id ~/.config/rofi/scripts/sound.sh @@ -211,3 +213,6 @@ bindsym $mod+u exec env RUST_BACKTRACE=1 swayr switch-window >> /tmp/swayr.log 2 bindsym $mod+Tab exec env RUST_BACKTRACE=1 swayr switch-to-urgent-or-lru-window >> /tmp/swayr.log 2>&1 bindsym $mod+$alt+Space exec env RUST_BACKTRACE=1 swayr switch-workspace-or-window >> /tmp/swayr.log 2>&1 + + +bindsym $mod+c [app_id="(.*)Calendar"] scratchpad show diff --git a/.config/sway/sway.d/10-autostart.conf b/.config/sway/sway.d/10-autostart.conf index 7f4c0b0..6614ded 100644 --- a/.config/sway/sway.d/10-autostart.conf +++ b/.config/sway/sway.d/10-autostart.conf @@ -1,4 +1,4 @@ -exec --no-startup-id swaymsg 'workspace number 1; exec alacritty; workspace number 10; exec thunderbird; workspace number 9; exec spotify; workspace number 2; exec brave' +exec --no-startup-id swaymsg 'workspace number 1; exec alacritty; workspace number 10; exec thunderbird; workspace number 9; exec spotify; workspace number 2; exec firefox' exec wl-paste -t text --watch clipman store exec nm-applet --indicator @@ -23,4 +23,5 @@ exec --no-startup-id swaymsg rename workspace number 10 to $ws10 exec ~/.config/sway/bin/session.sh -#exec ~/.config/sway/bin/assign-cgroups.py \ No newline at end of file +#exec ~/.config/sway/bin/assign-cgroups.py +exec_always "systemctl --user restart kanshi.service" \ No newline at end of file diff --git a/.config/swayr/config.toml b/.config/swayr/config.toml index 1f0ceec..ca4b7ac 100644 --- a/.config/swayr/config.toml +++ b/.config/swayr/config.toml @@ -1,5 +1,6 @@ [menu] executable = 'wofi' +#executable = 'rofi' args = [ '--show=dmenu', '--allow-markup', diff --git a/.config/systemd/user/pulseaudio.service b/.config/systemd/user/pulseaudio.service new file mode 120000 index 0000000..dc1dc0c --- /dev/null +++ b/.config/systemd/user/pulseaudio.service @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/.config/systemd/user/pulseaudio.socket b/.config/systemd/user/pulseaudio.socket new file mode 120000 index 0000000..dc1dc0c --- /dev/null +++ b/.config/systemd/user/pulseaudio.socket @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/.config/wal/templates/colors-vscode-theme.json b/.config/wal/templates/colors-vscode-theme.json new file mode 100644 index 0000000..534bb2a --- /dev/null +++ b/.config/wal/templates/colors-vscode-theme.json @@ -0,0 +1,736 @@ +{{ + "name": "vs-wal", + "type": "dark", + "colors": {{ + "editor.background": "{background}", + "editor.foreground": "{foreground}", + "activityBarBadge.background": "{color9}", + "sideBarTitle.foreground": "{foreground}", + "activityBar.background": "{background}", + "activityBar.dropBackground": "{color3}", + "activityBar.foreground": "{foreground}", + "activityBarBadge.foreground": "{foreground}", + "badge.foreground": "{foreground}", + "badge.background": "{background}", + "terminal.background": "{background}", + "terminal.foreground": "{foreground}", + "terminal.ansiBlack": "{color0}", + "terminal.ansiRed": "{color1}", + "terminal.ansiGreen": "{color2}", + "terminal.ansiYellow": "{color3}", + "terminal.ansiBlue": "{color4}", + "terminal.ansiMagenta": "{color5}", + "terminal.ansiCyan": "{color6}", + "terminal.ansiWhite": "{color7}", + "terminal.ansiBrightBlack": "{color8}", + "terminal.ansiBrightRed": "{color9}", + "terminal.ansiBrightGreen": "{color10}", + "terminal.ansiBrightYellow": "{color11}", + "terminal.ansiBrightBlue": "{color12}", + "terminal.ansiBrightMagenta": "{color13}", + "terminal.ansiBrightCyan": "{color14}", + "terminal.ansiBrightWhite": "{color15}", + "sideBar.background": "{background}", + "sideBar.foreground": "{foreground}", + "statusBar.background": "{background}", + "statusBar.debuggingBackground": "{foreground}", + "statusBar.debuggingForeground": "{background}", + "statusBar.noFolderForeground": "{foreground}", + "statusBar.noFolderBackground": "{background}", + "statusBar.foreground": "{foreground}", + "tab.activeBorder": "{color0}", + "tab.unfocusedActiveBorder": "{color0}", + "tab.activeBackground": "{foreground}10", + "tab.activeForeground": "{foreground}", + "tab.inactiveBackground": "{background}", + "tab.inactiveForeground": "{foreground}", + "tab.unfocusedActiveForeground": "{color1}", + "tab.unfocusedInactiveForeground": "{background}", + "input.background": "{background}", + "input.foreground": "{foreground}", + "button.background": "{color1}", + "button.foreground": "{foreground}", + "editorGroupHeader.tabsBackground": "{background}", + "editorGroup.dropBackground": "{color1}60", + "textLink.activeForeground": "{color3}", + "textLink.foreground": "{color2}", + "list.activeSelectionBackground": "{color2}", + "list.focusBackground": "{color2}", + "list.hoverForeground": "{foreground}", + "list.hoverBackground": "{color2}30", + "list.dropBackground": "{color2}30" + + }}, + "tokenColors": [ + {{ + "settings": {{ + "foreground": "{color1}", + "background": "{background}" + }} + }}, + {{ + "name": "Comment", + "scope": [ + "comment", + "punctuation.definition.comment" + ], + "settings": {{ + "fontStyle": "italic", + "foreground": "{color8}" + }} + }}, + {{ + "name": "Variables", + "scope": [ + "variable", + "string constant.other.placeholder" + ], + "settings": {{ + "foreground": "{color6}" + }} + }}, + {{ + "name": "Colors", + "scope": [ + "constant.other.color" + ], + "settings": {{ + "foreground": "{color7}" + }} + }}, + {{ + "name": "Invalid", + "scope": [ + "invalid", + "invalid.illegal" + ], + "settings": {{ + "foreground": "{color9}" + }} + }}, + {{ + "name": "Keyword, Storage", + "scope": [ + "keyword", + "storage.type", + "storage.modifier" + ], + "settings": {{ + "foreground": "{color2}" + }} + }}, + {{ + "name": "Operator, Misc", + "scope": [ + "keyword.control", + "constant.other.color", + "punctuation", + "meta.tag", + "punctuation.definition.tag", + "punctuation.separator.inheritance.php", + "punctuation.definition.tag.html", + "punctuation.definition.tag.begin.html", + "punctuation.definition.tag.end.html", + "punctuation.section.embedded", + "keyword.other.template", + "keyword.other.substitution" + ], + "settings": {{ + "foreground": "{color6}" + }} + }}, + {{ + "name": "Tag", + "scope": [ + "entity.name.tag", + "meta.tag.sgml", + "markup.deleted.git_gutter" + ], + "settings": {{ + "foreground": "{color9}" + }} + }}, + {{ + "name": "Function, Special Method", + "scope": [ + "entity.name.function", + "meta.function-call", + "variable.function", + "support.function", + "keyword.other.special-method" + ], + "settings": {{ + "foreground": "{color1}" + }} + }}, + {{ + "name": "Block Level Variables", + "scope": [ + "meta.block variable.other" + ], + "settings": {{ + "foreground": "{color9}" + }} + }}, + {{ + "name": "Other Variable, String Link", + "scope": [ + "support.other.variable", + "string.other.link" + ], + "settings": {{ + "foreground": "{color9}" + }} + }}, + {{ + "name": "Number, Constant, Function Argument, Tag Attribute, Embedded", + "scope": [ + "constant.numeric", + "constant.language", + "support.constant", + "constant.character", + "constant.escape", + "variable.parameter", + "keyword.other.unit", + "keyword.other" + ], + "settings": {{ + "foreground": "{color3}" + }} + }}, + {{ + "name": "String, Symbols, Inherited Class, Markup Heading", + "scope": [ + "string", + "constant.other.symbol", + "constant.other.key", + "entity.other.inherited-class", + "markup.heading", + "markup.inserted.git_gutter", + "meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js" + ], + "settings": {{ + "fontStyle": "normal", + "foreground": "{color4}" + }} + }}, + {{ + "name": "Class, Support", + "scope": [ + "entity.name", + "support.type", + "support.class", + "support.orther.namespace.use.php", + "meta.use.php", + "support.other.namespace.php", + "markup.changed.git_gutter", + "support.type.sys-types" + ], + "settings": {{ + "foreground": "{color5}" + }} + }}, + {{ + "name": "Entity Types", + "scope": [ + "support.type" + ], + "settings": {{ + "foreground": "{color14}" + }} + }}, + {{ + "name": "CSS Class and Support", + "scope": [ + "source.css support.type.property-name", + "source.sass support.type.property-name", + "source.scss support.type.property-name", + "source.less support.type.property-name", + "source.stylus support.type.property-name", + "source.postcss support.type.property-name" + ], + "settings": {{ + "foreground": "{color14}" + }} + }}, + {{ + "name": "Sub-methods", + "scope": [ + "entity.name.module.js", + "variable.import.parameter.js", + "variable.other.class.js" + ], + "settings": {{ + "foreground": "{color9}" + }} + }}, + {{ + "name": "Language methods", + "scope": [ + "variable.language" + ], + "settings": {{ + "fontStyle": "italic", + "foreground": "{color9}" + }} + }}, + {{ + "name": "entity.name.method.js", + "scope": [ + "entity.name.method.js" + ], + "settings": {{ + "fontStyle": "italic", + "foreground": "{color12}" + }} + }}, + {{ + "name": "meta.method.js", + "scope": [ + "meta.class-method.js entity.name.function.js", + "variable.function.constructor" + ], + "settings": {{ + "foreground": "{color12}" + }} + }}, + {{ + "name": "Attributes", + "scope": [ + "entity.other.attribute-name" + ], + "settings": {{ + "foreground": "{color13}" + }} + }}, + {{ + "name": "HTML Attributes", + "scope": [ + "text.html.basic entity.other.attribute-name.html", + "text.html.basic entity.other.attribute-name" + ], + "settings": {{ + "fontStyle": "italic", + "foreground": "{color3}" + }} + }}, + {{ + "name": "CSS Classes", + "scope": [ + "entity.other.attribute-name.class" + ], + "settings": {{ + "foreground": "{color3}" + }} + }}, + {{ + "name": "CSS ID's", + "scope": [ + "source.sass keyword.control" + ], + "settings": {{ + "foreground": "{color12}" + }} + }}, + {{ + "name": "Inserted", + "scope": [ + "markup.inserted" + ], + "settings": {{ + "foreground": "{color10}" + }} + }}, + {{ + "name": "Deleted", + "scope": [ + "markup.deleted" + ], + "settings": {{ + "foreground": "{color9}" + }} + }}, + {{ + "name": "Changed", + "scope": [ + "markup.changed" + ], + "settings": {{ + "foreground": "{color13}" + }} + }}, + {{ + "name": "Regular Expressions", + "scope": [ + "string.regexp" + ], + "settings": {{ + "foreground": "{color14}" + }} + }}, + {{ + "name": "Escape Characters", + "scope": [ + "constant.character.escape" + ], + "settings": {{ + "foreground": "{color14}" + }} + }}, + {{ + "name": "URL", + "scope": [ + "*url*", + "*link*", + "*uri*" + ], + "settings": {{ + "fontStyle": "underline" + }} + }}, + {{ + "name": "Decorators", + "scope": [ + "tag.decorator.js entity.name.tag.js", + "tag.decorator.js punctuation.definition.tag.js" + ], + "settings": {{ + "fontStyle": "italic", + "foreground": "{color12}" + }} + }}, + {{ + "name": "ES7 Bind Operator", + "scope": [ + "source.js constant.other.object.key.js string.unquoted.label.js" + ], + "settings": {{ + "fontStyle": "italic", + "foreground": "{color9}" + }} + }}, + {{ + "name": "JSON Key - Level 0", + "scope": [ + "source.json meta.structure.dictionary.json support.type.property-name.json" + ], + "settings": {{ + "foreground": "{color6}" + }} + }}, + {{ + "name": "JSON Key - Level 1", + "scope": [ + "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" + ], + "settings": {{ + "foreground": "{color7}" + }} + }}, + {{ + "name": "JSON Key - Level 2", + "scope": [ + "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" + ], + "settings": {{ + "foreground": "{color8}" + }} + }}, + {{ + "name": "JSON Key - Level 3", + "scope": [ + "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" + ], + "settings": {{ + "foreground": "{color9}" + }} + }}, + {{ + "name": "JSON Key - Level 4", + "scope": [ + "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" + ], + "settings": {{ + "foreground": "{color10}" + }} + }}, + {{ + "name": "JSON Key - Level 5", + "scope": [ + "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" + ], + "settings": {{ + "foreground": "{color12}" + }} + }}, + {{ + "name": "JSON Key - Level 6", + "scope": [ + "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" + ], + "settings": {{ + "foreground": "{color9}" + }} + }}, + {{ + "name": "JSON Key - Level 7", + "scope": [ + "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" + ], + "settings": {{ + "foreground": "{color13}" + }} + }}, + {{ + "name": "JSON Key - Level 8", + "scope": [ + "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" + ], + "settings": {{ + "foreground": "{color10}" + }} + }}, + {{ + "name": "Markdown - Plain", + "scope": [ + "text.html.markdown", + "punctuation.definition.list_item.markdown" + ], + "settings": {{ + "foreground": "{color7}" + }} + }}, + {{ + "name": "Markdown - Markup Raw Inline", + "scope": [ + "text.html.markdown markup.inline.raw.markdown" + ], + "settings": {{ + "foreground": "{color13}" + }} + }}, + {{ + "name": "Markdown - Markup Raw Inline Punctuation", + "scope": [ + "text.html.markdown markup.inline.raw.markdown punctuation.definition.raw.markdown" + ], + "settings": {{ + "foreground": "{color8}" + }} + }}, + {{ + "name": "Markdown - Line Break", + "scope": [ + "text.html.markdown meta.dummy.line-break" + ], + "settings": {{ + "foreground": "" + }} + }}, + {{ + "name": "Markdown - Heading", + "scope": [ + "markdown.heading", + "markup.heading | markup.heading entity.name", + "markup.heading.markdown punctuation.definition.heading.markdown" + ], + "settings": {{ + "foreground": "{color10}" + }} + }}, + {{ + "name": "Markup - Italic", + "scope": [ + "markup.italic" + ], + "settings": {{ + "fontStyle": "italic", + "foreground": "{color9}" + }} + }}, + {{ + "name": "Markup - Bold", + "scope": [ + "markup.bold", + "markup.bold string" + ], + "settings": {{ + "fontStyle": "bold", + "foreground": "{color9}" + }} + }}, + {{ + "name": "Markup - Bold-Italic", + "scope": [ + "markup.bold markup.italic", + "markup.italic markup.bold", + "markup.quote markup.bold", + "markup.bold markup.italic string", + "markup.italic markup.bold string", + "markup.quote markup.bold string" + ], + "settings": {{ + "fontStyle": "bold", + "foreground": "{color9}" + }} + }}, + {{ + "name": "Markup - Underline", + "scope": [ + "markup.underline" + ], + "settings": {{ + "fontStyle": "underline", + "foreground": "{color10}" + }} + }}, + {{ + "name": "Markup - Strike", + "scope": [ + "markup.strike" + ], + "settings": {{ + "fontStyle": "strike", + "foreground": "" + }} + }}, + {{ + "name": "Markdown - Blockquote", + "scope": [ + "markup.quote punctuation.definition.blockquote.markdown" + ], + "settings": {{ + "background": "{color8}", + "foreground": "{color8}" + }} + }}, + {{ + "name": "Markup - Quote", + "scope": [ + "markup.quote" + ], + "settings": {{ + "fontStyle": "italic", + "foreground": "" + }} + }}, + {{ + "name": "Markdown - Link", + "scope": [ + "string.other.link.title.markdown" + ], + "settings": {{ + "foreground": "{color12}" + }} + }}, + {{ + "name": "Markdown - Link Description", + "scope": [ + "string.other.link.description.title.markdown" + ], + "settings": {{ + "foreground": "{color13}" + }} + }}, + {{ + "name": "Markdown - Link Anchor", + "scope": [ + "constant.other.reference.link.markdown" + ], + "settings": {{ + "foreground": "{color3}" + }} + }}, + {{ + "name": "Markup - Raw Block", + "scope": [ + "markup.raw.block" + ], + "settings": {{ + "foreground": "{color13}" + }} + }}, + {{ + "name": "Markdown - Raw Block Fenced", + "scope": [ + "markup.raw.block.fenced.markdown" + ], + "settings": {{ + "foreground": "{color15}50" + }} + }}, + {{ + "name": "Markdown - Fenced Bode Block", + "scope": [ + "punctuation.definition.fenced.markdown" + ], + "settings": {{ + "foreground": "{color15}50" + }} + }}, + {{ + "name": "Markdown - Fenced Bode Block Variable", + "scope": [ + "markup.raw.block.fenced.markdown", + "variable.language.fenced.markdown", + "punctuation.section.class.end" + ], + "settings": {{ + "foreground": "{color7}" + }} + }}, + {{ + "name": "Markdown - Fenced Language", + "scope": [ + "variable.language.fenced.markdown" + ], + "settings": {{ + "foreground": "{color8}" + }} + }}, + {{ + "name": "Markdown - Separator", + "scope": [ + "meta.separator" + ], + "settings": {{ + "fontStyle": "bold", + "background": "{color15}50", + "foreground": "{color8}" + }} + }}, + {{ + "name": "Markup - Table", + "scope": [ + "markup.table" + ], + "settings": {{ + "foreground": "{color7}" + }} + }}, + {{ + "scope": "token.info-token", + "settings": {{ + "foreground": "{color6}" + }} + }}, + {{ + "scope": "token.warn-token", + "settings": {{ + "foreground": "{color3}" + }} + }}, + {{ + "scope": "token.error-token", + "settings": {{ + "foreground": "{color9}" + }} + }}, + {{ + "scope": "token.debug-token", + "settings": {{ + "foreground": "{color13}" + }} + }} + ] +}} diff --git a/.config/waybar/bin/biurko_off.sh b/.config/waybar/bin/biurko_off.sh new file mode 100755 index 0000000..c376336 --- /dev/null +++ b/.config/waybar/bin/biurko_off.sh @@ -0,0 +1,2 @@ +#!/bin/bash +curl -X POST -d '' http://192.168.88.169:8123/api/webhook/ledy_off diff --git a/.config/waybar/bin/biurko_on.sh b/.config/waybar/bin/biurko_on.sh new file mode 100755 index 0000000..8dfb7dc --- /dev/null +++ b/.config/waybar/bin/biurko_on.sh @@ -0,0 +1,2 @@ +#!/bin/bash +curl -X POST -d '' http://192.168.88.169:8123/api/webhook/ledy_on diff --git a/.config/waybar/bin/biurko_rainbow.sh b/.config/waybar/bin/biurko_rainbow.sh new file mode 100755 index 0000000..689c84d --- /dev/null +++ b/.config/waybar/bin/biurko_rainbow.sh @@ -0,0 +1,2 @@ +#!/bin/bash +curl -X POST -d '' http://192.168.88.169:8123/api/webhook/biurko_rainbow diff --git a/.config/waybar/bin/biurko_red.sh b/.config/waybar/bin/biurko_red.sh new file mode 100755 index 0000000..47d4fcd --- /dev/null +++ b/.config/waybar/bin/biurko_red.sh @@ -0,0 +1,2 @@ +#!/bin/bash +curl -X POST -d '' http://192.168.88.169:8123/api/webhook/ledy_red diff --git a/.config/waybar/bin/domofon.sh b/.config/waybar/bin/domofon.sh new file mode 100755 index 0000000..5ae1b80 --- /dev/null +++ b/.config/waybar/bin/domofon.sh @@ -0,0 +1,2 @@ +#!/bin/bash +curl -X POST -d '' http://192.168.88.169:8123/api/webhook/domofon diff --git a/.config/waybar/bin/tv_voldown.sh b/.config/waybar/bin/tv_voldown.sh new file mode 100755 index 0000000..cc9b2a8 --- /dev/null +++ b/.config/waybar/bin/tv_voldown.sh @@ -0,0 +1,2 @@ +#!/bin/bash +curl -X POST -d '' http://192.168.88.169:8123/api/webhook/tv_voldown diff --git a/.config/waybar/bin/tv_volup.sh b/.config/waybar/bin/tv_volup.sh new file mode 100755 index 0000000..03b9669 --- /dev/null +++ b/.config/waybar/bin/tv_volup.sh @@ -0,0 +1,2 @@ +#!/bin/bash +curl -X POST -d '' http://192.168.88.169:8123/api/webhook/tv_volup diff --git a/.config/waybar/config b/.config/waybar/config index c2ee1f8..de101bd 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -1,11 +1,10 @@ -// -*- mode: json -*- [ { "layer": "top", "position": "top", "modules-left": [ - "sway/workspaces", + "sway/workspaces" ], "modules-center": [ "sway/window" @@ -71,9 +70,15 @@ "custom/hum", "custom/pressure", "custom/pm_25", - "custom/pm_10", + "custom/pm_10" ], "modules-center": [ + "custom/biurko_on", + "custom/biurko_off", + "custom/biurko_rainbow", + "custom/domofon", + "custom/tv_volup", + "custom/tv_voldown" ], "modules-right": [ "custom/rsyncnet", @@ -108,6 +113,42 @@ "exec": "$HOME/.config/waybar/bin/sensor.sh pm2_5" }, + "custom/biurko_on": { + "format": "ON", + "on-click": "$HOME/.config/waybar/bin/biurko_on.sh" + }, + + "custom/biurko_off": { + "format": "OFF", + "on-click": "$HOME/.config/waybar/bin/biurko_off.sh" + }, + + "custom/tv_volup": { + "format": "🔊", + "on-click": "$HOME/.config/waybar/bin/tv_volup.sh" + }, + + "custom/tv_voldown": { + "format": "🔈", + "on-click": "$HOME/.config/waybar/bin/tv_voldown.sh" + }, + + "custom/domofon": { + "format": "📷", + "on-click": "$HOME/.config/waybar/bin/domofon.sh" + }, + + "custom/biurko_rainbow": { + "format": "🎉", + "on-click": "$HOME/.config/waybar/bin/biurko_rainbow.sh" + }, + + "custom/biurko_red": { + "format": "RED", + "on-click": "$HOME/.config/waybar/bin/biurko_red.sh" + }, + + "custom/pm_10": { "format": "pm10 {}", "return-type": "text", @@ -115,14 +156,6 @@ "exec": "$HOME/.config/waybar/bin/sensor.sh pm10" }, - "custom/rsyncnet": { - "format": "{}", - "return-type": "text", - "interval": 60, - "exec": "cat /tmp/rsync.net" - }, - - "battery": { "states": { "good": 95, @@ -143,4 +176,4 @@ "spacing": 6 } } -] \ No newline at end of file +] diff --git a/.config/waybar/style.css b/.config/waybar/style.css index e076ef4..af40252 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,4 +1,12 @@ -@import "../../.cache/wal/colors-waybar.css"; +@define-color fore #dbcdac; +@define-color back #0f0e09; +@define-color inactive #9F8D5E; +@define-color dark #324443; +@define-color active #dbcdac; +@define-color orange #FFA500; +@define-color green #228b22; +@define-color blue #7cb9e8; +@define-color yellow #deb887; * { @@ -38,6 +46,12 @@ window#waybar { margin-left: 10px; } +#custom-biurko_on, +#custom-biurko_off, +#custom-biurko_red, +#custom-tv_volup, +#custom-tv_voldown, +#custom-domofon, #workspaces { background: none; color: white; @@ -75,7 +89,7 @@ window#waybar { } #workspaces button.focused { - color: #FFA500; + color: @orange; margin: 0; } @@ -98,3 +112,21 @@ window#waybar { background: black; padding: 0 10px; } + +#clock.2, +#custom-temperature { + color: @orange; +} + +#custom-pressure { + color: @green; +} + +#custom-hum { + color: @blue; +} + +#custom-pm_25, +#custom-pm_10 { + color: @yellow; +} diff --git a/.gitconfig b/.gitconfig index fdc94e0..f0099bd 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,9 +1,11 @@ [user] email = aleksander@cynarski.pl name = Aleksander Cynarski - signingkey = C4340BA42B9C173A + #signingkey = C4340BA42B9C173A + signingkey = 7C6540C5B18BF2930DDEDA4D6A7C0327F517CA88 [push] default = matching + autoSetupRemote = true [merge] conflictstyle = diff3 tool = meld @@ -77,7 +79,13 @@ [includeIf "gitdir:~/Projects/CyfroweNiebo/"] path = ~/Projects/CyfroweNiebo/.gitconfig -[includeIf "gitdir:~/Projects/streamsage/"] +[includeIf "gitdir:~/Projects/streamsage.io/"] + path = ~/Projects/streamsage.io/.gitconfig + +[includeIf "gitdir:~/Projects/stream-sage/"] + path = ~/Projects/streamsage.io/.gitconfig + +[includeIf "gitdir:~/Projects/cardboard.live/"] path = ~/Projects/streamsage.io/.gitconfig [includeIf "gitdir:~/Projects/GONG/"] @@ -107,3 +115,5 @@ [interactive] diffFilter = delta --color-only +[safe] + directory = /opt/flutter diff --git a/.gitignore b/.gitignore index 3e52778..af7762e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ compile zeus/ _todos.md .tmuxp.yaml -vendor/ ./docker/docker-compose-elena.yml .jira-url .jira-prefix diff --git a/.zshrc b/.zshrc index c5529de..f73e193 100644 --- a/.zshrc +++ b/.zshrc @@ -10,6 +10,9 @@ # ################################################################################# +alias egrep="grep -E" +alias fgrep="grep -F" + #Load my environment exports [ -f ~/.exports ] && source ~/.exports @@ -38,6 +41,7 @@ export PATH="/home/paramah/bin:$PATH" #symfony export PATH="$HOME/.symfony/bin:$PATH" +export PATH="/home/paramah/.linkerd2/bin:$PATH" # Path to your oh-my-zsh installation. export ZSH=$HOME/.oh-my-zsh @@ -53,6 +57,7 @@ source /usr/bin/virtualenvwrapper.sh plugins=( zsh-autosuggestions virtualenvwrapper + virtualenv taskwarrior timewarrior archlinux @@ -78,7 +83,7 @@ zplug 'ytet5uy4/fzf-widgets' zplug 'zsh-users/zaw' zplug "pbar1/zsh-terraform" zplug 'voronkovich/project.plugin.zsh' -zplug romkatv/powerlevel10k, as:theme, depth:1 +#zplug romkatv/powerlevel10k, as:theme, depth:1 zplug "jocelynmallon/zshmarks" zplug "djui/alias-tips" zplug "zpm-zsh/clipboard" @@ -166,6 +171,8 @@ export goinside; ########################################################################################## +alias egrep="grep -E" +alias fgrep="grep -F" alias l="tmuxp load -y " alias dc="docker-compose" alias d="docker" @@ -202,6 +209,11 @@ alias vim="nvim" alias j="jump" alias b="bookmark" +alias r="ranger" + +alias k="kubectl" + +alias paste-online="wl-paste |lenpaste-cli" dd_telegram-desktop () { # launch telegram and send it to scratchpad (/usr/bin/telegram-desktop &) @@ -246,7 +258,7 @@ xset b off #eval "$(starship init zsh)" #eval "$(jira --completion-script-zsh)" #eval "$(_JZ_COMPLETE=source_zsh jz)" -#eval "$(_HAJDUK_COMPLETE=source_zsh hajduk)" +eval "$(_HAJDUK_COMPLETE=source_zsh hajduk)" #eval "$(_H_COMPLETE=source_zsh h)" eval "$(direnv hook zsh)" #eval "$(register-python-argcomplete gitlab)" @@ -289,14 +301,29 @@ function ec2-list(){ function ec2-connect(){ HOST=$(ec2-list | fzf --layout=reverse --border=none | awk '{print $4}' |sed 's/|//') - jssh $HOST + gum confirm "Add host to Stream Sage VPN route?" && skrzat mikrotik tovpn jazzy-l2tp jazzy ${HOST} + USER=$(gum choose "ec2-user" "admin" "ubuntu" "bitnami") + jssh $USER@$HOST } function ec2-vpc-connect(){ HOST=$(ec2-list | fzf --layout=reverse --border=none | awk '{print $6}') - jssh $HOST + USER=$(gum choose "ec2-user" "admin" "ubuntu" "bitnami") + jssh $USER@$HOST } +function targetgroups-list(){ + LB_ARN=$(aws elbv2 describe-load-balancers --query "LoadBalancers[*][LoadBalancerName, LoadBalancerArn]" --output table |fzf | awk '{print $4}') + echo LB_ARN +} + +function tester-toogle(){ + if [[ $(aws ec2 describe-instances --instance-ids $EC_TESTER_ID --query 'Reservations[].Instances[].State[].Name' --output text) = "running" ]] ; then \ + aws ec2 stop-instances --instance-ids $EC_TESTER_ID; \ + elif [[ $(aws ec2 describe-instances --instance-ids $EC_TESTER_ID --query 'Reservations[].Instances[].State[].Name' --output text) = "stopped" ]] ; then \ + aws ec2 start-instances --instance-ids $EC_TESTER_ID ; \ + fi +} # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. @@ -311,7 +338,7 @@ source $HOME/.oh-my-zsh/custom/plugins/fzf-tab-completion/zsh/fzf-zsh-completion autoload -Uz bashcompinit && bashcompinit complete -C aws_completer aws -eval "$(_MOLECULE_COMPLETE=source molecule)" +# eval "$(_MOLECULE_COMPLETE=source molecule)" #. ~/.cache/wal/colors.sh # # @@ -390,11 +417,16 @@ PERL_MM_OPT="INSTALL_BASE=/home/paramah/perl5"; export PERL_MM_OPT; PATH="/home/paramah/.local/share/gem/ruby/3.0.0/bin${PATH:+${PATH}}"; export PATH; #source <(clockify-cli completion zsh) +source <(kubectl completion zsh) +source <(helm completion zsh) +source <(kubectl completion zsh) POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD=true typeset -g POWERLEVEL9K_DIR_CLASSES=( '~/Projects/jazzy.pro(|/*)' WORK '' '~/Projects/streamsage(|/*)' WORKSS '' + '~/Projects/streamsage.io(|/*)' WORKSS '' + '~/Projects/stream-sage(|/*)' WORKSS '' '~/Projects/Private(|/*)' PRIVATE '' '~/Projects/cynarski.dev(|/*)' PRIVATE '' '~/Projects/CyfroweNiebo(|/*)' NIEBO '' @@ -405,3 +437,9 @@ typeset -g POWERLEVEL9K_DIR_WORK_VISUAL_IDENTIFIER_EXPANSION='(j!)' typeset -g POWERLEVEL9K_DIR_WORKSS_VISUAL_IDENTIFIER_EXPANSION='<>' typeset -g POWERLEVEL9K_DIR_PRIVATE_VISUAL_IDENTIFIER_EXPANSION='(℀ )' typeset -g POWERLEVEL9K_DIR_NIEBO_VISUAL_IDENTIFIER_EXPANSION='[☰ ]' +typeset -g POWERLEVEL9K_AWS_SHOW_ON_DEMAND='' + +#export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) +#export GPG_TTY=$(tty) +#gpgconf --launch gpg-agent +#gpg-connect-agent updatestartuptty /bye >/dev/null diff --git a/bin/ec2-tmux b/bin/ec2-tmux new file mode 100755 index 0000000..86af8b7 --- /dev/null +++ b/bin/ec2-tmux @@ -0,0 +1,51 @@ +#!/bin/bash -x + +#set -o errexit +set -o nounset +set -o pipefail + +SESSION=$AWS_PROFILE +EC2_INSTANCES=$(aws ec2 describe-instances --filter "Name=instance-state-name,Values=running" --query "Reservations[*].Instances[*].[PublicIpAddress, Tags[?Key=='Name'].Value|[0]]" --output text|sed -E 's/\s+/,/g') + +get_window() { + NAME=$1 + window_id=$(tmux list-windows -t $SESSION -F "#W:#I" |grep $NAME|cut -d':' -f2) + echo "$window_id" +} + +create_window() { + NAME=$1 + COUNT=$(tmux list-windows -t $SESSION|wc -l) + WINDOW_ID=$(($COUNT)) + tmux new-window -t $SESSION:$WINDOW_ID -n $NAME +} + +attach_to_window() { + NAME=$1 + HOST=$2 + WINDOW=$(get_window $NAME) + if [ "$WINDOW" = "" ] + then + create_window $NAME + tmux send-keys -t $NAME "jssh $HOST" C-m + else + tmux split-window -t $NAME + tmux send-keys -t $NAME "jssh $HOST" C-m + fi +} + + +tmux has-session -t $SESSION 2>/dev/null +if [ $? != 0 ]; then + tmux new-session -d -s $SESSION + for INSTANCE in $EC2_INSTANCES + do + HOST=$(echo $INSTANCE|cut -d',' -f1) + NAME=$(echo $INSTANCE|cut -d',' -f2) + attach_to_window $NAME $HOST + done +fi + +tmux attach-session -t $SESSION + + diff --git a/bin/pinentry b/bin/pinentry new file mode 100755 index 0000000..e404900 --- /dev/null +++ b/bin/pinentry @@ -0,0 +1,11 @@ +#!/bin/sh +set -eu + +PINENTRY_TERMINAL='/sbin/pinentry-curses' +PINENTRY_VAYLAND='/sbin/pinentry-gtk-2' + +if [ -n "${DISPLAY-}" -a -z "${TERM-}" ]; then + exec "$PINENTRY_VAYLAND" "$@" +else + exec "$PINENTRY_TERMINAL" "$@" +fi diff --git a/bin/ss-keys.sh b/bin/ss-keys.sh new file mode 100644 index 0000000..9245ba3 --- /dev/null +++ b/bin/ss-keys.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +echo "Adding T O O L B O X KEYS" +ssh-add ~/Projects/streamsage.io/terraform-envs/toolbox/toolbox-swarm-ssh-key.pem + diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json new file mode 100644 index 0000000..7bba792 --- /dev/null +++ b/nvim/coc-settings.json @@ -0,0 +1,10 @@ +{ + "languageserver": { + "go": { + "command": "gopls", + "rootPatterns": ["go.mod"], + "trace.server": "verbose", + "filetypes": ["go"] + } + } +} diff --git a/nvim/init.vim b/nvim/init.vim index 5d969f6..7c3e655 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -120,10 +120,11 @@ Plug 'stephpy/vim-php-cs-fixer' " Plug 'fatih/vim-hclfmt' Plug 'hashivim/vim-terraform' Plug 'hashivim/vim-consul' +Plug 'hashivim/vim-nomadproject' " Plug 'b4b4r07/vim-hcl' Plug 'vim-syntastic/syntastic' Plug 'juliosueiras/vim-terraform-completion' - +Plug 'jvirtanen/vim-hcl' " Python """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -153,7 +154,7 @@ Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app && yarn install' } " Plug 'neoclide/coc.nvim', {'branch': 'release'} " Or build from source code by using yarn: https://yarnpkg.com -" Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'} +Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'} call plug#end() "