treewide: remove hyprland

README.md

@@ -5,7 +5,7 @@ System and user configuration for NixOS-based systems.
 | | |
 |-|-|
 | **Shell:** | zsh |
-| **WM:** | Hyprland |
+| **WM:** | Niri |
 | **Theme:** | Adwaita |
 | **Terminal:** | kitty |
 

flake.nix

@@ -34,13 +34,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    hyprland.url = "github:hyprwm/Hyprland";
-
-    hyprland-plugins = {
-      url = "github:hyprwm/hyprland-plugins";
-      inputs.hyprland.follows = "hyprland";
-    };
-
     firefox-gnome-theme = {
       url = "github:rafaelmardojai/firefox-gnome-theme";
       flake = false;

hosts/artemis/default.nix

@@ -105,7 +105,6 @@ in
       };
       desktop = {
         gnome.enable = lib.mkForce false;
-        hyprland.enable = false;
       };
     };
   };

hosts/helios/default.nix

@@ -47,7 +47,6 @@ in
     };
     system.desktop = {
       gnome.enable = mkForce false;
-      hyprland.enable = true;
     };
   };
 

hosts/odyssey/default.nix

@@ -108,7 +108,6 @@
     };
     system.desktop = {
       gnome.enable = lib.mkForce false;
-      hyprland.enable = lib.mkForce false;
     };
   };
 

modules/nixos/default.nix

@@ -6,7 +6,6 @@
     ./services/postgresql.nix
     ./services/tailscale.nix
     ./system/desktop/gnome.nix
-    ./system/desktop/hyprland.nix
     ./system/wireless.nix
   ];
 }

modules/nixos/system/desktop/hyprland.nix

@@ -1,25 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-
-let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    ;
-  cfg = config.modules.system.desktop.hyprland;
-in
-{
-  options.modules.system.desktop.hyprland.enable = mkEnableOption "hyprland";
-
-  config = mkIf cfg.enable {
-    networking.networkmanager.enable = true;
-
-    programs.hyprland = {
-      enable = true;
-      withUWSM = true;
-    };
-  };
-}

users/jordan/artemis.nix

@@ -7,7 +7,6 @@
   imports = [
     ./common/optional/graphical/firefox.nix
     ./common/optional/graphical/fonts.nix
-    ./common/optional/graphical/hyprland
     ./common/optional/graphical/mimeapps.nix
   ];
 

users/jordan/common/optional/graphical/hyprland/default.nix

@@ -1,332 +0,0 @@
-{
-  inputs,
-  lib,
-  pkgs,
-  osConfig,
-  ...
-}:
-let
-  inherit (lib)
-    attrValues
-    concatStringsSep
-    elem
-    mapAttrs
-    mkIf
-    versionOlder
-    ;
-  inherit (lib.generators)
-    toINI
-    ;
-  concatMapAttrsStringSep =
-    sep: f: attrs:
-    concatStringsSep sep (attrValues (mapAttrs f attrs));
-  globalVariables = {
-    _JAVA_AWT_WM_NONREPARENTING = "1";
-    GDK_BACKEND = "wayland";
-    MOZ_ENABLE_WAYLAND = "1";
-    NIXOS_OZONE_WL = "1";
-    QT_QPA_PLATFORM = "wayland";
-    QT_STYLE_OVERRIDE = "kvantum";
-    QT_WAYLAND_DECORATION = "adwaita";
-    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-    SDL_VIDEODRIVER = "wayland";
-    XDG_SESSION_TYPE = "wayland";
-  }
-  // (
-    if elem "nvidia" osConfig.services.xserver.videoDrivers then
-      {
-        GBM_BACKEND = "nvidia-drm";
-        GSK_RENDERER =
-          if versionOlder osConfig.hardware.nvidia.package.version "570" then "ngl" else "vulkan";
-        LIBVA_DRIVER_NAME = "nvidia";
-      }
-    else
-      { }
-  );
-  hyprVariables = {
-    AQ_DRM_DEVICES = "/dev/dri/card0:/dev/dri/card1";
-  };
-in
-{
-  imports = [
-    ./hypridle.nix
-    ./hyprlock.nix
-    ./hyprpaper.nix
-    ./waybar.nix
-  ];
-
-  wayland.windowManager.hyprland = {
-    enable = true;
-    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-    portalPackage =
-      inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-    plugins = [
-      # pkgs.unstable.hyprlandPlugins.hyprbars
-      # pkgs.unstable.hyprlandPlugins.hypr-dynamic-cursors
-    ];
-    settings = {
-      general = {
-        gaps_in = 0;
-        gaps_out = 0;
-
-        border_size = 2;
-
-        allow_tearing = false;
-        layout = "dwindle";
-      };
-
-      plugin = {
-        dynamic-cursors = {
-          enabled = false;
-          mode = "none";
-          shake = {
-            enabled = true;
-          };
-        };
-
-        hyprbars = {
-          enabled = false;
-          bar_height = 20;
-          bar_blur = true;
-        };
-      };
-
-      dwindle = {
-        pseudotile = true;
-        preserve_split = true;
-      };
-
-      master = {
-        new_status = "master";
-      };
-
-      misc = {
-        force_default_wallpaper = 0;
-        disable_hyprland_logo = true;
-      };
-
-      ecosystem = {
-        no_donation_nag = true;
-        no_update_news = true;
-      };
-
-      experimental = {
-        xx_color_management_v4 = true;
-      };
-
-      decoration = {
-        rounding = 0;
-
-        active_opacity = 1.0;
-        inactive_opacity = 1.0;
-
-        shadow = {
-          enabled = true;
-          range = 4;
-          render_power = 3;
-        };
-
-        blur = {
-          enabled = true;
-          size = 3;
-          passes = 1;
-
-          vibrancy = 0.1696;
-        };
-      };
-
-      animations = {
-        enabled = true;
-        bezier = [
-          "easeOutQuint,0.23,1,0.32,1"
-          "easeInOutCubic,0.65,0.05,0.36,1"
-          "linear,0,0,1,1"
-          "almostLinear,0.5,0.5,0.75,1.0"
-          "quick,0.15,0,0.1,1"
-        ];
-        animation = [
-          "global, 1, 10, default"
-          "border, 1, 5.39, easeOutQuint"
-          "windows, 1, 4.79, easeOutQuint"
-          "windowsIn, 1, 4.1, easeOutQuint, popin 87%"
-          "windowsOut, 1, 1.49, linear, popin 87%"
-          "fadeIn, 1, 1.73, almostLinear"
-          "fadeOut, 1, 1.46, almostLinear"
-          "fade, 1, 3.03, quick"
-          "layers, 1, 3.81, easeOutQuint"
-          "layersIn, 1, 4, easeOutQuint, fade"
-          "layersOut, 1, 1.5, linear, fade"
-          "fadeLayersIn, 1, 1.79, almostLinear"
-          "fadeLayersOut, 1, 1.39, almostLinear"
-          "workspaces, 1, 1.94, almostLinear, fade"
-          "workspacesIn, 1, 1.21, almostLinear, fade"
-          "workspacesOut, 1, 1.94, almostLinear, fade"
-        ];
-      };
-
-      monitor = [
-        "desc:Dell Inc. DELL U3219Q HPTP413, preferred, auto, 1, vrr, 0, bitdepth, 10, cm, hdr"
-        "desc:LG Electronics LG TV SSCR2, 3840x2160@60, 0x0, 1, vrr, 0, bitdepth, 10, cm, hdr"
-      ];
-
-      input = {
-        kb_layout = "us";
-        kb_options = "caps:super";
-        follow_mouse = 1;
-        sensitivity = 0;
-      };
-
-      device = {
-        name = "mx-anywhere-3s-mouse";
-        sensitivity = -0.5;
-      };
-
-      "$terminal" = "kitty";
-      "$fileManager" = "thunar";
-      "$menu" = "anyrun";
-      "$mainMod" = "SUPER";
-
-      bind = [
-        "$mainMod, Q, exec, $terminal"
-        "$mainMod, C, killactive,"
-        "$mainMod, M, exit,"
-        "$mainMod, E, exec, $fileManager"
-        "$mainMod, V, togglefloating,"
-        "$mainMod, R, exec, $menu"
-        "$mainMod, P, pseudo, # dwindle"
-        "$mainMod, J, togglesplit, # dwindle"
-        "$mainMod, left, movefocus, l"
-        "$mainMod, right, movefocus, r"
-        "$mainMod, up, movefocus, u"
-        "$mainMod, down, movefocus, d"
-        "$mainMod, 1, workspace, 1"
-        "$mainMod, 2, workspace, 2"
-        "$mainMod, 3, workspace, 3"
-        "$mainMod, 4, workspace, 4"
-        "$mainMod, 5, workspace, 5"
-        "$mainMod, 6, workspace, 6"
-        "$mainMod, 7, workspace, 7"
-        "$mainMod, 8, workspace, 8"
-        "$mainMod, 9, workspace, 9"
-        "$mainMod, 0, workspace, 10"
-        "$mainMod SHIFT, 1, movetoworkspace, 1"
-        "$mainMod SHIFT, 2, movetoworkspace, 2"
-        "$mainMod SHIFT, 3, movetoworkspace, 3"
-        "$mainMod SHIFT, 4, movetoworkspace, 4"
-        "$mainMod SHIFT, 5, movetoworkspace, 5"
-        "$mainMod SHIFT, 6, movetoworkspace, 6"
-        "$mainMod SHIFT, 7, movetoworkspace, 7"
-        "$mainMod SHIFT, 8, movetoworkspace, 8"
-        "$mainMod SHIFT, 9, movetoworkspace, 9"
-        "$mainMod SHIFT, 0, movetoworkspace, 10"
-        "$mainMod, S, togglespecialworkspace, magic"
-        "$mainMod SHIFT, S, movetoworkspace, special:magic"
-        "$mainMod, mouse_down, workspace, e+1"
-        "$mainMod, mouse_up, workspace, e-1"
-      ];
-
-      bindm = [
-        "$mainMod, mouse:272, movewindow"
-        "$mainMod, mouse:273, resizewindow"
-      ];
-
-      bindel = [
-        ",XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
-        ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
-        ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-        ",XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
-        ",XF86MonBrightnessUp, exec, brightnessctl s 10%+"
-        ",XF86MonBrightnessDown, exec, brightnessctl s 10%-"
-      ];
-
-      bindl = [
-        ", XF86AudioNext, exec, playerctl next"
-        ", XF86AudioPause, exec, playerctl play-pause"
-        ", XF86AudioPlay, exec, playerctl play-pause"
-        ", XF86AudioPrev, exec, playerctl previous"
-      ];
-
-      windowrulev2 = [
-        "suppressevent maximize, class:.*"
-        "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0"
-      ];
-    };
-  };
-
-  xdg.configFile = mkIf osConfig.programs.hyprland.withUWSM {
-    "Kvantum/kvantum.kvconfig".text = toINI { } {
-      General.theme = "KvLibadwaitaDark";
-    };
-    "Kvantum/KvLibadwaita".source = "${inputs.kvlibadwaita}/src/KvLibadwaita";
-    "uwsm/env".text = concatMapAttrsStringSep "\n" (
-      name: value: "export ${name}=${value}"
-    ) globalVariables;
-    "uwsm/env-hyprland".text = concatMapAttrsStringSep "\n" (
-      name: value: "export ${name}=${value}"
-    ) hyprVariables;
-  };
-
-  home.pointerCursor = {
-    enable = true;
-    gtk.enable = true;
-    name = "macOS";
-    package = pkgs.apple-cursor;
-    size = 28;
-  };
-
-  gtk = {
-    enable = true;
-
-    iconTheme = {
-      name = "MoreWaita";
-      package = pkgs.unstable.morewaita-icon-theme;
-    };
-  };
-
-  fonts.fontconfig = {
-    enable = true;
-    defaultFonts = {
-      sansSerif = [
-        "Adwaita Sans"
-      ];
-      emoji = [
-        "Apple Color Emoji"
-      ];
-    };
-  };
-
-  programs.kitty = {
-    enable = true;
-    settings = {
-      background = "#000000";
-      background_opacity = 0.8;
-    };
-  };
-
-  programs.neovide = {
-    enable = true;
-    package = pkgs.unstable.neovide;
-    settings = {
-      font.size = 16.0;
-    };
-  };
-
-  home.packages = with pkgs.unstable; [
-    anyrun
-    clipse
-    dunst
-    libsForQt5.qtstyleplugin-kvantum
-    loupe
-    mpv
-    qadwaitadecorations
-    qadwaitadecorations-qt6
-    wl-clipboard
-  ];
-
-  services = {
-    flameshot.enable = true;
-    unclutter.enable = true;
-  };
-
-  services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
-}

