fabianhauser/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Clean up formatting

Browse source
This commit is contained in:
Fabian Hauser 2022-04-23 20:56:17 +02:00
parent 23d7557b3a
commit a451e63974
4 changed files with 36 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
defaults/hardware/thinkpad-x1-gen9.nix
View file

@ -5,19 +5,14 @@
hardwareModules.lenovo-thinkpad-x1-9th-gen hardwareModules.lenovo-thinkpad-x1-9th-gen
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules =
"xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "ahci" "usbhid" ];
"ahci"
"usbhid"
];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.initrd.kernelModules = [ "dm-snapshot" ]; # TODO: This should be moved to defaults boot.initrd.kernelModules =
[ "dm-snapshot" ]; # TODO: This should be moved to defaults
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [ modemmanager libmbim ];
modemmanager
libmbim
];
# CPU Configuration # CPU Configuration
hardware.cpu.intel.updateMicrocode = true; hardware.cpu.intel.updateMicrocode = true;

4
flake.nix
View file

@ -37,7 +37,7 @@
in pkgs.runCommand "nixfmt-check" { } '' in pkgs.runCommand "nixfmt-check" { } ''
set -euo pipefail set -euo pipefail
cd ${self} cd ${self}
${pkgs.findutils}/bin/find . -type f -name '*.nix' -exec ${pkgs.nixfmt}/bin/nixfmt --check {} + ${self.apps.${system}.format.program} --check
mkdir $out mkdir $out
''; '';
@ -91,7 +91,7 @@
format = let format = let
pkgs = pkgsUnstable; pkgs = pkgsUnstable;
formatter = pkgsUnstable.writeShellScriptBin "formatter" '' formatter = pkgsUnstable.writeShellScriptBin "formatter" ''
${pkgs.findutils}/bin/find . -type f -name '*.nix' -exec ${pkgs.nixfmt}/bin/nixfmt {} + ${pkgs.findutils}/bin/find . -type f -name '*.nix' -exec ${pkgs.nixfmt}/bin/nixfmt $@ {} +
''; '';
in { in {
type = "app"; type = "app";

52
home/fhauser/applications/default.nix
View file

@ -90,35 +90,35 @@
modem-manager-gui modem-manager-gui
]; ];
#TODO: Write module #TODO: Write module
activation.statefulConfigSymlinks = activation.statefulConfigSymlinks =
config.lib.dag.entryAfter [ "writeBoundary" ] '' config.lib.dag.entryAfter [ "writeBoundary" ] ''
set -eo pipefail set -eo pipefail
STATEFUL_ROOT="$HOME/.stateful" STATEFUL_ROOT="$HOME/.stateful"
if [ ! -d "$STATEFUL_ROOT" ]; then if [ ! -d "$STATEFUL_ROOT" ]; then
$DRY_RUN_CMD mkdir "$STATEFUL_ROOT" $DRY_RUN_CMD mkdir "$STATEFUL_ROOT"
fi
STATEFUL_CONFS=(
".config/spotify"
".mozilla"
".password-store"
)
for STATEFUL_CONF in ''${STATEFUL_CONFS[@]}; do
if [ -e "$STATEFUL_CONF" ] && [ ! -h "$STATEFUL_CONF" ]; then
echo "File $STATEFUL_CONF already exists, exiting!" >&2
exit 1
fi fi
STATEFUL_CONFS=( if [ -h "$STATEFUL_CONF" ]; then
".config/spotify" $DRY_RUN_CMD rm "$STATEFUL_CONF"
".mozilla" fi
".password-store"
)
for STATEFUL_CONF in ''${STATEFUL_CONFS[@]}; do
if [ -e "$STATEFUL_CONF" ] && [ ! -h "$STATEFUL_CONF" ]; then
echo "File $STATEFUL_CONF already exists, exiting!" >&2
exit 1
fi
if [ -h "$STATEFUL_CONF" ]; then STATEFUL_CONF_DIR="$STATEFUL_ROOT/$STATEFUL_CONF"
$DRY_RUN_CMD rm "$STATEFUL_CONF" $DRY_RUN_CMD mkdir -p "$STATEFUL_CONF_DIR"
fi $DRY_RUN_CMD ln -s $VERBOSE_ARG "$STATEFUL_CONF_DIR" "$HOME/$STATEFUL_CONF"
done
STATEFUL_CONF_DIR="$STATEFUL_ROOT/$STATEFUL_CONF" '';
$DRY_RUN_CMD mkdir -p "$STATEFUL_CONF_DIR"
$DRY_RUN_CMD ln -s $VERBOSE_ARG "$STATEFUL_CONF_DIR" "$HOME/$STATEFUL_CONF"
done
'';
}; };
} }

7
host/ochsenchopf/filesystems.nix
View file

@ -1,10 +1,9 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
boot.initrd.luks.devices = { boot.initrd.luks.devices = { "luks".device = "/dev/disk/by-label/luks"; };
"luks".device = "/dev/disk/by-label/luks";
};
fileSystems = let rootdev = "/dev/disk/by-label/hv_ochsenchopf"; in { fileSystems = let rootdev = "/dev/disk/by-label/hv_ochsenchopf";
in {
"/" = { "/" = {
device = rootdev; device = rootdev;
fsType = "btrfs"; fsType = "btrfs";