forked from foxora/nix
update to latest cerulean patches
This commit is contained in:
parent
b96802c7bd
commit
bcfcf3db78
7 changed files with 47 additions and 73 deletions
58
flake.lock
generated
58
flake.lock
generated
|
|
@ -156,17 +156,14 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770984934,
|
"lastModified": 1771048427,
|
||||||
"narHash": "sha256-5+/r1CFqmmzUIqZNjrGUjGgF4BxDkQ2NUrKkCsBBE9s=",
|
"narHash": "sha256-pGqtZ6LH3hcmtSiCy8bMnRxkBBT0CU18pIHlEm9yCs4=",
|
||||||
"owner": "emilelcb",
|
"path": "/home/me/cry/mk/Cerulean",
|
||||||
"repo": "Cerulean",
|
"type": "path"
|
||||||
"rev": "3ba385ee25cc02c91fe4c245a734d59c54a1b1df",
|
|
||||||
"type": "github"
|
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "emilelcb",
|
"path": "/home/me/cry/mk/Cerulean",
|
||||||
"repo": "Cerulean",
|
"type": "path"
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"crane": {
|
"crane": {
|
||||||
|
|
@ -1257,22 +1254,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_10": {
|
"nixpkgs_10": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1770197578,
|
|
||||||
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_11": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769461804,
|
"lastModified": 1769461804,
|
||||||
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
||||||
|
|
@ -1493,7 +1474,7 @@
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"sddm-silent": "sddm-silent",
|
"sddm-silent": "sddm-silent",
|
||||||
"spicetify-nix": "spicetify-nix",
|
"spicetify-nix": "spicetify-nix",
|
||||||
"systems": "systems_6",
|
"systems": "systems_5",
|
||||||
"zen": "zen"
|
"zen": "zen"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -1557,8 +1538,12 @@
|
||||||
},
|
},
|
||||||
"spicetify-nix": {
|
"spicetify-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_10",
|
"nixpkgs": [
|
||||||
"systems": "systems_5"
|
"nixpkgs-unstable"
|
||||||
|
],
|
||||||
|
"systems": [
|
||||||
|
"systems"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770846656,
|
"lastModified": 1770846656,
|
||||||
|
|
@ -1649,21 +1634,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_6": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -1766,7 +1736,7 @@
|
||||||
"zen": {
|
"zen": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
"nixpkgs": "nixpkgs_11"
|
"nixpkgs": "nixpkgs_10"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770910552,
|
"lastModified": 1770910552,
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
inputs = {
|
inputs = {
|
||||||
systems.url = "github:nix-systems/default";
|
systems.url = "github:nix-systems/default";
|
||||||
|
|
||||||
# WARNING: don't remove duplicate!! (cry64 will fix)
|
|
||||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-staging.url = "github:NixOS/nixpkgs/staging-next";
|
nixpkgs-staging.url = "github:NixOS/nixpkgs/staging-next";
|
||||||
|
|
||||||
|
|
@ -44,9 +43,15 @@
|
||||||
awww.url = "git+https://codeberg.org/LGFae/awww";
|
awww.url = "git+https://codeberg.org/LGFae/awww";
|
||||||
zen.url = "github:0xc000022070/zen-browser-flake";
|
zen.url = "github:0xc000022070/zen-browser-flake";
|
||||||
iamb.url = "github:ulyssa/iamb";
|
iamb.url = "github:ulyssa/iamb";
|
||||||
spicetify-nix.url = "github:Gerg-L/spicetify-nix";
|
|
||||||
nixcord.url = "github:FlameFlag/nixcord";
|
nixcord.url = "github:FlameFlag/nixcord";
|
||||||
millennium.url = "github:trivaris/millennium?dir=packages/nix";
|
millennium.url = "github:trivaris/millennium?dir=packages/nix";
|
||||||
|
spicetify-nix = {
|
||||||
|
url = "github:Gerg-L/spicetify-nix";
|
||||||
|
inputs = {
|
||||||
|
systems.follows = "systems";
|
||||||
|
nixpkgs.follows = "nixpkgs-unstable";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# temp theme until i bother creating my own </3
|
# temp theme until i bother creating my own </3
|
||||||
sddm-silent = {
|
sddm-silent = {
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ in {
|
||||||
# it will be the namespace for your options.
|
# it will be the namespace for your options.
|
||||||
nixCats = {
|
nixCats = {
|
||||||
enable = true;
|
enable = true;
|
||||||
nixpkgs_version = inputs.nixpkgs;
|
nixpkgs_version = inputs.nixpkgs-unstable;
|
||||||
# this will add the overlays from ./overlays and also,
|
# this will add the overlays from ./overlays and also,
|
||||||
# add any plugins in inputs named "plugins-pluginName" to pkgs.neovimPlugins
|
# add any plugins in inputs named "plugins-pluginName" to pkgs.neovimPlugins
|
||||||
# It will not apply to overall system, just nixCats.
|
# It will not apply to overall system, just nixCats.
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
inputs,
|
inputs,
|
||||||
upkgs,
|
upkgs,
|
||||||
spkgs,
|
spkgs,
|
||||||
root,
|
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -32,7 +31,7 @@
|
||||||
extraModulePackages = with kernelPackages; [v4l2loopback];
|
extraModulePackages = with kernelPackages; [v4l2loopback];
|
||||||
|
|
||||||
# qemu
|
# qemu
|
||||||
# boot.binfmt.emulatedSystems = [
|
# binfmt.emulatedSystems = [
|
||||||
# "riscv64-linux"
|
# "riscv64-linux"
|
||||||
# ];
|
# ];
|
||||||
# the following line is from:
|
# the following line is from:
|
||||||
|
|
@ -286,6 +285,10 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# XXX: WARNING: NOTE: (@dobutterfliescry)
|
||||||
|
# XXX: WARNING: NOTE: WHYYYYYY DOES AURORA'S CONFIG NOT PROPAGATE INPUTS??
|
||||||
|
home-manager.extraSpecialArgs = {inherit inputs;};
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
# List packages installed in system profile. To search, run:
|
||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
environment.systemPackages = with upkgs; [
|
environment.systemPackages = with upkgs; [
|
||||||
|
|
@ -318,12 +321,12 @@
|
||||||
|
|
||||||
# game stuff :3
|
# game stuff :3
|
||||||
(lutris.override {
|
(lutris.override {
|
||||||
extraupkgs = upkgs: [
|
extraPkgs = upkgs: [
|
||||||
libadwaita
|
libadwaita
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
(steam.override {
|
(steam.override {
|
||||||
extraupkgs = upkgs: [
|
extraPkgs = upkgs: [
|
||||||
nss
|
nss
|
||||||
xorg.libX11
|
xorg.libX11
|
||||||
xorg.libXScrnSaver
|
xorg.libXScrnSaver
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,9 @@
|
||||||
inputs,
|
inputs,
|
||||||
system,
|
system,
|
||||||
...
|
...
|
||||||
}: {
|
} @ args: {
|
||||||
nixpkgs.channels.default = {
|
nixpkgs.channels.default = rec {
|
||||||
|
default = upkgs;
|
||||||
# nixpkgs-unstable
|
# nixpkgs-unstable
|
||||||
upkgs = {
|
upkgs = {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
|
@ -12,7 +13,8 @@
|
||||||
cachyos.overlays.pinned
|
cachyos.overlays.pinned
|
||||||
millennium.overlays.default
|
millennium.overlays.default
|
||||||
|
|
||||||
(import ./overlays.nix {inherit inputs;})
|
# XXX: WARNING: TODO: cerulean will
|
||||||
|
(import ./overlays.nix args)
|
||||||
];
|
];
|
||||||
|
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
|
|
|
||||||
28
overlays.nix
28
overlays.nix
|
|
@ -3,20 +3,18 @@
|
||||||
inputs,
|
inputs,
|
||||||
system,
|
system,
|
||||||
...
|
...
|
||||||
}: [
|
}: (self: super: {
|
||||||
(self: super: {
|
ekphos = import ../packages/ekphos {
|
||||||
ekphos = import ../packages/ekphos {
|
pkgs = super;
|
||||||
pkgs = super;
|
};
|
||||||
};
|
|
||||||
|
|
||||||
element-desktop = super.element-desktop.overrideAttrs (final: prev: {
|
element-desktop = super.element-desktop.overrideAttrs (final: prev: {
|
||||||
desktopItems = [
|
desktopItems = [
|
||||||
((builtins.elemAt prev.desktopItems 0).override {
|
((builtins.elemAt prev.desktopItems 0).override {
|
||||||
exec = "element-desktop %u --password-store=\"gnome-libsecret\"";
|
exec = "element-desktop %u --password-store=\"gnome-libsecret\"";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
hyprland-git = inputs.hyprland-git.packages.${system};
|
hyprland-git = inputs.hyprland-git.packages.${system};
|
||||||
})
|
})
|
||||||
]
|
|
||||||
|
|
|
||||||
4
snow.nix
4
snow.nix
|
|
@ -3,10 +3,6 @@ cerulean.mkNexus ./. (self: {
|
||||||
nexus = {
|
nexus = {
|
||||||
specialArgs = {inherit inputs;};
|
specialArgs = {inherit inputs;};
|
||||||
|
|
||||||
extraPkgConfig = {
|
|
||||||
config.allowUnfree = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
extraModules = with inputs; [
|
extraModules = with inputs; [
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
];
|
];
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue