treewide: prune more old xorg configs, and rename wayland modules

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"

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

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

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 = {};
 }

modules/user/bspwm.nix

@@ -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
-    '';
-  };
-}

modules/user/pass.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  programs.password-store = {
-    enable = true;
-    package = pkgs.pass.withExtensions (exts: with exts; [ pass-import pass-otp ]);
-  };
-}

modules/user/picom.nix

@@ -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;
-    };
-  };
-}

modules/user/polybar.nix

@@ -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}<label>";
-          padding = 4;
-        };
-      };
-
-      "module/datetime" = {
-        type = "internal/date";
-        date = {
-          text = "%{T1}%%{F${colours.foreground2}}%H:%M%%{F-}";
-          alt = "%{T2}%%{F${colours.foreground2trans}}%A, %d %B %Y  %{T1}%%{F${colours.foreground2}}%H:%M%%{F${colours.foreground2trans}}:%{T2}%S%%{F-}";
-        };
-        format = {
-          background = colours.background2;
-        };
-      };
-    };
-  };
-}

modules/user/sessionVariables.nix

@@ -6,7 +6,6 @@
       "$PATH"
     ];
 
-    XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority";
     EDITOR = "nvim";
 
     _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java";

modules/user/sxhkd.nix

@@ -1,65 +0,0 @@
-{ config, pkgs, ... }:
-let
-  super = "Mod4";
-  alt = "Mod1";
-in {
-  services.sxhkd = {
-    enable = true;
-    keybindings = {
-      # Dunst (Notification daemon)
-      "super + grave" = "dunstctl history-pop";
-      "super + shift + period" = "dunstctl context";
-      "super + shift + space" = "dunstctl close-all";
-
-      # Rofi (App launcher)
-      "super + Return" = "rofi -lines 12 -padding 18 -width 60 -location 0 -show drun -sidebar-mode -columns 3 -font 'Noto Sans 8'";
-
-      # Printscreen
-      "Print" = "maim -us | tee ~/Pictures/Screenshots/$(date +%s)c.png | xclip -selection clipboard -t image/png";
-      "shift + Print" = "maim -u | tee ~/Pictures/Screenshots/$(date +%s).png | xclip -selection clipboard -t image/png";
-
-      # Quick-kill picom
-      "super + p" = "systemctl --user stop picom";
-      "super + shift + p" = "systemctl --user restart picom";
-
-      # Volume
-      "XF86Audio{RaiseVolume,LowerVolume,Mute}" = "pamixer -{i 5,d 5,t}";
-
-      # Brightness
-      "XF86MonBrightness{Up,Down}" = "light -{A,U} 10";
-      "shift + XF86MonBrightness{Up,Down}" = "light -{A,U} 1";
-
-      # Gamma
-      "ctrl + XF86MonBrightness{Up,Down}" = "xgamma -gamma {1.3,1}";
-
-      "Super_L" = "eww open mainbar";
-      "@Super_L" = "eww close mainbar";
-
-      # Kill focused window
-      "super + {_,shift + }c" = "bspc node -{c,k}";
-
-      # Change focus
-      "super + {h,j,k,l}" = "bspc node -f {west,south,north,east}";
-      "super + {Left,Down,Up,Right}" = "bspc node -f {west,south,north,east}";
-
-      # Switch windows
-      "super + shift + {h,j,k,l}" = "bspc node -s {west,south,north,east}";
-      "super + shift + {Left,Down,Up,Right}" = "bspc node -s {west,south,north,east}";
-
-      # Move focused window
-      "super + shift + {1-9,0}" = "bspc node -d ^{1-9,10}";
-
-      # Toggle tiled/fullscreen/floating
-      "super + {t,f,space}" = "bspc node -t '~{tiled,fullscreen,floating}'";
-
-      # Exit / Restart bspwm
-      "super + shift + {q,r}" = "bspc {quit,wm -r}";
-
-      # Restart sxhkd
-      "super + shift + s" = "pkill -USR1 -x sxhkd";
-
-      # Workspace switching
-      "super + {1-9,0}" = "bspc desktop -f ^{1-9,10}";
-    };
-  };
-}

scripts/polybar.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-polybar top      >> ${XDG_RUNTIME_DIR}/bar-top.log 2>&1 &
-polybar scroller >> ${XDG_RUNTIME_DIR}/bar-scroller.log 2>&1 &

users/rin/default.nix

@@ -36,10 +36,10 @@
       kitty
       mpv
       obs
-      rofi-wayland
+      rofi
 
       dunst
-      eww-wayland
+      eww
 
       spicetify
     ];