From 5d28b53778941f94ab56a3b7d9094812d8fec574 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 26 Oct 2020 23:45:27 -0500 Subject: [PATCH] Normalize indentation Why isn't .editorconfig working...? --- env/desktop/nix/base.nix | 2 +- env/laptop/hardware.nix | 44 +++++++++++++++---------------- env/nix/machines/third.nix | 6 ++--- env/nix/machines/wallwart.nix | 4 +-- env/nix/modules/bluetooth.nix | 2 +- env/nix/modules/de/graphics.nix | 4 +-- env/nix/modules/de/sway.nix | 18 ++++++------- env/nix/modules/fish.nix | 2 +- env/nix/modules/neovim.nix | 2 +- env/nix/modules/pulseaudio.nix | 4 +-- env/nix/modules/users/daniel.nix | 10 +++---- env/nix/modules/users/valerie.nix | 6 ++--- env/nix/pkgs/home.nix | 4 +-- 13 files changed, 54 insertions(+), 54 deletions(-) diff --git a/env/desktop/nix/base.nix b/env/desktop/nix/base.nix index 0ea6280..f96b4e4 100644 --- a/env/desktop/nix/base.nix +++ b/env/desktop/nix/base.nix @@ -8,7 +8,7 @@ imports = [ ./hardware-configuration.nix # TODO: fork? - (import "${builtins.fetchTarball https://github.com/rycee/home-manager/archive/master.tar.gz}/nixos") + (import "${builtins.fetchTarball https://github.com/rycee/home-manager/archive/master.tar.gz}/nixos") ]; home-manager.users.daniel = { diff --git a/env/laptop/hardware.nix b/env/laptop/hardware.nix index eb893b0..2326f4c 100644 --- a/env/laptop/hardware.nix +++ b/env/laptop/hardware.nix @@ -1,32 +1,32 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. { config, lib, pkgs, ... }: { - imports = - [ - ]; + imports = + [ + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/d1d92974-c0c0-4566-8131-c3dda9b21122"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/d1d92974-c0c0-4566-8131-c3dda9b21122"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/3EB9-C18F"; - fsType = "vfat"; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/3EB9-C18F"; + fsType = "vfat"; + }; - swapDevices = [ ]; + swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 4; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - # High-DPI console - console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz"; + nix.maxJobs = lib.mkDefault 4; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + # High-DPI console + console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz"; } diff --git a/env/nix/machines/third.nix b/env/nix/machines/third.nix index 4698cbd..cb945a8 100644 --- a/env/nix/machines/third.nix +++ b/env/nix/machines/third.nix @@ -31,13 +31,13 @@ xft-dpi=260 ''; - swapDevices = [ { device = "/swapfile"; size = (1024*16); } ]; + swapDevices = [ { device = "/swapfile"; size = (1024*16); } ]; boot = { # fallocate -l 16G /swapfile - resumeDevice = "/dev/disk/by-uuid/d1d92974-c0c0-4566-8131-c3dda9b21122"; + resumeDevice = "/dev/disk/by-uuid/d1d92974-c0c0-4566-8131-c3dda9b21122"; # sudo filefrag -v /swapfile | head -n 4 | tail -n 1 | \ - # tr -s "[:blank:]" | field 5 | tr -d ":" + # tr -s "[:blank:]" | field 5 | tr -d ":" kernelParams = [ "resume_offset=874496" ]; }; diff --git a/env/nix/machines/wallwart.nix b/env/nix/machines/wallwart.nix index 1e33af0..1cbad06 100644 --- a/env/nix/machines/wallwart.nix +++ b/env/nix/machines/wallwart.nix @@ -22,8 +22,8 @@ systemPackages = with pkgs; [ ntfs3g ]; }; - fileSystems."/storage/ext".options = [ "defaults" "user" "nofail" ]; - fileSystems."/storage/butter".options = [ "defaults" "auto" "nofail" ]; + fileSystems."/storage/ext".options = [ "defaults" "user" "nofail" ]; + fileSystems."/storage/butter".options = [ "defaults" "auto" "nofail" ]; fileSystems."/storage/windows" = { device = "/dev/disk/by-uuid/AE624593624560E7"; fsType = "ntfs"; diff --git a/env/nix/modules/bluetooth.nix b/env/nix/modules/bluetooth.nix index 1a80e13..ef5a122 100644 --- a/env/nix/modules/bluetooth.nix +++ b/env/nix/modules/bluetooth.nix @@ -1,3 +1,3 @@ { config, pkgs, ... }: { - hardware.bluetooth.enable = true; + hardware.bluetooth.enable = true; } diff --git a/env/nix/modules/de/graphics.nix b/env/nix/modules/de/graphics.nix index 2877010..ca67c8b 100644 --- a/env/nix/modules/de/graphics.nix +++ b/env/nix/modules/de/graphics.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: { - imports = [ ../lightdm.nix ]; - fonts.fonts = with pkgs; [ iosevka ]; + imports = [ ../lightdm.nix ]; + fonts.fonts = with pkgs; [ iosevka ]; hardware.opengl = { enable = true; driSupport = true; diff --git a/env/nix/modules/de/sway.nix b/env/nix/modules/de/sway.nix index 65f973d..38f5c41 100644 --- a/env/nix/modules/de/sway.nix +++ b/env/nix/modules/de/sway.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: let - unstable = import { config = { allowUnfree = true; }; }; + unstable = import { config = { allowUnfree = true; }; }; in { imports = [ ./graphics.nix ]; programs = { @@ -43,12 +43,12 @@ in { disableWhileTyping = false; }; }; - xdg.portal = { - enable = true; - gtkUsePortal = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - unstable.xdg-desktop-portal-wlr - ]; - }; + xdg.portal = { + enable = true; + gtkUsePortal = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + unstable.xdg-desktop-portal-wlr + ]; + }; } diff --git a/env/nix/modules/fish.nix b/env/nix/modules/fish.nix index 87050a2..5dc9b4e 100644 --- a/env/nix/modules/fish.nix +++ b/env/nix/modules/fish.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: let - unstable = import { config = { allowUnfree = true; }; }; + unstable = import { config = { allowUnfree = true; }; }; in { programs.fish = { enable = true; diff --git a/env/nix/modules/neovim.nix b/env/nix/modules/neovim.nix index 5ad8794..37a8a8e 100644 --- a/env/nix/modules/neovim.nix +++ b/env/nix/modules/neovim.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: let - unstable = import { config = { allowUnfree = true; }; }; + unstable = import { config = { allowUnfree = true; }; }; aliases = { vim = "nvim"; vi = "nvim"; }; in { diff --git a/env/nix/modules/pulseaudio.nix b/env/nix/modules/pulseaudio.nix index 76ab651..f8ad146 100644 --- a/env/nix/modules/pulseaudio.nix +++ b/env/nix/modules/pulseaudio.nix @@ -1,9 +1,9 @@ { config, pkgs, ... }: { - hardware.pulseaudio = { + hardware.pulseaudio = { enable = true; support32Bit = true; package = pkgs.pulseaudioFull; }; nixpkgs.config.pulseaudio = true; - sound.enable = true; + sound.enable = true; } diff --git a/env/nix/modules/users/daniel.nix b/env/nix/modules/users/daniel.nix index 58b8db3..571f1ea 100644 --- a/env/nix/modules/users/daniel.nix +++ b/env/nix/modules/users/daniel.nix @@ -1,8 +1,8 @@ { config, pkgs, ... }: { - users.users.daniel = { - isNormalUser = true; - extraGroups = [ "wheel" "docker" ]; - shell = pkgs.fish; + users.users.daniel = { + isNormalUser = true; + extraGroups = [ "wheel" "docker" ]; + shell = pkgs.fish; home = "/home/daniel/.home"; packages = with pkgs; [ fortune # fun sayings @@ -43,5 +43,5 @@ niv # dependency pinning? lorri # project envrc - like asdf-vm? ]; - }; + }; } diff --git a/env/nix/modules/users/valerie.nix b/env/nix/modules/users/valerie.nix index 73005e2..c3eff59 100644 --- a/env/nix/modules/users/valerie.nix +++ b/env/nix/modules/users/valerie.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - users.users.valerie = { - isNormalUser = true; - shell = pkgs.fish; + users.users.valerie = { + isNormalUser = true; + shell = pkgs.fish; home = "/home/valerie"; }; } diff --git a/env/nix/pkgs/home.nix b/env/nix/pkgs/home.nix index cb99cae..abad047 100644 --- a/env/nix/pkgs/home.nix +++ b/env/nix/pkgs/home.nix @@ -1,4 +1,4 @@ { config, pkgs, ... }: { - programs.home-manager.enable = true; - home.stateVersion = "20.03"; + programs.home-manager.enable = true; + home.stateVersion = "20.03"; }