Compare commits

..

6 Commits

12 changed files with 37 additions and 24 deletions

5
.gitignore vendored
View File

@@ -42,7 +42,10 @@ tmux/*
git/* git/*
!git/config !git/config
!git/ignore !git/ignore
!git/aflabs !git/config.d
git/config.d/*
!git/config.d/aflabs.conf
!git/config.d/flare.conf
# ghostty # ghostty
!ghostty !ghostty

View File

@@ -1,12 +1,3 @@
[includeIf "gitdir:~/Desktop/git/git.aflabs.org/"]
path = ~/.config/git/config.d/aflabs.conf
[includeIf "gitdir:~/Desktop/git/gitlab.com/flarenetwork"]
path = ~/.config/git/config.d/flare.conf
[includeIf "gitdir:~/Desktop/git/gitlab.com/flare-foundation"]
path = ~/.config/git/config.d/flare.conf
[user] [user]
name = Matej Janežič name = Matej Janežič
email = janezic.mj@gmail.com email = janezic.mj@gmail.com
@@ -54,3 +45,12 @@
[mergetool "nvimdiff"] [mergetool "nvimdiff"]
layout = "LOCAL,BASE,REMOTE / MERGED" layout = "LOCAL,BASE,REMOTE / MERGED"
[includeIf "gitdir:~/git/git.aflabs.org/**"]
path = ~/.config/git/config.d/aflabs.conf
[includeIf "gitdir:~/git/gitlab.com/flarenetwork/**"]
path = ~/.config/git/config.d/flare.conf
[includeIf "gitdir:~/git/gitlab.com/flare-foundation/**"]
path = ~/.config/git/config.d/flare.conf

2
git/config.d/aflabs.conf Normal file
View File

@@ -0,0 +1,2 @@
[user]
email = matej.janezic@aflabs.com

2
git/config.d/flare.conf Normal file
View File

@@ -0,0 +1,2 @@
[user]
email = matej@flare.network

View File

@@ -15,6 +15,9 @@ set $lockscreen swaylock
# other # other
set $wobs /tmp/wob.sock set $wobs /tmp/wob.sock
# style
set $border 3
# colors # colors
set $bg0 #32302f set $bg0 #32302f
set $bg1 #252423 set $bg1 #252423

View File

@@ -1,4 +1,5 @@
input "type:keyboard" { input "type:keyboard" {
xkb_options "fkeys:basic_13-24"
repeat_delay 150 repeat_delay 150
repeat_rate 35 repeat_rate 35
} }

View File

@@ -1,8 +1,8 @@
titlebar_border_thickness 2
font pango:JetBrainsMono Nerd Font Bold 10 font pango:JetBrainsMono Nerd Font Bold 10
default_floating_border normal 2 default_floating_border normal $border
default_border normal 2 default_border normal $border
titlebar_border_thickness $border
# class border bground text indicator child_border # class border bground text indicator child_border
client.focused $fg $bg0 $fg $fg $fg client.focused $fg $bg0 $fg $fg $fg

View File

@@ -1,11 +1,8 @@
gaps outer 6 titlebar_separator disable
gaps inner 6
gaps top 1
corner_radius 7
shadows enable shadows enable
shadow_blur_radius 25 shadow_blur_radius 25
shadow_color #0000007F shadow_color #0000007F
shadow_offset 0 5 shadow_offset 0 5
blur enable blur enable

View File

@@ -71,7 +71,7 @@ bindsym $mod+e layout toggle split
bindsym $mod+f fullscreen bindsym $mod+f fullscreen
# focus # focus
bindsym $mod+Shift+space floating toggle; [floating] border pixel 3; [tiling] border normal 3 bindsym $mod+Shift+space floating toggle; [floating] border pixel $border; [tiling] border normal $border
bindsym $mod+space focus mode_toggle bindsym $mod+space focus mode_toggle
bindsym $mod+a focus parent bindsym $mod+a focus parent
@@ -83,7 +83,8 @@ bindsym $mod+minus scratchpad show
bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
bindsym --locked XF86AudioLowerVolume exec pamixer -d 5 && pamixer --get-volume > $wobs bindsym --locked XF86AudioLowerVolume exec pamixer -d 5 && pamixer --get-volume > $wobs
bindsym --locked XF86AudioRaiseVolume exec pamixer -i 5 && pamixer --get-volume > $wobs bindsym --locked XF86AudioRaiseVolume exec pamixer -i 5 && pamixer --get-volume > $wobs
bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle bindsym --locked F16 exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
# xf86-brightnes # xf86-brightnes
bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%- bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+ bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+

View File

@@ -1,12 +1,12 @@
# additional theming # additional theming
for_window [floating] border pixel 3 for_window [floating] border pixel $border
for_window [tiling] border normal 3 for_window [tiling] border normal $border
# workspace assignment # workspace assignment
assign [app_id="google-chrome"] workspace 2 assign [app_id="google-chrome"] workspace 2
assign [app_id="thunderbird"] workspace 3 assign [app_id="thunderbird"] workspace 3
assign [app_id="Cider"] workspace 4 assign [app_id="Cider"] workspace 4
assign [class=".*BoltLauncher.*"] workspace 5 assign [app_id=".*BoltLauncher.*"] workspace 5
assign [class="net-runelite.*"] workspace 5 assign [class="net-runelite.*"] workspace 5
assign [app_id="vesktop"] workspace 8 assign [app_id="vesktop"] workspace 8
assign [app_id="Slack"] workspace 8 assign [app_id="Slack"] workspace 8

View File

@@ -1,7 +1,10 @@
# deamon # deamon
exec swayidle -w exec swayidle -w
exec wlsunset -l 46.1 -L 14.5 exec wlsunset -l 46.1 -L 14.5
exec rm -f $wobs && mkfifo $wobs && tail -f $wobs | wob exec rm -f $wobs \
&& mkfifo $wobs \
&& tail -f $wobs \
| wob
exec protonmail-bridge -n exec protonmail-bridge -n
# traditional "start when os starts" programs # traditional "start when os starts" programs

View File

@@ -24,6 +24,7 @@ alias accenton="defaults write -g ApplePressAndHoldEnabled -bool true"
alias accentoff="defaults write -g ApplePressAndHoldEnabled -bool false" alias accentoff="defaults write -g ApplePressAndHoldEnabled -bool false"
# git # git
alias gpo="git push origin"
alias gros="git reset origin/$(git_current_branch) --soft" alias gros="git reset origin/$(git_current_branch) --soft"
alias gcan="git commit -v --amend --no-edit" alias gcan="git commit -v --amend --no-edit"
alias glogaa="git log --oneline --graph --all --pretty=format:\"%C(auto)%h %C(blue)(%aL/%cL)%C(auto)%(decorate) %s%Creset\"" alias glogaa="git log --oneline --graph --all --pretty=format:\"%C(auto)%h %C(blue)(%aL/%cL)%C(auto)%(decorate) %s%Creset\""