mirror of
https://github.com/donovanglover/nix-config.git
synced 2024-11-22 00:03:55 +01:00
Revert "meta: Document usage of dwm on phone"
This was cool but there were a few issues such as me not being able to find the infamous "dock patch" despite grepping for dock on https://dwm.suckless.org/patches/, which resulted in the keyboard hiding tiled windows and being below floating windows. There was also an issue where starting corekeyboard from dwm would result in styling not being applied compared to starting it from the terminal. A third issue was that from a quick attempt I couldn't get callaudiod to start inside dwm, which was required for gnome-calls. Overall it looks like I will be using Phosh until further notice on the PinePhone, as I've already gotten it to work well enough for my use case.
This commit is contained in:
parent
b00b2dd8d4
commit
aaef3ecf8b
10
home/dwm.nix
10
home/dwm.nix
@ -2,8 +2,6 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
barScript = "dwm/bar.fish";
|
barScript = "dwm/bar.fish";
|
||||||
|
|
||||||
phosh-backgrounds = pkgs.callPackage ../packages/phosh-backgrounds.nix { };
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home = {
|
home = {
|
||||||
@ -11,7 +9,6 @@ in
|
|||||||
feh
|
feh
|
||||||
xclip
|
xclip
|
||||||
scrot
|
scrot
|
||||||
CuboCore.corekeyboard
|
|
||||||
];
|
];
|
||||||
|
|
||||||
file.".xinitrc" = {
|
file.".xinitrc" = {
|
||||||
@ -29,15 +26,14 @@ in
|
|||||||
export SDL_IM_MODULE=fcitx
|
export SDL_IM_MODULE=fcitx
|
||||||
export GLFW_IM_MODULE=ibus
|
export GLFW_IM_MODULE=ibus
|
||||||
export GTK_CSD=0
|
export GTK_CSD=0
|
||||||
export MOZ_USE_XINPUT2=1
|
|
||||||
|
|
||||||
xrdb -merge ~/.Xresources
|
xrdb -merge ~/.Xresources
|
||||||
xset r rate 300 50
|
xset r rate 300 50
|
||||||
feh --no-fehbg --bg-scale ${phosh-backgrounds}/wall-lock.jpg
|
feh --no-fehbg --bg-scale ${config.stylix.image}
|
||||||
~/.config/${barScript} &
|
~/.config/${barScript} &
|
||||||
|
picom --daemon
|
||||||
|
${pkgs.nemo}/bin/nemo-desktop &
|
||||||
fcitx5 &
|
fcitx5 &
|
||||||
kitty &
|
|
||||||
corekeyboard &
|
|
||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
dbus-launch --sh-syntax --exit-with-session dwm
|
dbus-launch --sh-syntax --exit-with-session dwm
|
||||||
|
@ -6,6 +6,5 @@
|
|||||||
"Xft.lcdfilter" = "lcddefault";
|
"Xft.lcdfilter" = "lcddefault";
|
||||||
"Xft.hintstyle" = "hintfull";
|
"Xft.hintstyle" = "hintfull";
|
||||||
"Xft.rgba" = "rgb";
|
"Xft.rgba" = "rgb";
|
||||||
"Xft.dpi" = 192;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -36,9 +36,7 @@ in
|
|||||||
|
|
||||||
home-manager.sharedModules = attrValues {
|
home-manager.sharedModules = attrValues {
|
||||||
inherit (self.homeModules)
|
inherit (self.homeModules)
|
||||||
dwm
|
|
||||||
eza
|
eza
|
||||||
fcitx
|
|
||||||
fish
|
fish
|
||||||
git
|
git
|
||||||
gpg
|
gpg
|
||||||
@ -265,8 +263,19 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
|
xserver = {
|
||||||
|
displayManager.lightdm.enable = false;
|
||||||
|
|
||||||
|
desktopManager.phosh = {
|
||||||
|
enable = true;
|
||||||
|
group = "users";
|
||||||
|
user = username;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
udisks2.enable = mkForce false;
|
udisks2.enable = mkForce false;
|
||||||
pipewire.enable = mkForce false;
|
pipewire.enable = mkForce false;
|
||||||
|
greetd.enable = mkForce false;
|
||||||
};
|
};
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
|
@ -70,7 +70,6 @@ in
|
|||||||
static const char *dmenucmd[] = { "rofi", "-show", "drun" };
|
static const char *dmenucmd[] = { "rofi", "-show", "drun" };
|
||||||
static const char *quitcmd[] = { "kill", "xinit" };
|
static const char *quitcmd[] = { "kill", "xinit" };
|
||||||
static const char *termcmd[] = { "kitty", NULL };
|
static const char *termcmd[] = { "kitty", NULL };
|
||||||
static const char *keyboardcmd[] = { "corekeyboard", NULL };
|
|
||||||
static const char *brighter[] = { "brightnessctl", "set", "5%+", NULL };
|
static const char *brighter[] = { "brightnessctl", "set", "5%+", NULL };
|
||||||
static const char *dimmer[] = { "brightnessctl", "set", "5%-", NULL };
|
static const char *dimmer[] = { "brightnessctl", "set", "5%-", NULL };
|
||||||
static const char *up_vol[] = { "wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@", "5%+", NULL };
|
static const char *up_vol[] = { "wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@", "5%+", NULL };
|
||||||
@ -109,7 +108,6 @@ in
|
|||||||
|
|
||||||
static const Button buttons[] = {
|
static const Button buttons[] = {
|
||||||
{ ClkTagBar, 0, Button1, view, {0} },
|
{ ClkTagBar, 0, Button1, view, {0} },
|
||||||
{ ClkStatusText, 0, Button1, spawn, {.v = keyboardcmd } },
|
|
||||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user