diff --git a/flake.lock b/flake.lock index d7e5940..c118c30 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1728326504, - "narHash": "sha256-dQXAj+4d6neY7ldCiH6gNym3upP49PVxRzEPxXlD9Aw=", + "lastModified": 1728902391, + "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "65dd97b5d21e917295159bbef1d52e06963f4eb0", + "rev": "9874e08eec85b5542ca22494e127b0cdce46b786", "type": "github" }, "original": { @@ -226,24 +226,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -354,11 +336,11 @@ ] }, "locked": { - "lastModified": 1728727368, - "narHash": "sha256-7FMyNISP7K6XDSIt1NJxkXZnEdV3HZUXvFoBaJ/qdOg=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "eb74e0be24a11a1531b5b8659535580554d30b28", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -435,11 +417,11 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1729551526, + "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", "type": "github" }, "original": { @@ -456,11 +438,11 @@ ] }, "locked": { - "lastModified": 1728726232, - "narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=", + "lastModified": 1729260213, + "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", "owner": "nix-community", "repo": "home-manager", - "rev": "d57112db877f07387ce7104b5ac346ede556d2d7", + "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", "type": "github" }, "original": { @@ -506,11 +488,11 @@ ] }, "locked": { - "lastModified": 1727821604, - "narHash": "sha256-hNw5J6xatedqytYowx0mJKgctjA4lQARZFdgnzM2RpM=", + "lastModified": 1728669738, + "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "d60e1e01e6e6633ef1c87148b9137cc1dd39263d", + "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", "type": "github" }, "original": { @@ -533,11 +515,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1728930677, - "narHash": "sha256-s0Nyh9m1u+xfnaELM3XRtJPUUyjyHS8kwhNYXFucUXM=", + "lastModified": 1729553322, + "narHash": "sha256-7uYakoqf6hWN2vCAbWD5Eq3Redt7Uhgtbz0vbIVD730=", "ref": "refs/heads/main", - "rev": "01c2ff34ddcb5995409c33c2b549e93b98b56d6b", - "revCount": 5343, + "rev": "5e96d738e698f22969ca502d042d5751711c6d8a", + "revCount": 5365, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -608,11 +590,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1728812532, - "narHash": "sha256-n+XqE90WHimAn/3gNuPYU4LwfBX+Ye50LroTPi7nuSM=", + "lastModified": 1729583655, + "narHash": "sha256-UNj9ZkiilRzicFe1bnh78ePRJftwJgzRbe2widXh/Pw=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "a36622478692a28be4d356b03765137c252e7779", + "rev": "7c06b3e0f086f06b0e49f84d54c3e27247ac9b91", "type": "github" }, "original": { @@ -629,36 +611,17 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1728710667, - "narHash": "sha256-9HR9EePhzweUAUPUccByNYxKQzfFAnxfu2BXTLqOLZQ=", + "lastModified": 1729427131, + "narHash": "sha256-Ablfg1XeD5tEU3yOHe5mcqqWbtdBaePUlwHUtel0Wpk=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "e8406a7708bceb3b5bedf56b67490dbe3d27e6f8", + "rev": "0a41e37c9112a752ac2a7b9afbbdac5d14c536c6", "type": "github" }, "original": { "owner": "KZDKM", "repo": "Hyprspace", - "type": "github" - } - }, - "hyprswitch": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1725107917, - "narHash": "sha256-6on3nwb3gB4t+P/2IExgGhVLVgAkF6ZiE5x+qcQHEXU=", - "owner": "h3rmt", - "repo": "hyprswitch", - "rev": "f478c394ad6db5ba268f80052f1eb2366366b21e", - "type": "github" - }, - "original": { - "owner": "h3rmt", - "ref": "release", - "repo": "hyprswitch", + "rev": "0a41e37c9112a752ac2a7b9afbbdac5d14c536c6", "type": "github" } }, @@ -674,11 +637,11 @@ ] }, "locked": { - "lastModified": 1727300645, - "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "lastModified": 1728941256, + "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", "type": "github" }, "original": { @@ -720,11 +683,11 @@ ] }, "locked": { - "lastModified": 1728385805, - "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=", + "lastModified": 1728901530, + "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc", + "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", "type": "github" }, "original": { @@ -735,11 +698,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729509737, + "narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037", "type": "github" }, "original": { @@ -765,18 +728,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1720386169, @@ -795,11 +746,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", + "lastModified": 1729357638, + "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", "type": "github" }, "original": { @@ -811,11 +762,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -859,26 +810,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1711588226, - "narHash": "sha256-nd7goEu+nH/WZ/uCxvbWzSYqzZZn25kWTeKfANOhCjU=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7232f19f7fb710e3554cafaa9d8e93cff8273b59", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -888,7 +824,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1725194671, "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", @@ -908,7 +844,7 @@ "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -919,11 +855,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728985146, - "narHash": "sha256-Kopqg/ZYUxle3wNruPmISv7uU/iMJQ4/wEqx4rGG4xA=", + "lastModified": 1729602958, + "narHash": "sha256-eKGQKlj1oShfR6uqE1RjB4CgQ3DBrMS4VPrGPDKq1J4=", "owner": "nix-community", "repo": "nixvim", - "rev": "25b8d2ab20fbc4a291e83a490382d503c999ab3a", + "rev": "b076f006c6b0cc6644a651bd21d4449cc3e7e56d", "type": "github" }, "original": { @@ -935,11 +871,11 @@ "nixy-wallpapers": { "flake": false, "locked": { - "lastModified": 1729003896, - "narHash": "sha256-NWpQF1xBzUF6ji1ZfUQqcKmVe/ORz2RdUc2zJOLec4U=", + "lastModified": 1729534389, + "narHash": "sha256-VlPfWXRtIfJKDaGqbjThqooa1cYV/+jzv2Tx+YN4JXY=", "owner": "anotherhadi", "repo": "nixy-wallpapers", - "rev": "5a6b9c8ce880fc41d793c178d5935ff3b47a7919", + "rev": "3e2ba1a817c45e8a54b26101983ed3a0c57a3ea6", "type": "github" }, "original": { @@ -957,11 +893,11 @@ ] }, "locked": { - "lastModified": 1728701796, - "narHash": "sha256-FTDCOUnq+gdnHC3p5eisv1X1mMtKJDNMegwpZjRzQKY=", + "lastModified": 1728905062, + "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=", "owner": "NuschtOS", "repo": "search", - "rev": "9578d865b081c29ae98131caf7d2f69a42f0ca6e", + "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84", "type": "github" }, "original": { @@ -993,11 +929,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728092656, - "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { @@ -1013,9 +949,8 @@ "hyprland": "hyprland", "hyprpanel": "hyprpanel", "hyprspace": "hyprspace", - "hyprswitch": "hyprswitch", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim", "nixy-wallpapers": "nixy-wallpapers", "sops-nix": "sops-nix", @@ -1079,11 +1014,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729587807, + "narHash": "sha256-YOc4033a/j1TbdLfkaSOSX2SrvlmuM+enIFoveNTCz4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "26642e8f193f547e72d38cd4c0c4e45b49236d27", "type": "github" }, "original": { @@ -1100,11 +1035,11 @@ ] }, "locked": { - "lastModified": 1728965841, - "narHash": "sha256-IwFh7KUJ9saIONcklEkXR3ANtGxkZsNdtpeT6eyF01Q=", + "lastModified": 1729570661, + "narHash": "sha256-gZj1hMVvZjE4inSUElqQuA9iiUioB/zIqgl0i3XcliU=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "3dfd050f21568902449939f085e8d1aa28fb9913", + "rev": "96cf0aad6fe67a31567a51e54dc6b9fcbe90626a", "type": "github" }, "original": { @@ -1123,18 +1058,18 @@ "flake-utils": "flake-utils_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1728900372, - "narHash": "sha256-hmG/u7qZEm7CTh1XPDi+pg4Oi0nNrv7sL8PgZDRe6wg=", + "lastModified": 1729380793, + "narHash": "sha256-TV6NYBUqTHI9t5fqNu4Qyr4BZUD2yGxAn3E+d5/mqaI=", "owner": "danth", "repo": "stylix", - "rev": "33a2eff15181e557bb6dd9d2073b90f7d218975d", + "rev": "fb9399b7e2c855f42dae76a363bab28d4f24aa8d", "type": "github" }, "original": { @@ -1290,11 +1225,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1729242555, + "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 28d693f..52dee8a 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hyprspace = { - url = "github:KZDKM/Hyprspace"; + # BUG: This is a temporary fix for the flake issue + url = "github:KZDKM/Hyprspace/0a41e37c9112a752ac2a7b9afbbdac5d14c536c6"; inputs.hyprland.follows = "hyprland"; }; nixy-wallpapers = { @@ -36,7 +37,6 @@ hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; stylix.url = "github:danth/stylix"; apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; - hyprswitch.url = "github:h3rmt/hyprswitch/release"; }; outputs = inputs@{ nixpkgs, ... }: { diff --git a/home/programs/shell/eza.nix b/home/programs/shell/eza.nix index 470852c..4ff1af2 100644 --- a/home/programs/shell/eza.nix +++ b/home/programs/shell/eza.nix @@ -2,7 +2,7 @@ { programs.eza = { enable = true; - icons = true; + icons = "auto"; extraOptions = [ "--group-directories-first" diff --git a/home/programs/shell/zsh.nix b/home/programs/shell/zsh.nix index 6ba5ace..dd53bed 100644 --- a/home/programs/shell/zsh.nix +++ b/home/programs/shell/zsh.nix @@ -61,7 +61,7 @@ in { ls = "eza --icons=always --no-quotes"; tree = "eza --icons=always --tree --no-quotes"; sl = "ls"; - open = "${pkgs.xdg_utils}/bin/xdg-open"; + open = "${pkgs.xdg-utils}/bin/xdg-open"; icat = "${pkgs.kitty}/bin/kitty +kitten icat"; wireguard-import = "nmcli connection import type wireguard file"; diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix index dceff73..bf7f9f5 100644 --- a/home/system/hyprland/default.nix +++ b/home/system/hyprland/default.nix @@ -16,7 +16,7 @@ in { home.packages = with pkgs; [ qt5.qtwayland qt6.qtwayland - qt5ct + libsForQt5.qt5ct qt6ct hyprshot hyprpicker diff --git a/nixos/fonts.nix b/nixos/fonts.nix index b8b2508..9ada424 100644 --- a/nixos/fonts.nix +++ b/nixos/fonts.nix @@ -13,7 +13,7 @@ jost dejavu_fonts noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji (nerdfonts.override { fonts = [ "FiraCode" "Meslo" ]; }) openmoji-color