users/jordan/common/optional/graphical/hyprland/hypridle.nix

@@ -1,28 +0,0 @@
-{
-  ...
-}:
-
-{
-  services.hypridle = {
-    enable = true;
-    settings = {
-      general = {
-        after_sleep_cmd = "hyprctl dispatch dpms on";
-        ignore_dbus_inhibit = false;
-        lock_cmd = "hyprlock";
-      };
-
-      listener = [
-        {
-          timeout = 900;
-          on-timeout = "hyprlock";
-        }
-        {
-          timeout = 1200;
-          on-timeout = "hyprctl dispatch dpms off";
-          on-resume = "hyprctl dispatch dpms on";
-        }
-      ];
-    };
-  };
-}

users/jordan/common/optional/graphical/hyprland/hyprlock.nix

@@ -1,51 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-let
-  inherit (lib)
-    getExe
-    ;
-in
-{
-  wayland.windowManager.hyprland.settings.bind = [
-    "$mainMod, L, exec, uwsm app -- ${getExe config.programs.hyprlock.package}"
-  ];
-
-  programs.hyprlock = {
-    enable = true;
-    settings = {
-      general = {
-        disable_loading_bar = false;
-        grace = 3;
-        hide_cursor = true;
-        no_fade_in = false;
-      };
-
-      background = [
-        {
-          path = "screenshot";
-          blur_passes = 3;
-          blur_size = 8;
-        }
-      ];
-
-      input-field = [
-        {
-          size = "200, 50";
-          position = "0, -80";
-          monitor = "";
-          dots_center = true;
-          fade_on_empty = false;
-          font_color = "rgb(202, 211, 245)";
-          inner_color = "rgb(91, 96, 120)";
-          outer_color = "rgb(24, 25, 38)";
-          outline_thickness = 5;
-          placeholder_text = "Password...";
-          shadow_passes = 2;
-        }
-      ];
-    };
-  };
-}

users/jordan/common/optional/graphical/hyprland/hyprpaper.nix

@@ -1,21 +0,0 @@
-{
-  ...
-}:
-
-{
-  services.hyprpaper = {
-    enable = true;
-    settings = {
-      ipc = "on";
-      splash = false;
-
-      preload = [
-        "/home/jordan/Pictures/Aurora.png"
-      ];
-
-      wallpaper = [
-        ",/home/jordan/Pictures/Aurora.png"
-      ];
-    };
-  };
-}

users/jordan/common/optional/graphical/hyprland/waybar.css

@@ -1,96 +0,0 @@
-* {
-  font-family: sans-serif;
-}
-
-window#waybar {
-  background: linear-gradient(
-    to bottom,
-    rgba(118, 118, 118, 0.78) 0%,
-    rgba(50, 50, 50, 0.78) 50%,
-    rgba(0, 0, 0, 0.74) 50%,
-    rgba(0, 0, 0, 0.76) 100%
-  );
-  border-top: 1px solid rgba(71, 71, 71, 0.90);
-  border-bottom: 1px solid rgba(0, 0, 0, 0.97);
-  box-shadow: inset 0px 1px 0px 0px rgba(158, 158, 158, 0.90);
-  text-shadow: black 0px 0px 2px;
-  color: white;
-}
-
-#workspaces button {
-  margin: 2px;
-  background: linear-gradient(
-    to bottom,
-    rgba(255, 255, 255, 0.35) 0%,
-    rgba(255, 255, 255, 0.11) 50%,
-    rgba(255, 255, 255, 0) 50%
-  );
-  border: 1px solid rgba(0, 0, 0, 0.37);
-  border-radius: 4px;
-  box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.25);
-  text-shadow: black 0px 0px 2px;
-  color: white;
-}
-
-#workspaces button:hover {
-  background:
-    linear-gradient(
-      to bottom,
-      rgba(255, 255, 255, 0.35) 0%,
-      rgba(255, 255, 255, 0.17) 50%,
-      rgba(255, 255, 255, 0) 50%
-    ),
-    radial-gradient(
-      ellipse 80% 80% at 50% 110%,
-      rgba(44, 126, 204, 1) 0%,
-      rgba(44, 126, 204, 0) 80%
-    );
-}
-
-#workspaces button.active {
-  background: linear-gradient(
-    to bottom,
-    rgba(0, 0, 0, 0.40) 0%,
-    rgba(0, 0, 0, 0.38) 50%,
-    rgba(0, 0, 0, 0.55) 50%
-  );
-  box-shadow: inset 0px 1px 0px 0px rgb(0, 0, 0);
-}
-
-#workspaces button.active:hover {
-  background:
-    linear-gradient(
-      to bottom,
-      rgba(0, 0, 0, 0.40) 0%,
-      rgba(0, 0, 0, 0.38) 50%,
-      rgba(0, 0, 0, 0.55) 50%
-    ),
-    radial-gradient(
-      ellipse 80% 80% at 50% 120%,
-      rgba(43, 143, 189, 1) 0%,
-      rgba(43, 143, 189, 0) 80%
-    );
-}
-
-#workspaces button.urgent {
-  background:
-    linear-gradient(
-      to bottom,
-      rgba(255, 255, 255, 0.35) 0%,
-      rgba(255, 255, 255, 0.11) 50%,
-      rgba(255, 255, 255, 0) 50%
-    ),
-    radial-gradient(
-      ellipse 80% 80% at 50% 100%,
-      rgba(199, 128, 14, 1) 0%,
-      rgba(170, 75, 12, 0) 100%
-    );
-}
-
-.modules-left {
-  margin-left: 10px;
-}
-
-.modules-right {
-  margin-right: 10px;
-}

