Remove the duplication shit
This commit is contained in:
parent
a4f8f48f4b
commit
79169ce8e5
44
flake.nix
44
flake.nix
|
@ -20,12 +20,8 @@
|
|||
# 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";
|
||||
};
|
||||
|
@ -34,10 +30,6 @@
|
|||
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";
|
||||
|
||||
|
@ -69,8 +61,6 @@
|
|||
|
||||
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
|
||||
|
@ -105,7 +95,6 @@
|
|||
nixpkgs,
|
||||
nixos-generators,
|
||||
catppuccin,
|
||||
catppuccin,
|
||||
disko,
|
||||
home-manager,
|
||||
sops-nix,
|
||||
|
@ -114,14 +103,10 @@
|
|||
zjstatus,
|
||||
# linger,
|
||||
# pihole,
|
||||
zjstatus,
|
||||
# linger,
|
||||
# pihole,
|
||||
lanzaboote,
|
||||
jovian,
|
||||
nixos-hardware,
|
||||
nix-index-database,
|
||||
nix-index-database,
|
||||
conduit,
|
||||
...
|
||||
} @ inputs: let
|
||||
|
@ -137,11 +122,6 @@
|
|||
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;
|
||||
|
@ -177,17 +157,11 @@
|
|||
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
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
@ -211,10 +185,6 @@
|
|||
inputs.catppuccin.homeManagerModules.catppuccin
|
||||
inputs.plasma-manager.homeManagerModules.plasma-manager
|
||||
];
|
||||
home-manager.sharedModules = [
|
||||
inputs.catppuccin.homeManagerModules.catppuccin
|
||||
inputs.plasma-manager.homeManagerModules.plasma-manager
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
@ -234,12 +204,6 @@
|
|||
inputs.catppuccin.homeManagerModules.catppuccin
|
||||
];
|
||||
}
|
||||
catppuccin.nixosModules.catppuccin
|
||||
{
|
||||
home-manager.sharedModules = [
|
||||
inputs.catppuccin.homeManagerModules.catppuccin
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
|
@ -261,10 +225,6 @@
|
|||
inputs.plasma-manager.homeManagerModules.plasma-manager
|
||||
inputs.catppuccin.homeManagerModules.catppuccin
|
||||
];
|
||||
home-manager.sharedModules = [
|
||||
inputs.plasma-manager.homeManagerModules.plasma-manager
|
||||
inputs.catppuccin.homeManagerModules.catppuccin
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
@ -287,10 +247,6 @@
|
|||
inputs.plasma-manager.homeManagerModules.plasma-manager
|
||||
inputs.catppuccin.homeManagerModules.catppuccin
|
||||
];
|
||||
home-manager.sharedModules = [
|
||||
inputs.plasma-manager.homeManagerModules.plasma-manager
|
||||
inputs.catppuccin.homeManagerModules.catppuccin
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue