1
0
Fork 0
forked from foxora/nix

Compare commits

..

No commits in common. "0a72c0387c7189a9883b7656d28bba2ed285a00a" and "f66aa330c3b483dd7ede43d0b6e2dfed7d8ab406" have entirely different histories.

7 changed files with 74 additions and 51 deletions

58
flake.lock generated
View file

@ -156,14 +156,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771048427, "lastModified": 1770984934,
"narHash": "sha256-pGqtZ6LH3hcmtSiCy8bMnRxkBBT0CU18pIHlEm9yCs4=", "narHash": "sha256-5+/r1CFqmmzUIqZNjrGUjGgF4BxDkQ2NUrKkCsBBE9s=",
"path": "/home/me/cry/mk/Cerulean", "owner": "emilelcb",
"type": "path" "repo": "Cerulean",
"rev": "3ba385ee25cc02c91fe4c245a734d59c54a1b1df",
"type": "github"
}, },
"original": { "original": {
"path": "/home/me/cry/mk/Cerulean", "owner": "emilelcb",
"type": "path" "repo": "Cerulean",
"type": "github"
} }
}, },
"crane": { "crane": {
@ -1254,6 +1257,22 @@
} }
}, },
"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=",
@ -1474,7 +1493,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_5", "systems": "systems_6",
"zen": "zen" "zen": "zen"
} }
}, },
@ -1538,12 +1557,8 @@
}, },
"spicetify-nix": { "spicetify-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs_10",
"nixpkgs-unstable" "systems": "systems_5"
],
"systems": [
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1770846656, "lastModified": 1770846656,
@ -1634,6 +1649,21 @@
"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": [
@ -1736,7 +1766,7 @@
"zen": { "zen": {
"inputs": { "inputs": {
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_11"
}, },
"locked": { "locked": {
"lastModified": 1770910552, "lastModified": 1770910552,

View file

@ -4,6 +4,7 @@
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";
@ -43,15 +44,9 @@
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 = {

View file

@ -3,10 +3,7 @@
spkgs, spkgs,
... ...
}: let }: let
inherit utils = inputs.nixcats.utils;
(inputs.nixcats)
utils
;
in { in {
imports = [ imports = [
inputs.nixcats.homeModule inputs.nixcats.homeModule
@ -17,7 +14,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-unstable; nixpkgs_version = inputs.nixpkgs;
# 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.

View file

@ -2,6 +2,7 @@
inputs, inputs,
upkgs, upkgs,
spkgs, spkgs,
root,
... ...
}: { }: {
imports = [ imports = [
@ -31,7 +32,7 @@
extraModulePackages = with kernelPackages; [v4l2loopback]; extraModulePackages = with kernelPackages; [v4l2loopback];
# qemu # qemu
# binfmt.emulatedSystems = [ # boot.binfmt.emulatedSystems = [
# "riscv64-linux" # "riscv64-linux"
# ]; # ];
# the following line is from: # the following line is from:
@ -285,10 +286,6 @@
}; };
}; };
# 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; [
@ -321,12 +318,12 @@
# game stuff :3 # game stuff :3
(lutris.override { (lutris.override {
extraPkgs = upkgs: [ extraupkgs = upkgs: [
libadwaita libadwaita
]; ];
}) })
(steam.override { (steam.override {
extraPkgs = upkgs: [ extraupkgs = upkgs: [
nss nss
xorg.libX11 xorg.libX11
xorg.libXScrnSaver xorg.libXScrnSaver

View file

@ -2,9 +2,8 @@
inputs, inputs,
system, system,
... ...
} @ args: { }: {
nixpkgs.channels.default = rec { nixpkgs.channels.default = {
default = upkgs;
# nixpkgs-unstable # nixpkgs-unstable
upkgs = { upkgs = {
inherit system; inherit system;
@ -13,8 +12,7 @@
cachyos.overlays.pinned cachyos.overlays.pinned
millennium.overlays.default millennium.overlays.default
# XXX: WARNING: TODO: cerulean will (import ./overlays.nix {inherit inputs;})
(import ./overlays.nix args)
]; ];
config.allowUnfree = true; config.allowUnfree = true;

View file

@ -3,18 +3,20 @@
inputs, inputs,
system, system,
... ...
}: (self: super: { }: [
ekphos = import ../packages/ekphos { (self: super: {
pkgs = super; ekphos = import ../packages/ekphos {
}; 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};
}) })
]

View file

@ -3,6 +3,10 @@ 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
]; ];