diff --git a/flake.lock b/flake.lock index faaa50c..d229df2 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -89,6 +89,29 @@ "type": "github" } }, + "chaotic": { + "inputs": { + "flake-schemas": "flake-schemas", + "home-manager": "home-manager", + "jovian": "jovian", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1757377667, + "narHash": "sha256-RR9KPGEKOzWtc3s9rjOAzn2GP6hgXcPlmbGNBw2MGcQ=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "960a6988b572f2ed7ac453c43ae1fc4a05c297dd", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "ref": "nyxpkgs-unstable", + "repo": "nyx", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1754269165, @@ -111,11 +134,11 @@ ] }, "locked": { - "lastModified": 1756115622, - "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=", + "lastModified": 1757255839, + "narHash": "sha256-XH33B1X888Xc/xEXhF1RPq/kzKElM0D5C9N6YdvOvIc=", "owner": "nix-community", "repo": "disko", - "rev": "bafad29f89e83b2d861b493aa23034ea16595560", + "rev": "c8a0e78d86b12ea67be6ed0f7cae7f9bfabae75a", "type": "github" }, "original": { @@ -127,11 +150,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1756083905, + "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", "type": "github" }, "original": { @@ -238,11 +261,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -259,11 +282,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -272,6 +295,20 @@ "type": "github" } }, + "flake-schemas": { + "locked": { + "lastModified": 1721999734, + "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", + "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", + "revCount": 75, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" + } + }, "fromYaml": { "flake": false, "locked": { @@ -330,15 +367,16 @@ "home-manager": { "inputs": { "nixpkgs": [ + "chaotic", "nixpkgs" ] }, "locked": { - "lastModified": 1756261190, - "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", + "lastModified": 1757256385, + "narHash": "sha256-WK7tOhWwr15mipcckhDg2no/eSpM1nIh4C9le8HgHhk=", "owner": "nix-community", "repo": "home-manager", - "rev": "77f348da3176dc68b20a73dab94852a417daf361", + "rev": "f35703b412c67b48e97beb6e27a6ab96a084cd37", "type": "github" }, "original": { @@ -347,6 +385,48 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1757385184, + "narHash": "sha256-LCxtQn9ajvOgGRbQIRUJgfP7clMGGvV1SDW1HcSb0zk=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "26993d87fd0d3b14f7667b74ad82235f120d986e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1757230583, + "narHash": "sha256-4uqu7sFPOaVTCogsxaGMgbzZ2vK40GVGMfUmrvK3/LY=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "fc3960e6c32c9d4f95fff2ef84444284d24d3bea", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -356,14 +436,14 @@ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1754297745, - "narHash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=", + "lastModified": 1756744479, + "narHash": "sha256-EyZXusK/wRD3V9vDh00W2Re3Eg8UQ+LjVBQrrH9dq1U=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "892cbdca865d6b42f9c0d222fe309f7720259855", + "rev": "747b7912f49e2885090c83364d88cf853a020ac1", "type": "github" }, "original": { @@ -374,11 +454,11 @@ }, "mnw": { "locked": { - "lastModified": 1748710831, - "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", + "lastModified": 1756659871, + "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", + "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16", "type": "github" }, "original": { @@ -389,14 +469,14 @@ }, "musnix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1741303672, - "narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=", + "lastModified": 1756852730, + "narHash": "sha256-qPere4RBHoZxiEGl8zXU8gjroZg4gkYGEwaAbKmL4vE=", "owner": "musnix", "repo": "musnix", - "rev": "d56a15f30329f304151e4e05fa82264d127da934", + "rev": "7ccc92050e43dc92309396c6f2fe1f542214a242", "type": "github" }, "original": { @@ -417,11 +497,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1756284022, - "narHash": "sha256-5q5rKE9Cbt1qDXtqgRr9FSeJrhS6apGatP3s9Oyejh8=", + "lastModified": 1757363972, + "narHash": "sha256-b5OwbYpkjpMTfTSNoHbfLmPUodNq49OlkD/cL4hW5kU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a98afc5eb87093eec2f70c2e53e5faf919875025", + "rev": "bd1d13d781896562409b57c26744c27342614e21", "type": "github" }, "original": { @@ -433,16 +513,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1748151941, - "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", "owner": "YaLTeR", "repo": "niri", - "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.05.1", + "ref": "v25.08", "repo": "niri", "type": "github" } @@ -450,11 +530,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756275478, - "narHash": "sha256-BvPxbh+37rb5SHS5zFF6lis63B8BTuKDGRqMjbb9qBU=", + "lastModified": 1757358784, + "narHash": "sha256-UNeUJW3c10z0aMJ87QKS85C/JgK9ng6pdRS0EwY6OLg=", "owner": "YaLTeR", "repo": "niri", - "rev": "e038b8770a17b67cbf9c9d007a1f3a9ac0b53c60", + "rev": "bdee1a657699a77bc4cdb050f7355f37f64c45a6", "type": "github" }, "original": { @@ -479,6 +559,29 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "chaotic", + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1744536153, @@ -497,11 +600,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1756310898, - "narHash": "sha256-z9HD8XcUQ1wXpvs1a4xHtU/alQ1I5Tlvbxa10F3DozA=", + "lastModified": 1757413115, + "narHash": "sha256-SstdyWkrWaUEpMZOMMoL7I0VCTVuIP5kMvoE5fkNCCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e98f11bd5c96ddcce8f1fadbecb28050949b6620", + "rev": "23f5594259139b4e186743ad21b059e1ca4d696c", "type": "github" }, "original": { @@ -513,11 +616,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1756217674, - "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", + "lastModified": 1757341549, + "narHash": "sha256-fRnT+bwP1sB6ne7BLw4aXkVYjr+QCZZ+e4MhbokHyd4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", + "rev": "9d1fa9fa266631335618373f8faad570df6f9ede", "type": "github" }, "original": { @@ -529,11 +632,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1756217674, - "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", + "lastModified": 1757341549, + "narHash": "sha256-fRnT+bwP1sB6ne7BLw4aXkVYjr+QCZZ+e4MhbokHyd4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", + "rev": "9d1fa9fa266631335618373f8faad570df6f9ede", "type": "github" }, "original": { @@ -545,11 +648,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1740695751, - "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", - "owner": "NixOS", + "lastModified": 1757238739, + "narHash": "sha256-ovEq9v+Xc+oQH1zvQo28rT/YVqMQK2TRgUcNanvo2Zk=", + "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", + "rev": "6d8fca2c92488ff860524dd3400aa90a3310123e", "type": "github" }, "original": { @@ -561,11 +664,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1756125398, - "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -577,11 +680,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1756125398, - "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { @@ -594,14 +713,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1756310566, - "narHash": "sha256-TNM9RzpDDQAsGcG9kV7pSyKWZGgbHTP6jjpgcBIuapk=", + "lastModified": 1757410866, + "narHash": "sha256-dQPfCdW4JjGnBpDRCe2PsWxJUR7HogShm1I451pSCVc=", "owner": "nix-community", "repo": "NUR", - "rev": "5651d12e076d7c3444d066728945d8bccca181c5", + "rev": "6cbe18c86febbb94970ccc2b7c4649131c5c9509", "type": "github" }, "original": { @@ -622,11 +741,11 @@ ] }, "locked": { - "lastModified": 1751906969, - "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "lastModified": 1756961635, + "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", "owner": "nix-community", "repo": "NUR", - "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", "type": "github" }, "original": { @@ -646,11 +765,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1755463179, - "narHash": "sha256-5Ggb1Mhf7ZlRgGi2puCa2PvWs6KbMnWBlW6KW7Vf79Y=", + "lastModified": 1757397598, + "narHash": "sha256-v/FANUOWyeWlWCD61HDLSNO9nHnQALAtvLf2VtE1+WU=", "owner": "notashelf", "repo": "nvf", - "rev": "03833118267ad32226b014b360692bdce9d6e082", + "rev": "c7944a48a3c61cb3ca08ac2dc8b8de124d15dcb8", "type": "github" }, "original": { @@ -669,11 +788,11 @@ ] }, "locked": { - "lastModified": 1754501628, - "narHash": "sha256-FExJ54tVB5iu7Dh2tLcyCSWpaV+lmUzzWKZUkemwXvo=", + "lastModified": 1756632588, + "narHash": "sha256-ydam6eggXf3ZwRutyCABwSbMAlX+5lW6w1SVZQ+kfSo=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "cca090f8115c4172b9aef6c5299ae784bdd5e133", + "rev": "d47428e5390d6a5a8f764808a4db15929347cd77", "type": "github" }, "original": { @@ -711,13 +830,14 @@ "root": { "inputs": { "aagl": "aagl", + "chaotic": "chaotic", "disko": "disko", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "lanzaboote": "lanzaboote", "musnix": "musnix", "niri": "niri", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable_2", "nur": "nur", @@ -746,6 +866,27 @@ } }, "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1757298987, + "narHash": "sha256-yuFSw6fpfjPtVMmym51ozHYpJQ7SzVOTkk7tUv2JA0U=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "cfd63776bde44438ff2936f0c9194c79dd407a5f", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -829,11 +970,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755997543, - "narHash": "sha256-/fejmCQ7AWa655YxyPxRDbhdU7c5+wYsFSjmEMXoBCM=", + "lastModified": 1757360005, + "narHash": "sha256-VwzdFEQCpYMU9mc7BSQGQe5wA1MuTYPJnRc9TQCTMcM=", "owner": "nix-community", "repo": "stylix", - "rev": "f47c0edcf71e802378b1b7725fa57bb44fe85ee8", + "rev": "834a743c11d66ea18e8c54872fbcc72ce48bc57f", "type": "github" }, "original": { @@ -908,11 +1049,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1754779259, + "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", "type": "github" }, "original": { @@ -924,11 +1065,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1754788770, + "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", "type": "github" }, "original": { @@ -940,11 +1081,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1755613540, + "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", "type": "github" }, "original": { @@ -973,11 +1114,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1756260173, - "narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=", + "lastModified": 1757179758, + "narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb", + "rev": "970728d0d9d1eada342bb8860af214b601139e58", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1ff9f92..2d74e34 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nur.url = "github:nix-community/NUR"; + chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; # Home manager using nixos-unstable home-manager = { @@ -134,6 +135,7 @@ inputs.aagl.nixosModules.default inputs.lanzaboote.nixosModules.lanzaboote inputs.musnix.nixosModules.musnix + inputs.chaotic.nixosModules.default { nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects ]; }; @@ -163,7 +165,8 @@ inputs.nix-flatpak.homeManagerModules.nix-flatpak inputs.niri.homeModules.niri inputs.niri.homeModules.stylix - inputs.plasma-manager.homeManagerModules.plasma-manager + inputs.plasma-manager.homeModules.plasma-manager + inputs.chaotic.homeManagerModules.default ]; }; # set formatter, using nixfmt-tree here diff --git a/home-manager/fish.nix b/home-manager/fish.nix index ba62530..4cda943 100644 --- a/home-manager/fish.nix +++ b/home-manager/fish.nix @@ -6,11 +6,13 @@ shellAliases = { ls = "eza -lh"; ip = "ip --color=auto"; - nano = "nvim"; cd = "z"; + }; + shellAbbrs = { + nano = "nvim"; cat = "bat"; - # Aliases for my nixos workflow + # Abbreviations for my nixos workflow nixos-switch = "sudo nixos-rebuild switch --flake ~/nixconf &| nom"; home-switch = "home-manager switch --flake ~/nixconf &| nom"; server-switch = "nixos-rebuild switch --flake ~/nixconf#biggerpi --target-host blue@biggerpi --use-remote-sudo &| nom"; diff --git a/home-manager/home.nix b/home-manager/home.nix index 31f96a0..a78521d 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -73,14 +73,5 @@ # Add support for bluetooth headset media controls services.mpris-proxy.enable = true; - programs.alacritty = { - enable = true; - package = pkgs.alacritty; - settings = { - window.dimensions = { - lines = 3; - columns = 200; - }; - }; - }; + programs.kitty.enable = true; } diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index b7a4d4c..bbd0f57 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -12,13 +12,13 @@ # Monitor config for home desk layout monitor = [ "eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor - "desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, 1920x1080@119.98, -960x-1080, auto" # left external monitor - "desc:Lenovo Group Limited LEN G24-10 U5B4KL78, 1920x1080@119.98, 960x-1080, auto" # right external monitor + "desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, 1920x1080@119.98, 960x-1080, auto" # left external monitor + "desc:Lenovo Group Limited LEN G24-10 U5B4KL78, 1920x1080@119.98, -960x-1080, auto" # right external monitor ", preferred, auto-center-up, 1" # any other monitors get added centrally above, this is meant for TVs really ]; workspace = [ - "name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true, persistent:true" - "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true, persistent:true" + "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true, persistent:true" + "name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true, persistent:true" "name:main, monitor:eDP-2, default:true, persistent:true" ]; windowrulev2 = [ @@ -65,7 +65,7 @@ "[workspace name:bg_noise] librewolf https://www.youtube.com/playlist?list=WL" - "[workspace name:main] alacritty" + "[workspace name:main] kitty" "nm-applet --indicator" "blueman-applet" @@ -78,7 +78,7 @@ "$mod, F11, fullscreen" # Keybinds for starting programs "$mod, F, exec, librewolf" - "$mod, 1, exec, alacritty" + "$mod, 1, exec, kitty" "$mod, D, exec, vesktop" "$mod, space, exec, bash -c 'wofi --show drun, run'" diff --git a/home-manager/librewolf.nix b/home-manager/librewolf.nix index 300d076..deb759f 100644 --- a/home-manager/librewolf.nix +++ b/home-manager/librewolf.nix @@ -20,6 +20,7 @@ youtube-shorts-block youtube-high-definition shinigami-eyes + improved-tube ]; search = { # default = "ddg"; # Set search engine to DuckDuckGo diff --git a/home-manager/nvf.nix b/home-manager/nvf.nix index a6fa36f..7e2d36d 100644 --- a/home-manager/nvf.nix +++ b/home-manager/nvf.nix @@ -37,7 +37,12 @@ markdown.enable = true; java.enable = true; }; - autocomplete.blink-cmp.enable = true; + autocomplete.blink-cmp = { + enable = true; + sourcePlugins = { + emoji.enable = true; + }; + }; notes.neorg = { enable = true; treesitter = { diff --git a/home-manager/stylix.nix b/home-manager/stylix.nix index 3b81d1f..811c44c 100644 --- a/home-manager/stylix.nix +++ b/home-manager/stylix.nix @@ -21,7 +21,7 @@ }; emoji = { - package = pkgs.noto-fonts-emoji; + package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; }; }; diff --git a/home-manager/waybar.nix b/home-manager/waybar.nix index ffb5f86..8eb6fc4 100644 --- a/home-manager/waybar.nix +++ b/home-manager/waybar.nix @@ -3,34 +3,39 @@ programs.waybar = { enable = true; systemd.enable = true; # using these instead of exec-once beacuse SOME packages (swaync) dont let you disable them - settings = { - mainBar = { - layer = "top"; - position = "top"; - height = 30; - modules-left = [ "hyprland/workspaces" ]; - modules-center = [ - "clock" - "custom/swaync" - ]; - modules-right = [ - "pulseaudio/slider" - "backlight/slider" - "battery" - "tray" - ]; - "clock" = { - "format" = "{:%A %d %b %T}"; - "tooltip" = "true"; - "tooltip-format" = "{calendar}"; - "interval" = 1; - "calendar" = { - "mode" = "month"; - "format" = { - "months" = "{}"; - "weekdays" = "{}"; + settings = { + mainBar = { + layer = "top"; + position = "top"; + height = 30; + modules-left = [ "hyprland/workspaces" ]; + modules-center = [ + "clock" + "custom/swaync" + ]; + modules-right = [ + "pulseaudio/slider" + "backlight/slider" + "battery" + "tray" + ]; + "clock" = { + "format" = "{:%A %d %b %T}"; + "tooltip" = "true"; + "tooltip-format" = "{calendar}"; + "interval" = 1; + "calendar" = { + "mode" = "month"; + "format" = { + "months" = "{}"; + "weekdays" = "{}"; "today" = "{}"; }; + "actions" = { + "on-scroll-up" = "shift_down"; + "on-scroll-down" = "shift_up"; + "on-click-middle" = "shift_reset"; + }; }; }; "custom/swaync" = { diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix index 5bca4f5..4c1ffdd 100644 --- a/hosts/gabbielaptop/configuration.nix +++ b/hosts/gabbielaptop/configuration.nix @@ -30,7 +30,7 @@ boot.initrd.kernelModules = [ "amdgpu" ]; boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ]; boot.kernelModules = [ "v4l2loopback" ]; - boot.kernelPackages = pkgs.linuxKernel.kernels.linux_zen; + boot.kernelPackages = pkgs.linuxPackages_cachyos; # remember to set this to the kernel package SET, not the kernel package itself networking.hostName = "gabbielaptop"; # Define your hostname.