aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/guix/channels.scm2
-rw-r--r--config/nvim/lua/plugins.lua4
-rw-r--r--config/sway/bindsym-media9
-rw-r--r--config/sway/config2
-rw-r--r--config/sway/daemons1
-rw-r--r--config/user-dirs.conf1
6 files changed, 13 insertions, 6 deletions
diff --git a/config/guix/channels.scm b/config/guix/channels.scm
index 6340814..5361d40 100644
--- a/config/guix/channels.scm
+++ b/config/guix/channels.scm
@@ -8,7 +8,7 @@
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
(channel
(name 'elektroline)
- (url "https://gitlab.com/elektroline-predator/guix-channel.git")
+ (url "https://gitlab.elektroline.cz/common/guix-channel.git")
(introduction
(make-channel-introduction
"3fd9ac5fc2fb5b2c77b0fee16163beee419ae353"
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 0066902..77e7efb 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -59,6 +59,7 @@ require("packer").startup(function(use)
local lint = require("lint")
lint.linters_by_ft = {
c = { "clangtidy", "editorconfig-checker" },
+ cpp = { "clangtidy", "editorconfig-checker" },
lua = { "selene", "editorconfig-checker" },
markdown = { "vale" },
nix = { "statix", "deadnix", "nix", "editorconfig-checker" },
@@ -107,6 +108,7 @@ require("packer").startup(function(use)
require("conform").setup({
formatters_by_ft = {
c = { "clang-format", "trim_newlines", "trim_whitespace" },
+ cpp = { "clang-format", "trim_newlines", "trim_whitespace" },
json = { "jq", "trim_newlines", "trim_whitespace" },
lua = { "stylua", "trim_newlines", "trim_whitespace" },
nix = { "alejandra", "trim_newlines", "trim_whitespace" },
@@ -116,6 +118,8 @@ require("packer").startup(function(use)
typst = { "typstyle", "trim_newlines", "trim_whitespace" },
xml = { "xmllint", "trim_newlines", "trim_whitespace" },
yaml = { "yq", "trim_newlines", "trim_whitespace" },
+ meson = { "muon", "trim_newlines", "trim_whitespace" },
+ ["scheme.guile"] = { "trim_newlines", "trim_whitespace" },
},
})
end,
diff --git a/config/sway/bindsym-media b/config/sway/bindsym-media
index 28c4011..f08508a 100644
--- a/config/sway/bindsym-media
+++ b/config/sway/bindsym-media
@@ -16,10 +16,11 @@ bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl set 10%+
bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl set 10%-
# Media player controls
-bindsym XF86AudioPlay exec --no-startup-id mpc toggle && pkill -RTMIN+12 i3blocks
-bindsym XF86AudioStop exec --no-startup-id mpc stop && pkill -RTMIN+12 i3blocks
-bindsym XF86AudioNext exec --no-startup-id mpc next && pkill -RTMIN+12 i3blocks
-bindsym XF86AudioPrev exec --no-startup-id mpc prev && pkill -RTMIN+12 i3blocks
+bindsym --locked XF86AudioPlay exec playerctl play-pause
+bindsym --locked XF86AudioPause exec playerctl play-pause
+bindsym --locked XF86AudioPrev exec playerctl previous
+bindsym --locked XF86AudioNext exec playerctl next
+bindsym --locked XF86AudioStop exec playerctl stop
# Run media player control app
bindsym $mod+Shift+m exec alacritty -t "Music player daemon client" -e ncmpcpp
for_window [ title="Music player daemon client" ] floating enable;
diff --git a/config/sway/config b/config/sway/config
index cd2b575..b4e09e4 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -34,4 +34,6 @@ bindsym $mod+Shift+r reload
include bindsym-*
################################################################################
+bar swaybar_command waybar
+
include daemons
diff --git a/config/sway/daemons b/config/sway/daemons
index a6579da..3dcbd6f 100644
--- a/config/sway/daemons
+++ b/config/sway/daemons
@@ -2,7 +2,6 @@
exec --no-startup-id {
kanshi
swayidle
- waybar
dunst
}
diff --git a/config/user-dirs.conf b/config/user-dirs.conf
index ea9337c..ae36895 100644
--- a/config/user-dirs.conf
+++ b/config/user-dirs.conf
@@ -6,3 +6,4 @@ XDG_DOCUMENTS_DIR="$HOME/documents"
XDG_MUSIC_DIR="$HOME/music"
XDG_PICTURES_DIR="$HOME/images"
XDG_VIDEOS_DIR="$HOME/video"
+XDG_PROJECTS_DIR="$HOME/projects"