fixed formating
This commit is contained in:
parent
1acf673ead
commit
52c6b012ca
19 changed files with 142 additions and 134 deletions
|
@ -28,7 +28,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs = inputs@{ self, utils, home-manager, nixpkgs, agenix, ...}:
|
||||
outputs = inputs@{ self, utils, home-manager, nixpkgs, agenix, ... }:
|
||||
utils.lib.mkFlake {
|
||||
inherit self inputs;
|
||||
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
[
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
|
|
|
@ -5,7 +5,8 @@
|
|||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
|
@ -14,7 +15,8 @@
|
|||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
|
@ -22,37 +24,41 @@
|
|||
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/078b81ba-238e-471d-9951-b743588532b8";
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
|
||||
fileSystems."/persist" =
|
||||
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=persist" ];
|
||||
};
|
||||
|
||||
fileSystems."/log" =
|
||||
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=log" ];
|
||||
neededForBoot = true;
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/938D-F813";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/938D-F813";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/29ebf65f-e6ca-4625-9f72-a9321152be1b"; }
|
||||
];
|
||||
[{ device = "/dev/disk/by-uuid/29ebf65f-e6ca-4625-9f72-a9321152be1b"; }];
|
||||
|
||||
}
|
||||
|
|
|
@ -69,5 +69,5 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
home-manager.users.moritz = {...}: (base);
|
||||
home-manager.users.moritz = { ... }: (base);
|
||||
}
|
||||
|
|
|
@ -10,5 +10,5 @@ let
|
|||
});
|
||||
in
|
||||
{
|
||||
home-manager.users.moritz = {...}: (base "/home/moritz/");
|
||||
home-manager.users.moritz = { ... }: (base "/home/moritz/");
|
||||
}
|
||||
|
|
|
@ -22,5 +22,5 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
home-manager.users.moritz = {...}: (base);
|
||||
home-manager.users.moritz = { ... }: (base);
|
||||
}
|
||||
|
|
|
@ -10,5 +10,5 @@ let
|
|||
});
|
||||
in
|
||||
{
|
||||
home-manager.users.moritz = {...}: (base "/home/moritz");
|
||||
home-manager.users.moritz = { ... }: (base "/home/moritz");
|
||||
}
|
||||
|
|
|
@ -34,5 +34,5 @@ let
|
|||
in
|
||||
{
|
||||
environment.pathsToLink = [ "/share/zsh" ];
|
||||
home-manager.users.moritz = {...}: (base "/home/moritz");
|
||||
home-manager.users.moritz = { ... }: (base "/home/moritz");
|
||||
}
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
};
|
||||
|
||||
fonts.fonts = with pkgs; [
|
||||
(nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono"];})
|
||||
(nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono" ]; })
|
||||
];
|
||||
|
||||
# PACKAGES
|
||||
|
|
|
@ -18,5 +18,5 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
home-manager.users.moritz = {...}: (base);
|
||||
home-manager.users.moritz = { ... }: (base);
|
||||
}
|
||||
|
|
|
@ -1,10 +1,5 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
hardware.opengl.enable = true;
|
||||
home-manager.users.moritz = {
|
||||
home.packages = with pkgs; [
|
||||
steam
|
||||
];
|
||||
};
|
||||
programs.steam.enable = true;
|
||||
}
|
||||
|
|
|
@ -12,5 +12,5 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
home-manager.users.moritz = {...}: (base);
|
||||
home-manager.users.moritz = { ... }: (base);
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ let
|
|||
|
||||
## Doom dependencies
|
||||
git
|
||||
(ripgrep.override {withPCRE2 = true;})
|
||||
(ripgrep.override { withPCRE2 = true; })
|
||||
gnutls # for TLS connectivity
|
||||
|
||||
## Optional dependencies
|
||||
|
@ -48,7 +48,10 @@ let
|
|||
## Module dependencies
|
||||
# :checkers spell
|
||||
(aspellWithDicts (ds: with ds; [
|
||||
en en-computers en-science de
|
||||
en
|
||||
en-computers
|
||||
en-science
|
||||
de
|
||||
]))
|
||||
# :checkers grammar
|
||||
languagetool
|
||||
|
@ -64,5 +67,5 @@ in
|
|||
|
||||
fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
|
||||
|
||||
home-manager.users.moritz = {...}: (base);
|
||||
home-manager.users.moritz = { ... }: (base);
|
||||
}
|
||||
|
|
|
@ -48,5 +48,5 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
home-manager.users.moritz = {...}: (base);
|
||||
home-manager.users.moritz = { ... }: (base);
|
||||
}
|
||||
|
|
|
@ -8,4 +8,7 @@ final: prev: {
|
|||
system = prev.system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
nur = import inputs.nur {
|
||||
system = prev.system;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue