From 6da4854c51e0be07eb17b66e27e787df36beb1ed Mon Sep 17 00:00:00 2001
From: unexplrd <unexplrd@linerds.us>
Date: Sun, 30 Mar 2025 15:22:47 +0300
Subject: [PATCH] remove way-edges

Signed-off-by: unexplrd <unexplrd@linerds.us>
---
 flake.lock                            |  92 +----
 flake.nix                             |   2 -
 modules/home/desktop/default.nix      |   5 +-
 modules/home/desktop/niri/default.nix | 507 +-------------------------
 4 files changed, 15 insertions(+), 591 deletions(-)

diff --git a/flake.lock b/flake.lock
index f21ad33..48222e4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -381,24 +381,6 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_6"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "flakey-profile": {
       "locked": {
         "lastModified": 1712898590,
@@ -1154,22 +1136,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1736320768,
-        "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts_2",
@@ -1260,8 +1226,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "sops-nix": "sops-nix",
-        "stylix": "stylix",
-        "way-edges": "way-edges"
+        "stylix": "stylix"
       }
     },
     "rust-analyzer-src": {
@@ -1302,24 +1267,6 @@
         "type": "github"
       }
     },
-    "rust-overlay_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1741573199,
-        "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
@@ -1450,21 +1397,6 @@
         "type": "github"
       }
     },
-    "systems_6": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tinted-foot": {
       "flake": false,
       "locked": {
@@ -1569,28 +1501,6 @@
         "type": "github"
       }
     },
