diff --git a/flake.lock b/flake.lock index 51e2c69..066aea5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,9 +1,11 @@ { "nodes": { - "agenix": { + "ageNix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager", + "home-manager": [ + "homeManager" + ], "nixpkgs": [ "nixpkgs" ], @@ -42,7 +44,7 @@ "darwin": { "inputs": { "nixpkgs": [ - "agenix", + "ageNix", "nixpkgs" ] }, @@ -69,11 +71,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1709706238, - "narHash": "sha256-DBYWNdMGX6uWsR5KS9Vdg6vfU0QKIuPZzt2PrXmShwQ=", + "lastModified": 1711434200, + "narHash": "sha256-d1/GwzQfxG66qfFiZv79m0C63JXIkzLHVHXaf9A42tY=", "owner": "nix-community", "repo": "fenix", - "rev": "4dc1af0afeb1c8f50fc552c8109f7b8f603eebc0", + "rev": "08b43790fd25acd39f3cc1fdaf36c183c59ca528", "type": "github" }, "original": { @@ -82,14 +84,14 @@ "type": "github" } }, - "flake-compat": { + "flakeCompat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -98,174 +100,18 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { + "flakeUtils": { "inputs": { - "systems": "systems_2" + "systems": [ + "systems" + ] }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -276,24 +122,32 @@ }, "ghostty": { "inputs": { - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-stable": [ + "nixpkgs" + ], + "nixpkgs-unstable": [ + "nixpkgs" + ], "nixpkgs-zig-0-12": "nixpkgs-zig-0-12", - "zig": "zig", - "zls": "zls" + "zig": [ + "zig" + ], + "zls": [ + "zig" + ] }, "locked": { - "lastModified": 1710279140, - "narHash": "sha256-oOkMWgl3SBpK+zNTkDtrrwTkc8g2JFfssF7fpo1q/ZQ=", + "lastModified": 1711508420, + "narHash": "sha256-T0io4K+gZOlps4GOUbwdskvmE9j6w33RLOTOwzfcgkI=", "ref": "refs/heads/main", - "rev": "13c5a70da7e809c62629f02cb81fbea0ff06ec6c", - "revCount": 5247, + "rev": "caf2742b768937869bb6c843c89c87f48f3ac1d2", + "revCount": 5721, "type": "git", - "url": "ssh://git@github.com/mitchellh/ghostty" + "url": "ssh://git@github.com/RGBCube/ghostty" }, "original": { "type": "git", - "url": "ssh://git@github.com/mitchellh/ghostty" + "url": "ssh://git@github.com/RGBCube/ghostty" } }, "ghosttyModule": { @@ -312,28 +166,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "ghostty", - "zls", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1694102001, - "narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "zls", @@ -354,27 +186,6 @@ "type": "github" } }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "homeManager": { "inputs": { "nixpkgs": [ @@ -382,11 +193,11 @@ ] }, "locked": { - "lastModified": 1709677162, - "narHash": "sha256-nIXa0KM3FOVjD3XDDigW12qktQvLG+uKuPg00rjIX/8=", + "lastModified": 1711133180, + "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "owner": "nix-community", "repo": "home-manager", - "rev": "bdea159ffab9865f808b8d92fd2bef33521867b2", + "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "type": "github" }, "original": { @@ -395,21 +206,54 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1711035742, + "narHash": "sha256-5vvhCSUGG9TA2G1eIRgokuYizhRnZu0ZbcU1MXfHsUE=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "6a92473237f430399a417e1c2da9d7fcd4970086", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprland": { "inputs": { + "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "nixpkgs": "nixpkgs", - "systems": "systems_3", + "hyprlang": [ + "hyprlang" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "systems" + ], "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1709684144, - "narHash": "sha256-7j+EjESpJYRx6tRkeTd6YgQxFUWXJ1vmhnwh0S8jlaA=", + "lastModified": 1711466169, + "narHash": "sha256-8LyPRWHz6YFWS5IIgjb94K6eDH5Riwe65BBkreC6v1c=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "fb87e332c59ce386a095b3e81bb1abbcc9cc3e5c", + "rev": "ae52b7f4680716976d05b638aaa90e169d199117", "type": "github" }, "original": { @@ -447,19 +291,40 @@ "inputs": { "nixpkgs": [ "hyprland", + "hyprcursor", + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { + "inputs": { + "nixpkgs": [ "nixpkgs" ], "systems": [ - "hyprland", "systems" ] }, "locked": { - "lastModified": 1708787654, - "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=", + "lastModified": 1711250455, + "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0fce791ba2334aca183f2ed42399518947550d0d", + "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", "type": "github" }, "original": { @@ -470,14 +335,16 @@ }, "hyprpicker": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1703987863, - "narHash": "sha256-MHhAk74uk0qHVwSkLCcXLXMe4478M2oZEFPXwjSoo2E=", + "lastModified": 1711283076, + "narHash": "sha256-Cda+XbHpvyz3HhdJ7FlXFoaazOWtdBoOWmEaj4ZFwRM=", "owner": "hyprwm", "repo": "hyprpicker", - "rev": "2ef703474fb96e97e03e66e8820f213359f29382", + "rev": "0eb49192a5cdd5e6e8e6c2c82c33857d78d6cd56", "type": "github" }, "original": { @@ -487,18 +354,6 @@ } }, "langref": { - "flake": false, - "locked": { - "narHash": "sha256-mYdDCBdNEIeMbavdhSo8qXqW+3fqPC8BAich7W3umrI=", - "type": "file", - "url": "https://raw.githubusercontent.com/ziglang/zig/63bd2bff12992aef0ce23ae4b344e9cb5d65f05d/doc/langref.html.in" - }, - "original": { - "type": "file", - "url": "https://raw.githubusercontent.com/ziglang/zig/63bd2bff12992aef0ce23ae4b344e9cb5d65f05d/doc/langref.html.in" - } - }, - "langref_2": { "flake": false, "locked": { "narHash": "sha256-94broSBethRhPJr0G9no4TPyB8ee6BQ/hHK1QnLPln0=", @@ -526,61 +381,21 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "mail": { - "inputs": { - "blobs": "blobs", - "flake-compat": "flake-compat_3", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-23_05": "nixpkgs-23_05", - "nixpkgs-23_11": "nixpkgs-23_11", - "utils": "utils" - }, - "locked": { - "lastModified": 1706742486, - "narHash": "sha256-sv/MISTeD0rqeVivpZJpynboMWJp6i62OmrZX1rGl38=", - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "rev": "9e36323ae3dde787f761420465c3ae560f3dbf29", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "type": "gitlab" - } - }, "nixSuper": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": [ + "flakeCompat" + ], "libgit2": "libgit2", - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1708070219, - "narHash": "sha256-/2fidzoXrrNwr8te2cU3JdtrpockWIjU4DpLgNr4FTo=", + "lastModified": 1711388763, + "narHash": "sha256-z5lTtZ3Np3P5E03S7J627Gie7HtLPxscmuQ40Vu8xuw=", "owner": "privatevoid-net", "repo": "nix-super", - "rev": "924eb1127a21ebf4bd7f438d7c6aca133ce1de84", + "rev": "06eac000db910dd07c935b2dd279b92b21b61571", "type": "github" }, "original": { @@ -591,50 +406,20 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708807242, - "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", + "lastModified": 1709083642, + "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", + "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-23_05": { - "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, - "nixpkgs-23_11": { - "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -651,45 +436,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1702049175, - "narHash": "sha256-c/q2+tGHbmLgzT3sXyUKVJR98h1CTks2+nkVaoZPRM0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b15508bd65870620f1df5864e8e861dffbc4e428", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1688221086, - "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-zig-0-12": { "locked": { - "lastModified": 1710092316, - "narHash": "sha256-96pThxPueCevkteIFsx2lMDcCjDrQtBfEbIJR2g+C5Q=", + "lastModified": 1711143939, + "narHash": "sha256-oT6a81U4NHjJH1hjaMVXKsdTZJwl2dT+MhMESKoevvA=", "owner": "vancluever", "repo": "nixpkgs", - "rev": "add3752a30c1d9caa7614208afcb8e5502ce4407", + "rev": "c4749393c06e52da4adf42877fdf9bac7141f0de", "type": "github" }, "original": { @@ -701,48 +454,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1683014792, - "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", + "lastModified": 1711518224, + "narHash": "sha256-M75UGj6cj41U6WEAQIt1NT1KHtmUGFjkFGEkbkOnFFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", + "rev": "1b08f32c98637285b4dd3b74f2ea2b3b487106bd", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1700748986, - "narHash": "sha256-/nqLrNU297h3PCw4QyDpZKZEUHmialJdZW2ceYFobds=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9ba29e2346bc542e9909d1021e8fd7d4b3f64db0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -750,11 +470,11 @@ "nuScripts": { "flake": false, "locked": { - "lastModified": 1709670450, - "narHash": "sha256-7Bdz/XR0T8qjUGbtKT15AOxh6QrOIMJk8NIUi5EteMs=", + "lastModified": 1711478865, + "narHash": "sha256-cXcMGdmdfyrfhCVHRRHNQnstFbFhIKyQdNivgBT/tpA=", "owner": "nushell", "repo": "nu_scripts", - "rev": "351691f118b8d89480d2502869b69d5e9fb0f1dd", + "rev": "41fe58eceeaf24e560dc448280be3a143207982f", "type": "github" }, "original": { @@ -765,30 +485,34 @@ }, "root": { "inputs": { - "agenix": "agenix", + "ageNix": "ageNix", "fenix": "fenix", + "flakeCompat": "flakeCompat", + "flakeUtils": "flakeUtils", "ghostty": "ghostty", "ghosttyModule": "ghosttyModule", "homeManager": "homeManager", "hyprland": "hyprland", + "hyprlang": "hyprlang_2", "hyprpicker": "hyprpicker", - "mail": "mail", "nixSuper": "nixSuper", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nuScripts": "nuScripts", + "simpleMail": "simpleMail", + "systems": "systems_3", "themes": "themes", - "zig": "zig_2", - "zls": "zls_2" + "zig": "zig", + "zls": "zls" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1709671826, - "narHash": "sha256-Ici6z+lmXIxcBPWTCD+YI2qJCdgpiKlOWmo92F6rOFk=", + "lastModified": 1711404839, + "narHash": "sha256-5W2Vzw2nfrOk194qLcZDyNmmH/mda6B6413M58C85Bk=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "767d5d3eab237a1fbc10d62b120020b12f6026c5", + "rev": "e52bb8cddb0d636a86a3560e9eadb5f3d8f8c2af", "type": "github" }, "original": { @@ -798,6 +522,33 @@ "type": "github" } }, + "simpleMail": { + "inputs": { + "blobs": "blobs", + "flake-compat": [ + "flakeCompat" + ], + "nixpkgs": [ + "nixpkgs" + ], + "utils": [ + "flakeUtils" + ] + }, + "locked": { + "lastModified": 1710449465, + "narHash": "sha256-2orO8nfplp6uQJBFqKkj1iyNMC6TysmwbWwbb4osTag=", + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "rev": "79c8cfcd5873a85559da6201b116fb38b490d030", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "type": "gitlab" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -814,21 +565,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -843,7 +579,7 @@ "type": "github" } }, - "systems_4": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -873,37 +609,22 @@ "type": "github" } }, - "utils": { - "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1708558866, - "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", + "lastModified": 1709983277, + "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", "owner": "wlroots", "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" } }, @@ -927,11 +648,11 @@ ] }, "locked": { - "lastModified": 1708696469, - "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=", + "lastModified": 1709299639, + "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "1b713911c2f12b96c2574474686e4027ac4bf826", + "rev": "2d2fb547178ec025da643db57d40a971507b82fe", "type": "github" }, "original": { @@ -942,88 +663,22 @@ }, "zig": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1710028389, - "narHash": "sha256-NjtsA9aTb9qgzmuuXJabVL0LeNw8ae3BXpF/+UCT2yc=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "7e2da66bd83f27441d2a3244ebdc7d0b4d20c3c4", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zig-overlay": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "ghostty", - "zls", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1701390337, - "narHash": "sha256-C+Lyio+GPl3B2IAZ6Nk5hAAE2g6a8bO9vMACUfOLC/g=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "1815ef2d0451b1121a6a91051da84906fcb06f99", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zig-overlay_2": { - "inputs": { - "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_6", - "nixpkgs": [ - "zls", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709208548, - "narHash": "sha256-cHzhHGJ2mT11mta+JOVNURSG5MdNJrBsDowVIj5nl2Q=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "bfa983b61aa539e64703404f434f77b10d41c37e", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zig_2": { - "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_4", + "flake-compat": [ + "flakeCompat" + ], + "flake-utils": [ + "flakeUtils" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1709640506, - "narHash": "sha256-KyX0jga/DzLHdO7/W5hmPZ3aOBnQmP77kiuBXh3FaTY=", + "lastModified": 1711454961, + "narHash": "sha256-Hm5wZoCrfQYiSv6F2AqRXfb3iBQOFVwTHaXCVw4VIcg=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "94cbbf1d41eaded823d5287513c7c79c980aaf3f", + "rev": "fc90c09499061b194328f42469df73b09563fc83", "type": "github" }, "original": { @@ -1034,21 +689,24 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": [ + "flakeUtils" + ], "gitignore": "gitignore", "langref": "langref", "nixpkgs": [ - "ghostty", - "nixpkgs-stable" + "nixpkgs" ], - "zig-overlay": "zig-overlay" + "zig-overlay": [ + "zig" + ] }, "locked": { - "lastModified": 1703036566, - "narHash": "sha256-GKw+ON8FcUVHxDzA35piev/W/YUvXv5aZ4hmIzNFWuc=", + "lastModified": 1711133472, + "narHash": "sha256-iF7WXLFcze9f/H78NB98Oh3O55SrlgymCD7Vrk13aQU=", "owner": "zigtools", "repo": "zls", - "rev": "adaeabbe1ba888d74309d0a837d4abddc24cf638", + "rev": "96eddd067615efd9a88fa596dfa4c75943302885", "type": "github" }, "original": { @@ -1057,30 +715,6 @@ "repo": "zls", "type": "github" } - }, - "zls_2": { - "inputs": { - "flake-utils": "flake-utils_5", - "gitignore": "gitignore_2", - "langref": "langref_2", - "nixpkgs": [ - "nixpkgs" - ], - "zig-overlay": "zig-overlay_2" - }, - "locked": { - "lastModified": 1709575088, - "narHash": "sha256-3dIOlxTxCH+bP+AwvvAioUmyvF7zVxpa0DIfKVKsGhA=", - "owner": "zigtools", - "repo": "zls", - "rev": "dd307c59bf32e2cec323235c776e07fa36efb465", - "type": "github" - }, - "original": { - "owner": "zigtools", - "repo": "zls", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7a71f73..576586c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,62 +1,32 @@ { - description = "All my NixOS configurations."; + description = "RGBCube's NixOS Configuration Collection"; nixConfig = { - extra-substituters = [ - "https://cache.garnix.io/" - # "https://cache.privatevoid.net/" - "https://ghostty.cachix.org/" - "https://hyprland.cachix.org/" - "https://nix-community.cachix.org/" - ]; - - extra-trusted-public-keys = [ - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - "cache.privatevoid.net-1:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=" - "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; + extra-substituters = "https://cache.garnix.io/"; + extra-trusted-public-keys = "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="; }; inputs = { + nixpkgs.url = "github:NixOS/nixpkgs"; + nixSuper = { url = "github:privatevoid-net/nix-super"; - }; - nixpkgs = { - url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.flake-compat.follows = "flakeCompat"; + # inputs.nixpkgs.follows = "nixpkgs"; }; homeManager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; }; - agenix = { - url = "github:ryantm/agenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + ageNix = { + url = "github:ryantm/agenix"; - mail = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - hyprland = { - url = "github:hyprwm/Hyprland"; - }; - - hyprpicker = { - url = "github:hyprwm/hyprpicker"; - }; - - ghostty = { - url = "git+ssh://git@github.com/mitchellh/ghostty"; - }; - - ghosttyModule = { - url = "github:clo4/ghostty-hm-module"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "homeManager"; }; nuScripts = { @@ -64,30 +34,91 @@ flake = false; }; + simpleMail = { + url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; + + inputs.nixpkgs.follows = "nixpkgs"; + inputs.utils.follows = "flakeUtils"; + inputs.flake-compat.follows = "flakeCompat"; + }; + + hyprland = { + url = "github:hyprwm/Hyprland"; + + inputs.hyprlang.follows = "hyprlang"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.systems.follows = "systems"; + }; + + hyprpicker = { + url = "github:hyprwm/hyprpicker"; + + inputs.nixpkgs.follows = "nixpkgs"; + }; + + ghostty = { + url = "git+ssh://git@github.com/RGBCube/ghostty"; + + inputs.nixpkgs-unstable.follows = "nixpkgs"; + inputs.nixpkgs-stable.follows = "nixpkgs"; + + inputs.zig.follows = "zig"; + inputs.zls.follows = "zig"; + }; + fenix = { - url = "github:nix-community/fenix"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:nix-community/fenix"; + + inputs.nixpkgs.follows = "nixpkgs"; }; zig = { - url = "github:mitchellh/zig-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:mitchellh/zig-overlay"; + + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flakeUtils"; + inputs.flake-compat.follows = "flakeCompat"; }; zls = { - url = "github:zigtools/zls"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:zigtools/zls/master"; + + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flakeUtils"; + inputs.zig-overlay.follows = "zig"; }; - themes = { - url = "github:RGBCube/ThemeNix"; + ghosttyModule.url = "github:clo4/ghostty-hm-module"; + + themes.url = "github:RGBCube/ThemeNix"; + + # I don't use these, but I place them here and make the other + # inputs follow them, so I get much less duplicate code pulled in. + flakeUtils = { + url = "github:numtide/flake-utils"; + + inputs.systems.follows = "systems"; + }; + + flakeCompat = { + url = "github:edolstra/flake-compat"; + flake = false; + }; + + systems.url = "github:nix-systems/default"; + + hyprlang = { + url = "github:hyprwm/hyprlang"; + + inputs.nixpkgs.follows = "nixpkgs"; + inputs.systems.follows = "systems"; }; }; outputs = { nixpkgs, - agenix, - mail, + ageNix, + simpleMail, homeManager, themes, ... @@ -120,7 +151,7 @@ pkgs = import nixpkgs { inherit system; }; upkgs = let defaults = lib.genAttrs - [ "nixSuper" "agenix" "hyprland" "hyprpicker" "ghostty" "zls" ] + [ "nixSuper" "ageNix" "hyprland" "hyprpicker" "ghostty" "zls" ] (name: inputs.${name}.packages.${system}.default); other = { @@ -183,10 +214,10 @@ in [ homeManager.nixosModules.default - agenix.nixosModules.default + ageNix.nixosModules.default ./secrets - mail.nixosModules.default + simpleMail.nixosModules.default defaultConfiguration ] ++ (importDirectory ./hosts/${host}) diff --git a/modules/nix.nix b/modules/nix.nix index f86430c..f4a3b83 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -13,6 +13,8 @@ }) (systemConfiguration { + environment.etc."flakes".text = builtins.toJSON inputs; + nix = { gc = { automatic = true; @@ -27,10 +29,11 @@ package = upkgs.nixSuper; - registry = (builtins.mapAttrs - (_: value: lib.mkIf (value ? sourceInfo) { - flake = value; - }) inputs) // { default.flake = inputs.nixpkgs; }; + registry = { + default.flake = inputs.nixpkgs; + } // builtins.mapAttrs (_: value: lib.mkIf (lib.isType "flake" value) { + flake = value; + }) inputs; settings.experimental-features = [ "auto-allocate-uids" @@ -47,7 +50,8 @@ settings = { accept-flake-config = true; - builders-use-substitutes = true; + builders-use-substitutes = true; + flake-registry = ""; # I DON'T WANT THE GLOBAL REGISTRY!!! http-connections = 50; trusted-users = [ "root" "@wheel" ]; use-cgroups = true; diff --git a/modules/packages.nix b/modules/packages.nix index 27c2b20..e0e0e4e 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -26,7 +26,7 @@ ])) (desktopSystemPackages (with pkgs; [ - upkgs.agenix + upkgs.ageNix clang_16 clang-tools_16