fixed formating

This commit is contained in:
Moritz Böhme 2021-09-15 00:41:46 +02:00
parent 1acf673ead
commit 52c6b012ca
19 changed files with 142 additions and 134 deletions

View file

@ -28,7 +28,7 @@
}; };
}; };
outputs = inputs@{ self, utils, home-manager, nixpkgs, agenix, ...}: outputs = inputs@{ self, utils, home-manager, nixpkgs, agenix, ... }:
utils.lib.mkFlake { utils.lib.mkFlake {
inherit self inputs; inherit self inputs;

View file

@ -6,7 +6,8 @@
{ {
imports = imports =
[ # Include the results of the hardware scan. [
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
]; ];

View file

@ -5,7 +5,8 @@
{ {
imports = 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" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
@ -14,7 +15,8 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154"; {
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=root" ]; options = [ "subvol=root" ];
}; };
@ -22,37 +24,41 @@
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/078b81ba-238e-471d-9951-b743588532b8"; boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/078b81ba-238e-471d-9951-b743588532b8";
fileSystems."/home" = fileSystems."/home" =
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154"; {
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=home" ]; options = [ "subvol=home" ];
}; };
fileSystems."/nix" = fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154"; {
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=nix" ]; options = [ "subvol=nix" ];
}; };
fileSystems."/persist" = fileSystems."/persist" =
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154"; {
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=persist" ]; options = [ "subvol=persist" ];
}; };
fileSystems."/log" = fileSystems."/log" =
{ device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154"; {
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=log" ]; options = [ "subvol=log" ];
neededForBoot = true; neededForBoot = true;
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/938D-F813"; {
device = "/dev/disk/by-uuid/938D-F813";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/29ebf65f-e6ca-4625-9f72-a9321152be1b"; } [{ device = "/dev/disk/by-uuid/29ebf65f-e6ca-4625-9f72-a9321152be1b"; }];
];
} }

View file

@ -69,5 +69,5 @@ let
}; };
in in
{ {
home-manager.users.moritz = {...}: (base); home-manager.users.moritz = { ... }: (base);
} }

View file

@ -10,5 +10,5 @@ let
}); });
in in
{ {
home-manager.users.moritz = {...}: (base "/home/moritz/"); home-manager.users.moritz = { ... }: (base "/home/moritz/");
} }

View file

@ -22,5 +22,5 @@ let
}; };
in in
{ {
home-manager.users.moritz = {...}: (base); home-manager.users.moritz = { ... }: (base);
} }

View file

@ -10,5 +10,5 @@ let
}); });
in in
{ {
home-manager.users.moritz = {...}: (base "/home/moritz"); home-manager.users.moritz = { ... }: (base "/home/moritz");
} }

View file

@ -34,5 +34,5 @@ let
in in
{ {
environment.pathsToLink = [ "/share/zsh" ]; environment.pathsToLink = [ "/share/zsh" ];
home-manager.users.moritz = {...}: (base "/home/moritz"); home-manager.users.moritz = { ... }: (base "/home/moritz");
} }

View file

@ -18,7 +18,7 @@
}; };
fonts.fonts = with pkgs; [ fonts.fonts = with pkgs; [
(nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono"];}) (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono" ]; })
]; ];
# PACKAGES # PACKAGES

View file

@ -18,5 +18,5 @@ let
}; };
in in
{ {
home-manager.users.moritz = {...}: (base); home-manager.users.moritz = { ... }: (base);
} }

View file

@ -1,10 +1,5 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
hardware.opengl.enable = true; programs.steam.enable = true;
home-manager.users.moritz = {
home.packages = with pkgs; [
steam
];
};
} }

View file

@ -12,5 +12,5 @@ let
}; };
in in
{ {
home-manager.users.moritz = {...}: (base); home-manager.users.moritz = { ... }: (base);
} }

View file

@ -37,7 +37,7 @@ let
## Doom dependencies ## Doom dependencies
git git
(ripgrep.override {withPCRE2 = true;}) (ripgrep.override { withPCRE2 = true; })
gnutls # for TLS connectivity gnutls # for TLS connectivity
## Optional dependencies ## Optional dependencies
@ -48,7 +48,10 @@ let
## Module dependencies ## Module dependencies
# :checkers spell # :checkers spell
(aspellWithDicts (ds: with ds; [ (aspellWithDicts (ds: with ds; [
en en-computers en-science de en
en-computers
en-science
de
])) ]))
# :checkers grammar # :checkers grammar
languagetool languagetool
@ -64,5 +67,5 @@ in
fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ]; fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
home-manager.users.moritz = {...}: (base); home-manager.users.moritz = { ... }: (base);
} }

View file

@ -48,5 +48,5 @@ let
}; };
in in
{ {
home-manager.users.moritz = {...}: (base); home-manager.users.moritz = { ... }: (base);
} }

View file

@ -8,4 +8,7 @@ final: prev: {
system = prev.system; system = prev.system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
nur = import inputs.nur {
system = prev.system;
};
} }