From bf632250b267e175fb2b87303bb6e35c671d0a92 Mon Sep 17 00:00:00 2001 From: sefidel Date: Sun, 2 Jan 2022 00:05:25 +0900 Subject: repo: reformat using nixpkgs-fmt --- home/modules/misc/neotheme/default.nix | 59 +++++------ home/modules/profiles/browsing/default.nix | 42 ++++---- home/modules/profiles/default.nix | 8 +- home/modules/profiles/development/default.nix | 140 +++++++++++++------------- home/modules/profiles/messaging/default.nix | 20 ++-- home/modules/profiles/misc/default.nix | 20 ++-- lib/mk_home.nix | 24 ++--- nixos/configurations/alpha.nix | 10 +- nixos/configurations/hardware/alpha.nix | 2 +- 9 files changed, 164 insertions(+), 161 deletions(-) diff --git a/home/modules/misc/neotheme/default.nix b/home/modules/misc/neotheme/default.nix index 74f2c74..df69251 100644 --- a/home/modules/misc/neotheme/default.nix +++ b/home/modules/misc/neotheme/default.nix @@ -2,7 +2,8 @@ with lib; let cfg = config.neotheme; -in { +in +{ options.neotheme = { wallpaper = mkOption { type = types.str; @@ -26,34 +27,36 @@ in { example = "My Amazing Theme"; }; - colors = let - mkColorOption = name: { - inherit name; - value = mkOption { - type = types.strMatching "[a-fA-F0-9]{6}"; - description = "color ${name}."; + colors = + let + mkColorOption = name: { + inherit name; + value = mkOption { + type = types.strMatching "[a-fA-F0-9]{6}"; + description = "color ${name}."; + }; }; - }; - in listToAttrs (map mkColorOption [ - "background" - "foreground" - "color0" - "color1" - "color2" - "color3" - "color4" - "color5" - "color6" - "color7" - "bright0" - "bright1" - "bright2" - "bright3" - "bright4" - "bright5" - "bright6" - "bright7" - ]); + in + listToAttrs (map mkColorOption [ + "background" + "foreground" + "color0" + "color1" + "color2" + "color3" + "color4" + "color5" + "color6" + "color7" + "bright0" + "bright1" + "bright2" + "bright3" + "bright4" + "bright5" + "bright6" + "bright7" + ]); }; }; } diff --git a/home/modules/profiles/browsing/default.nix b/home/modules/profiles/browsing/default.nix index 8c10a5c..4bf7dd9 100644 --- a/home/modules/profiles/browsing/default.nix +++ b/home/modules/profiles/browsing/default.nix @@ -1,30 +1,30 @@ { config, lib, pkgs, ... }: let cfg = config.profiles.browsing; in - { - options.profiles.browsing = { - enable = lib.mkEnableOption - "A profile that enables a browser for the GUI and the terminal"; - }; - - config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ lynx ]; +{ + options.profiles.browsing = { + enable = lib.mkEnableOption + "A profile that enables a browser for the GUI and the terminal"; + }; - programs.qutebrowser = { - enable = true; + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ lynx ]; - searchEngines = { - g = "https://www.google.com/search?hl=en&q={}"; - nw = "https://nixos.wiki/index.php?search={}"; - no = "https://search.nixos.org/options?channel=unstable&from=0size=50&sort=relevance&type=packages&query={}"; - }; + programs.qutebrowser = { + enable = true; - quickmarks = { - github = "https://github.com"; - sourcehut = "https://sr.ht"; - }; + searchEngines = { + g = "https://www.google.com/search?hl=en&q={}"; + nw = "https://nixos.wiki/index.php?search={}"; + no = "https://search.nixos.org/options?channel=unstable&from=0size=50&sort=relevance&type=packages&query={}"; + }; - settings = import ./qutebrowser-settings.nix; + quickmarks = { + github = "https://github.com"; + sourcehut = "https://sr.ht"; }; + + settings = import ./qutebrowser-settings.nix; }; - } + }; +} diff --git a/home/modules/profiles/default.nix b/home/modules/profiles/default.nix index 1fa2960..af9d9a8 100644 --- a/home/modules/profiles/default.nix +++ b/home/modules/profiles/default.nix @@ -6,8 +6,8 @@ let in builtins.foldl' reducer { } config.activeProfiles; in - { - options.activeProfiles = lib.mkOption { type = lib.types.listOf lib.types.str; }; +{ + options.activeProfiles = lib.mkOption { type = lib.types.listOf lib.types.str; }; - config.profiles = profileEnabler; - } + config.profiles = profileEnabler; +} diff --git a/home/modules/profiles/development/default.nix b/home/modules/profiles/development/default.nix index 3006630..a396ce9 100644 --- a/home/modules/profiles/development/default.nix +++ b/home/modules/profiles/development/default.nix @@ -3,82 +3,82 @@ let cfg = config.profiles.development; in - { - options.profiles.development = { - enable = lib.mkEnableOption - "A profile that enables the system to be used for developing programs"; - }; +{ + options.profiles.development = { + enable = lib.mkEnableOption + "A profile that enables the system to be used for developing programs"; + }; - config = lib.mkIf cfg.enable { - programs.gh.enable = true; - programs.git = { - enable = true; - package = pkgs.gitFull; + config = lib.mkIf cfg.enable { + programs.gh.enable = true; + programs.git = { + enable = true; + package = pkgs.gitFull; - userName = "Zack A"; - userEmail = "hi@boopy.dev"; + userName = "Zack A"; + userEmail = "hi@boopy.dev"; - signing = { - key = null; - signByDefault = true; - }; + signing = { + key = null; + signByDefault = true; + }; - aliases = { - graph = - "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold cyan)%h%C(reset) - %C(green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all"; - co = "checkout"; - br = "branch"; - st = "status"; - ps = "push"; - pl = "pull"; - root = "rev-parse --show-toplevel"; - }; + aliases = { + graph = + "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold cyan)%h%C(reset) - %C(green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all"; + co = "checkout"; + br = "branch"; + st = "status"; + ps = "push"; + pl = "pull"; + root = "rev-parse --show-toplevel"; + }; - extraConfig = { - init.defaultBranch = "main"; - pull.rebase = true; - }; + extraConfig = { + init.defaultBranch = "main"; + pull.rebase = true; + }; - ignores = [ - # IntelliJ files and folders - ".idea/" - "*.iml" - # backupfiles and shadow copies done by editors - "*~" - "\\#*\\#" - ".#*" - # Elixir language server - "/.elixir_ls" - # MyPy Cache - ".mypy_cache" - # Visual Studio Code project configuration - "/.vscode" - # Result folder for nix builds - "result" - "result-*" - # direnv caches - ".direnv/" - # emacs/python stuff - "flycheck_*.py" - ]; - }; + ignores = [ + # IntelliJ files and folders + ".idea/" + "*.iml" + # backupfiles and shadow copies done by editors + "*~" + "\\#*\\#" + ".#*" + # Elixir language server + "/.elixir_ls" + # MyPy Cache + ".mypy_cache" + # Visual Studio Code project configuration + "/.vscode" + # Result folder for nix builds + "result" + "result-*" + # direnv caches + ".direnv/" + # emacs/python stuff + "flycheck_*.py" + ]; + }; - home.packages = [ - pkgs.ripgrep - pkgs.rust-analyzer - pkgs.gnupg - pkgs.tig - pkgs.silver-searcher - ]; + home.packages = [ + pkgs.ripgrep + pkgs.rust-analyzer + pkgs.gnupg + pkgs.tig + pkgs.silver-searcher + ]; - services.gpg-agent = { - enable = true; - enableExtraSocket = true; - defaultCacheTtl = 34560000; - defaultCacheTtlSsh = 34560000; - maxCacheTtl = 34560000; - maxCacheTtlSsh = 34560000; - }; - }; - } + services.gpg-agent = { + enable = true; + enableExtraSocket = true; + defaultCacheTtl = 34560000; + defaultCacheTtlSsh = 34560000; + maxCacheTtl = 34560000; + maxCacheTtlSsh = 34560000; + }; + }; +} diff --git a/home/modules/profiles/messaging/default.nix b/home/modules/profiles/messaging/default.nix index 1bdc873..76dc0fc 100644 --- a/home/modules/profiles/messaging/default.nix +++ b/home/modules/profiles/messaging/default.nix @@ -1,14 +1,14 @@ { config, lib, pkgs, ... }: let cfg = config.profiles.messaging; in - { - options.profiles.messaging = { - enable = lib.mkEnableOption - "A profile that enables the system to communicate via internet."; - }; +{ + options.profiles.messaging = { + enable = lib.mkEnableOption + "A profile that enables the system to communicate via internet."; + }; - config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ discord-canary aerc weechat element slack ]; - nixpkgs.allowedUnfree = [ "discord-canary" "slack" ]; - }; - } + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ discord-canary aerc weechat element slack ]; + nixpkgs.allowedUnfree = [ "discord-canary" "slack" ]; + }; +} diff --git a/home/modules/profiles/misc/default.nix b/home/modules/profiles/misc/default.nix index 4881bd3..0999080 100644 --- a/home/modules/profiles/misc/default.nix +++ b/home/modules/profiles/misc/default.nix @@ -1,14 +1,14 @@ { config, lib, pkgs, ... }: let cfg = config.profiles.misc; in - { - options.profiles.misc = { - enable = lib.mkEnableOption - "A profile that enables miscellaneous options and packages."; - }; +{ + options.profiles.misc = { + enable = lib.mkEnableOption + "A profile that enables miscellaneous options and packages."; + }; - config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ spotify zoom-us obsidian ]; - nixpkgs.allowedUnfree = [ "spotify" "spotify-unwrapped" "zoom" "obsidian" ]; - }; - } + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ spotify zoom-us obsidian ]; + nixpkgs.allowedUnfree = [ "spotify" "spotify-unwrapped" "zoom" "obsidian" ]; + }; +} diff --git a/lib/mk_home.nix b/lib/mk_home.nix index e352f5f..7abe42a 100644 --- a/lib/mk_home.nix +++ b/lib/mk_home.nix @@ -5,16 +5,16 @@ let args = inputs; entrypoint = "${self}/home/configurations/${username}@${hostname}.nix"; in - home-manager.lib.homeManagerConfiguration { - inherit username system; - homeDirectory = "/home/${username}"; - stateVersion = version; - pkgs = nixpkgs.legacyPackages.${system}; +home-manager.lib.homeManagerConfiguration { + inherit username system; + homeDirectory = "/home/${username}"; + stateVersion = version; + pkgs = nixpkgs.legacyPackages.${system}; - configuration = { lib, ... }: { - _module = { inherit args; }; - imports = [ - entrypoint - ] ++ __attrValues self.homeModules; - }; - } + configuration = { lib, ... }: { + _module = { inherit args; }; + imports = [ + entrypoint + ] ++ __attrValues self.homeModules; + }; +} diff --git a/nixos/configurations/alpha.nix b/nixos/configurations/alpha.nix index 01b413e..a8b25ce 100644 --- a/nixos/configurations/alpha.nix +++ b/nixos/configurations/alpha.nix @@ -1,7 +1,7 @@ -{ config, pkgs, lib, ...}: +{ config, pkgs, lib, ... }: { - imports = []; + imports = [ ]; security = { acme.acceptTerms = true; @@ -41,11 +41,11 @@ enable = true; version = 2; - efiSupport = true; + efiSupport = true; configurationLimit = 10; device = "nodev"; useOSProber = true; - # device = "/dev/disk/by-uuid/7905-2E41"; + # device = "/dev/disk/by-uuid/7905-2E41"; extraEntries = '' menuentry "Reboot" { reboot @@ -93,7 +93,7 @@ services.journald.extraConfig = lib.mkForce ""; - systemd.extraConfig = "RebootWatchdogSec=5"; + systemd.extraConfig = "RebootWatchdogSec=5"; programs = { sway = { diff --git a/nixos/configurations/hardware/alpha.nix b/nixos/configurations/hardware/alpha.nix index 409d7b1..482676e 100644 --- a/nixos/configurations/hardware/alpha.nix +++ b/nixos/configurations/hardware/alpha.nix @@ -12,7 +12,7 @@ let options = [ "subvol=${name}" "compress=zstd" "noatime" ]; }; in -{ +{ boot.initrd.availableKernelModules = [ "xhci-pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" "tcp_bbr" ]; -- cgit 1.4.1