users/jordan/common/optional/graphical/hyprland/waybar.nix

@@ -1,53 +0,0 @@
-{
-  ...
-}:
-
-{
-  programs.waybar = {
-    enable = true;
-    settings = [
-      {
-        layer = "top";
-        position = "bottom";
-        height = 30;
-        spacing = 10;
-
-        modules-left = [
-          "hyprland/workspaces"
-        ];
-        modules-center = [
-          "hyprland/window"
-        ];
-        modules-right = [
-          "disk"
-          "cpu"
-          "memory"
-          "privacy"
-          "clock"
-        ];
-
-        clock = {
-          format = "{:%I:%M %p}";
-        };
-
-        disk = {
-          format = "{free}";
-          path = "/";
-        };
-
-        privacy = {
-          modules = [
-            {
-              type = "screenshare";
-            }
-            {
-              type = "audio-in";
-            }
-          ];
-        };
-      }
-    ];
-    style = ./waybar.css;
-    systemd.enable = true;
-  };
-}

users/jordan/helios.nix

@@ -7,7 +7,7 @@
   imports = [
     ./common/optional/graphical/firefox.nix
     ./common/optional/graphical/fonts.nix
-    ./common/optional/graphical/hyprland
+    ./common/optional/graphical/niri.nix
     ./common/optional/graphical/mimeapps.nix
   ];