From 2e74aa5f00f0b914f73b7177e57df81a6d84151d Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 23 Mar 2025 00:29:58 +1100 Subject: [PATCH] treewide: prune more old xorg configs, and rename wayland modules --- hosts/anemone/default.nix | 7 +- hosts/hyacinth/default.nix | 5 +- modules/default.nix | 8 +- .../system/{greetd_wayland.nix => greetd.nix} | 0 modules/system/gui.nix | 3 + modules/user/bspwm.nix | 19 -- modules/user/{eww-wayland.nix => eww.nix} | 0 modules/user/pass.nix | 6 - modules/user/picom.nix | 41 ----- modules/user/polybar.nix | 165 ------------------ modules/user/{rofi-wayland.nix => rofi.nix} | 0 modules/user/sessionVariables.nix | 1 - modules/user/sxhkd.nix | 65 ------- scripts/polybar.sh | 4 - users/rin/{wayland.nix => default.nix} | 4 +- 15 files changed, 10 insertions(+), 318 deletions(-) rename modules/system/{greetd_wayland.nix => greetd.nix} (100%) delete mode 100644 modules/user/bspwm.nix rename modules/user/{eww-wayland.nix => eww.nix} (100%) delete mode 100644 modules/user/pass.nix delete mode 100644 modules/user/picom.nix delete mode 100644 modules/user/polybar.nix rename modules/user/{rofi-wayland.nix => rofi.nix} (100%) delete mode 100644 modules/user/sxhkd.nix delete mode 100755 scripts/polybar.sh rename users/rin/{wayland.nix => default.nix} (97%) diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix index b29d535..34b1c03 100644 --- a/hosts/anemone/default.nix +++ b/hosts/anemone/default.nix @@ -17,7 +17,7 @@ ccache corectrl flatpak - greetd_wayland + greetd gui input kernel @@ -31,12 +31,9 @@ ./kernel.nix ./networking.nix - ../../users/rin/wayland.nix + ../../users/rin ]; - programs.hyprland.enable = true; - security.pam.services.hyprlock = {}; - # For steam fhs-env nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" diff --git a/hosts/hyacinth/default.nix b/hosts/hyacinth/default.nix index ae0364a..ea385b8 100644 --- a/hosts/hyacinth/default.nix +++ b/hosts/hyacinth/default.nix @@ -20,7 +20,7 @@ ccache corectrl flatpak - greetd_wayland + greetd gui input kernel @@ -38,10 +38,9 @@ ./networking.nix ./packages.nix - ../../users/rin/wayland.nix + ../../users/rin ]; services.postgresql.ensureDatabases = [ "barista" "barista-dev" ]; - programs.hyprland.enable = true; systemd.services.nix-daemon.environment.TMPDIR = "/nix/tmp"; # For steam fhs-env diff --git a/modules/default.nix b/modules/default.nix index 36b8adc..7cd86ec 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -32,7 +32,7 @@ in { ./system/ccache.nix ./system/corectrl.nix ./system/flatpak.nix - ./system/greetd_wayland.nix + ./system/greetd.nix ./system/gui.nix ./system/home-manager.nix ./system/input.nix @@ -48,7 +48,6 @@ in { ./system/wireguard.nix ]; user = mkAttrsFromPaths [ - ./user/bspwm.nix ./user/catppuccin.nix ./user/direnv.nix ./user/dunst.nix @@ -63,14 +62,9 @@ in { ./user/neovim-minimal.nix ./user/npm.nix ./user/obs.nix - ./user/packages-rin.nix - ./user/pass.nix - ./user/picom.nix - ./user/polybar.nix ./user/rofi.nix ./user/sessionVariables.nix ./user/spicetify.nix - ./user/sxhkd.nix ./user/theming.nix ./user/xdg.nix ./user/zsh.nix diff --git a/modules/system/greetd_wayland.nix b/modules/system/greetd.nix similarity index 100% rename from modules/system/greetd_wayland.nix rename to modules/system/greetd.nix diff --git a/modules/system/gui.nix b/modules/system/gui.nix index 128e850..e9443ab 100644 --- a/modules/system/gui.nix +++ b/modules/system/gui.nix @@ -26,4 +26,7 @@ displayManager.lightdm.enable = lib.mkForce false; desktopManager.xterm.enable = false; }; + + programs.hyprland.enable = true; + security.pam.services.hyprlock = {}; } diff --git a/modules/user/bspwm.nix b/modules/user/bspwm.nix deleted file mode 100644 index 13b2941..0000000 --- a/modules/user/bspwm.nix +++ /dev/null @@ -1,19 +0,0 @@ -# Depends on eww -{ config, pkgs, ... }: { - xsession.windowManager.bspwm = { - enable = true; - monitors = { "DP-1" = [ "1" "2" "3" "4" "5" "6" "7" "8" "9" "0"]; }; - settings = { - window_gap = 10; - border_width = 0; - split_ratio = 0.5; - top_padding = 0; - }; - extraConfig = '' - ${pkgs.feh}/bin/feh --no-fehbg --bg-fill ~/Pictures/Wallpapers/current - - ${pkgs.procps}/bin/pkill -SIGINT eww - ${pkgs.eww}/bin/eww open linebar - ''; - }; -} diff --git a/modules/user/eww-wayland.nix b/modules/user/eww.nix similarity index 100% rename from modules/user/eww-wayland.nix rename to modules/user/eww.nix diff --git a/modules/user/pass.nix b/modules/user/pass.nix deleted file mode 100644 index f1d4c3d..0000000 --- a/modules/user/pass.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: { - programs.password-store = { - enable = true; - package = pkgs.pass.withExtensions (exts: with exts; [ pass-import pass-otp ]); - }; -} diff --git a/modules/user/picom.nix b/modules/user/picom.nix deleted file mode 100644 index 7c7d5e7..0000000 --- a/modules/user/picom.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, ... }: { - services.picom = { - enable = true; - - # blur = true; - # blurExclude = [ - # (builtins.concatStringsSep " && " [ - # "class_g != 'Alacritty'" - # "class_g != 'kitty'" - # #"class_g != 'Polybar'" - # "class_g != 'URxvt'" - # ]) - # ]; - fade = true; - fadeDelta = 5; - fadeSteps = [ 0.05 0.05 ]; - - opacityRules = [ - "80:class_g = 'Alacritty' && !focused" - "95:class_g = 'kitty' && !focused" - ]; - vSync = true; - - settings = { - glx-no-stencil = true; - glx-copy-from-front = false; - glx-no-rebind-pixmap = true; - # https://github.com/yshui/picom/issues/578 - glx-use-copysubbuffer-mesa = false; - use-damage = true; - - detect-transient = true; - detect-client-leader = true; - detect-client-opacity = true; - detect-rounded-corners = true; - use-ewmh-active-win = true; - mark-wmwin-focused = true; - mark-ovredir-focused = true; - }; - }; -} diff --git a/modules/user/polybar.nix b/modules/user/polybar.nix deleted file mode 100644 index ce71f38..0000000 --- a/modules/user/polybar.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ config, ... }: { - services.polybar = - let - colours = { - background1 = "#1a1b26"; - background2 = "#9d7cd8"; - accent = "#c0caf5"; - foreground2 = "#1a1b26"; - foreground2trans = "#cc1a1b26"; - }; - in { - enable = true; - script = builtins.readFile ../../scripts/polybar.sh; - settings = { - "bar/scroller" = { - monitor = "DP-1"; - width = "100%"; - height = 1; - background = colours.background1; - spacing = 2; - override-redirect = true; - - modules.center = "workspaces-stub"; - scroll = { - up = "#workspaces-stub.prev"; - down = "#workspaces-stub.next"; - }; - }; - - "bar/top" = { - monitor = "DP-1"; - width = "100%"; - height = 29; - background = colours.background1; - foreground = "#fff"; - offset-y = 3; - - spacing = 2; - padding = { - left = 5; - right = 5; - bottom = 5; - }; - override-redirect = true; - wm-restack = "bspwm"; - - font = [ - "NotoSans:style=SemiBold:size=11:antialias=true;2" - "NotoSans:size=11:antialias=true;2" - "MaterialIcons:size=17:antialias=true;6" - "Iosevka:style=Medium:antialias=false:size=19;4" - - "HanaMinA:size=9.8;1" - "HanaMinB:size=9.8;1" - ]; - - modules = { - left = "left workspaces right"; - center = "title"; - right = "left datetime right"; - }; - - enable-ipc = true; - scroll = { - up = "#workspaces.prev"; - down = "#workspaces.next"; - }; - }; - - "module/left" = { - type = "custom/text"; - - content = { - text = "%{T4}"; - background = colours.background1; - foreground = colours.background2; - }; - }; - - "module/right" = { - type = "custom/text"; - - content = { - text = "%{T4}"; - background = colours.background1; - foreground = colours.background2; - }; - }; - - "module/workspaces" = { - type = "internal/bspwm"; - - pin-workspaces = true; - enable-click = true; - enable-scroll = false; - reverse-scroll = false; - - label = { - monitor = ""; - focused = { - text = "%{T3}"; # ef4a - background = colours.background2; - foreground = colours.accent; - }; - occupied = { - text = "%{T3}"; # e837 - background = colours.background2; - foreground = colours.background1; - }; - empty = { - text = "%{T3}"; # ef4a - background = colours.background2; - foreground = colours.background1; - }; - urgent = { - text = "%{T3}"; # e837 - background = colours.background2; - foreground = colours.background1; - }; - - separator = { - text = " "; - background = colours.background2; - padding = "0"; - }; - }; - }; - - "module/workspaces-stub" = { - type = "internal/bspwm"; - pin-workspaces = true; - enable-click = false; - enable-scroll = false; - reverse-scroll = false; - label = { - monitor = ""; - focused = ""; - occupied = ""; - empty = ""; - urgent = ""; - separator = ""; - }; - }; - - "module/title" = { - type = "internal/xwindow"; - format = { - text = "%{T1}