diff --git a/flake.lock b/flake.lock index fe1e71e..5829b3a 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ "nuscht-search": "nuscht-search" }, "locked": { - "lastModified": 1735634086, - "narHash": "sha256-DTcB/kBZULyJztXXnH3OVF5LHLl+O670DuLZZNUMnNo=", + "lastModified": 1735895235, + "narHash": "sha256-MtsfkMikkPjnZUMqsqXQ29cHzlRD2lMe27jXua28cHU=", "owner": "catppuccin", "repo": "nix", - "rev": "63290ea1d2a28e65195017ed78a81cfc242ef0df", + "rev": "b326f48f17023fc0060590ba299d55f7da8350a5", "type": "github" }, "original": { @@ -211,22 +211,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -240,7 +224,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -256,7 +240,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1733328505, @@ -352,11 +336,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -385,25 +369,7 @@ }, "flake-utils_4": { "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" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -422,38 +388,17 @@ "freetype2": { "flake": false, "locked": { - "lastModified": 1687587065, - "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=", - "owner": "wez", - "repo": "freetype2", - "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "lastModified": 1723459814, + "narHash": "sha256-4l90lDtpgm5xlh2m7ifrqNy373DTRTULRkAzicrM93c=", + "owner": "freetype", + "repo": "freetype", + "rev": "42608f77f20749dd6ddc9e0536788eaad70ea4b5", "type": "github" }, "original": { - "owner": "wez", - "repo": "freetype2", - "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", - "type": "github" - } - }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs-stable": "nixpkgs-stable_2", - "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" - }, - "locked": { - "lastModified": 1735863342, - "narHash": "sha256-KWYFaGeE22CFzx/ql8frrlfyfqvbS2UOMzX8IVaHqns=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "cde8b7e8101d181b792a045e2a2c9bc07f97e824", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", + "owner": "freetype", + "ref": "VER-2-13-3", + "repo": "freetype", "type": "github" } }, @@ -537,7 +482,7 @@ }, "haivim": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ], @@ -667,11 +612,11 @@ ] }, "locked": { - "lastModified": 1735774425, - "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", + "lastModified": 1735925111, + "narHash": "sha256-/NptDI4njO5hH0ZVQ2yzbvTXmBOabZaGYkjhnMJ37TY=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", + "rev": "ef64efdbaca99f9960f75efab991e4c49e79a5f1", "type": "github" }, "original": { @@ -750,15 +695,15 @@ "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_7", + "systems": "systems_6", "xdph": "xdph" }, "locked": { - "lastModified": 1735851503, - "narHash": "sha256-r5FFHhiZZOOlzWsS06oz+7MKpjJydDXsD9N2NcKFSjE=", + "lastModified": 1735908454, + "narHash": "sha256-BfS6oIqF6x7URohd9+RgB5o7FUzAcENiioLf1nDJA+o=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f3c49c1295126c2154ee800ceedb48b79451840c", + "rev": "b0cd9972e8158bbda2ee3933668ce727e8a9ae5c", "type": "github" }, "original": { @@ -1060,11 +1005,11 @@ }, "nixpkgs-smol": { "locked": { - "lastModified": 1735801820, - "narHash": "sha256-tOAdzu1ck58BA3hZItecyqrhe2fdoQgJiWm4iyUyhgc=", + "lastModified": 1735888521, + "narHash": "sha256-KY5WZZ0kNBcWZtecGWoMKkkCx4aQGEQgQXuBz+WTq20=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3da6bd3e69891c1e20bbf083a1c8738d6c814060", + "rev": "4138c1b330db6ac6f67abcc9988202e231b3ec54", "type": "github" }, "original": { @@ -1091,22 +1036,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -1122,22 +1051,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1733229606, - "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1735471104, @@ -1188,11 +1101,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -1204,11 +1117,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -1220,11 +1133,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1735617354, - "narHash": "sha256-5zJyv66q68QZJZsXtmjDBazGnF0id593VSy+8eSckoo=", + "lastModified": 1735821806, + "narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "69b9a8c860bdbb977adfa9c5e817ccb717884182", + "rev": "d6973081434f88088e5321f83ebafe9a1167c367", "type": "github" }, "original": { @@ -1253,7 +1166,7 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "home-manager": "home-manager_3", @@ -1283,11 +1196,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1735857266, - "narHash": "sha256-P0Wdee51bHxa0rjAjTcRlSOLPXiKQZMkgNVz8aHZLJM=", + "lastModified": 1735927071, + "narHash": "sha256-SyYWtRQcASoPI2aN5Ebl/q/ttp4YL9ichSkn+QjsGGQ=", "owner": "nix-community", "repo": "NUR", - "rev": "7a66c741d7d1f69e5c5e94ed8f6993a4bb4e3c6a", + "rev": "36e72b706af2b0b2e7aabcbf8ceda61e63737d38", "type": "github" }, "original": { @@ -1321,7 +1234,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "ixx": "ixx_2", "nixpkgs": [ "haivim", @@ -1345,13 +1258,13 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "gitignore": "gitignore_2", "nixpkgs": [ "hyprland", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1734797603, @@ -1374,7 +1287,6 @@ "chaotic": "chaotic", "deploy-rs": "deploy-rs", "disko": "disko", - "ghostty": "ghostty", "haivim": "haivim", "home-manager": "home-manager_4", "hyprland": "hyprland", @@ -1395,11 +1307,11 @@ ] }, "locked": { - "lastModified": 1735784864, - "narHash": "sha256-tIl5p3ueaPw7T5T1UXkLc8ISMk6Y8CI/D/rd0msf73I=", + "lastModified": 1735871325, + "narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "04d5f1836721461b256ec452883362c5edc5288e", + "rev": "a599f011db521766cbaf7c2f5874182485554f00", "type": "github" }, "original": { @@ -1430,17 +1342,17 @@ }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1735827474, - "narHash": "sha256-s8fDRn99iDIf5olFuIXlw6BDUjdBj4sk9uqPWD4pDdU=", + "lastModified": 1735877772, + "narHash": "sha256-6OT4xYCwZTJ9qK28NNM98ibFZinwrJK/sRlg+dDqdJs=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "c0db9c52e158f3b3dedb08e77f3c87aecac3d2c3", + "rev": "0227d83d2eb29189b8ed8d180e2442ada633dd0d", "type": "github" }, "original": { @@ -1525,21 +1437,6 @@ } }, "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" - } - }, - "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1554,7 +1451,7 @@ "type": "github" } }, - "systems_8": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1632,7 +1529,7 @@ }, "wezterm": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", @@ -1642,11 +1539,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1735842584, - "narHash": "sha256-YOArk0EzLd2FmObtuptIXjPvkZd2yQiZXwKkp2DKbPk=", + "lastModified": 1735931735, + "narHash": "sha256-4wzEN5IPYmqLP8TAdFatoRhCZ7W9y65AWoYN0Qgvbg8=", "owner": "wez", "repo": "wezterm", - "rev": "d8f4cb3559c5cebf7d779eb63a90d37ecd6376a8", + "rev": "8e9cf912e66f704f300fac6107206a75036de1e7", "type": "github" }, "original": { @@ -1702,11 +1599,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1735849099, - "narHash": "sha256-nYykv3COeYunqlha9Co+8CCigM2GtdtS7vw9xuhoO7Q=", + "lastModified": 1735881391, + "narHash": "sha256-T9N1q8YWn9MnIqUpm0+p/kAqktfSoeKfyOTZiXQoNPU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b275d71ba83928121235a4e7968b9be55986fdc6", + "rev": "4a48a5c007863df58d1586f96010a6d4bde99f69", "type": "github" }, "original": { @@ -1715,31 +1612,6 @@ "type": "github" } }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty" - ], - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, "zlib": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 999e1fa..ee4b472 100644 --- a/flake.nix +++ b/flake.nix @@ -63,10 +63,6 @@ wezterm.url = "github:wez/wezterm?dir=nix"; - ghostty = { - url = "github:ghostty-org/ghostty"; - }; - catppuccin = {url = "github:catppuccin/nix";}; hyprland.url = "github:hyprwm/Hyprland"; diff --git a/hosts/nyx/configuration.nix b/hosts/nyx/configuration.nix index 4bb1fa0..3255195 100644 --- a/hosts/nyx/configuration.nix +++ b/hosts/nyx/configuration.nix @@ -224,7 +224,7 @@ ssh-to-age sops inputs.zen-browser.packages."${pkgs.system}".default - # cava + cava socat btrfs-progs # pkgs-smol.btop-rocm @@ -279,7 +279,6 @@ mission-center speedcrunch geogebra - inputs.ghostty.packages.x86_64-linux.default ]; fonts.packages = with pkgs; [ diff --git a/modules/home-manager/hypr/hyprland/keybinds.nix b/modules/home-manager/hypr/hyprland/keybinds.nix index 10b70ec..0a5b3a5 100644 --- a/modules/home-manager/hypr/hyprland/keybinds.nix +++ b/modules/home-manager/hypr/hyprland/keybinds.nix @@ -33,7 +33,6 @@ "Super, R, exec, ${pkgs.anyrun}/bin/anyrun" "Super, W, exec, ${pkgs.floorp}/bin/floorp" "Super, Q, exec, wezterm" - "Super, Return, exec, ghostty" "Super, C, killactive" "Super, V, togglefloating" "Super, E, exec, ${pkgs.nautilus}/bin/nautilus -w"