might've fixed disko ??? OMG TOTES GOATS ???
This commit is contained in:
parent
0801a929bd
commit
4f5acf57ad
3 changed files with 30 additions and 16 deletions
33
flake.nix
33
flake.nix
|
|
@ -8,33 +8,39 @@
|
|||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
|
||||
# nixos user repository ? :o
|
||||
# nur.url = "git:nix-community/NUR";
|
||||
|
||||
# alejandra ?? think its a code formatter
|
||||
# alejandra ?? think its a nix code formatter
|
||||
# alejandra.url = "github:kamadorueda/alejandra/3.0.0";
|
||||
|
||||
# nix gaming ?
|
||||
# nix-gaming.url = "github:fufexan/nix-gaming";
|
||||
# declaratice disks
|
||||
disko = {
|
||||
url = "github:nix-community/disko";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# declarative dots
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-23.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# window manager (ricer friendly)
|
||||
hyprland = {
|
||||
url = "github:hyprwm/Hyprland";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
hyprpicker.url = "github:hyprwm/hyprpicker";
|
||||
# hypr-contrib.url = "github:hyprwm/contrib";
|
||||
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, hyprland, ... }:
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
nixos-hardware,
|
||||
disko,
|
||||
home-manager,
|
||||
hyprland,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
overlay-unstable = final: prev: {
|
||||
|
|
@ -46,7 +52,7 @@
|
|||
overlay-flake-pkgs = final: prev: {
|
||||
};
|
||||
common-modules = [
|
||||
# ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable overlay-flake-pkgs ]; })
|
||||
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable overlay-flake-pkgs ]; })
|
||||
];
|
||||
in
|
||||
{
|
||||
|
|
@ -55,9 +61,10 @@
|
|||
inherit system;
|
||||
# specialArgs = { inherit hyprland; };
|
||||
modules = [
|
||||
disko.nixosModules.disko
|
||||
./hosts/proserpina/configuration.nix # Load muir main nix config
|
||||
# nixos-hardware.nixosModules.$MODEL
|
||||
]; # ++ common-modules;
|
||||
] ++ common-modules;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
|
||||
# "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
|
||||
./disko-config.nix
|
||||
./network-configuration.nix
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
|
||||
disko.devices = {
|
||||
disk = {
|
||||
sda = {
|
||||
|
|
@ -19,6 +20,7 @@
|
|||
];
|
||||
};
|
||||
};
|
||||
|
||||
luks = {
|
||||
size = "100%";
|
||||
content = {
|
||||
|
|
@ -31,6 +33,7 @@
|
|||
#keyFile = "/tmp/secret.key";
|
||||
};
|
||||
# additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
|
||||
|
||||
content = {
|
||||
type = "btrfs";
|
||||
extraArgs = [ "-f" ];
|
||||
|
|
@ -49,11 +52,15 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue