aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/nvim/.lua-format34
-rw-r--r--.config/nvim/init.lua7
-rw-r--r--.config/sway/config24
-rw-r--r--.config/waybar/config6
-rw-r--r--.gitmodules6
5 files changed, 62 insertions, 15 deletions
diff --git a/.config/nvim/.lua-format b/.config/nvim/.lua-format
new file mode 100644
index 0000000..0c78da7
--- /dev/null
+++ b/.config/nvim/.lua-format
@@ -0,0 +1,34 @@
+# vi: ft=yaml
+column_limit: 80
+indent_width: 1
+use_tab: true
+tab_width: 4
+continuation_indent_width: 4
+spaces_before_call: 1
+keep_simple_control_block_one_line: true
+keep_simple_function_one_line: true
+align_args: true
+break_after_functioncall_lp: false
+break_before_functioncall_rp: false
+spaces_inside_functioncall_parens: false
+spaces_inside_functiondef_parens: false
+align_parameter: true
+chop_down_parameter: false
+break_after_functiondef_lp: false
+break_before_functiondef_rp: false
+align_table_field: true
+break_after_table_lb: true
+break_before_table_rb: true
+chop_down_table: false
+chop_down_kv_table: true
+table_sep: ","
+extra_sep_at_table_end: true
+column_table_limit: 80
+spaces_inside_table_braces: true
+break_after_operator: true
+double_quote_to_single_quote: false
+single_quote_to_double_quote: true
+spaces_around_equals_in_field: true
+line_breaks_after_function_body: 1
+line_separator: input
+
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index fdf2a11..65b7139 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -199,7 +199,12 @@ return require("packer").startup(function(use)
end,
}
- use { "https://github.com/norcalli/nvim-colorizer.lua" }
+ use {
+ "https://github.com/norcalli/nvim-colorizer.lua",
+ config = function ()
+ require('colorizer').setup()
+ end
+ }
use {
"https://github.com/google/vim-coverage",
diff --git a/.config/sway/config b/.config/sway/config
index c8c35ed..848e94c 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -14,6 +14,7 @@ set $left h
set $down j
set $up k
set $right l
+
set $gtk-theme Matcha-dark-sea
set $icon-theme Papirus-Dark-Maia
set $cursor-theme xcursor-breeze
@@ -50,7 +51,7 @@ set $accent-color #ffffff
# Basic color configuration using the Base16 variables for windows and borders.
# Property Name Border BG Text Indicator Child Border
client.focused $color5 $color12 $color0 $color12 $color12
-client.focused_inactive $color1 $color1 $color5 $color3 $color1
+#client.focused_inactive $color1 $color1 $color5 $color3 $color1
#client.unfocused $color1 $color0 $color5 $color1 $color1
client.urgent $color8 $color8 $color0 $color8 $color8
client.placeholder $color0 $color0 $color5 $color0 $color0
@@ -60,11 +61,11 @@ default_border pixel 8
xwayland enable
# Applications
-set $term alacritty
+set $term $(which foot || which alacritty)
# Note: pass the final command to swaymsg so that the resulting window can be opened
# on the original workspace that the command was run on.
set $menu wofi --show drun -Ii -w 3
-set $screenshot flameshot gui
+set $screenshot grim /dev/stdout | wl-copy
set $toggle_layout input "2821:6228:Asus_Keyboard" xkb_switch_layout next
set $lock swaylock
set $toggle_bar killall -SIGUSR1 waybar
@@ -75,6 +76,8 @@ set $toggle_bar killall -SIGUSR1 waybar
output * bg /usr/share/backgrounds/background.png fill
output eDP-1 scale 1
output eDP-1 adaptive_sync on
+output eDP-1 pos 0 0
+output HDMI-1 pos 0 0
# You can get the names of your outputs by running: swaymsg -t get_outputs
### Idle configuration
@@ -87,7 +90,6 @@ exec swayidle -w \
timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
before-sleep 'swaylock -f -c 000000'
-
### Input configuration
input "2821:6228:Asus_Keyboard" xkb_layout us,no
@@ -130,7 +132,7 @@ input "2821:6228:Asus_Keyboard" xkb_layout us,no
bindsym --locked XF86AudioPrev exec playerctl previous
# Toggle keyboard layout
- bindsym $mod+Shift $toggle_layout
+ bindsym $mod+m $toggle_layout
bindsym $mod+Tab workspace back_and_forth
@@ -253,7 +255,7 @@ mode "resize" {
bindsym $right resize grow width 10px
# Ditto, with arrow keys
- bindsym Left resize shrink width 10px
+ bindshm Left resize shrink width 10px
bindsym Down resize grow height 10px
bindsym Up resize shrink height 10px
bindsym Right resize grow width 10px
@@ -264,16 +266,16 @@ mode "resize" {
}
bindsym $mod+r mode "resize"
-#
+
# Status Bar:
-#
+
# Read `man 5 sway-bar` for more information about this section.
bar {
swaybar_command waybar
}
input "type:touchpad" {
- left_handed enabled
+ # left_handed enabled
tap enabled
natural_scroll enabled
dwt enabled
@@ -286,6 +288,9 @@ exec dunst
exec nm-applet --indicator
exec blueman-applet
exec thunar --daemon
+
+exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+
exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
exec hash dbus-update-activation-environment 2>/dev/null && \
dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
@@ -296,5 +301,4 @@ exec export QT_QPA_PLATFORM=wayland
exec export XDG_CURRENT_DESKTOP=sway
exec export XDG_SESSION_DESKTOP=sway
-
include /etc/sway/config.d/*
diff --git a/.config/waybar/config b/.config/waybar/config
index f010fa3..4104420 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -2,9 +2,9 @@
{
// "layer": "top", // Waybar at top layer
// "position": "bottom", // Waybar position (top|bottom|left|right)
- //"height": 30, // Waybar height (to be removed for auto height)
+ "height": 40, // Waybar height (to be removed for auto height)
// "width": 1280, // Waybar width
- "spacing": 4, // Gaps between modules (4px)
+ //"spacing": 4, // Gaps between modules (4px)
// Choose the order of the modules
"modules-left": [
"sway/workspaces"
@@ -94,7 +94,7 @@
},
"tray": {
"icon-size": 21,
- "spacing": 10
+ "spacing": 12
},
"clock": {
// "timezone": "America/New_York",
diff --git a/.gitmodules b/.gitmodules
index c9f9a2e..c43326f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,11 @@
[submodule ".config/alacritty/themes/dracula"]
path = .config/alacritty/themes/dracula
- url = https://github.com/github.com/dracula/alacritty.git
+ url = https://github.com/dracula/alacritty.git
[submodule ".config/wofi"]
path = .config/wofi
url = https://github.com/dracula/wofi.git
+
+[submodule ".config/foot"]
+ path = .config/foot
+ url = https://github.com/dracula/foot.git