diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix index c41206e..1b7816a 100644 --- a/hosts/vali/mars/configuration.nix +++ b/hosts/vali/mars/configuration.nix @@ -52,11 +52,8 @@ ssh.enable = true; btop.enable = true; mpv.enable = true; - i3.enable = true; dwm.enable = true; schizofox.enable = true; - displaymanager.enable = true; - #neovim.enable = true; #git = { # enable = true; # userName = "vali"; diff --git a/hosts/vali/mars/default.nix b/hosts/vali/mars/default.nix index 2a9abad..acef5b9 100644 --- a/hosts/vali/mars/default.nix +++ b/hosts/vali/mars/default.nix @@ -6,5 +6,6 @@ _: { ./profile.nix ./i3 ./dwm/dwm.nix + ]; } diff --git a/hosts/vali/mars/dwm/dwm-6.5/dwm b/hosts/vali/mars/dwm/dwm-6.5/dwm index ada53af..5424031 100755 Binary files a/hosts/vali/mars/dwm/dwm-6.5/dwm and b/hosts/vali/mars/dwm/dwm-6.5/dwm differ diff --git a/hosts/vali/mars/dwm/dwm-6.5/dwm.c b/hosts/vali/mars/dwm/dwm-6.5/dwm.c index b801c2c..e940130 100644 --- a/hosts/vali/mars/dwm/dwm-6.5/dwm.c +++ b/hosts/vali/mars/dwm/dwm-6.5/dwm.c @@ -1740,7 +1740,7 @@ void togglefullscr(const Arg *arg) { if(selmon->sel) - setfullscreen(selmon->sel, !selmon->sel>isfullscreen); + setfullscreen(selmon->sel, !selmon->sel->isfullscreen); } void diff --git a/hosts/vali/mars/dwm/dwm-6.5/dwm.o b/hosts/vali/mars/dwm/dwm-6.5/dwm.o index 3ced421..16a9fb0 100644 Binary files a/hosts/vali/mars/dwm/dwm-6.5/dwm.o and b/hosts/vali/mars/dwm/dwm-6.5/dwm.o differ diff --git a/hosts/vali/mars/dwm/dwm.nix b/hosts/vali/mars/dwm/dwm.nix index a90b77c..2cf92f3 100644 --- a/hosts/vali/mars/dwm/dwm.nix +++ b/hosts/vali/mars/dwm/dwm.nix @@ -12,6 +12,11 @@ in { windowManager.dwm = { enable = true; }; + displayManager.sddm = { + enable = true; + setupScript = "xrandr --output HDMI-1 --rotate normal --output DP-2 --rotate normal --left-of HDMI-1 --output HDMI-0 --right-of HDMI-1"; +# defaultSession = "dwm"; + }; }; nixpkgs.overlays = [ (final: prev: { diff --git a/hosts/vali/mars/profile.nix b/hosts/vali/mars/profile.nix index 26bce2e..bc3a40a 100644 --- a/hosts/vali/mars/profile.nix +++ b/hosts/vali/mars/profile.nix @@ -8,5 +8,6 @@ _: { ../../../options/common/pin-registry.nix ../../../options/common/preserve-system.nix #../../options/ + ../../../options/desktop/monitors.nix ]; } diff --git a/hosts/vali/mars/programs.nix b/hosts/vali/mars/programs.nix index d51ff68..5c068f8 100644 --- a/hosts/vali/mars/programs.nix +++ b/hosts/vali/mars/programs.nix @@ -15,6 +15,7 @@ in { element-desktop eza fastfetch + feh (fenix.complete.withComponents [ "cargo" "clippy" @@ -74,6 +75,7 @@ in { vlc wget xclip + xfce.thunar xorg.libX11.dev xorg.libXft xorg.libXinerama diff --git a/modules/other/default.nix b/modules/other/default.nix index 549359d..dc00064 100644 --- a/modules/other/default.nix +++ b/modules/other/default.nix @@ -2,7 +2,7 @@ _: { imports = [ ./home-manager.nix ./system.nix -# ./xdg.nix + ./xdg.nix ./displaymanager.nix ]; } diff --git a/modules/other/xdg.nix b/modules/other/xdg.nix index 36a32b8..09c8966 100644 --- a/modules/other/xdg.nix +++ b/modules/other/xdg.nix @@ -63,7 +63,6 @@ in { atexit.register(write_history) ''; - xdg = { cacheHome = "${hmCfg.home.homeDirectory}/.cache"; configHome = "${hmCfg.home.homeDirectory}/.config";