-    "way-edges": {
-      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay_2"
-      },
-      "locked": {
-        "lastModified": 1742996487,
-        "narHash": "sha256-jh8ZMSo3iBwHByBjYsKgPO9mF0xv6R1FJ0kHTiMiG4U=",
-        "owner": "way-edges",
-        "repo": "way-edges",
-        "rev": "68b0bbe8708ef6df758ecdf9a5b592ecb14bcfb8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "way-edges",
-        "repo": "way-edges",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
diff --git a/flake.nix b/flake.nix
index 5ba0f37..126211f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,6 @@
     nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
     sops-nix.url = "github:mic92/sops-nix";
     stylix.url = "github:danth/stylix";
-    way-edges.url = "github:way-edges/way-edges";
     # TODO: somehow reduce the number of *.inputs.nixpkgs.follows = "nixpkgs" stuff, mb a function?
     blueprint.inputs.nixpkgs.follows = "nixpkgs";
     chaotic.inputs.nixpkgs.follows = "nixpkgs";
@@ -37,7 +36,6 @@
     # neve.inputs.nixvim.follows = "nixvim";
     nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
-    way-edges.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = inputs: inputs.blueprint {inherit inputs;};
diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix
index 17f4ba8..c18c8e5 100644
--- a/modules/home/desktop/default.nix
+++ b/modules/home/desktop/default.nix
@@ -1,6 +1,5 @@
-{inputs, ...}: {
-  imports = with inputs; [
-    way-edges.homeManagerModules.default
+{
+  imports = [
     ./common/xdg-userdirs.nix
     ./gnome
     ./hyprland
diff --git a/modules/home/desktop/niri/default.nix b/modules/home/desktop/niri/default.nix
index 093de1d..cac4d3c 100644
--- a/modules/home/desktop/niri/default.nix
+++ b/modules/home/desktop/niri/default.nix
@@ -28,7 +28,6 @@ in {
   config = lib.mkIf cfg.enable {
     stylix.targets = {
       waybar.enable = false;
-      hyprlock.enable = false;
       wpaperd.enable = true;
       qt.enable = false;
     };
@@ -239,27 +238,6 @@ in {
           }
         '';
       };
-      dunst = {
-        enable = false;
-        settings = {
-          global = {
-            width = 300;
-            height = 300;
-            icon_theme = "${config.dconf.settings."org/gnome/desktop/interface".icon-theme}";
-            corner_radius = 12;
-            #corners = "top-right,bottom-left";
-            offset = "16x16";
-            origin = "top-right";
-            timeout = 15;
-            frame_width = 3;
-            notification_limit = 5;
-          };
-          rule-telegram = {
-            "desktop_entry" = "org.telegram.desktop";
-            "urgency" = "normal";
-          };
-        };
-      };
       hypridle = {
         enable = true;
         settings = {
@@ -300,90 +278,6 @@ in {
         };
       };
     };
-    programs.hyprlock = {
-      enable = false;
-      settings = {
-        general = {
-          disable_loading_bar = true;
-          #grace = 300;
-          hide_cursor = true;
-          no_fade_in = false;
-        };
-        background = [
-          {
-            path = "screenshot";
-            blur_passes = 3;
-            blur_size = 8;
-          }
-        ];
-        input-field = [
-          {
-            size = "274, 50";
-            rounding = 12;
-            outline_thickness = 4;
-            position = "0, -30";
-            monitor = "";
-            dots_center = true;
-            fade_on_empty = false;
-            font_family = "${config.stylix.fonts.serif.name}";
-            font_color = "rgb(${colors.base05})";
-            inner_color = "rgb(${colors.base00})";
-            outer_color = "rgb(${colors.base0D})";
-            check_color = "rgb(${colors.base0A})";
-            fail_color = "rgb(${colors.base08})";
-            placeholder_text = "locked...";
-            fail_text = "wrong";
-            shadow_passes = 0;
-          }
-        ];
-        shape = [
-          {
-            rounding = 12;
-            size = "150, 50";
-            color = "rgb(${colors.base00})";
-            border_color = "rgb(${colors.base0D})";
-            position = "-62, 30";
-            halign = "center";
-            valign = "center";
-          }
-          {
-            rounding = 12;
-            size = "120, 50";
-            color = "rgb(${colors.base00})";
-            border_color = "rgb(${colors.base0D})";
-            position = "77, 28";
-            halign = "center";
-            valign = "center";
-          }
-        ];
-        label = [
-          {
-            monitor = "";
-            text = "$LAYOUT";
-            text_align = "center";
-            font_size = 16;
-            font_family = "${config.stylix.fonts.serif.name}";
-            outer_color = "rgb(${colors.base00})";
-            color = "rgb(${colors.base05})";
-            position = "-62, 28";
-            halign = "center";
-            valign = "center";
-          }
-          {
-            monitor = "";
-            text = "cmd[update:1000] ${pkgs.uutils-coreutils-noprefix}/bin/echo $(${pkgs.uutils-coreutils-noprefix}/bin/date +%H:%M:%S)";
-            text_align = "center";
-            font_size = 16;
-            font_family = "${config.stylix.fonts.serif.name}";
-            outer_color = "rgb(${colors.base00})";
-            color = "rgb(${colors.base05})";
-            position = "77, 28";
-            halign = "center";
-            valign = "center";
-          }
-        ];
-      };
-    };
     xdg.configFile = {
       niri = {
         target = "niri/config.kdl";
@@ -784,365 +678,6 @@ in {
         '';
       };
     };
-    programs.way-edges = {
-      enable = false;
-      settings = {
-        "$schema" = "https://raw.githubusercontent.com/way-edges/way-edges/master/config/config.schema.json";
-        ensure_load_group = ["niri" "tray" "common"];
-        groups = [
-          {
-            name = "niri";
-            widgets = [
-              {
-                edge = "top";
-                layer = "overlay";
-                margins = {left = "25%";};
-                monitor = 0;
-                position = "left";
-                widget = {
-                  event_map = {
-                    "272" = "niri msg action focus-column-left";
-                    "273" = "niri msg action focus-workspace-up";
-                  };
-                  length = "25%";
-                  thickness = 20;
-                  type = "btn";
-                };
-              }
-              {
-                edge = "top";
-                layer = "overlay";
-                margins = {right = "25%";};
-                monitor = 0;
-                position = "right";
-                widget = {
-                  event_map = {
-                    "272" = "niri msg action focus-column-right";
-                    "273" = "niri msg action focus-workspace-down";
-                  };
-                  frame_rate = 144;
-                  length = "25%";
-                  thickness = 20;
-                  type = "btn";
-                };
-              }
-              {
-                edge = "top";
-                layer = "overlay";
-                margins = {left = "25%";};
-                monitor = 0;
-                position = "left";
-                widget = {
-                  color = "#${colors.base00}";
-                  event_map = {
-                    "272" = "niri msg action focus-column-left";
-                    "273" = "niri msg action focus-workspace-up";
-                  };
-                  length = "25%";
-                  thickness = 20;
-                  type = "btn";
-                };
-              }
-              {
-                edge = "top";
-                layer = "overlay";
-                margins = {right = "25%";};
-                monitor = 0;
-                position = "right";
-                widget = {
-                  color = "#${colors.base00}";
-                  event_map = {
-                    "272" = "niri msg action focus-column-right";
-                    "273" = "niri msg action focus-workspace-down";
-                  };
-                  length = "25%";
-                  thickness = 20;
-                  type = "btn";
-                };
-              }
-              {
-                edge = "left";
-                layer = "overlay";
-                monitor = 0;
-                position = "bottom";
-                widget = {
-                  active_increase = 0.5;
-                  default_color = "#${colors.base00}";
-                  hover_color = "#${colors.base03}";
-                  focus_color = "#${colors.base0C}";
-                  length = "20%";
-                  preset = "niri";
-                  thickness = 30;
-                  type = "workspace";
-                };
-              }
-            ];
-          }
-          {
-            name = "common";
-            widgets =
-              [
-                {
-                  edge = "bottom";
-                  layer = "overlay";
-                  monitor = 0;
-                  widget = {
-                    color = "#${colors.base00}";
-                    event_map = {
-                      "272" = "niri msg action maximize-column";
-                      # "273" = "sh -c pkill nwg-drawer || nwg-drawer";
-                      "276" = "niri msg action toggle-column-tabbed-display";
-                    };
-                    length = "40%";
-                    thickness = 20;
-                    type = "btn";
-                  };
-                }
-                {
-                  edge = "left";
-                  layer = "overlay";
-                  margins = {top = 40;};
-                  monitor = 0;
-                  name = "stats";
-                  position = "top";
-                  widget = {
-                    outlook = {
-                      color = "#5d3f3c";
-                      type = "window";
-                    };
-                    type = "wrap-box";
-                    widgets = [
-                      {
-                        index = [
-                          (lib.strings.toInt "-1")
-                          (lib.strings.toInt "-1")
-                        ];
-                        widget = {
-                          bg_color = "#00000044";
-                          fg_color = "#82B2E3";
-                          font_family = config.stylix.fonts.serif.name;
-                          font_size = 20;
-                          prefix = " ";
-                          preset = {
-                            type = "disk";
-                            update_interval = 500;
-                          };
-                          suffix = " {preset}";
-                          suffix_hide = true;
-                          type = "ring";
-                        };
-                      }
-                      {
-                        index = [
-                          (lib.strings.toInt "-1")
-                          (lib.strings.toInt "-1")
-                        ];
-                        widget = {
-                          bg_color = "#00000044";
-                          fg_color = "#FFB77B";
-                          font_family = config.stylix.fonts.serif.name;
-                          font_size = 20;
-                          prefix = " ";
-                          preset = {
-                            type = "battery";
-                            update_interval = 500;
-                          };
-                          suffix = " {preset}";
-                          suffix_hide = true;
-                          type = "ring";
-                        };
-                      }
-                      {
-                        index = [
-                          (lib.strings.toInt "-1")
-                          (lib.strings.toInt "-1")
-                        ];
-                        widget = {
-                          bg_color = "#00000044";
-                          fg_color = "#FB8893";
-                          font_family = config.stylix.fonts.serif.name;
-                          font_size = 20;
-                          prefix = " ";
-                          preset = {
-                            type = "cpu";
-                            update_interval = 500;
-                          };
-                          suffix = " {preset}";
-                          suffix_hide = true;
-                          type = "ring";
-                        };
-                      }
-                      {
-                        index = [
-                          (lib.strings.toInt "-1")
-                          (lib.strings.toInt "-1")
-                        ];
-                        widget = {
-                          bg_color = "#00000044";
-                          fg_color = "#BEAFD9";
-                          font_family = config.stylix.fonts.serif.name;
-                          font_size = 20;
-                          prefix = "󰾶 ";
-                          preset = {
-                            type = "swap";
-                            update_interval = 500;
-                          };
-                          suffix = " {preset}";
-                          suffix_hide = true;
-                          type = "ring";
-                        };
-                      }
-                      {
-                        index = [
-                          (lib.strings.toInt "-1")
-                          (lib.strings.toInt "-1")
-                        ];
-                        widget = {
-                          bg_color = "#00000044";
-                          font_family = config.stylix.fonts.serif.name;
-                          font_size = 20;
-                          prefix = " ";
-                          preset = {
-                            type = "ram";
-                            update_interval = 500;
-                          };
-                          suffix = " {preset}";
-                          suffix_hide = true;
-                          type = "ring";
-                        };
-                      }
-                    ];
-                  };
-                }
-                {
-                  edge = "top";
-                  layer = "overlay";
-                  monitor = 0;
-                  name = "time";
-                  position = "right";
-                  widget = {
-                    font_family = config.stylix.fonts.serif.name;
-                    outlook = {
-                      color = "#${colors.base00}";
-                      margins = {
-                        bottom = 10;
-                        left = 30;
-                        right = 30;
-                        top = 10;
-                      };
-                      type = "window";
-                    };
-                    type = "wrap-box";
-                    widgets = [
-                      {
-                        index = [
-                          (lib.strings.toInt "-1")
-                          (lib.strings.toInt "-1")
-                        ];
-                        widget = {
-                          font_family = config.stylix.fonts.serif.name;
-                          fg_color = "#${colors.base07}";
-                          font_size = 30;
-                          preset = {
-                            format = "%v %T %A";
-                            type = "time";
-                            update_interval = 500;
-                          };
-                          type = "text";
-                        };
-                      }
-                    ];
-                  };
-                }
-                {
-                  edge = "top";
-                  layer = "overlay";
-                  monitor = 0;
-                  position = "left";
-                  preview_size = 7;
-                  widget = {
-                    font_family = config.stylix.fonts.serif.name;
-                    border_width = 4;
-                    length = "12.5%";
-                    bg_color = "#${colors.base00}";
-                    fg_color = "#${colors.base0C}";
-                    mute_color = "#${colors.base0A}";
-                    preset.type = "speaker";
-                    redraw_only_on_internal_update = true;
-                    thickness = 30;
-                    type = "slider";
-                  };
-                }
-              ]
-              ++ (lib.optionals (hostId
-                != "c7f6c4a1") [
-                {
-                  edge = "top";
-                  layer = "overlay";
-                  margins = {left = "12.5%";};
-                  monitor = 0;
-                  position = "left";
-                  preview_size = 7;
-                  widget = {
-                    font_family = config.stylix.fonts.serif.name;
-                    border_width = 4;
-                    bg_color = "#${colors.base00}";
-                    fg_color = "#${colors.base0B}";
-                    length = "12.5%";
-                    preset.type = "backlight";
-                    redraw_only_on_internal_update = true;
-                    thickness = 30;
-                    type = "slider";
-                  };
-                }
-              ]);
-          }
-          {
-            name = "tray";
-            widgets = [
-              {
-                edge = "bottom";
-                layer = "overlay";
-                monitor = 0;
-                name = "tray";
-                position = "right";
-                widget = {
-                  align = "bottom_left";
-                  outlook = {
-                    font_family = config.stylix.fonts.serif.name;
-                    color = "#${colors.base07}";
-                    type = "window";
-                  };
-                  type = "wrap-box";
-                  widgets = [
-                    {
-                      index = [
-                        (lib.strings.toInt "-1")
-                        (lib.strings.toInt "-1")
-                      ];
-                      widget = {
-                        font_family = config.stylix.fonts.serif.name;
-                        grid_align = "bottom_left";
-                        header_draw_config = {text_color = "#${colors.base00}";};
-                        header_menu_align = "left";
-                        header_menu_stack = "menu_top";
-                        icon_size = 42;
-                        menu_draw_config = {
-                          border_color = "#${colors.base00}";
-                          text_color = "#${colors.base00}";
-                          font_pixel_height = 18;
-                        };
-                        type = "tray";
-                      };
-                    }
-                  ];
-                };
-              }
-            ];
-          }
-        ];
-      };
-    };
     programs.waybar = {
       enable = true;
       systemd = {
@@ -1493,7 +1028,7 @@ in {
     };
     dconf.settings = {
       "org/gnome/desktop/interface" = {
-        icon-theme = "${config.gtk.iconTheme.name}";
+        icon-theme = config.gtk.iconTheme.name;
       };
     };
     xdg = {
@@ -1502,38 +1037,26 @@ in {
         enable = true;
         defaultApplications = let
           file_manager = ["org.gnome.Nautilus.desktop"];
-          web_browser = ["re.sonny.Junction.desktop"];
           image_viewer = ["org.gnome.Loupe.desktop"];
-          video_player = ["io.github.celluloid_player.Celluloid.desktop"];
           pdf_reader = ["org.gnome.Papers.desktop"];
+          video_player = ["io.github.celluloid_player.Celluloid.desktop"];
+          web_browser = ["re.sonny.Junction.desktop"];
         in {
+          "application/pdf" = pdf_reader;
+          "image/jpeg" = image_viewer;
+          "image/png" = image_viewer;
           "inode/directory" = file_manager;
-          "video/x-matroska" = video_player;
+          "text/html" = web_browser;
           "video/mp4" = video_player;
           "video/mpeg" = video_player;
+          "video/x-matroska" = video_player;
           "video/x-mpeg" = video_player;
-          "image/png" = image_viewer;
-          "image/jpeg" = image_viewer;
-          "application/pdf" = pdf_reader;
-          "text/html" = web_browser;
+          "x-scheme-handler/about" = web_browser;
           "x-scheme-handler/http" = web_browser;
           "x-scheme-handler/https" = web_browser;
-          "x-scheme-handler/about" = web_browser;
           "x-scheme-handler/unknown" = web_browser;
         };
       };
-      #   desktopEntries = {
-      #     zen-browser-profile = {
-      #       name = "Zen Browser (Choose profile)";
-      #       icon = "app.zen_browser.zen";
-      #       exec = "flatpak run --branch=stable --arch=x86_64 --command=launch-script.sh --file-forwarding app.zen_browser.zen --ProfileManager @@u %u @@";
-      #     };
-      #     logseq-wayland = {
-      #       name = "Logseq Desktop (Wayland)";
-      #       icon = "com.logseq.Logseq";
-      #       exec = "flatpak run --branch=stable --arch=x86_64 --command=run.sh --file-forwarding com.logseq.Logseq @@u %U @@ --enable-features=UseOzonePlatform --ozone-platform=wayland --enable-features=WaylandWindowDecorations";
-      #     };
-      #   };
     };
     systemd.user = {
       settings.Manager.DefaultEnvironment = {
@@ -1560,8 +1083,6 @@ in {
         udiskie = mkGraphicalService {};
         waybar = mkGraphicalService {};
         network-manager-applet = mkGraphicalService {};
-        # wlsunset = mkGraphicalService {};
-        # hypridle = mkGraphicalService {};
         copyq = mkGraphicalService {
           Service =
             graphicalService.Service
@@ -1574,23 +1095,19 @@ in {
             graphicalService.Service
             // {
               Type = "simple";
-              ExecStart = "${lib.getExe pkgs.xwayland-satellite} :123";
+              ExecStart = lib.getExe pkgs.xwayland-satellite + " :123";
             };
         };
         wpaperd = mkGraphicalService {
           Service =
-            graphicalService.Service
-            // {
-              Restart = "always";
-              RestartSec = "10";
-            };
+            lib.mkDefault graphicalService.Service;
         };
         gnome-polkit-agent = mkGraphicalService {
           Service =
             graphicalService.Service
             // {
               Type = "simple";
-              ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+              ExecStart = pkgs.polkit_gnome + "/libexec/polkit-gnome-authentication-agent-1";
             };
         };
       };