diff options
| -rw-r--r-- | config/guix/channels.scm | 2 | ||||
| -rw-r--r-- | config/nvim/lua/plugins.lua | 4 | ||||
| -rw-r--r-- | config/sway/bindsym-media | 9 | ||||
| -rw-r--r-- | config/sway/config | 2 | ||||
| -rw-r--r-- | config/sway/daemons | 1 | ||||
| -rw-r--r-- | config/user-dirs.conf | 1 | ||||
| -rw-r--r-- | gitconfig | 8 | ||||
| -rwxr-xr-x | install | 5 | ||||
| m--------- | private | 0 | ||||
| -rw-r--r-- | profile | 5 |
10 files changed, 31 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" @@ -57,6 +57,14 @@ defaultBranch = master [column] ui = auto +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true [includeIf "gitdir:~/elektroline/"] path = ~/.gitconfig-elektroline + +[credential "https://gitlab.com"] + helper = !/run/current-system/sw/bin/glab auth git-credential @@ -114,6 +114,11 @@ if ask "sync" "Install synchronization"; then fi if ask "desktop" "Install desktop"; then + if ! [[ -d ~/.themes/Nordic-darker-standard-buttons ]]; then + mkdir -p ~/.themes + curl -L https://github.com/EliverLara/Nordic/releases/download/v2.2.0/Nordic-darker-standard-buttons.tar.xz | + tar -JxC ~/.themes + fi # Force some dconf settings gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' gsettings set org.gnome.desktop.interface font-name 'Cantarell 8' diff --git a/private b/private -Subproject 42319216fd11263699a0c84bd457067784c45e2 +Subproject 1550c38035f45fb1ecb40048f3b5fe0908953d3 @@ -10,8 +10,12 @@ fi export CT_PREFIX_DIR='~/.local/${CT_TARGET}' export CT_LOCAL_TARBALLS_DIR="~/src/ct-ng" +# Meson caching +export MESON_PACKAGE_CACHE_DIR="$HOME/.cache/meson" # Python caching export PYTHONPYCACHEPREFIX="$HOME/.cache/pycache" +export MYPY_CACHE_DIR="$HOME/.cache/mypy" +export RUFF_CACHE_DIR="$HOME/.cache/ruff" # Nix for profile in "$HOME"/.nix-profile/etc/profile.d/*; do @@ -24,6 +28,7 @@ GUIX_PROFILE="$HOME/.config/guix/current" ! [[ -d "$GUIX_PROFILE" ]] || source "$GUIX_PROFILE/etc/profile" GUIX_PROFILE="$HOME/.guix-profile" ! [[ -d "$GUIX_PROFILE" ]] || source "$GUIX_PROFILE/etc/profile" +unset GUIX_PROFILE # Rest of the profile run only if login is from linux console [[ "$(tty)" != /dev/tty* ]] && return |