All the updates after this mess, should be good now

This commit is contained in:
Lillian Violet 2024-05-06 15:55:51 +02:00
parent 28c916d0ef
commit a4f8f48f4b
18 changed files with 532 additions and 32 deletions

View file

@ -20,8 +20,12 @@
# catpuccin theme
catppuccin.url = "github:catppuccin/nix";
# catpuccin theme
catppuccin.url = "github:catppuccin/nix";
# Conduit fork without all the fuss and drama
conduit = {
url = "github:girlbossceo/conduwuit";
url = "github:girlbossceo/conduwuit";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -30,6 +34,10 @@
nix-index-database.url = "github:nix-community/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
# Nix index database files
nix-index-database.url = "github:nix-community/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
# Secret management with sops
sops-nix.url = "github:Mic92/sops-nix";
@ -61,6 +69,8 @@
zjstatus.url = "github:dj95/zjstatus";
zjstatus.url = "github:dj95/zjstatus";
# Fix for steam cursor not being visible under wayland
# Add any other flake you might need
@ -71,6 +81,10 @@
# url = "github:mindsbackyard/linger-flake";
# inputs.flake-utils.follows = "flake-utils";
# };
# linger = {
# url = "github:mindsbackyard/linger-flake";
# inputs.flake-utils.follows = "flake-utils";
# };
# pihole = {
# url = "github:mindsbackyard/pihole-flake";
@ -78,6 +92,12 @@
# inputs.flake-utils.follows = "flake-utils";
# inputs.linger.follows = "linger";
# };
# pihole = {
# url = "github:mindsbackyard/pihole-flake";
# inputs.nixpkgs.follows = "nixpkgs";
# inputs.flake-utils.follows = "flake-utils";
# inputs.linger.follows = "linger";
# };
};
outputs = {
@ -85,6 +105,7 @@
nixpkgs,
nixos-generators,
catppuccin,
catppuccin,
disko,
home-manager,
sops-nix,
@ -93,10 +114,14 @@
zjstatus,
# linger,
# pihole,
zjstatus,
# linger,
# pihole,
lanzaboote,
jovian,
nixos-hardware,
nix-index-database,
nix-index-database,
conduit,
...
} @ inputs: let
@ -112,6 +137,11 @@
in {
# Your custom packages
# Accessible through 'nix build', 'nix shell', etc
packages = forAllSystems (system:
import ./pkgs (import nixpkgs {
inherit system;
config.allowUnfree = true;
}));
packages = forAllSystems (system:
import ./pkgs (import nixpkgs {
inherit system;
@ -147,11 +177,17 @@
home-manager.nixosModules.home-manager
nix-index-database.nixosModules.nix-index
catppuccin.nixosModules.catppuccin
nix-index-database.nixosModules.nix-index
catppuccin.nixosModules.catppuccin
{
home-manager.sharedModules = [
inputs.catppuccin.homeManagerModules.catppuccin
inputs.plasma-manager.homeManagerModules.plasma-manager
];
home-manager.sharedModules = [
inputs.catppuccin.homeManagerModules.catppuccin
inputs.plasma-manager.homeManagerModules.plasma-manager
];
}
];
};
@ -168,11 +204,17 @@
home-manager.nixosModules.home-manager
nix-index-database.nixosModules.nix-index
catppuccin.nixosModules.catppuccin
nix-index-database.nixosModules.nix-index
catppuccin.nixosModules.catppuccin
{
home-manager.sharedModules = [
inputs.catppuccin.homeManagerModules.catppuccin
inputs.plasma-manager.homeManagerModules.plasma-manager
];
home-manager.sharedModules = [
inputs.catppuccin.homeManagerModules.catppuccin
inputs.plasma-manager.homeManagerModules.plasma-manager
];
}
];
};
@ -192,6 +234,12 @@
inputs.catppuccin.homeManagerModules.catppuccin
];
}
catppuccin.nixosModules.catppuccin
{
home-manager.sharedModules = [
inputs.catppuccin.homeManagerModules.catppuccin
];
}
];
};
@ -207,11 +255,16 @@
jovian.nixosModules.jovian
home-manager.nixosModules.home-manager
catppuccin.nixosModules.catppuccin
catppuccin.nixosModules.catppuccin
{
home-manager.sharedModules = [
inputs.plasma-manager.homeManagerModules.plasma-manager
inputs.catppuccin.homeManagerModules.catppuccin
];
home-manager.sharedModules = [
inputs.plasma-manager.homeManagerModules.plasma-manager
inputs.catppuccin.homeManagerModules.catppuccin
];
}
];
};
@ -227,11 +280,36 @@
home-manager.nixosModules.home-manager
nix-index-database.nixosModules.nix-index
catppuccin.nixosModules.catppuccin
nix-index-database.nixosModules.nix-index
catppuccin.nixosModules.catppuccin
{
home-manager.sharedModules = [
inputs.plasma-manager.homeManagerModules.plasma-manager
inputs.catppuccin.homeManagerModules.catppuccin
];
home-manager.sharedModules = [
inputs.plasma-manager.homeManagerModules.plasma-manager
inputs.catppuccin.homeManagerModules.catppuccin
];
}
];
};
iso_server = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
"${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
./nixos/hosts/iso_server/configuration.nix
sops-nix.nixosModules.sops
home-manager.nixosModules.home-manager
nix-index-database.nixosModules.nix-index
catppuccin.nixosModules.catppuccin
{
home-manager.sharedModules = [
inputs.catppuccin.homeManagerModules.catppuccin
];
}
];
};