feat: adds smart-gaps; remap floating terminal window

flake.lock

@@ -21,33 +21,12 @@
         "type": "github"
       }
     },
-    "Hyswipe": {
-      "inputs": {
-        "hyprland": [
-          "hyprland"
-        ],
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1739005621,
-        "narHash": "sha256-IMipnrVIfjVNFm/pV4kI0y27gVBSTjxWNgRTO6lksjQ=",
-        "owner": "KZDKM",
-        "repo": "Hyswipe",
-        "rev": "cd6f1857e2991ac123b7c16e73a7f6e66244052a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "KZDKM",
-        "repo": "Hyswipe",
-        "type": "github"
-      }
-    },
     "agenix": {
       "inputs": {
         "darwin": "darwin",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "systems": "systems_3"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1747575206,
@@ -104,11 +83,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745357003,
+        "lastModified": 1747864449,
-        "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=",
+        "narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f",
+        "rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5",
         "type": "github"
       },
       "original": {
@@ -122,11 +101,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1747519437,
+        "lastModified": 1748080874,
-        "narHash": "sha256-uv9Wv59d+mckS2CkorOF484wp2G5TNGijdoBZ5RkAk0=",
+        "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "3ba714046ee32373e88166e6e9474d6ae6a5b734",
+        "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112",
         "type": "github"
       },
       "original": {
@@ -276,7 +255,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -358,11 +337,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747688838,
+        "lastModified": 1747978958,
-        "narHash": "sha256-FZq4/3OtGV/cti9Vccsy2tGSUrxTO4hkDF9oeGRTen4=",
+        "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "45c2985644b60ab64de2a2d93a4d132ecb87cf66",
+        "rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
         "type": "github"
       },
       "original": {
@@ -461,15 +440,15 @@
           "nixpkgs"
         ],
         "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems_4",
+        "systems": "systems_3",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1747610850,
+        "lastModified": 1748112063,
-        "narHash": "sha256-eGOtDlq3h+r/X/j4oSNo6cmQlt67TVolgUJMnGKTRt4=",
+        "narHash": "sha256-+1wJYkfvw6weJJ2xTbcqCfhLR/DNy4ymTHsF8I8uj/g=",
         "ref": "refs/heads/main",
-        "rev": "eb3b38d40baca5c05ddbc1507b3d3f02a0ccb164",
+        "rev": "28c9122adbb9cba2ba19ad723eb0f36c19b21f2d",
-        "revCount": 6127,
+        "revCount": 6134,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -614,11 +593,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746655412,
+        "lastModified": 1747484975,
-        "narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=",
+        "narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "557241780c179cf7ef224df392f8e67dab6cef83",
+        "rev": "163c83b3db48a17c113729c220a60b94596c9291",
         "type": "github"
       },
       "original": {
@@ -632,7 +611,7 @@
         "hyprutils": "hyprutils_2",
         "hyprwayland-scanner": "hyprwayland-scanner_2",
         "nixpkgs": "nixpkgs_5",
-        "systems": "systems_5"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1747584204,
@@ -654,7 +633,7 @@
         "hyprutils": "hyprutils_3",
         "hyprwayland-scanner": "hyprwayland-scanner_3",
         "nixpkgs": "nixpkgs_6",
-        "systems": "systems_6"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1746481417,
@@ -757,11 +736,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739870480,
+        "lastModified": 1747584298,
-        "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=",
+        "narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b",
+        "rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3",
         "type": "github"
       },
       "original": {
@@ -856,11 +835,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1747620037,
+        "lastModified": 1747965612,
-        "narHash": "sha256-M5yyl1Cp5rolwGBuCEKXG6qJj9lao16lshqPF83z0qs=",
+        "narHash": "sha256-koAXv7H+cZBMOZkOekO7AIan0e75/ptPqkiOkO3x9lM=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "5d7985a2d5c877f6a276a2b024fff6bb2995ff24",
+        "rev": "10e16d55b14d6d2f86d636d546be5130c0827933",
         "type": "github"
       },
       "original": {
@@ -871,11 +850,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1747684167,
+        "lastModified": 1747900541,
-        "narHash": "sha256-l6jbonaboCBlB8lCjBkrqgh2zEnvt6F3f4dOU/8CLd4=",
+        "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "e8f38b2c19c0647e39021c3d47172ff5469af8a9",
+        "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06",
         "type": "github"
       },
       "original": {
@@ -948,11 +927,11 @@
     },
     "nixpkgs_11": {
       "locked": {
-        "lastModified": 1747542820,
+        "lastModified": 1748026106,
-        "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
+        "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
+        "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
         "type": "github"
       },
       "original": {
@@ -1060,11 +1039,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1747542820,
+        "lastModified": 1748026106,
-        "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
+        "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
+        "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
         "type": "github"
       },
       "original": {
@@ -1137,11 +1116,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1747683907,
+        "lastModified": 1748115910,
-        "narHash": "sha256-dgEK4d1QPNFhv0s5s9lpvEWOVBlRZENp7TVh8V8qYDU=",
+        "narHash": "sha256-XrtByWu6NjrGq1nysW4XsliVLslZXXKzCKHSC6QM5dY=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "64046fedb710701f87e5e86390b4dbe77f1d733b",
+        "rev": "24dcce023477b994838e387ae042c6b93a749288",
         "type": "github"
       },
       "original": {
@@ -1200,7 +1179,6 @@
     "root": {
       "inputs": {
         "Hyprspace": "Hyprspace",
-        "Hyswipe": "Hyswipe",
         "agenix": "agenix",
         "alejandra": "alejandra",
         "catppuccin": "catppuccin",
@@ -1249,21 +1227,6 @@
       }
     },
     "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1278,6 +1241,21 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
     "systems_4": {
       "locked": {
         "lastModified": 1689347949,
@@ -1309,21 +1287,6 @@
       }
     },
     "systems_6": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_7": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

flake.nix

@@ -21,10 +21,6 @@
       url = "github:KZDKM/Hyprspace";
       inputs.hyprland.follows = "hyprland"; # Hyprspace uses latest Hyprland. We declare this to keep them in sync.
     };
-    Hyswipe = {
-      url = "github:KZDKM/Hyswipe";
-      inputs.hyprland.follows = "hyprland"; # Hyswipe uses latest Hyprland. We declare this to keep them in sync.
-    };
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nur.url = "github:nix-community/NUR";
     nixos-hardware.url = "github:nixos/nixos-hardware";

modules/core/sshd.nix

@@ -11,7 +11,7 @@
     };
   };
 
-  networking.firewall.allowedTCPPorts = [ config.services.openssh.ports ];
+  networking.firewall.allowedTCPPorts = config.services.openssh.ports;
 
   users.users.liv.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGXi00z/rxVrWLKgYr+tWIsbHsSQO75hUMSTThNm5wUw liv@sakura" # main laptop

modules/home/hyprland/config.nix

@@ -214,7 +214,7 @@
       bind = [
         # keybindings
         "$mainMod, Return, exec, kitty"
-        "$mainMod, Backspace, exec, [float; center; size 950 650] kitty"
+        "$mainMod SHIFT, Return, exec, [float; center; size 950 650] kitty"
         "$mainMod, Q, killactive,"
         "$mainMod, F, fullscreen, 0" # set 1 to 0 to set full screen without waybar
         "$mainMod, Space, togglefloating,"
@@ -224,6 +224,9 @@
         "$mainMod SHIFT, B, exec, pkill -SIGUSR1 .waybar-wrapped"
         "$mainMod, C,exec, hyprpicker -a"
         "$mainMod, W,exec, wallpaper-picker"
+        "$mainMod, G, togglegroup,"
+        "SUPER, N, changegroupactive, f"
+        "SUPER, P, changegroupactive, b"
 
         # clipboard manager
         "$mainMod SHIFT, V, exec, cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy"
@@ -235,7 +238,7 @@
         "$mainMod SHIFT, T, exec, thunderbird"
         "$mainMod SHIFT, E, exec, element-desktop"
         "$mainMod SHIFT, P, exec, pavucontrol-qt"
-        "$mainMod SHIFT, N ,exec, notes" # should be added by scripts/custom packages
+        "$mainMod SHIFT, N ,exec, notes"
         "$mainMod, N,exec, swaync-client -t"
 
         # screenshot
@@ -316,6 +319,11 @@
         "$mainMod, mouse:273, resizewindow"
       ];
 
+      workspace = [
+        "w[tv1], gapsout:0, gapsin:0"
+        "f[1], gapsout:0, gapsin:0"
+      ];
+
       # windowrule
       windowrule = [
         "float,title:^(float_kitty)$"
@@ -326,6 +334,10 @@
         "move 0 0,title:^(Librewolf — Sharing Indicator)$"
         "size 700 450,title:^(Volume Control)$"
         "move 40 55%,title:^(Volume Control)$"
+        "bordersize 0, floating:0, onworkspace:w[tv1]"
+        "rounding 0, floating:0, onworkspace:w[tv1]"
+        "bordersize 0, floating:0, onworkspace:f[1]"
+        "rounding 0, floating:0, onworkspace:f[1]"
       ];
 
       # windowrulev2

modules/home/scripts/scripts.nix

@@ -1,37 +1,23 @@
 { pkgs, ... }:
 let
-  wall-change = pkgs.writeShellScriptBin "wall-change" (builtins.readFile ./scripts/wall-change.sh);
-  wallpaper-picker = pkgs.writeShellScriptBin "wallpaper-picker" (
-    builtins.readFile ./scripts/wallpaper-picker.sh
-  );
   runbg = pkgs.writeShellScriptBin "runbg" (builtins.readFile ./scripts/runbg.sh);
-
   notes = pkgs.writeShellScriptBin "notes" (builtins.readFile ./scripts/notes.sh);
   grabtext = pkgs.writeShellScriptBin "grabtext" (builtins.readFile ./scripts/grabtext.sh);
   unfuck = pkgs.writeShellScriptBin "unfuck" (builtins.readFile ./scripts/unfuck.sh);
