chore: Improve formatting

Also simplifies the piccom call in .xinitrc.
This commit is contained in:
Donovan Glover 2024-08-22 16:44:11 -04:00
parent 5efc4364bb
commit 9e76605a80
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
2 changed files with 36 additions and 34 deletions

View File

@ -418,7 +418,7 @@
type = "lua"; type = "lua";
config = # lua config = # lua
'' ''
require'nvim-treesitter.configs'.setup { require('nvim-treesitter.configs').setup {
highlight = { highlight = {
enable = true, enable = true,
disable = function(lang) disable = function(lang)

View File

@ -7,43 +7,45 @@ let
in in
{ {
home-manager.sharedModules = singleton { home-manager.sharedModules = singleton {
home.packages = with pkgs; [ home = {
feh packages = with pkgs; [
xclip feh
]; xclip
];
home.file.".xinitrc" = { file.".xinitrc" = {
executable = true; executable = true;
text = # bash text = # bash
'' ''
#!/usr/bin/env sh #!/usr/bin/env sh
export XDG_SESSION_TYPE=x11 export XDG_SESSION_TYPE=x11
export GDK_BACKEND=x11 export GDK_BACKEND=x11
export XDG_CURRENT_DESKTOP=dwm export XDG_CURRENT_DESKTOP=dwm
export GTK_IM_MODULE=fcitx export GTK_IM_MODULE=fcitx
export QT_IM_MODULE=fcitx export QT_IM_MODULE=fcitx
export XMODIFIERS=@im=fcitx export XMODIFIERS=@im=fcitx
export SDL_IM_MODULE=fcitx export SDL_IM_MODULE=fcitx
export GLFW_IM_MODULE=ibus export GLFW_IM_MODULE=ibus
xrdb -merge ~/.Xresources xrdb -merge ~/.Xresources
xset r rate 300 50 xset r rate 300 50
feh --bg-fill "$(fish -c 'random choice (fd . ${osu-backgrounds}/2024-07-15-Aerial-Antics-Art-Contest-All-Entries --follow -e jpg -e png)')" & feh --bg-fill "$(fish -c 'random choice (fd . ${osu-backgrounds}/2024-07-15-Aerial-Antics-Art-Contest-All-Entries --follow -e jpg -e png)')" &
while true; do while true; do
xsetroot -name "$(date +"%F %R")" xsetroot -name "$(date +"%F %R")"
sleep 1m sleep 1m
done & done &
picom --backend glx --vsync --shadow --fading --blur-background --blur-method dual_kawase --blur-size 10 --daemon picom --daemon
fcitx5 & fcitx5 &
while true; do while true; do
dwm >/dev/null 2>&1 dwm >/dev/null 2>&1
done done
''; '';
};
}; };
services = { services = {
@ -111,8 +113,8 @@ in
windowManager.dwm = { windowManager.dwm = {
enable = true; enable = true;
package = pkgs.dwm.overrideAttrs (oldAttrs: { package = pkgs.dwm.override {
patches = oldAttrs.patches ++ [ patches = [
../assets/dwm-actualfullscreen.patch ../assets/dwm-actualfullscreen.patch
(pkgs.fetchpatch { (pkgs.fetchpatch {
@ -120,7 +122,7 @@ in
hash = "sha256-GIbRW0Inwbp99rsKLfIDGvPwZ3pqihROMBp5vFlHx5Q="; hash = "sha256-GIbRW0Inwbp99rsKLfIDGvPwZ3pqihROMBp5vFlHx5Q=";
}) })
]; ];
}); };
}; };
}; };