punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Update

Browse source
This commit is contained in:
punkfairie 2025-02-25 18:56:36 -08:00
parent fde723022c
commit 91efed8051
Signed by: punkfairie
GPG key ID: B3C5488E9A1A7CA6
3 changed files with 95 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
flake.lock
View file

@ -1,5 +1,21 @@
{ {
"nodes": { "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": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -7,11 +23,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736631212, "lastModified": 1740452771,
"narHash": "sha256-mG9lRZBcPiAGiVJ9B97BJoIGQcSBWIVlBiN30QYCtG0=", "narHash": "sha256-/tI1vFJ7/dXJqUmI+s0EV1F0DPe6dZvT444mrLUkrlU=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "6ace2f2d12bdf74235d5cbf9fbd34a71c9716685", "rev": "42be12b510253d750138ec90c66decc282298b44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -468,11 +484,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736508663, "lastModified": 1740494361,
"narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -753,11 +769,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736523798, "lastModified": 1740367490,
"narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "130595eba61081acde9001f43de3248d8888ac4a", "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -783,6 +799,22 @@
"type": "github" "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": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_4", "flake-parts": "flake-parts_4",
@ -792,11 +824,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1736730531, "lastModified": 1740527263,
"narHash": "sha256-nYmCgyRUx2p62h8sQWYbcYp60/demRcJEFaSnORhQyc=", "narHash": "sha256-n8eEOnW/TLNflOzVI6dSxa14atMqj0AdtmGjScRbcMk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "77b78d6315172541d1bb5a42fa5314de77efeceb", "rev": "86aca69f5f83ff9953f462d228388de92fb7abb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -839,6 +871,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"biome-fix": "biome-fix",
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
"lix": "lix", "lix": "lix",
@ -852,6 +885,7 @@
"rose-pine-hyprcursor": "rose-pine-hyprcursor", "rose-pine-hyprcursor": "rose-pine-hyprcursor",
"rose-pine-qt5ct": "rose-pine-qt5ct", "rose-pine-qt5ct": "rose-pine-qt5ct",
"snowfall-lib": "snowfall-lib", "snowfall-lib": "snowfall-lib",
"srvos": "srvos",
"unstable": "unstable", "unstable": "unstable",
"wezterm": "wezterm" "wezterm": "wezterm"
} }
@ -966,6 +1000,24 @@
"type": "github" "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": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -1101,11 +1153,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1736523798, "lastModified": 1740367490,
"narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "130595eba61081acde9001f43de3248d8888ac4a", "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1147,11 +1199,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1735931735, "lastModified": 1740350337,
"narHash": "sha256-4wzEN5IPYmqLP8TAdFatoRhCZ7W9y65AWoYN0Qgvbg8=", "narHash": "sha256-Ue+ERNL8y9l/0BTay1/fm1V2zcKFf/dX5H1DHI2TO+w=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "8e9cf912e66f704f300fac6107206a75036de1e7", "rev": "fd532a8c2fb3b56593597cf8be1775da1feda0a3",
"type": "github" "type": "github"
}, },
"original": { "original": {

28
flake.nix
View file

@ -21,13 +21,22 @@
marleyvim.overlays.default marleyvim.overlays.default
]; ];
systems.modules.nixos = with inputs; [ systems = {
rose-pine.nixosModules.rose-pine modules.nixos = with inputs; [
]; rose-pine.nixosModules.rose-pine
];
systems.modules.darwin = with inputs; [ modules.darwin = with inputs; [
lix.nixosModules.default 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; [ homes.modules = with inputs; [
rose-pine.homeManagerModules.rose-pine rose-pine.homeManagerModules.rose-pine
@ -71,6 +80,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
srvos.url = "github:nix-community/srvos";
nixgl = { nixgl = {
url = "github:nix-community/nixGL"; url = "github:nix-community/nixGL";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -102,5 +113,10 @@
url = "git+https://codewith.babesonthe.net/punkfairie/rofi-themes"; url = "git+https://codewith.babesonthe.net/punkfairie/rofi-themes";
flake = false; flake = false;
}; };
# Biome fix
# FIXME: Remove once https://github.com/NixOS/nixpkgs/pull/384904 is
# released
biome-fix.url = "github:nixos/nixpkgs/dae25408d6804b3f162cbc88d58fee6d9ea5f1b3";
}; };
} }

3
overlays/biome/default.nix Normal file
View file

@ -0,0 +1,3 @@
{channels, ...}: final: prev: {
inherit (channels.biome-fix) biome;
}