From 7a2b125646643a1f7e44e0a0f32b6d24879d2db3 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 15 Jun 2024 18:37:00 +0100 Subject: [PATCH] housekeeping --- home/common/core/zsh.nix | 2 +- home/common/optional/desktop/dwm/default.nix | 3 +++ home/common/optional/desktop/dwm/sxhkdrc.nix | 4 +--- home/common/optional/desktop/dwm/xinitrc.nix | 2 +- home/fileserver.nix | 6 +----- home/nixdev.nix | 10 +++------- home/semita.nix | 3 +-- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/home/common/core/zsh.nix b/home/common/core/zsh.nix index c0cba1b..dd12831 100644 --- a/home/common/core/zsh.nix +++ b/home/common/core/zsh.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: { +{ config, ... }: { programs.zsh = { enable = true; diff --git a/home/common/optional/desktop/dwm/default.nix b/home/common/optional/desktop/dwm/default.nix index fe304a8..7f8a034 100644 --- a/home/common/optional/desktop/dwm/default.nix +++ b/home/common/optional/desktop/dwm/default.nix @@ -19,6 +19,9 @@ # Notification scripts ./scripts/dunstify-volume-notification.nix + + # Helper scripts + ./scripts/emoji-picker.nix ]; home.packages = [ diff --git a/home/common/optional/desktop/dwm/sxhkdrc.nix b/home/common/optional/desktop/dwm/sxhkdrc.nix index 1b60de5..71d21db 100644 --- a/home/common/optional/desktop/dwm/sxhkdrc.nix +++ b/home/common/optional/desktop/dwm/sxhkdrc.nix @@ -1,4 +1,5 @@ { + # TODO add emoji and dmenu-dict scripts home.file.".config/sxhkd/sxhkdrc" = { recursive = true; text = '' @@ -35,9 +36,6 @@ Print flameshot gui - control + F11 - dmenu-clipper - control + F8 dmenu-dict diff --git a/home/common/optional/desktop/dwm/xinitrc.nix b/home/common/optional/desktop/dwm/xinitrc.nix index 22d5a9e..f8527fe 100644 --- a/home/common/optional/desktop/dwm/xinitrc.nix +++ b/home/common/optional/desktop/dwm/xinitrc.nix @@ -8,7 +8,7 @@ picom -b --config ~/.config/picom/picom.conf xrdb ~/.Xresources - autostart="dwmblocks feh-wallpaper-changer sxhkd dunst" + autostart="dwmblocks feh-wallpaper-changer sxhkd" for program in $autostart; do pidof -sx "$program" || "$program" & diff --git a/home/fileserver.nix b/home/fileserver.nix index 0766451..b54e626 100644 --- a/home/fileserver.nix +++ b/home/fileserver.nix @@ -1,8 +1,4 @@ -{ - pkgs, - config, - lib, - ... +{ ... }: { imports = [ # Import users diff --git a/home/nixdev.nix b/home/nixdev.nix index 0ba30ad..cc5c5f7 100644 --- a/home/nixdev.nix +++ b/home/nixdev.nix @@ -1,8 +1,4 @@ -{ - pkgs, - config, - lib, - ... +{ ... }: { imports = [ # Import users @@ -21,7 +17,7 @@ # | DP-1 # ------ monitors = [ - { + { name = "Virtual-1"; width = 2048; height = 1152; @@ -29,5 +25,5 @@ workspace = "1"; primary = true; } - ]; + ]; } diff --git a/home/semita.nix b/home/semita.nix index 493467e..311b890 100644 --- a/home/semita.nix +++ b/home/semita.nix @@ -1,5 +1,4 @@ -{ inputs -, ... +{ ... }: { imports = [ # Import users