Run nix fmt
This formats all our files and fixes any formatting issues we may have.
Change-Id: Icdad124ddbca716601af26e63e9857605770707e
Reviewed-on: https://git.clicks.codes/c/Chimera/NixFiles/+/428
Tested-by: Skyler Grey <minion@clicks.codes>
Reviewed-by: Samuel Shuert <coded@clicks.codes>
diff --git a/.sops.nix b/.sops.nix
index ae58c94..b4ef113 100644
--- a/.sops.nix
+++ b/.sops.nix
@@ -1,18 +1,20 @@
-nixpkgs: let
+nixpkgs:
+let
keys = {
users = {
coded = "BC82DF237610AE9113EB075900E944BFBE99ADB5";
minion = "76E0B09A741C4089522111E5F27E3E5922772E7A";
};
hosts = {
- shorthair = "B5237D6B63AB2E13FDA07170E5AED9775DD21543";
- greylag = "047bf8897df877fe86133e98522c6d280d545c00";
+ shorthair = "B5237D6B63AB2E13FDA07170E5AED9775DD21543";
+ greylag = "047bf8897df877fe86133e98522c6d280d545c00";
};
-};
-in {
+ };
+in
+{
creation_rules = [
{
- path_regex = ''.*\.sops\.chimera\.(yaml|json|env|ini|[^.]*\.bin)$'';
+ path_regex = ".*\\.sops\\.chimera\\.(yaml|json|env|ini|[^.]*\\.bin)$";
pgp = nixpkgs.lib.concatStringsSep "," [
keys.users.coded
keys.users.minion
@@ -21,18 +23,18 @@
];
}
{
- path_regex = ''.*\.sops\.coded\.(yaml|json|env|ini|[^.]*\.bin)$'';
+ path_regex = ".*\\.sops\\.coded\\.(yaml|json|env|ini|[^.]*\\.bin)$";
pgp = nixpkgs.lib.concatStringsSep "," [
keys.users.coded
keys.hosts.shorthair
];
}
{
- path_regex = ''.*\.sops\.minion\.(yaml|json|env|ini|[^.]*\.bin)$'';
+ path_regex = ".*\\.sops\\.minion\\.(yaml|json|env|ini|[^.]*\\.bin)$";
pgp = nixpkgs.lib.concatStringsSep "," [
keys.users.minion
keys.hosts.greylag
];
}
];
-}
\ No newline at end of file
+}
diff --git a/TODO.md b/TODO.md
index 1215383..e7f786a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -7,5 +7,4 @@
- [ ] anyrun
- [ ] hypr-empty
- [ ] Yubikey Auth over SSH
-- [ ] Nix-index Home Manager Module
-- [ ] Possible GTK refactor (move home.pointerCursor.gtk.enable)TODO
\ No newline at end of file
+- [ ] Possible GTK refactor (move home.pointerCursor.gtk.enable)
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index 9f08db1..553e22b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,12 +42,13 @@
{ self, nixpkgs, ... }@inputs:
let
extraHomeModules = [
- inputs.anyrun.homeManagerModules.default
- inputs.hyprland.homeManagerModules.default
- inputs.nur.hmModules.nur
+ inputs.anyrun.homeManagerModules.default
+ inputs.hyprland.homeManagerModules.default
+ inputs.nur.hmModules.nur
inputs.nix-index-database.hmModules.nix-index
];
- in inputs.snowfall-lib.mkFlake {
+ in
+ inputs.snowfall-lib.mkFlake {
inherit inputs;
src = ./.;
diff --git a/homes/x86_64-linux/coded@shorthair/openrgb/default.nix b/homes/x86_64-linux/coded@shorthair/openrgb/default.nix
index bcd1867..7f5688e 100644
--- a/homes/x86_64-linux/coded@shorthair/openrgb/default.nix
+++ b/homes/x86_64-linux/coded@shorthair/openrgb/default.nix
@@ -1,3 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = [ pkgs.openrgb ];
}
diff --git a/homes/x86_64-linux/minion@greylag/default.nix b/homes/x86_64-linux/minion@greylag/default.nix
index e651678..6c4ca5f 100644
--- a/homes/x86_64-linux/minion@greylag/default.nix
+++ b/homes/x86_64-linux/minion@greylag/default.nix
@@ -29,11 +29,11 @@
programs.git.extraConfig.alias = {
recommit = "!git commit --verbose -eF $(git rev-parse --git-dir)/COMMIT_EDITMSG";
- graph = "log --graph --oneline --decorate";
- hash = "rev-parse HEAD";
- personal = "config user.email skyler3665@gmail.com";
- clicks = "config user.email minion@clicks.codes";
- collabora = "config user.email skyler.grey@collabora.com";
+ graph = "log --graph --oneline --decorate";
+ hash = "rev-parse HEAD";
+ personal = "config user.email skyler3665@gmail.com";
+ clicks = "config user.email minion@clicks.codes";
+ collabora = "config user.email skyler.grey@collabora.com";
};
programs.git.extraConfig.user = {
diff --git a/modules/home/editor/neovim/default.nix b/modules/home/editor/neovim/default.nix
index 7098365..2b522b3 100644
--- a/modules/home/editor/neovim/default.nix
+++ b/modules/home/editor/neovim/default.nix
@@ -7,6 +7,7 @@
description = "Use neovim as the default editor";
default = true;
};
+ # https://github.com/mrcjkb/kickstart-nix.nvim
};
config = lib.mkIf config.chimera.editor.neovim.enable {
diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix
index 95d3f8d..7bbc040 100644
--- a/modules/home/git/default.nix
+++ b/modules/home/git/default.nix
@@ -61,11 +61,13 @@
core = {
repositoryformatversion = 0;
filemode = true;
- # TODO: from git docs, should we provide an option for this?: NOTE: this is a possibly dangerous operation; do not use it unless you understand the implications (see git-rebase[1] for details).
+ # TODO: from git docs, should we provide an option for this?: NOTE: this is a possibly dangerous operation; do not use it unless you understand the implications (see git-rebase[1] for details).
};
push = {
autoSetupRemote = true;
- gpgSign = lib.mkIf config.chimera.git.gpg.enable (if config.chimera.git.gpg.push then "if-asked" else false);
+ gpgSign = lib.mkIf config.chimera.git.gpg.enable (
+ if config.chimera.git.gpg.push then "if-asked" else false
+ );
};
url = {
"ssh://git@github.com/".pushInsteadOf = "https://github.com/";
diff --git a/modules/home/gpg/default.nix b/modules/home/gpg/default.nix
index 475c0a9..9384c96 100644
--- a/modules/home/gpg/default.nix
+++ b/modules/home/gpg/default.nix
@@ -18,4 +18,4 @@
enableBashIntegration = config.chimera.shell.bash.enable;
};
};
-}
\ No newline at end of file
+}
diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix
index 3e2e780..14dac7b 100644
--- a/modules/home/hyprland/default.nix
+++ b/modules/home/hyprland/default.nix
@@ -79,9 +79,9 @@
};
exec-once = [
- "${pkgs.hyprpaper}/bin/hyprpaper"
- "hyprctl setcursor ${config.chimera.theme.cursor.name} ${builtins.toString config.chimera.theme.cursor.size}"
- ];
+ "${pkgs.hyprpaper}/bin/hyprpaper"
+ "hyprctl setcursor ${config.chimera.theme.cursor.name} ${builtins.toString config.chimera.theme.cursor.size}"
+ ];
monitor = config.chimera.hyprland.monitors ++ [ ",preferred,auto,1" ];
diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index d7c65a5..cbb310a 100644
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -92,9 +92,7 @@
arguments = [ "--smart-case" ];
};
- programs.htop = lib.mkIf config.chimera.shell.replacements.htop.enable {
- enable = true;
- };
+ programs.htop = lib.mkIf config.chimera.shell.replacements.htop.enable { enable = true; };
programs.zoxide = lib.mkIf config.chimera.shell.replacements.zoxide.enable {
enable = true;
@@ -104,12 +102,10 @@
};
programs.tealdeer = lib.mkIf config.chimera.shell.usefulPackages.enable {
- enable = true;
- settings.updates.autoupdate = true;
- };
- programs.jq = lib.mkIf config.chimera.shell.usefulPackages.enable {
enable = true;
+ settings.updates.autoupdate = true;
};
+ programs.jq = lib.mkIf config.chimera.shell.usefulPackages.enable { enable = true; };
home.packages =
(
diff --git a/modules/home/sops/default.nix b/modules/home/sops/default.nix
index d978623..6ec57c9 100644
--- a/modules/home/sops/default.nix
+++ b/modules/home/sops/default.nix
@@ -1,3 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
home.packages = [ pkgs.sops ];
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/registry/default.nix b/modules/nixos/registry/default.nix
index 3b35051..8cc09ea 100644
--- a/modules/nixos/registry/default.nix
+++ b/modules/nixos/registry/default.nix
@@ -1,3 +1,4 @@
-{ inputs, ... }: {
+{ inputs, ... }:
+{
nix.registry = builtins.mapAttrs (_: flake: { inherit flake; }) inputs;
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/shell/default.nix b/modules/nixos/shell/default.nix
index 5ce6545..1dfcd3e 100644
--- a/modules/nixos/shell/default.nix
+++ b/modules/nixos/shell/default.nix
@@ -1,6 +1,7 @@
-{ pkgs, ... }: {
- programs.zsh.enable = true;
+{ pkgs, ... }:
+{
+ programs.zsh.enable = true;
- users.users.minion.shell = pkgs.bashInteractive;
- users.users.coded.shell = pkgs.zsh;
-}
\ No newline at end of file
+ users.users.minion.shell = pkgs.bashInteractive;
+ users.users.coded.shell = pkgs.zsh;
+}
diff --git a/modules/nixos/ssh/default.nix b/modules/nixos/ssh/default.nix
index c3df0bf..25d7869 100644
--- a/modules/nixos/ssh/default.nix
+++ b/modules/nixos/ssh/default.nix
@@ -1,6 +1,7 @@
-{ ... }: {
+{ ... }:
+{
services.openssh = {
enable = true;
settings.PasswordAuthentication = false;
};
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/users/default.nix b/modules/nixos/users/default.nix
index 7d81bfb..8227086 100644
--- a/modules/nixos/users/default.nix
+++ b/modules/nixos/users/default.nix
@@ -17,9 +17,7 @@
users.users.coded = {
isNormalUser = true;
- extraGroups = [
- "wheel"
- ];
+ extraGroups = [ "wheel" ];
openssh.authorizedKeys.keys = [
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAILrwKN4dJQ0BiLmjsA/66QHhu06+JyokWtHkLcjhWU79AAAABHNzaDo= coded-yk5c-resident"
];
diff --git a/modules/nixos/wifi/default.nix b/modules/nixos/wifi/default.nix
index e0b7968..f033b69 100644
--- a/modules/nixos/wifi/default.nix
+++ b/modules/nixos/wifi/default.nix
@@ -1,4 +1,5 @@
-{ config, ... }: {
+{ config, ... }:
+{
networking.wireless = {
enable = true;
userControlled.enable = true;
diff --git a/systems/x86_64-linux/greylag/users/default.nix b/systems/x86_64-linux/greylag/users/default.nix
index 6b9b998..66e3f73 100644
--- a/systems/x86_64-linux/greylag/users/default.nix
+++ b/systems/x86_64-linux/greylag/users/default.nix
@@ -1,5 +1,7 @@
-{ config, ... }: {
- users.users.minion.hashedPasswordFile = config.sops.secrets."systems/x86_64-linux/greylag/users/passwords.sops.minion.json:minion".path;
+{ config, ... }:
+{
+ users.users.minion.hashedPasswordFile =
+ config.sops.secrets."systems/x86_64-linux/greylag/users/passwords.sops.minion.json:minion".path;
sops.secrets."systems/x86_64-linux/greylag/users/passwords.sops.minion.json:minion" = {
mode = "0400";
@@ -10,4 +12,4 @@
key = "minion";
neededForUsers = true;
};
-}
\ No newline at end of file
+}
diff --git a/systems/x86_64-linux/shorthair/hardware/boot/default.nix b/systems/x86_64-linux/shorthair/hardware/boot/default.nix
index 0bdd46f..b432b13 100644
--- a/systems/x86_64-linux/shorthair/hardware/boot/default.nix
+++ b/systems/x86_64-linux/shorthair/hardware/boot/default.nix
@@ -9,7 +9,10 @@
"sd_mod"
"sr_mod"
];
- boot.initrd.kernelModules = [ "kvm-amd" "amdgpu" ];
+ boot.initrd.kernelModules = [
+ "kvm-amd"
+ "amdgpu"
+ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
diff --git a/systems/x86_64-linux/shorthair/hardware/filesystems/default.nix b/systems/x86_64-linux/shorthair/hardware/filesystems/default.nix
index 07145e9..dd73eda 100644
--- a/systems/x86_64-linux/shorthair/hardware/filesystems/default.nix
+++ b/systems/x86_64-linux/shorthair/hardware/filesystems/default.nix
@@ -15,5 +15,4 @@
# device = "/dev/disk/by-uuid/b0ffc786-a525-413d-97e8-24e57a39dd0b";
# }
#];
-
}
diff --git a/systems/x86_64-linux/shorthair/openrgb/default.nix b/systems/x86_64-linux/shorthair/openrgb/default.nix
index b396f34..ab557ed 100644
--- a/systems/x86_64-linux/shorthair/openrgb/default.nix
+++ b/systems/x86_64-linux/shorthair/openrgb/default.nix
@@ -1,3 +1 @@
-{
- services.hardware.openrgb.enable = true;
-}
\ No newline at end of file
+{ services.hardware.openrgb.enable = true; }
diff --git a/systems/x86_64-linux/shorthair/users/default.nix b/systems/x86_64-linux/shorthair/users/default.nix
index c872ce9..b305f99 100644
--- a/systems/x86_64-linux/shorthair/users/default.nix
+++ b/systems/x86_64-linux/shorthair/users/default.nix
@@ -1,5 +1,7 @@
-{ config, ... }: {
- users.users.coded.hashedPasswordFile = config.sops.secrets."systems/x86_64-linux/shorthair/users/passwords.sops.coded.json:coded".path;
+{ config, ... }:
+{
+ users.users.coded.hashedPasswordFile =
+ config.sops.secrets."systems/x86_64-linux/shorthair/users/passwords.sops.coded.json:coded".path;
sops.secrets."systems/x86_64-linux/shorthair/users/passwords.sops.coded.json:coded" = {
mode = "0400";
@@ -10,4 +12,4 @@
key = "coded";
neededForUsers = true;
};
-}
\ No newline at end of file
+}