muon/flake
1
0
Fork 0
mirror of https://codeberg.org/muon/home.git synced 2025-12-06 08:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update nix

Browse source
This commit is contained in:
muon 2025-01-13 15:40:24 +00:00
parent 8920fa33bc
commit f1ec089354
4 changed files with 14 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -279,11 +279,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736277415, "lastModified": 1736781604,
"narHash": "sha256-kPDXF6cIPsVqSK08XF5EC6KM7BdMnM9vtJDzsnf+lLU=", "narHash": "sha256-nIjcN89nxaI5ZnwU/1gzc3rBVQ/te5sHraYeG4cyJX4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5c4302313d9207f7ec0886d68f8ff4a3c71209a1", "rev": "9616d81f98032d1ee9bec68ab4b6a8c833add88c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -425,11 +425,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736012469, "lastModified": 1736701207,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -484,11 +484,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1736300059, "lastModified": 1736779864,
"narHash": "sha256-z3mR+0gBN/iVM8UgfCSIxjgw4jm1bu1kjMKyQx9mGBc=", "narHash": "sha256-OgKIMua33t0ZcdcFiUntFKidwhZrRZUTLlVHJ+mAiZQ=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "168306ce7f5d823ccee8b7d4e112ea20671c2b8f", "rev": "934e2bfe7954d6c94f25d45cb12a8b3547825699",
"type": "github" "type": "github"
}, },
"original": { "original": {

28
flake.nix
View file

@ -14,33 +14,9 @@
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs' = (import inputs.nixpkgs { inherit system; }).applyPatches { pkgs = import inputs.nixpkgs { inherit system; };
name = "nixpkgs-unstable-patched";
src = inputs.nixpkgs;
patches = [
(builtins.fetchurl {
url =
"https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/369042.patch";
sha256 =
"sha256:08asxmd34rzaxb8dr4nccy26k3vxnx7psy2imnp40fdplqna0a85";
})
(builtins.fetchurl {
url =
"https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/368790.patch";
sha256 =
"sha256:1blsawm4l30wkrdkvvq0fw2aki7v921isdwrk9dw8yh09cglbfd9";
})
(builtins.fetchurl {
url =
"https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/368091.patch";
sha256 =
"sha256:11qnwrq8sgbmxiy9qvv7q2lbl824x90p2iklf3kjf9yb3c2dx9nj";
})
];
};
pkgs = import pkgs' { inherit system; };
utils = import ./utils.nix { inherit builtins inputs system pkgs; }; utils = import ./utils.nix { inherit inputs system; };
in { in {
nixosConfigurations = { nixosConfigurations = {
# desktop # desktop

2
hosts/muho/home.nix
View file

@ -3,7 +3,7 @@ let cfg = osConfig.mods;
in { in {
# Modules # Modules
mods.xdg.enable = true; mods.xdg.enable = true;
mods.social.enable = true; mods.social.enable = false;
mods.i3.enable = false; mods.i3.enable = false;
mods.terminal.zsh.enable = true; mods.terminal.zsh.enable = true;
mods.terminal.emulator.enable = false; mods.terminal.emulator.enable = false;

12
utils.nix
View file

@ -1,15 +1,7 @@
{ builtins, inputs, system, pkgs, ... }: { { inputs, system, ... }: {
mkHost = host: mkHost = host:
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
specialArgs = with builtins; specialArgs = { inherit inputs system; };
let
hasInfix = infix: content: match ".*${infix}.*" "${content}" != null;
muho = hasInfix "/muho/" (toString host);
in if muho then {
inherit inputs system pkgs;
} else {
inherit inputs system;
};
modules = [ modules = [
host host