diff --git a/flake.lock b/flake.lock index 388ca02..ecb73b1 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1780413908, - "narHash": "sha256-T15bnskj20rdc4vJ55bFF2lVCVR8edilWn0hiYR7vVs=", + "lastModified": 1781883168, + "narHash": "sha256-raAojJGk0aWdscfFn/9ikZ6V5oUuAZcAz5kjAZ2QN3E=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "a61f943f5e94b75c5600a2968cb699d0e37945b3", + "rev": "daed450e9b1a4fadfef68fb4fa5e2f3391fedb34", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1780462466, - "narHash": "sha256-t6c7FTqMB0skEz+4tei5v8GEyL4fRDgx24oW3LrnYiE=", + "lastModified": 1781953785, + "narHash": "sha256-YgEE1a5QdKd47AfRoU5G8nm0gGzeCuPN2emupNDMQcc=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "bb41330bd4372672f552beda66712fb70b17f0fa", + "rev": "e8e9d325eea25f5664e045787c19baac661828de", "type": "github" }, "original": { @@ -102,11 +102,11 @@ }, "crane": { "locked": { - "lastModified": 1765145449, - "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=", + "lastModified": 1781825982, + "narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=", "owner": "ipetkov", "repo": "crane", - "rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5", + "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7", "type": "github" }, "original": { @@ -123,11 +123,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1779856798, - "narHash": "sha256-Q1BTTk45eEvP6R6/VQQ6P1GhTQHVZMhyyu3qDmYEwhQ=", + "lastModified": 1781407285, + "narHash": "sha256-xVYNYbd9cPY18yrOn2Ysh7ecZknQj4y67o58MIOXbsI=", "owner": "daeuniverse", "repo": "flake.nix", - "rev": "a4f652e35e792173b30c5b9c7897f9ecebc63cc8", + "rev": "e13041c9a160defbc6aac95bcb88ba5c43cf25ae", "type": "github" }, "original": { @@ -145,11 +145,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1770019181, - "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=", + "lastModified": 1781627888, + "narHash": "sha256-5yHuAh9k7rT7rtf3uRaXkiUyYvQE9oaCgzhprLm2mr8=", "owner": "serokell", "repo": "deploy-rs", - "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171", + "rev": "6d3087eedff75a715b40c0e124ba15d2dd7bec28", "type": "github" }, "original": { @@ -165,11 +165,11 @@ ] }, "locked": { - "lastModified": 1780290312, - "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=", + "lastModified": 1781152676, + "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=", "owner": "nix-community", "repo": "disko", - "rev": "115e5211780054d8a890b41f0b7734cafad54dfe", + "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1", "type": "github" }, "original": { @@ -181,16 +181,32 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1780706624, - "narHash": "sha256-h/ySOMWHGbPR1+I4RJAIL0K1LKNz0x4M3/hOyZVC/4w=", + "lastModified": 1782125445, + "narHash": "sha256-dhhRbow5hVisqkZSmr4k9QXUsCR74AGKHShfb/lf9l4=", "owner": "doomemacs", - "repo": "doomemacs", - "rev": "dba9aa6363b9c0bada796ee3e8e26adb84a9c43a", + "repo": "core", + "rev": "0012109e82f55299c38df7444daf0470f716e023", "type": "github" }, "original": { "owner": "doomemacs", - "repo": "doomemacs", + "repo": "core", + "type": "github" + } + }, + "doomemacs-modules": { + "flake": false, + "locked": { + "lastModified": 1781422387, + "narHash": "sha256-OpcKPDoguGnpgElNa9hAktV025UvGt4BSPa1NFMo7IY=", + "owner": "doomemacs", + "repo": "modules", + "rev": "5a44cf7bdb74ffccd0e61921803d5fba51a4df10", + "type": "github" + }, + "original": { + "owner": "doomemacs", + "repo": "modules", "type": "github" } }, @@ -200,11 +216,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1780831028, - "narHash": "sha256-GOG3YnJ/wgZoJN/1g6AjbwHPZWgaOociRZRewD9BFl0=", + "lastModified": 1782138215, + "narHash": "sha256-ttpP+5uCnpTvR78J2/kuZyO0KmLDTmsB0U6RuTyGK/4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "82202b8a770eb4639858cec6ec44c45b136520f4", + "rev": "a75ed1b52ce01aa12107d2ceee7e5a92dc06d8e0", "type": "github" }, "original": { @@ -223,11 +239,11 @@ ] }, "locked": { - "lastModified": 1780740363, - "narHash": "sha256-wPsrhLhPPnvLEQR13Xh7akCA2aesGTrAb0OFGa6lgNk=", + "lastModified": 1782135403, + "narHash": "sha256-+JakcxKQnp0tbHMUJdiFGNZbUBzbbpaQ+lE0JJoXHHo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "61c716a7f0fdc7088305e98a9f9189c1835a0314", + "rev": "0aabf2cb457b222dc348c3e6c5b691711ddce4b9", "type": "github" }, "original": { @@ -271,15 +287,15 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -462,11 +478,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1779375398, - "narHash": "sha256-qAUODNxHM9K6CrRCFgfBcbqzRd+YHiWn9fEfmIzrohA=", + "lastModified": 1782088553, + "narHash": "sha256-bGfByNnjuzENdvTW97s4UhwglYY7ydBk54gOZmnaM4Q=", "owner": "mattwparas", "repo": "helix", - "rev": "4d86612df48447088ef4190bf503fd54a7562aa9", + "rev": "0522d519fd5227f77ecef387a87e51b732907562", "type": "github" }, "original": { @@ -483,11 +499,11 @@ ] }, "locked": { - "lastModified": 1780679734, - "narHash": "sha256-KmRNvpNOb7QEORa06bVgjW9kITcx0VhsI7w0vhmZyD8=", + "lastModified": 1782154529, + "narHash": "sha256-mVdyS2SxbPGNHTJX4n4EUMT/S2BPyZJ/ZR2UhkJcSF4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b2b7db486e06e098711dc291bb25db82850e1d16", + "rev": "af11a877f238208676b596a5b6c3f3d8dcf5a86b", "type": "github" }, "original": { @@ -504,16 +520,16 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1765382359, - "narHash": "sha256-RJmgVDzjRI18BWVogG6wpsl1UCuV6ui8qr4DJ1LfWZ8=", + "lastModified": 1782141370, + "narHash": "sha256-hqijVSEETttmo8Okql9/LG0Ua34hdciKW1a5zzlj8mU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e8c096ade12ec9130ff931b0f0e25d2f1bc63607", + "rev": "7c9a54a7f87b4539ddbd8bda09a8a5f5f9361aa9", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v1.0.0", + "ref": "v1.1.0", "repo": "lanzaboote", "type": "github" } @@ -525,11 +541,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1780790681, - "narHash": "sha256-ElNsuFEXsYkj7lLRP0WcL8GdPnAjVwkMyRuSX6Tv7lk=", + "lastModified": 1782086674, + "narHash": "sha256-GuN06EDWFefs6MJnGTKsjd1GRWy3r5xYzDIQs4+aqZ0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "4b02dabdaac3d363ad7a86839c548fa4e32aad07", + "rev": "80fa93450cf3f0062cae52f107e66b1a7db2e8f1", "type": "github" }, "original": { @@ -541,11 +557,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1780741572, - "narHash": "sha256-9j6oxizUi9ZmJyE7ewPUMeJKPwQOfLKU8mC9humsgAo=", + "lastModified": 1782084642, + "narHash": "sha256-vqBemsQl1c6Bp0+zsti/wgGZDBFWGmbNF3LP2j2FY/U=", "owner": "neovim", "repo": "neovim", - "rev": "ec7dab077bf6bf53794f2bc42010c977687094a6", + "rev": "2dd5e3eb4fdf2d7711778246617a2435b131cb09", "type": "github" }, "original": { @@ -566,11 +582,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1780694373, - "narHash": "sha256-wuj6QmOlLsGjBOut+Ki/hiOT/H5ONzBePqOkOolsNfo=", + "lastModified": 1781795508, + "narHash": "sha256-VKrApQ3WCkEe9D8DbaeFjGqLAh7zqYGYjbQYtY5ikxc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8f7043c852210cd0875a1bbe9ca872c90ab5ac74", + "rev": "493ce1e33e72f86312584f331c8cf52b3432ec99", "type": "github" }, "original": { @@ -599,11 +615,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1780637332, - "narHash": "sha256-FeKyLRxLZu2EUnhifijZPDZRl0sVnPVHMtizAINNiN4=", + "lastModified": 1781781064, + "narHash": "sha256-Ii/koEm/sRyg65qbAQWqEgboSEIhdH0EL4KglAc14p0=", "owner": "YaLTeR", "repo": "niri", - "rev": "f717ae030fe56fc52522ebef69f17f3f09064ac4", + "rev": "49fc6117fd6c043adaa2ead316b82db5ed735d36", "type": "github" }, "original": { @@ -623,11 +639,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1780771919, - "narHash": "sha256-cbace1ZTWYFG0luPL7OFlUxDh/t9lmPj+Isvg9hLN0k=", + "lastModified": 1782099009, + "narHash": "sha256-fC/xSFANAxsbLUr/BQdfMrJFm22SEZ04em3uNAQpq60=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "3d940a534da0ba6bce60e345ff2c9c7b062087fb", + "rev": "d2e6bb747a4ab16167bd4bbc1eddf0c6ab18c7f1", "type": "github" }, "original": { @@ -639,6 +655,7 @@ "nix-doom": { "inputs": { "doomemacs": "doomemacs", + "doomemacs-modules": "doomemacs-modules", "emacs-overlay": "emacs-overlay_2", "nixpkgs": [ "nixpkgs" @@ -646,11 +663,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1780741484, - "narHash": "sha256-d4eriM+P6+GDoS9RQpVZVo/e4D8QD9gV1v2vCbThaa0=", + "lastModified": 1782135883, + "narHash": "sha256-3/XqkF5Q3eLuY7pgskZvAas0RGhoTu2GZuiIaljlF7U=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "8373130d0facbace1c5218b2d4409f59b11425f6", + "rev": "0f7867c04dbc20201865db74b1e65a3615cd4aa7", "type": "github" }, "original": { @@ -670,11 +687,11 @@ ] }, "locked": { - "lastModified": 1780588301, - "narHash": "sha256-2MHi4YewvB3ijS30AoP484TVDfC0zp7y9+3Cv0Dp2QA=", + "lastModified": 1781363098, + "narHash": "sha256-uhidFg3n92Lh9JKQJQExEPNRe+fTzhC7/G9XebdzSYU=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "85a12dcb3685991a0fb61dd731b44d3dca5346bd", + "rev": "55d95057021c5d285d95c5f254006f4fa9c3084b", "type": "github" }, "original": { @@ -688,11 +705,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1780310866, - "narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=", + "lastModified": 1781622756, + "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4ed851c979641e28597a05086332d75cdc9e395f", + "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5", "type": "github" }, "original": { @@ -718,6 +735,22 @@ "type": "github" } }, + "nixpkgs-b12141ef619e0a9c1c84dc8c684040326f27cdcc": { + "locked": { + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-patch-rqbit-bump": { "flake": false, "locked": { @@ -732,11 +765,11 @@ }, "nixpkgs-patcher": { "locked": { - "lastModified": 1779142267, - "narHash": "sha256-ozaE7fp0HQ6MCVKz09p2mwSrt8cwpswYOBQc1Oa2Wk4=", + "lastModified": 1781789965, + "narHash": "sha256-ZRlWPq2Qms6KbesJrj7cUe2GN7s8BZISfp9ZbrCi2x0=", "owner": "gepbird", "repo": "nixpkgs-patcher", - "rev": "1035997b647799694e4ac1cf217e7ee1c050bce0", + "rev": "d2abed2b94b7955e05b4e2e8a9b8ac45597ecf94", "type": "github" }, "original": { @@ -747,11 +780,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1780453794, - "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=", + "lastModified": 1781808408, + "narHash": "sha256-0sOb6OIaD/K1zHxBhpmlKvkADfe0n8+l4Jj2e1Q0r3w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338", + "rev": "e8210c649915deed7080033cdbabcc19e40bb899", "type": "github" }, "original": { @@ -763,11 +796,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1780511130, - "narHash": "sha256-2v9lT4ya59Lh1FqPeLnz1MoX9y/wz2huqfe9RtQZITk=", + "lastModified": 1781509190, + "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "535f3e6942cb1cead3929c604320d3db54b542b9", + "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4", "type": "github" }, "original": { @@ -779,11 +812,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -795,11 +828,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-NpH8iEQ5JHv/BtUuzTEXUMDxPLetCDzIv4OxL8H7Kps=", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "lastModified": 1781577229, + "narHash": "sha256-rcUHdUtJEvMdNEl2Wq+YpHraHKfcer3KsBscpZEF2Yg=", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre1004030.64c08a7ca051/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1017464.567a49d1913c/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -824,11 +857,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -856,11 +889,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -872,11 +905,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1780747962, - "narHash": "sha256-IX7G1dlKrOqPOImfbo7ADDfV5yU1+j+MRChI3TL4tAA=", + "lastModified": 1781607440, + "narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73", + "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158", "type": "github" }, "original": { @@ -888,11 +921,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1780751787, - "narHash": "sha256-nWR7F46SyrLvN8Ot39XJDpVCswekGakXlOD4KsTYKW0=", + "lastModified": 1782014548, + "narHash": "sha256-zYKx9xcbPvk4zOzkny3w2/AkuKhJqGwRD+piA3urkx8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00fa9a692bafc08a86061886f888b843bf7fbdb0", + "rev": "72349305fb839e27697873de7a4ce3a98c378f48", "type": "github" }, "original": { @@ -917,11 +950,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -933,11 +966,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1780336545, - "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", + "lastModified": 1781607440, + "narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f", + "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158", "type": "github" }, "original": { @@ -954,11 +987,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1780839013, - "narHash": "sha256-O36vo+rCNFtF/XB/FmeQ7Zlta3ZKCw+5bM7PRPIIG7o=", + "lastModified": 1782145918, + "narHash": "sha256-xYx+9aM7JzFSy7F5xCnbMgDlzjRFxoXbRl+eL4rcfMQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "4b98b6ae9c88b105dacd9fbf8712275b28077ff8", + "rev": "7f813fc7a6a2f92103208a69a98d6afa24f5bb23", "type": "github" }, "original": { @@ -975,15 +1008,16 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1780803063, - "narHash": "sha256-pthUzeY81Gx1PTKCP4gYTwZYUxNpKZh2pOLPa9ZyofI=", + "lastModified": 1780949817, + "narHash": "sha256-2oJuPyt+4dd+ZzO7TFqpmkSAAYpRg9SF4eV8kJGl6Tk=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "5311e14d2000af2f523789c76a3d869dcb42f130", + "rev": "f816591afc2f2f606d1f0cf70b51e95c04a7a8aa", "type": "github" }, "original": { "owner": "noctalia-dev", + "ref": "legacy-v4", "repo": "noctalia-shell", "type": "github" } @@ -1017,11 +1051,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1780838252, - "narHash": "sha256-UCNUS/ch2lJF5xUWBOUkEP08jTAlniyViX7aov7+jIs=", + "lastModified": 1782151680, + "narHash": "sha256-IEELhqTnlCiAmND09HADfdz4Fa5uxVT5oi8JZq3nh/g=", "owner": "nix-community", "repo": "NUR", - "rev": "4ed761053ccc884ef6388336c8a9a52155f65511", + "rev": "05c357e255f33c637a5001b638b4ee3f585bd7ea", "type": "github" }, "original": { @@ -1081,11 +1115,11 @@ ] }, "locked": { - "lastModified": 1765016596, - "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", + "lastModified": 1781733627, + "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", + "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", "type": "github" }, "original": { @@ -1111,6 +1145,7 @@ "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_8", + "nixpkgs-b12141ef619e0a9c1c84dc8c684040326f27cdcc": "nixpkgs-b12141ef619e0a9c1c84dc8c684040326f27cdcc", "nixpkgs-patch-rqbit-bump": "nixpkgs-patch-rqbit-bump", "nixpkgs-patcher": "nixpkgs-patcher", "nixvim": "nixvim", @@ -1154,11 +1189,11 @@ ] }, "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", + "lastModified": 1782012058, + "narHash": "sha256-9mWUnReOUXfKjZuJAL/bAFH3LUyECTRtXgSNVjRw3UY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", + "rev": "8534567325bd8a8d2928e6afd81e0a87d19efd3c", "type": "github" }, "original": { @@ -1174,11 +1209,11 @@ ] }, "locked": { - "lastModified": 1780547341, - "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=", + "lastModified": 1781943681, + "narHash": "sha256-NFHmA7H47adqiyp+0iEOyZOQhmigDqA/NBAlf4imB6U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a", + "rev": "420f8d2e9882911f65cfac15cc706f639ba96cca", "type": "github" }, "original": { @@ -1190,11 +1225,11 @@ "spacemacs": { "flake": false, "locked": { - "lastModified": 1780421525, - "narHash": "sha256-ZiXdELtfjwbrauJmnTYw/lB69EPUxZX+vtX+XFBWFu4=", + "lastModified": 1781976347, + "narHash": "sha256-KglrxymoUAKnfMzmezK1LTqEe/BOwcdrkRQy+xw83Ws=", "owner": "syl20bnr", "repo": "spacemacs", - "rev": "a1b98eb7d303226be60a0afe3025fc87d67be23b", + "rev": "7ee024bd93d7737c8c4e40dd04934d15e3ff87b9", "type": "github" }, "original": { @@ -1209,11 +1244,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1780422259, - "narHash": "sha256-dWGk4SEdI189kQW5cE4Uo1Mc+P+kQEdgMcyMgTtmQOA=", + "lastModified": 1782031037, + "narHash": "sha256-a7oWSyS7SN81UOqVt481yIEMDsMpaJ7GNdV6Eaz5Yqg=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "8414bbf2fcc7bc0a22c675e498e3c7365c1aec0a", + "rev": "9cb27462cfd20edac174353f1e95bc03aa888863", "type": "github" }, "original": { @@ -1244,11 +1279,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1780701809, - "narHash": "sha256-u7AUNs6U6eD1os4+ghbr1gH4QjPWzOdKvpeM+E+XRKM=", + "lastModified": 1781997134, + "narHash": "sha256-muBZG4O/agq/ljgHr6c3AsobIWgODAS6vf50xIS7o+Q=", "owner": "nix-community", "repo": "stylix", - "rev": "3a02d9f73608641b28e08b26acb0b0b47c05f14b", + "rev": "a6a493119e492e15874caf6f7f8c7e572e64c655", "type": "github" }, "original": { @@ -1505,11 +1540,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1779745227, - "narHash": "sha256-yqY7RtEJGJiENzR0GwL6q69tSAy6xAAmAcLuIhLjPf8=", + "lastModified": 1781226823, + "narHash": "sha256-28696iIw8uE0ZUyFTtzhEM8xMh85clCYypMxkvUi+sc=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "5d1efbc9dc3ab1c10160b656e0247f3325daf0f2", + "rev": "8575d0ef55d70f9b4c46b6bffb3accf912217e1e", "type": "github" }, "original": { @@ -1528,11 +1563,11 @@ ] }, "locked": { - "lastModified": 1780779947, - "narHash": "sha256-arzemFzhfyQsH/oEFActojNHYPbGyUgz0SjZyNtLOJU=", + "lastModified": 1782144240, + "narHash": "sha256-RgCWSv7AJZCwPhCzz+J0lvwp1WBz9ouvCnnlmvu0xfw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "1f63037ce09ed6f29b00e2b24d691a0741be1f1b", + "rev": "d1693556428967f8b4eef128feb090421ddcaf15", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ee84929..6a69f9b 100644 --- a/flake.nix +++ b/flake.nix @@ -1,52 +1,57 @@ { description = "A simple NixOS flakes"; - outputs = { - flake-parts, - home-manager, - treefmt-nix, - nixpkgs, - nixpkgs-patcher, - ... - } @ inputs: let - nixpkgs-lib = nixpkgs.lib; - lib = nixpkgs-lib.extend (final: prev: nixpkgs-lib.recursiveUpdate {nixpkgs-patcher = nixpkgs-patcher.lib;} (import ./lib final prev)); - in - flake-parts.lib.mkFlake + outputs = { - inherit inputs; - specialArgs = { - inherit lib; - rootPath = ./.; - }; - } - ( - {lib, ...}: { - systems = ["x86_64-linux"]; - imports = - [ + flake-parts, + home-manager, + treefmt-nix, + nixpkgs, + nixpkgs-patcher, + ... + }@inputs: + let + nixpkgs-lib = nixpkgs.lib; + lib = nixpkgs-lib.extend ( + final: prev: + nixpkgs-lib.recursiveUpdate { nixpkgs-patcher = nixpkgs-patcher.lib; } (import ./lib final prev) + ); + in + flake-parts.lib.mkFlake + { + inherit inputs; + specialArgs = { + inherit lib; + rootPath = ./.; + }; + } + ( + { lib, ... }: { + systems = [ "x86_64-linux" ]; + imports = [ home-manager.flakeModules.home-manager treefmt-nix.flakeModule ] ++ lib.youthlic.loadImports ./flake; - flake = { - inherit lib; - nix.settings = { - # substituters shared in home-manager and nixos configuration - substituters = let - cachix = x: "https://${x}.cachix.org"; - in - lib.flatten [ - (cachix "nix-community") - "https://cache.nixos.org" - "https://cache.nixos-cuda.org" - "https://attic.xuyh0120.win/lantian" - "https://cache.garnix.io" - ]; + flake = { + inherit lib; + nix.settings = { + # substituters shared in home-manager and nixos configuration + substituters = + let + cachix = x: "https://${x}.cachix.org"; + in + lib.flatten [ + (cachix "nix-community") + "https://cache.nixos.org" + "https://cache.nixos-cuda.org" + "https://attic.xuyh0120.win/lantian" + "https://cache.garnix.io" + ]; + }; }; - }; - } - ); + } + ); inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; @@ -63,6 +68,13 @@ repo = "nixpkgs-patcher"; }; + nixpkgs-b12141ef619e0a9c1c84dc8c684040326f27cdcc = { + type = "github"; + owner = "nixos"; + repo = "nixpkgs"; + ref = "b12141ef619e0a9c1c84dc8c684040326f27cdcc"; + }; + nix-cachyos-kernel = { type = "github"; owner = "xddxdd"; @@ -198,7 +210,7 @@ type = "github"; owner = "nix-community"; repo = "lanzaboote"; - ref = "v1.0.0"; + ref = "v1.1.0"; }; nix-doom = { @@ -223,6 +235,7 @@ type = "github"; owner = "noctalia-dev"; repo = "noctalia-shell"; + ref = "legacy-v4"; inputs = { nixpkgs.follows = "nixpkgs"; }; diff --git a/home/alice/configurations/Cape/default.nix b/home/alice/configurations/Cape/default.nix index 6e02a33..619f02c 100644 --- a/home/alice/configurations/Cape/default.nix +++ b/home/alice/configurations/Cape/default.nix @@ -53,26 +53,11 @@ Ciphers = "chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr"; }; enableDefaultConfig = false; - matchBlocks = { - "*" = { - forwardAgent = false; - addKeysToAgent = "no"; - compression = false; - serverAliveInterval = 0; - serverAliveCountMax = 3; - hashKnownHosts = false; - userKnownHostsFile = "~/.ssh/known_hosts"; - controlMaster = "no"; - controlPath = "~/.ssh/master-%r@%n:%p"; - controlPersist = "no"; - }; + settings = { "github.com" = { - hostname = "ssh.github.com"; - port = 443; - user = "git"; - extraOptions = { - AddKeysToAgent = "yes"; - }; + HostName = "ssh.github.com"; + Port = 443; + User = "git"; }; }; }; diff --git a/home/david/modules/programs/openssh.nix b/home/david/modules/programs/openssh.nix index 3a7ebf8..230c93c 100644 --- a/home/david/modules/programs/openssh.nix +++ b/home/david/modules/programs/openssh.nix @@ -22,26 +22,12 @@ in { Ciphers = "chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr"; }; enableDefaultConfig = false; - matchBlocks = { - "*" = { - forwardAgent = false; - addKeysToAgent = "no"; - compression = false; - serverAliveInterval = 0; - serverAliveCountMax = 3; - hashKnownHosts = false; - userKnownHostsFile = "~/.ssh/known_hosts"; - controlMaster = "no"; - controlPath = "~/.ssh/master-%r@%n:%p"; - controlPersist = "no"; - }; + settings = { "github.com" = { - hostname = "ssh.github.com"; - port = 443; - user = "git"; - extraOptions = { - AddKeysToAgent = "yes"; - }; + HostName = "ssh.github.com"; + Port = 443; + User = "git"; + AddKeysToAgent = "yes"; }; }; }; diff --git a/nixos/configurations/Akun/default.nix b/nixos/configurations/Akun/default.nix index 184c4a4..a68b2d5 100644 --- a/nixos/configurations/Akun/default.nix +++ b/nixos/configurations/Akun/default.nix @@ -51,8 +51,6 @@ vim helix - fluffychat - kdePackages.neochat vlc btop localsend diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index ed5cbd3..31753bc 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -99,11 +99,8 @@ vim helix - fluffychat - kdePackages.neochat vlc btop - handbrake wechat-uos nvtopPackages.full localsend @@ -116,7 +113,6 @@ juicity waypipe - wineWow64Packages.waylandFull iperf3 neovim-nightly doom-emacs diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index ebfa014..93f60a7 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -20,8 +20,7 @@ allowUnfree = true; allowInsecurePredicate = p: builtins.elem (lib.getName p) [ - # for neochat - "olm" + "electron" "immersive-translate" ]; diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 92a094b..b484779 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -15,6 +15,7 @@ in ./neovim-nightly.nix ./vim.nix ./prismlauncher.nix + ./fix-clash-verge.nix # Nur ./nur.nix diff --git a/overlays/modifications/fix-clash-verge.nix b/overlays/modifications/fix-clash-verge.nix new file mode 100644 index 0000000..eb17b02 --- /dev/null +++ b/overlays/modifications/fix-clash-verge.nix @@ -0,0 +1,10 @@ +{ inputs, ... }: +_final: prev: +let + inherit (prev.stdenv.hostPlatform) system; +in +{ + inherit (inputs.nixpkgs-b12141ef619e0a9c1c84dc8c684040326f27cdcc.legacyPackages.${system}) + clash-verge-rev + ; +} diff --git a/pkgs/rime-all/package.nix b/pkgs/rime-all/package.nix index 9131724..45a7cbf 100644 --- a/pkgs/rime-all/package.nix +++ b/pkgs/rime-all/package.nix @@ -24,7 +24,5 @@ buildEnv { for s in *.schema.yaml; do rime_deployer --compile "$s" . "${rime-data}/share/rime-data/" ./build done - - rm ./build/*.txt ''; }