diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index e227481..d81fbfe 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -71,6 +71,11 @@ dwm.enable = true; }; }; + # displayManager.sddm = { + # enable = true; + # wayland.enable = true; + # }; + desktopManager.plasma6.enable = true; libinput.enable = true; greetd = { enable = true; @@ -95,6 +100,7 @@ environment.etc."greetd/environments".text = '' Hyprland none+i3 + non+dwm ''; hardware = { @@ -127,10 +133,16 @@ ]; nixpkgs.config.allowUnfree = true; -nixpkgs.overlays = [ + nixpkgs.overlays = [ (final: prev: { dwm = prev.dwm.overrideAttrs (old: {src = /home/liamm/oss/dwm;}); }) + (final: prev: { + dmenu = prev.dmenu.overrideAttrs (old: {src = /home/liamm/oss/dmenu;}); + }) + (final: prev: { + slstatus = prev.slstatus.overrideAttrs (old: {src = /home/liamm/oss/slstatus;}); + }) ]; # nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ # "steam" diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 5abe990..fa24372 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -32,6 +32,7 @@ brave brightnessctl contour + dmenu emacs-all-the-icons-fonts # emacsPackages.pdf-tools exfatprogs @@ -64,6 +65,7 @@ prismlauncher qbittorrent signal-desktop + slstatus swww texliveFull thunderbird diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index f0e8e51..12c7682 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -43,15 +43,15 @@ "swww init" ]; env = [ + "WLR_NO_HARDWARE_CURSORS,1" "HYPRCURSOR_THEME,${config.gtk.cursorTheme.name}" "HYPRCURSOR_SIZE,24" - "XCURSOR_THEME,${config.gtk.cursorTheme.name}" - "XCURSOR_SIZE,24" - "WLR_NO_HARDWARE_CURSORS,1" "XDG_CURRENT_DESKTOP,Hyprland" "XDG_SESSION_TYPE,wayland" "XDG_SESSION_DESKTOP,Hyprland" - "QT_QPA_PLATFORM,Hyprland;xcb" + "QT_QPA_PLATFORM,xcb;Hyprland" + # "XCURSOR_THEME,${config.gtk.cursorTheme.name}" + # "XCURSOR_SIZE,24" ]; input = { kb_layout = "us"; @@ -363,7 +363,7 @@ input-field = [ { monitor = ""; - size = "300, 50"; + size = "300, 20"; outline_thickness = 3; dots_size = 0.33; dots_spacing = 0.15; diff --git a/modules/old_configs/ghostty/config b/modules/old_configs/ghostty/config index cf5fb8d..b7fbc43 100644 --- a/modules/old_configs/ghostty/config +++ b/modules/old_configs/ghostty/config @@ -25,7 +25,7 @@ gtk-wide-tabs = true macos-non-native-fullscreen = true # font -font-size = 14 +font-size = 12 # cursor and mouse cursor-style = block