Compare commits
4 Commits
8864557b02
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
de535944f3
|
|||
|
6e56e1d203
|
|||
|
5721cebb57
|
|||
|
15e72a654d
|
5
.gitignore
vendored
5
.gitignore
vendored
@@ -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
|
||||||
|
|||||||
18
git/config
18
git/config
@@ -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
2
git/config.d/aflabs.conf
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
[user]
|
||||||
|
email = matej.janezic@aflabs.com
|
||||||
2
git/config.d/flare.conf
Normal file
2
git/config.d/flare.conf
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
[user]
|
||||||
|
email = matej@flare.network
|
||||||
@@ -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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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%+
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ for_window [tiling] border normal $border
|
|||||||
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
|
||||||
|
|||||||
@@ -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\""
|
||||||
|
|||||||
Reference in New Issue
Block a user