remove hyprland, foot configs

5 files changed, 4 insertions, 229 deletions

diff --git a/flake.lock b/flake.lock
index 4daf24b..e71be4e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -60,27 +60,6 @@
     },
     "flake-parts": {
       "inputs": {
-        "nixpkgs-lib": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
@@ -97,7 +76,7 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
+    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
@@ -311,41 +290,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1774386573,
-        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nur": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1774616000,
-        "narHash": "sha256-fPtYDx+6NSvcrsR3kJ/s/4Exc/BRzOkNZT3E1PgL0Io=",
-        "owner": "nix-community",
-        "repo": "nur",
-        "rev": "1fb4ca6ac4d9af7bceb2b132e98c0553bbebf8a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nur",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -376,7 +320,6 @@
         "home-manager": "home-manager",
         "niri-flake": "niri-flake",
         "nixpkgs": "nixpkgs",
-        "nur": "nur",
         "sops-nix": "sops-nix",
         "sorre-website": "sorre-website",
         "treefmt-nix": "treefmt-nix_2",
@@ -405,7 +348,7 @@
     },
     "sorre-website": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -500,7 +443,7 @@
     "xpkgs": {
       "inputs": {
         "emacs-overlay": "emacs-overlay",
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_2",
         "nixpkgs": [
           "nixpkgs"
         ],
diff --git a/share/cfg/default.nix b/share/cfg/default.nix
index c834122..08b4300 100644
--- a/share/cfg/default.nix
+++ b/share/cfg/default.nix
@@ -10,9 +10,7 @@
     ./gallery-dl.nix
     ./shellenv.nix
     ./fish.nix
-    ./hyprland.nix
     ./emacs.nix
-    ./foot.nix
     ./zed
     ./kitty.nix
   ];
diff --git a/share/cfg/foot.nix b/share/cfg/foot.nix
deleted file mode 100644
index 4ef5579..0000000
--- a/share/cfg/foot.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  cfg = config.programs.foot;
-  foot-pkg = pkgs.symlinkJoin {
-    name = "foot-wrapped";
-    paths = [
-      pkgs.foot
-      pkgs.nerd-fonts.caskaydia-cove
-    ];
-  };
-in
-{
-  programs.foot = {
-    server.enable = cfg.enable;
-    package = foot-pkg;
-    settings = {
-      main = {
-        term = "xterm-256color";
-        dpi-aware = "yes";
-        font = "CaskaydiaCove Nerd Font:14";
-      };
-
-      mouse = {
-        hide-when-typing = "yes";
-      };
-    };
-  };
-
-  programs.fish.functions.icat =
-    # TODO: find window manager agnostic way to get current window size
-    lib.mkIf (cfg.enable && config.wayland.windowManager.hyprland.enable) {
-      body = ''
-        set --local width $(hyprctl -j activewindow | jaq '.size[0]')
-        set --local maximgwidth $(math "ceil($width * 0.7)")
-        img2sixel --width $maximgwidth $argv
-      '';
-    };
-
-  home.packages = lib.mkIf cfg.enable (
-    builtins.attrValues {
-      inherit (pkgs) libsixel jaq hyprland;
-    }
-  );
-}
diff --git a/share/cfg/hyprland.nix b/share/cfg/hyprland.nix
deleted file mode 100644
index 1dab90d..0000000
--- a/share/cfg/hyprland.nix
+++ /dev/null
@@ -1,117 +0,0 @@
-{ pkgs, ... }:
-let
-  programs = {
-    audio = {
-      increase = "wpctl set-volume @DEFAULT_AUDIO_SINK@ --limit 1.0 5%+";
-      decrease = "wpctl set-volume @DEFAULT_AUDIO_SINK@ --limit 1.0 5%-";
-      toggle-mute = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
-    };
-    screenshot = ''grim -g "$(slurp)" -t png - | wl-copy --type image/png'';
-    cmd = {
-      run = "tofi-run";
-      drun = "tofi-drun";
-    };
-    brightness = {
-      increase = "brightnessctl set +5%";
-      decrease = "brightnessctl set 5%-";
-    };
-    terminal = "foot";
-  };
-in
-{
-  home.packages = [ pkgs.hyprland-qtutils ];
-
-  wayland.windowManager.hyprland = {
-    extraConfig = ''
-      $mod = SUPER
-
-      bind = $mod SHIFT, Return, exec, ${programs.terminal}
-
-      general {
-        layout = master
-      }
-
-      master {
-        mfact = 0.5
-        new_status = slave
-      }
-
-      # workspaces
-      # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
-      ${builtins.concatStringsSep "\n" (
-        builtins.genList (
-          x:
-          let
-            ws =
-              let
-                c = (x + 1) / 10;
-              in
-              builtins.toString (x + 1 - (c * 10));
-          in
-          ''
-            bind = $mod, ${ws}, workspace, ${toString (x + 1)}
-            bind = $mod SHIFT, ${ws}, movetoworkspacesilent, ${toString (x + 1)}
-          ''
-        ) 10
-      )}
-
-        bind = $mod SHIFT, C, killactive
-        bind = $mod SHIFT, F, togglefloating
-        bind = $mod SHIFT, Q, exit
-        bind = $mod, P, exec, ${programs.cmd.drun}
-        bind = $mod SHIFT, P, exec, ${programs.cmd.run}
-
-        bind = $mod, H, cyclenext, prev
-        bind = $mod, L, cyclenext
-        bind = $mod SHIFT, H, swapnext, prev
-        bind = $mod SHIFT, L, swapnext
-
-        # audio control
-        binde =, XF86AudioRaiseVolume, exec, ${programs.audio.increase}
-        binde =, XF86AudioLowerVolume, exec, ${programs.audio.decrease}
-        bind =, XF86AudioMute, exec, ${programs.audio.toggle-mute}
-
-        # monitor brightness control
-        binde =, XF86MonBrightnessUp, exec, ${programs.brightness.increase}
-        binde =, XF86MonBrightnessDown, exec, ${programs.brightness.decrease}
-
-        # Screenshotting
-        # My stupid laptop outputs these three key codes when the PrtSc key is
-        # pressed instead of using just one code like any sane device would
-        bind = SUPER SHIFT, S, exec, ${programs.screenshot}
-
-        input {
-          # focus change on cursor move
-          follow_mouse = 1
-          accel_profile = flat
-        }
-        monitor=,preferred,auto,1
-
-        decoration {
-          rounding = 10
-        }
-
-        # set opacity to 0.9 active and 0.5 inactive for foot
-        windowrule = opacity 0.9 override 0.5 override,^(foot)$
-
-        # Move windows to their designated workspaces
-        windowrulev2 = workspace 3,class:(firefox)
-        windowrulev2 = workspace 4,class:(org.telegram.desktop)
-        windowrulev2 = workspace 4,class:(Signal)
-
-        # Floating picture-in-picture windows
-        windowrulev2 = float, title:^(Picture-in-Picture)$,class:^(firefox)$
-        windowrulev2 = size 15% 15%, title:^(Picture-in-Picture)$,class:^(firefox)$
-
-        # workaround for https://github.com/hyprwm/Hyprland/issues/2661
-        windowrulev2 = stayfocused, title:^()$,class:^(steam)$
-        windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$
-
-        # No fade-in animation for the launcher
-        layerrule = noanim, launcher
-
-        bindm = SUPER, mouse:272, movewindow      # Left mouse button
-        bindm = SUPER, mouse:273, resizewindow 1  # Right mouse button
-    '';
-  };
-}
diff --git a/share/cfg/tofi.nix b/share/cfg/tofi.nix
index de97cf4..433a911 100644
--- a/share/cfg/tofi.nix
+++ b/share/cfg/tofi.nix
@@ -29,7 +29,7 @@
       padding-bottom = 0;
       padding-left = 0;
       drun-launch = true;
-      terminal = "foot";
+      terminal = "kitty";
     };
   };
 }