-
   toggle_blur = pkgs.writeScriptBin "toggle_blur" (builtins.readFile ./scripts/toggle_blur.sh);
   toggle_oppacity = pkgs.writeScriptBin "toggle_oppacity" (
     builtins.readFile ./scripts/toggle_oppacity.sh
   );
-
   ascii = pkgs.writeScriptBin "ascii" (builtins.readFile ./scripts/ascii.sh);
 in
 {
   home.packages = with pkgs; [
-    wall-change
-    wallpaper-picker
-
-    toggle_blur
-    toggle_oppacity
-
     runbg
-
     notes
     grabtext
     unfuck
-
+    toggle_blur
+    toggle_oppacity
     ascii
-
   ];
 }

modules/home/scripts/scripts/compress.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-if (( $# == 1 )) then
-    # echo -ne "Archive name: "
-    # read name
-    # tar -cvzf "$name.tar.gz" $1
-    tar -cvzf "$1.tar.gz" $1
-else
-    echo "Wrong number of arguments..."
-fi

modules/home/scripts/scripts/extract.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-for i in "$@" ; do
-    tar -xvzf $i
-    break
-done

modules/home/scripts/scripts/maxfetch.sh

@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-
-unicode=" " 
-version="1.2.0"
-
-_black=$(tput setaf 0)
-red=$(tput setaf 1)
-green=$(tput setaf 2)
-yellow=$(tput setaf 3)
-blue=$(tput setaf 4)
-magenta=$(tput setaf 5)
-cyan=$(tput setaf 6)
-_white=$(tput setaf 7)
-_bright=$(tput bold)
-normal=$(tput sgr0)
-_underline=$(tput smul)
-
-up=$(uptime | awk -F'( |,|:)+' '{
-        d=h=m=0;
-        if ($7=="min")
-            m=$6;
-        else {
-            if ($7~/^day/) { d=$6; h=$8; m=$9}
-            else {h=$6;m=$7}
-        }
-    }
-    { print h+0,"h",m+0,"m" }
-')
-up=$(sed -e "s/ h/h/g" <<< ${up})
-up=$(sed -e "s/ m/m/g" <<< ${up})
-
-pkgs=$(nix-store --query --requisites /run/current-system | wc -l)
-
-fetch() {
-    echo "${cyan}$(tput bold)     _  ___      ____  ____    ${normal}$(tput sgr0)"
-    echo "${cyan}$(tput bold)    / |/ (_)_ __/ __ \/ __/    ${normal}$(tput sgr0)"
-    echo "${cyan}$(tput bold)   /    / /\ \ / /_/ /\ \      ${normal}$(tput sgr0)"
-    echo "${cyan}$(tput bold)  /_/|_/_//_\_"'\\'"____/___/  ${normal}$(tput sgr0)"
-    echo ""
-    echo "  ╭─────────────╮ "
-    echo "  │  ${red} ${normal} user    │ ${red}$(whoami)${normal}"
-    echo "  │  ${yellow} ${normal} distro  │ ${yellow}$(sed -nE "s@PRETTY_NAME=\"([^\"]*)\"@\1@p" /etc/os-release)${normal} "
-    echo "  │  ${green} ${normal} kernel  │ ${green}$(uname -r)${normal} "
-    echo "  │  ${cyan}󱂬 ${normal} de/wm   │ ${cyan}$XDG_CURRENT_DESKTOP${normal} "
-    echo "  │  ${blue} ${normal} uptime  │ ${blue}${up}${normal} "
-    echo "  │  ${magenta} ${normal} shell   │ ${magenta}$(echo ${SHELL##*/})${normal} "
-    echo "  │  ${red}󰏖 ${normal} pkgs    │ ${red}${pkgs}${normal} "
-    echo "  ├─────────────┤ "
-    echo "  │  ${_white}  ${normal}colors  │${_white}$unicode${normal}${red}$unicode${normal}${yellow}$unicode${normal}${green}$unicode${normal}${cyan}$unicode${normal}${blue}$unicode${normal}${magenta}$unicode${normal}${_black}$unicode${normal}"
-    echo "  ╰─────────────╯ "
-}
-
-fetch && exit 0

modules/home/scripts/scripts/music.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-if (ps aux | grep audacious | grep -v grep > /dev/null) then
-    pkill audacious
-else
-    hyprctl dispatch exec "[workspace 5 silent] audacious -t"
-    sleep 0.5
-    audtool playlist-repeat-status |grep "on" || audtool playlist-repeat-toggle
-    audtool playlist-shuffle-status|grep "on" || audtool playlist-shuffle-toggle
-fi

modules/home/scripts/scripts/vm-start.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env zsh
-
-# VM name
-vm_name="win10"
-export LIBVIRT_DEFAULT_URI="qemu:///system"
-
-# change workspace
-hyprctl dispatch workspace 6
-
-virsh start ${vm_name}
-virt-viewer -f -w -a ${vm_name}