flake.nix

@@ -301,7 +301,6 @@
           swayimg = pkgs.callPackage ./packages/swayimg/default.nix { };
           hyprland-autoname-workspaces =
             pkgs.callPackage ./packages/workspace-renamer/default.nix { };
-          pyprland = pkgs.callPackage ./packages/pyprland { };
           shortcuts = let
             script = writePython311Script "shortcuts" { }
               (builtins.readFile ./scripts/shortcuts/shortcuts.py);

home-manager/common/programs/emacs.nix

@@ -53,7 +53,6 @@
       home.sessionVariables = {
         EDITOR = "emacsclient -c";
         VISUAL = "emacsclient -c";
-        ALTERNATE_EDITOR = "";
       };
     }))
     (lib.mkIf (config.nathan.programs.emacs.enable && pkgs.stdenv.isLinux) {

home-manager/linux/programs/hyprland.nix

@@ -52,11 +52,10 @@ in with lib; {
       evince
       # Productivity
       libreoffice-fresh
-      ## Hyprland addons
+      ## Sway addons
       font-awesome
       inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.hyprpaper
       swayosd
-      inputs.self.packages.${pkgs.system}.pyprland
       # For fancy x11 scaling
       sommelier
       # Polkit
@@ -139,7 +138,7 @@ in with lib; {
 
         bind = $mainMod, Q, exec, alacritty
         bind = $mainMod, C, killactive,
-        # bind = $mainMod, M, exit,
+        bind = $mainMod, M, exit,
         bind = $mainMod, E, exec, dolphin
         bind = $mainMod, V, togglefloating,
         bind = $mainMod, R, exec, ${fuzzel-command}
@@ -216,32 +215,6 @@ in with lib; {
         windowrulev2 = noborder,class:^(.gamescope-wrapped)$,title:VMware Workstation
         windowrulev2 = rounding 0,class:^(.gamescope-wrapped)$,title:VMware Workstation
 
-        ## Scratchpads
-
-        # Alacritty
-        bind = SUPER ALT, Q, exec, pypr toggle term
-        $dropterm = ^(alacritty-dropterm)$
-        windowrule = float,$dropterm
-        windowrule = size 40% 50%,$dropterm
-        windowrule = workspace special silent,$dropterm
-        windowrule = center,$dropterm
-
-        # Emacs
-        bind = SUPER ALT, W, exec, pypr toggle emacs
-        $scratchmacs = title:^(scratchmacs)$
-        windowrulev2 = float,$scratchmacs
-        windowrulev2 = size 40% 50%,$scratchmacs
-        windowrulev2 = workspace special silent,$scratchmacs
-        windowrulev2 = center,$scratchmacs
-
-        # Ario
-        bind = SUPER ALT, E, exec, pypr toggle ario
-        $dropario = class:^(ario)$
-        windowrulev2 = float,$dropario
-        windowrulev2 = size 50% 70%,$dropario
-        windowrulev2 = workspace special silent,$dropario
-        windowrulev2 = center,$dropario
-
         # Clipboard history management
         exec-once=wl-paste --watch cliphist store
         bind = $mainMod, X, exec, cliphist list | ${fuzzel-command} --dmenu | cliphist decode | wl-copy
@@ -300,54 +273,7 @@ in with lib; {
       onChange = ''
         mkdir -p ~/.config/shortcuts/shortcuts
       '';
-    };
-    # Setup pyprland
-    systemd.user.services.pypr = {
-      Unit = {
-        Description = "pypr";
-        After = [ "graphical-session.target" ];
-      };
-      Service = {
-        Type = "simple";
-        ExecStart = "${inputs.self.packages.${pkgs.system}.pyprland}/bin/pypr";
-        Restart = "on-failure";
-      };
-      Install = { WantedBy = [ "graphical-session.target" ]; };
-    };
-    # And its config file
-    xdg.configFile."hypr/pyprland.json" = let
-      emacsStart = pkgs.writeShellScript "emacsStart.sh" ''
-        exec emacsclient -c --frame-parameters='(quote (name . "scratchmacs"))'
-      '';
-      # https://github.com/hyprland-community/pyprland/issues/6
-      # "emacs": {
-      #   "command": "${emacsStart}",
-      #   "animation": "",
-      #   "unfocus": "hide"
-      # }
-    in {
-      text = ''
-        {
-          "pyprland": {
-            "plugins": [
-              "scratchpads"
-            ]
-          },
-          "scratchpads": {
-            "term": {
-              "command": "alacritty --class alacritty-dropterm --working-directory ~ -e tmux new -A -s scratch",
-              "animation": "",
-              "unfocus": "hide"
-            },
-          "ario": {
-            "command": "ario",
-            "animation": "",
-            "unfocus": "hide"
-           }
-          }
-        }
-      '';
-      onChange = "systemctl --user restart pypr";
+
     };
     #########################
     ## SwayNotificationCenter (notifications)
@@ -482,8 +408,6 @@ in with lib; {
             max-length = 50;
             format-icons = {
               spotify = " ";
-              firefox = " ";
-              mopidy = " ";
               default = " ";
             };
             escape = true;

home-manager/linux/programs/media.nix

@@ -18,8 +18,7 @@ in {
         mpc-cli
         calibre
         playerctl
-        ncmpcpp
-        ario
+        ymuse
       ];
       # Register haruna as the default video player
       xdg.mimeApps.defaultApplications = {

packages/pyprland/default.nix

@@ -1,15 +0,0 @@
-{ config, lib, pkgs, poetry2nix, ... }:
-let
-  vals = builtins.fromJSON (builtins.readFile ../../sources/pyprland.json);
-  rev = vals.rev;
-  hash = vals.hash;
-  src = pkgs.fetchFromGitHub {
-    owner = "hyprland-community";
-    repo = "pyprland";
-    inherit rev hash;
-  };
-in poetry2nix.mkPoetryApplication {
-  inherit src;
-  poetrylock = ./poetry.lock;
-  pyproject = "${src}/pyproject.toml";
-}

packages/pyprland/poetry.lock

@@ -1,7 +0,0 @@
-# This file is automatically @generated by Poetry 1.4.2 and should not be changed by hand.
-package = []
-
-[metadata]
-lock-version = "2.0"
-python-versions = "^3.10"
-content-hash = "53f2eabc9c26446fbcc00d348c47878e118afc2054778c3c803a0a8028af27d9"

sources/pyprland.json

@@ -1,4 +0,0 @@
-{
-  "rev": "8b42c1dec296854241e024f731e5707cf997b9d5",
-  "hash": "sha256-InwPUPNVW0fYrwrvmc3PhzLm2tK8IDM4CHpgfft/WJM="
-}

sources/update-sources.sh

@@ -28,18 +28,6 @@ echo "swayimg now at $SWAYIMG_VERSION"
 #     > $DIRECTORY/autoname.json
 # echo "autoname now at $AUTONAME_REV"
 
-# Update pyprland
-PYPRLAND_BRANCH=$(curl https://api.github.com/repos/hyprland-community/pyprland | jq -r '.default_branch')
-PYPRLAND_REV=$(curl https://api.github.com/repos/hyprland-community/pyprland/git/refs/heads/$PYPRLAND_BRANCH | \
-                jq -r '.object.sha')
-PYPRLAND_HASH=$(nix-prefetch fetchFromGitHub --owner hyprland-community --repo pyprland --rev $PYPRLAND_REV)
-jq --null-input \
-    --arg rev "$PYPRLAND_REV" \
-    --arg hash "$PYPRLAND_HASH" \
-    '{"rev": $rev, "hash": $hash}' \
-    > $DIRECTORY/pyprland.json
-echo "pyprland now at $PYPRLAND_REV"
-
 # Update gamescope
 GAMESCOPE_BRANCH=$(curl https://api.github.com/repos/ValveSoftware/gamescope | jq -r '.default_branch')
 GAMESCOPE_REV=$(curl https://api.github.com/repos/ValveSoftware/gamescope/git/refs/heads/$GAMESCOPE_BRANCH | \
@@ -51,3 +39,4 @@ jq --null-input \
     '{"rev": $rev, "hash": $hash}' \
     > $DIRECTORY/gamescope.json
 echo "gamescope now at $GAMESCOPE_REV"
+