From a46b9bc7add7c61b96c6c10e24593fd95d1685ce Mon Sep 17 00:00:00 2001 From: Bad Date: Sun, 3 Jul 2022 01:06:34 +0200 Subject: [PATCH] Reformat code --- flake.nix | 6 +++--- hosts/tesco.nix | 11 ++++++----- overlays/overrides.nix | 6 +++--- profiles/core/default.nix | 4 ++-- profiles/game/default.nix | 2 +- profiles/peerix/default.nix | 6 +++--- secrets/secrets.nix | 2 +- users/mae/default.nix | 2 +- 8 files changed, 20 insertions(+), 19 deletions(-) diff --git a/flake.nix b/flake.nix index f92aa2d..6d3188e 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ digga.inputs.deploy.follows = "deploy"; home.url = "github:nix-community/home-manager/master"; -# home.url = "path:/home/mae/home-manager"; + # home.url = "path:/home/mae/home-manager"; home.inputs.nixpkgs.follows = "latest"; home.inputs.utils.follows = "flake-utils"; @@ -40,12 +40,12 @@ naersk.inputs.nixpkgs.follows = "nixos"; peerix.url = "github:cid-chan/peerix"; -# peerix.url = "github:MaeIsBad/peerix"; + # peerix.url = "github:MaeIsBad/peerix"; peerix.inputs.nixpkgs.follows = "nixos"; nixos-hardware.url = "github:nixos/nixos-hardware"; fenix.url = "github:nix-community/fenix"; -# fenix.inputs.nixpkgs.follows = "nixos"; + # fenix.inputs.nixpkgs.follows = "nixos"; }; outputs = diff --git a/hosts/tesco.nix b/hosts/tesco.nix index e667cad..b76f403 100644 --- a/hosts/tesco.nix +++ b/hosts/tesco.nix @@ -10,7 +10,7 @@ # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "21.05"; # Did you read the comment? - + boot.loader.grub = { enable = true; version = 2; @@ -52,17 +52,18 @@ }; fileSystems."/" = - { device = "/dev/bcache0"; + { + device = "/dev/bcache0"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-label/BOOT"; + { + device = "/dev/disk/by-label/BOOT"; fsType = "vfat"; }; swapDevices = - [ { device = "/dev/disk/by-label/ssd-swap"; } - ]; + [{ device = "/dev/disk/by-label/ssd-swap"; }]; } diff --git a/overlays/overrides.nix b/overlays/overrides.nix index d65eedb..e0bbed5 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -1,5 +1,5 @@ -channels: final: prev: -let +channels: final: prev: +let latest = channels.latest; in { @@ -29,7 +29,7 @@ in rust-analyzer cargo-crev cargo-fuzz - tdesktop + tdesktop vimPlugins neovim-unwrapped; diff --git a/profiles/core/default.nix b/profiles/core/default.nix index 665bd89..0c68233 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -6,7 +6,7 @@ in # Cachix nix = { binaryCaches = [ - "https://cache.nixos.org/" + "https://cache.nixos.org/" "https://nix-community.cachix.org" ]; binaryCachePublicKeys = [ @@ -32,7 +32,7 @@ in environment.variables.EDITOR = "$EDITOR"; services.logind.lidSwitch = "ignore"; - services.logind.extraConfig = '' + services.logind.extraConfig = '' # don’t shutdown when power button is short-pressed HandlePowerKey=ignore ''; diff --git a/profiles/game/default.nix b/profiles/game/default.nix index a2b57f2..80ae672 100644 --- a/profiles/game/default.nix +++ b/profiles/game/default.nix @@ -7,7 +7,7 @@ minetest mumble polymc - (retroarch.override {cores = [libretro.snes9x]; }) + (retroarch.override { cores = [ libretro.snes9x ]; }) olympus godot ]; diff --git a/profiles/peerix/default.nix b/profiles/peerix/default.nix index 8d4709d..6824590 100644 --- a/profiles/peerix/default.nix +++ b/profiles/peerix/default.nix @@ -1,9 +1,9 @@ -{config, pkgs, ...}: -let +{ config, pkgs, ... }: +let peerix_user = "peerix"; in { - users.groups.${peerix_user} = {}; + users.groups.${peerix_user} = { }; users.users.${peerix_user} = { group = peerix_user; isSystemUser = true; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 9e00961..f89adb4 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -6,7 +6,7 @@ let tesco_sys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqryVRMbcei0pZTOP1wgTVzn452vgsUP7MrEb0LQ17s root@tesco"; mae_tesco = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN64wtGODBn2yygv1sOXnV8qbXImbOttMlhdTKEyQCoT mae@tesco"; - systemKeys = [teapot_sys tesco_sys]; + systemKeys = [ teapot_sys tesco_sys ]; allKeys = [ mae_teapot mae_tesco ] ++ systemKeys; in { diff --git a/users/mae/default.nix b/users/mae/default.nix index 14b6527..1f2dbd3 100644 --- a/users/mae/default.nix +++ b/users/mae/default.nix @@ -8,7 +8,7 @@ shell = pkgs.zsh; extraGroups = [ "wheel" "video" "lp" "scanner" "adbusers" "render" "libvirtd" "podman" "docker" ]; }; - home-manager.users.mae = {pkgs, ...}: { + home-manager.users.mae = { pkgs, ... }: { imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ../profiles/syncthing ../profiles/kdeconnect ../profiles/podman ../profiles/alacritty ../profiles/tmux ../profiles/mpv ../profiles/sway ]; home.sessionVariables = {