diff --git a/flake.lock b/flake.lock index 10ba854..ede8feb 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1751045017, - "narHash": "sha256-uuO9eP9kD7g4hnjKANBM3dG95/b0tO3DyAKK4VziQxc=", + "lastModified": 1750290749, + "narHash": "sha256-Wd6BlAKF9h8cN+V0BYRXyhdIhoAWV9C0IX5y+RhiVZQ=", "ref": "refs/heads/master", - "rev": "7715309055e86f65ab14c6e79cbb40c8d8e07ca1", - "revCount": 7, + "rev": "20693cdf66818e5644b538ccf9acacc82a2828e2", + "revCount": 6, "type": "git", "url": "https://git.xunuwu.xyz/xun/crosshair-overlay" }, @@ -141,11 +141,11 @@ ] }, "locked": { - "lastModified": 1753140376, - "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", + "lastModified": 1750040002, + "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", "owner": "nix-community", "repo": "disko", - "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", + "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", "type": "github" }, "original": { @@ -162,11 +162,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1753516548, - "narHash": "sha256-jgEd+C1KWecVYUyfU0FVEshBBTYTPg+l3Jvggjjm2kw=", + "lastModified": 1750219402, + "narHash": "sha256-b3y7V7db0VwLGtpcLRmT1Aa9dpAKoHQdem55UhgB/fw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "247377bac75a5f4efe14d871d00e583127c10282", + "rev": "a00ce73b626ed274fbfe9f51627861e140b08f6d", "type": "gitlab" }, "original": { @@ -256,6 +256,21 @@ "type": "github" } }, + "flake-compat_5": { + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -263,11 +278,11 @@ ] }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -281,11 +296,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -364,11 +379,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -471,6 +486,32 @@ "type": "github" } }, + "git-hooks_2": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore_2", + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -494,30 +535,52 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "48.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } }, "hardware": { "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", + "lastModified": 1750083401, + "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", + "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", "type": "github" }, "original": { @@ -577,11 +640,11 @@ ] }, "locked": { - "lastModified": 1753554374, - "narHash": "sha256-VvPpzxOsQZHa3njTV5o8EXETQJIGF4saGrRpe4sPV/s=", + "lastModified": 1750127463, + "narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "37fec70bd5dace2fb025d3f7cbc0899a7fce6081", + "rev": "28eef8722d1af18ca13e687dbf485e1c653a0402", "type": "github" }, "original": { @@ -656,11 +719,11 @@ ] }, "locked": { - "lastModified": 1753447932, - "narHash": "sha256-uKZ2HAJlQK4WUowggB4pVGFFqMVqVTkQaQ2+48/J+pY=", + "lastModified": 1750211919, + "narHash": "sha256-wmx5ci3SSR5QgrnA35ozjAQu6HiC5Vl8s5qRRCOTWmQ=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "1e3c1bd1461e9296334e039eeb20f7100153e98a", + "rev": "6a0dc614977835c664c3849a59303c3234f57808", "type": "github" }, "original": { @@ -676,11 +739,11 @@ ] }, "locked": { - "lastModified": 1752985182, - "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", + "lastModified": 1749960154, + "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", + "rev": "424a40050cdc5f494ec45e46462d288f08c64475", "type": "github" }, "original": { @@ -698,11 +761,11 @@ ] }, "locked": { - "lastModified": 1753237324, - "narHash": "sha256-iXvv/VYLMyAoaTadYrX0PGwd6N2wVX337Os6k8TAlF4=", + "lastModified": 1750212369, + "narHash": "sha256-QXZc1il1KSGTtARN5ZI6wx1HxCXjEFZXsRZWl5+tOLc=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "64ca2cbbf9c65dd3bd98192d74872a80e8dcb871", + "rev": "886fbf6b49af5754ed096e04f97fd9d87f0fd7e0", "type": "github" }, "original": { @@ -717,11 +780,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753450337, - "narHash": "sha256-l0QLEenVKuU6U2g1wI0zuf9IAm7QpisIbf8wAI6BUX4=", + "lastModified": 1749574455, + "narHash": "sha256-fm2/8KPOYvvIAnNVtjDlTt/My00lIbZQ+LMrfQIWVzs=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "a8dfcd2962f6e788759a75b36ca86b14aa44d8e5", + "rev": "917af390377c573932d84b5e31dd9f2c1b5c0f09", "type": "github" }, "original": { @@ -732,27 +795,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1749173751, + "narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1751159883, - "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -778,11 +841,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -801,14 +864,15 @@ "nixpkgs": [ "stylix", "nixpkgs" - ] + ], + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1751906969, - "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "lastModified": 1748730660, + "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", "owner": "nix-community", "repo": "NUR", - "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", "type": "github" }, "original": { @@ -825,11 +889,11 @@ ] }, "locked": { - "lastModified": 1752968690, - "narHash": "sha256-8795clbksJi4RTEf9OI4+1rZ9FQsqxrl6/e3xTWcLfM=", + "lastModified": 1751707015, + "narHash": "sha256-FIgI9/nzdks/NEYJHpOJcQSiwrMRN9yf0eYFnJsICk4=", "owner": "xunuwu", "repo": "nvim-config", - "rev": "bbcffc07bdbf52ba359fb6e1c1678104525fc330", + "rev": "f820aba76531faaded0965c3175b827f331e742d", "type": "github" }, "original": { @@ -933,11 +997,11 @@ ] }, "locked": { - "lastModified": 1752544651, - "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", + "lastModified": 1750119275, + "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2c8def626f54708a9c38a5861866660395bb3461", + "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", "type": "github" }, "original": { @@ -953,8 +1017,13 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", + "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_6", + "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ], @@ -967,15 +1036,15 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1753553562, - "narHash": "sha256-CpTwdsrPU3UFy95Btg56RcVMgNpnw3C0DYTznE5aRq4=", - "owner": "nix-community", + "lastModified": 1750205637, + "narHash": "sha256-49wV81h1jnHJky1XNHfgwxNA0oCwSTLMz4hhrtWCM8A=", + "owner": "danth", "repo": "stylix", - "rev": "af85565aba0f4749cb18b118a7333a0745920950", + "rev": "82323751bcd45579c8d3a5dd05531c3c2a78e347", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "danth", "repo": "stylix", "type": "github" } @@ -1091,11 +1160,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1748180480, + "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", "type": "github" }, "original": { @@ -1107,11 +1176,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1748740859, + "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", "type": "github" }, "original": { @@ -1123,11 +1192,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", "type": "github" }, "original": { @@ -1158,6 +1227,28 @@ "type": "github" } }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems_3" diff --git a/flake.nix b/flake.nix index 05d33bc..8b14816 100644 --- a/flake.nix +++ b/flake.nix @@ -76,8 +76,9 @@ nvim-config.url = "github:xunuwu/nvim-config"; nvim-config.inputs.nixpkgs.follows = "nixpkgs"; - stylix.url = "github:nix-community/stylix"; + stylix.url = "github:danth/stylix"; stylix.inputs.nixpkgs.follows = "nixpkgs"; + stylix.inputs.home-manager.follows = "home-manager"; firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; firefox-addons.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/cli/comma.nix b/home/cli/comma.nix index 55159fb..17729ef 100644 --- a/home/cli/comma.nix +++ b/home/cli/comma.nix @@ -1,5 +1,5 @@ {inputs, ...}: { - imports = [inputs.nix-index-database.homeModules.nix-index]; + imports = [inputs.nix-index-database.hmModules.nix-index]; programs = { nix-index-database.comma.enable = true; diff --git a/home/programs/beets.nix b/home/programs/beets.nix index 68bc089..944938c 100644 --- a/home/programs/beets.nix +++ b/home/programs/beets.nix @@ -26,7 +26,7 @@ in { lyrics = { synced = true; # prefer synced - sources = ["lrclib" "genius" "google"]; + sources = ["lrclib" "genius" "google" "tekstowo"]; }; paths = { diff --git a/hosts/nixdesk/home.nix b/hosts/nixdesk/home.nix index cf947c0..014b161 100644 --- a/hosts/nixdesk/home.nix +++ b/hosts/nixdesk/home.nix @@ -118,8 +118,8 @@ jjui vscodium-fhs android-studio - # jetbrains.rider - # jetbrains.idea-ultimate + jetbrains.rider + jetbrains.idea-ultimate # communication element-desktop diff --git a/pkgs/binaryninja-personal/default.nix b/pkgs/binaryninja-personal/default.nix index 9bf7cdd..a38f33d 100644 --- a/pkgs/binaryninja-personal/default.nix +++ b/pkgs/binaryninja-personal/default.nix @@ -10,7 +10,6 @@ fontconfig, qt6, dbus, - libxml2, python3, wayland, makeDesktopItem, @@ -28,7 +27,7 @@ }; crack = requireFile { name = "libbinaryninjacore.so.1"; - sha256 = "5d03d63e226cf7295270c003651c690766915cad5bbc42c4830d80517e3f005e"; + sha256 = "6bff56e25e55eb701f00ba294f8d5f0cd169d350412bcbfe4fea7a8feb1b3022"; message = "add cracked libbinaryninjacore.so.1 to the nix store with command \"nix-store --add-fixed sha256 libbinaryninjacore.so.1\""; }; in @@ -57,15 +56,12 @@ in python3 ]; - preFixup = '' - mkdir -p $out/lib - ln -s ${lib.getLib libxml2}/lib/libxml2.so $out/lib/libxml2.so.2 - ''; - src = requireFile { name = "binaryninja_personal_linux.zip"; url = "https://binary.ninja/recover/"; - sha256 = "073d5dc59e67dabb8aa8c419385b2a0dc17831f108d73def4934e4cade563c87"; + + # https://auth.lol/hashes || https://binary.ninja/js/hashes.js + sha256 = "770be9e7e76f4b083aa767f8f2ad6fdd3dddbe247658a84905a7f625402f49bf"; }; dontWrapQtApps = true; diff --git a/pkgs/cartograph-cf/default.nix b/pkgs/cartograph-cf/default.nix index 5ea8e77..b4aed1c 100644 --- a/pkgs/cartograph-cf/default.nix +++ b/pkgs/cartograph-cf/default.nix @@ -7,7 +7,7 @@ pname = "Cartograph-CF"; version = "0.1"; src = fetchFromGitHub { - owner = "Nasaee"; + owner = "xiyaowong"; repo = "Cartograph-CF"; rev = "619de85c103dbd5c150e1d5df039357f8ac2ed52"; hash = "sha256-NVqHxLQZnHb0lMjODkaDwSoglGPkUVJHL1xTmASoER4=";