diff --git a/flake.lock b/flake.lock index 3fcfd07..319bca6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "biome-fix": { + "locked": { + "lastModified": 1740440594, + "narHash": "sha256-P9xK+EONixAQB6paguHCfwip37al0QDhh+3w2XHtyoY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dae25408d6804b3f162cbc88d58fee6d9ea5f1b3", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dae25408d6804b3f162cbc88d58fee6d9ea5f1b3", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -7,11 +23,11 @@ ] }, "locked": { - "lastModified": 1736631212, - "narHash": "sha256-mG9lRZBcPiAGiVJ9B97BJoIGQcSBWIVlBiN30QYCtG0=", + "lastModified": 1740452771, + "narHash": "sha256-/tI1vFJ7/dXJqUmI+s0EV1F0DPe6dZvT444mrLUkrlU=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "6ace2f2d12bdf74235d5cbf9fbd34a71c9716685", + "rev": "42be12b510253d750138ec90c66decc282298b44", "type": "github" }, "original": { @@ -468,11 +484,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1740494361, + "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17", "type": "github" }, "original": { @@ -753,11 +769,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736523798, - "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "130595eba61081acde9001f43de3248d8888ac4a", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -783,6 +799,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1740301968, + "narHash": "sha256-eDAiNagpMExcLoSIgjdef2ZYyvjuy1VTF8r9OZXCMGc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b7fe81518095c48a8ba94fc7cfe5c0fc8370851b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": "flake-parts_4", @@ -792,11 +824,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1736730531, - "narHash": "sha256-nYmCgyRUx2p62h8sQWYbcYp60/demRcJEFaSnORhQyc=", + "lastModified": 1740527263, + "narHash": "sha256-n8eEOnW/TLNflOzVI6dSxa14atMqj0AdtmGjScRbcMk=", "owner": "nix-community", "repo": "NUR", - "rev": "77b78d6315172541d1bb5a42fa5314de77efeceb", + "rev": "86aca69f5f83ff9953f462d228388de92fb7abb9", "type": "github" }, "original": { @@ -839,6 +871,7 @@ }, "root": { "inputs": { + "biome-fix": "biome-fix", "darwin": "darwin", "home-manager": "home-manager", "lix": "lix", @@ -852,6 +885,7 @@ "rose-pine-hyprcursor": "rose-pine-hyprcursor", "rose-pine-qt5ct": "rose-pine-qt5ct", "snowfall-lib": "snowfall-lib", + "srvos": "srvos", "unstable": "unstable", "wezterm": "wezterm" } @@ -966,6 +1000,24 @@ "type": "github" } }, + "srvos": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1740358604, + "narHash": "sha256-Wi87Dx5j8JH+ETlU0zrPSAe7zD2wQkEY6DtITCeyOdI=", + "owner": "nix-community", + "repo": "srvos", + "rev": "b3065811ae1c822b856af8a254e07703172a0e76", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "srvos", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1101,11 +1153,11 @@ }, "unstable": { "locked": { - "lastModified": 1736523798, - "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "130595eba61081acde9001f43de3248d8888ac4a", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -1147,11 +1199,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1735931735, - "narHash": "sha256-4wzEN5IPYmqLP8TAdFatoRhCZ7W9y65AWoYN0Qgvbg8=", + "lastModified": 1740350337, + "narHash": "sha256-Ue+ERNL8y9l/0BTay1/fm1V2zcKFf/dX5H1DHI2TO+w=", "owner": "wez", "repo": "wezterm", - "rev": "8e9cf912e66f704f300fac6107206a75036de1e7", + "rev": "fd532a8c2fb3b56593597cf8be1775da1feda0a3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 24bab85..5a20017 100644 --- a/flake.nix +++ b/flake.nix @@ -21,13 +21,22 @@ marleyvim.overlays.default ]; - systems.modules.nixos = with inputs; [ - rose-pine.nixosModules.rose-pine - ]; + systems = { + modules.nixos = with inputs; [ + rose-pine.nixosModules.rose-pine + ]; - systems.modules.darwin = with inputs; [ - lix.nixosModules.default - ]; + modules.darwin = with inputs; [ + lix.nixosModules.default + ]; + + hosts.marleynet.modules = with inputs; [ + srvos.nixosModules.server + srvos.nixosModules.mixins-terminfo + srvos.nixosModules.mixins-trusted-nix-caches + srvos.nixosModules.mixins-systemd-boot + ]; + }; homes.modules = with inputs; [ rose-pine.homeManagerModules.rose-pine @@ -71,6 +80,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + srvos.url = "github:nix-community/srvos"; + nixgl = { url = "github:nix-community/nixGL"; inputs.nixpkgs.follows = "nixpkgs"; @@ -102,5 +113,10 @@ url = "git+https://codewith.babesonthe.net/punkfairie/rofi-themes"; flake = false; }; + + # Biome fix + # FIXME: Remove once https://github.com/NixOS/nixpkgs/pull/384904 is + # released + biome-fix.url = "github:nixos/nixpkgs/dae25408d6804b3f162cbc88d58fee6d9ea5f1b3"; }; } diff --git a/overlays/biome/default.nix b/overlays/biome/default.nix new file mode 100644 index 0000000..69546da --- /dev/null +++ b/overlays/biome/default.nix @@ -0,0 +1,3 @@ +{channels, ...}: final: prev: { + inherit (channels.biome-fix) biome; +}