From c43341a8b2b3e0065cddb95ad9cb70dcdd2f30b0 Mon Sep 17 00:00:00 2001 From: dadada Date: Thu, 4 Aug 2022 21:13:54 +0200 Subject: [PATCH] switch to nixpkgs-fmt --- flake.nix | 2 +- home/configurations.nix | 49 ++++----- home/home/default.nix | 25 ++--- home/home/pkgs.nix | 2 +- home/modules/alacritty/default.nix | 12 +-- home/modules/colors.nix | 7 +- home/modules/default.nix | 9 +- home/modules/direnv.nix | 12 +-- home/modules/emacs/default.nix | 82 +++++++-------- home/modules/fish.nix | 14 +-- home/modules/git.nix | 14 +-- home/modules/gpg.nix | 12 +-- home/modules/gtk.nix | 12 +-- home/modules/keyring.nix | 12 +-- home/modules/kitty/default.nix | 14 +-- home/modules/mako.nix | 14 +-- home/modules/session.nix | 12 +-- home/modules/ssh.nix | 10 +- home/modules/sway/default.nix | 14 +-- home/modules/syncthing.nix | 12 +-- home/modules/termite.nix | 14 +-- home/modules/tmux.nix | 10 +- home/modules/vim/default.nix | 14 +-- home/modules/xdg.nix | 12 +-- home/modules/zsh.nix | 12 +-- home/nixpkgs-config.nix | 2 +- lib/default.nix | 2 +- nixos/agares/configuration.nix | 13 ++- nixos/agares/hardware-configuration.nix | 21 ++-- nixos/configurations.nix | 46 +++++---- nixos/gorgon/configuration.nix | 41 ++++---- nixos/gorgon/hardware-configuration.nix | 21 ++-- nixos/ifrit/configuration.nix | 47 ++++----- nixos/ifrit/hardware-configuration.nix | 21 ++-- nixos/modules/admin.nix | 80 +++++++-------- nixos/modules/backup.nix | 14 +-- nixos/modules/ddns.nix | 52 +++++----- nixos/modules/default.nix | 2 +- nixos/modules/element.nix | 15 +-- nixos/modules/fido2.nix | 12 +-- nixos/modules/fileShare.nix | 10 +- nixos/modules/gitea.nix | 15 +-- nixos/modules/headphones.nix | 14 +-- nixos/modules/homepage.nix | 36 +++---- nixos/modules/kanboard/default.nix | 19 ++-- nixos/modules/networking.nix | 22 ++-- nixos/modules/nix.nix | 20 ++-- nixos/modules/profiles/laptop.nix | 11 +- nixos/modules/profiles/server.nix | 9 +- nixos/modules/share.nix | 12 +-- nixos/modules/steam.nix | 14 +-- nixos/modules/update.nix | 12 +-- nixos/modules/vpnServer.nix | 28 +++--- nixos/modules/weechat.nix | 12 +-- nixos/modules/zsh.nix | 11 +- nixos/pruflas/configuration.nix | 21 ++-- nixos/pruflas/hardware-configuration.nix | 21 ++-- nixos/surgat/configuration.nix | 19 ++-- nixos/surgat/hardware-configuration.nix | 21 ++-- outputs.nix | 123 ++++++++++++----------- overlays/default.nix | 3 +- overlays/python3-packages.nix | 2 +- overlays/tubslatex.nix | 46 ++++----- pkgs/python-pkgs/default.nix | 3 +- pkgs/scripts.nix | 8 +- pkgs/tubslatex/default.nix | 12 +-- pkgs/vimPlugins/default.nix | 9 +- shell.nix | 2 +- tests/default.nix | 3 +- 69 files changed, 664 insertions(+), 665 deletions(-) diff --git a/flake.nix b/flake.nix index 13660f9..ed6374c 100644 --- a/flake.nix +++ b/flake.nix @@ -30,5 +30,5 @@ }; }; - outputs = {...} @ args: import ./outputs.nix args; + outputs = { ... } @ args: import ./outputs.nix args; } diff --git a/home/configurations.nix b/home/configurations.nix index 0593981..60588da 100644 --- a/home/configurations.nix +++ b/home/configurations.nix @@ -1,29 +1,32 @@ -{ - self, - nixpkgs, - home-manager, -} @ inputs: let - hmConfiguration = { - homeDirectory ? "/home/dadada", - extraModules ? [], - system ? "x86_64-linux", - username ? "dadada", - stateVersion, - }: (home-manager.lib.homeManagerConfiguration { - configuration = {...}: { - imports = (nixpkgs.lib.attrValues self.hmModules) ++ extraModules; - nixpkgs = { - config = import ./nixpkgs-config.nix { - pkgs = nixpkgs; +{ self +, nixpkgs +, home-manager +, +} @ inputs: +let + hmConfiguration = + { homeDirectory ? "/home/dadada" + , extraModules ? [ ] + , system ? "x86_64-linux" + , username ? "dadada" + , stateVersion + , + }: (home-manager.lib.homeManagerConfiguration { + configuration = { ... }: { + imports = (nixpkgs.lib.attrValues self.hmModules) ++ extraModules; + nixpkgs = { + config = import ./nixpkgs-config.nix { + pkgs = nixpkgs; + }; }; + manual.manpages.enable = false; }; - manual.manpages.enable = false; - }; - inherit system homeDirectory username stateVersion; - }); -in { + inherit system homeDirectory username stateVersion; + }); +in +{ home = hmConfiguration { - extraModules = [./home]; + extraModules = [ ./home ]; stateVersion = "20.09"; }; } diff --git a/home/home/default.nix b/home/home/default.nix index afcee54..44f5ca5 100644 --- a/home/home/default.nix +++ b/home/home/default.nix @@ -1,9 +1,9 @@ -{ - config, - pkgs, - lib, - ... -}: let +{ config +, pkgs +, lib +, ... +}: +let useFeatures = [ "alacritty" #"emacs" @@ -18,7 +18,8 @@ "xdg" "zsh" ]; -in { +in +{ programs.git = { signing = { key = "D68C84695C087E0F733A28D0EEB8D1CE62C4DFEA"; @@ -31,7 +32,7 @@ in { programs.gpg.settings.default-key = "99658A3EB5CD7C13"; dadada.home = - lib.attrsets.genAttrs useFeatures (useFeatures: {enable = true;}) + lib.attrsets.genAttrs useFeatures (useFeatures: { enable = true; }) // { session = { enable = true; @@ -49,8 +50,8 @@ in { systemd.user.services."languagetool-http-server" = { Unit = { Description = "Languagetool HTTP server"; - PartOf = ["graphical-session-pre.target"]; - After = ["graphical-session.target"]; + PartOf = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; }; Service = { @@ -59,11 +60,11 @@ in { Restart = "always"; }; - Install = {WantedBy = ["graphical-session.target"];}; + Install = { WantedBy = [ "graphical-session.target" ]; }; }; # Let Home Manager install and manage itself. programs.home-manager.enable = true; - home.packages = import ./pkgs.nix {pkgs = pkgs;}; + home.packages = import ./pkgs.nix { pkgs = pkgs; }; } diff --git a/home/home/pkgs.nix b/home/home/pkgs.nix index 9ec1fb5..b6b78c3 100644 --- a/home/home/pkgs.nix +++ b/home/home/pkgs.nix @@ -1,4 +1,4 @@ -{pkgs}: +{ pkgs }: with pkgs; [ anki aqbanking diff --git a/home/modules/alacritty/default.nix b/home/modules/alacritty/default.nix index 2faace4..2eacc99 100644 --- a/home/modules/alacritty/default.nix +++ b/home/modules/alacritty/default.nix @@ -1,12 +1,12 @@ -{ - pkgs, - lib, - config, - ... +{ pkgs +, lib +, config +, ... }: with lib; let cfg = config.dadada.home.alacritty; -in { +in +{ options.dadada.home.alacritty = { enable = mkEnableOption "Enable alacritty config"; }; diff --git a/home/modules/colors.nix b/home/modules/colors.nix index 5a2f594..5c197a1 100644 --- a/home/modules/colors.nix +++ b/home/modules/colors.nix @@ -1,7 +1,6 @@ -{ - config, - lib, - ... +{ config +, lib +, ... }: with lib; { options.dadada.home.colors = mkOption { diff --git a/home/modules/default.nix b/home/modules/default.nix index 4d4eff8..5e29743 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -1,12 +1,11 @@ -{ - self, - nix-doom-emacs, - ... +{ self +, nix-doom-emacs +, ... } @ inputs: { alacritty = import ./alacritty; colors = import ./colors.nix; direnv = import ./direnv.nix; - emacs = import ./emacs {inherit nix-doom-emacs;}; + emacs = import ./emacs { inherit nix-doom-emacs; }; fish = import ./fish.nix; git = import ./git.nix; gpg = import ./gpg.nix; diff --git a/home/modules/direnv.nix b/home/modules/direnv.nix index acc00ea..cf36bf1 100644 --- a/home/modules/direnv.nix +++ b/home/modules/direnv.nix @@ -1,12 +1,12 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.home.direnv; -in { +in +{ options.dadada.home.direnv = { enable = mkEnableOption "Enable direnv config"; }; diff --git a/home/modules/emacs/default.nix b/home/modules/emacs/default.nix index 9d13d78..ded8f05 100644 --- a/home/modules/emacs/default.nix +++ b/home/modules/emacs/default.nix @@ -1,13 +1,13 @@ -{nix-doom-emacs, ...}: { - config, - pkgs, - lib, - ... -}: +{ nix-doom-emacs, ... }: { config + , pkgs + , lib + , ... + }: with lib; let cfg = config.dadada.home.emacs; -in { - imports = [nix-doom-emacs.hmModule]; +in +{ + imports = [ nix-doom-emacs.hmModule ]; options.dadada.home.emacs = { enable = mkEnableOption "Enable dadada emacs config"; }; @@ -17,40 +17,42 @@ in { doomPrivateDir = ./doom.d; emacsPackagesOverlay = self: super: with pkgs; { - tsc = super.tsc.overrideAttrs (old: let - libtsc_dyn = rustPlatform.buildRustPackage rec { - pname = "emacs-tree-sitter"; - version = "0.15.1"; - src = fetchFromGitHub { - owner = "ubolonton"; - repo = "emacs-tree-sitter"; - rev = version; - sha256 = "sha256-WgkGtmw63+kRLTRiSEO4bFF2IguH5g4odCujyazkwJc="; + tsc = super.tsc.overrideAttrs (old: + let + libtsc_dyn = rustPlatform.buildRustPackage rec { + pname = "emacs-tree-sitter"; + version = "0.15.1"; + src = fetchFromGitHub { + owner = "ubolonton"; + repo = "emacs-tree-sitter"; + rev = version; + sha256 = "sha256-WgkGtmw63+kRLTRiSEO4bFF2IguH5g4odCujyazkwJc="; + }; + preBuild = '' + export BINDGEN_EXTRA_CLANG_ARGS="$(< ${stdenv.cc}/nix-support/libc-crt1-cflags) \ + $(< ${stdenv.cc}/nix-support/libc-cflags) \ + $(< ${stdenv.cc}/nix-support/cc-cflags) \ + $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ + ${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \ + ${lib.optionalString stdenv.cc.isGNU + "-isystem ${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${lib.getVersion stdenv.cc.cc}/include/"} \ + ${lib.optionalString stdenv.cc.isGNU + "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/${stdenv.hostPlatform.config}"} \ + $NIX_CFLAGS_COMPILE" + ''; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + cargoHash = "sha256-HB5tFR1slY2D6jb2mt4KrGrGBUUVrxiBjmVycO+qfYY="; }; + in + { + inherit (libtsc_dyn) src; preBuild = '' - export BINDGEN_EXTRA_CLANG_ARGS="$(< ${stdenv.cc}/nix-support/libc-crt1-cflags) \ - $(< ${stdenv.cc}/nix-support/libc-cflags) \ - $(< ${stdenv.cc}/nix-support/cc-cflags) \ - $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ - ${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \ - ${lib.optionalString stdenv.cc.isGNU - "-isystem ${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${lib.getVersion stdenv.cc.cc}/include/"} \ - ${lib.optionalString stdenv.cc.isGNU - "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/${stdenv.hostPlatform.config}"} \ - $NIX_CFLAGS_COMPILE" + ext=${stdenv.hostPlatform.extensions.sharedLibrary} + dest=$out/share/emacs/site-lisp/elpa/tsc-${old.version} + install -D ${libtsc_dyn}/lib/libtsc_dyn$ext $dest/tsc-dyn$ext + echo -n "0.15.1" > $dest/DYN-VERSION ''; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - cargoHash = "sha256-HB5tFR1slY2D6jb2mt4KrGrGBUUVrxiBjmVycO+qfYY="; - }; - in { - inherit (libtsc_dyn) src; - preBuild = '' - ext=${stdenv.hostPlatform.extensions.sharedLibrary} - dest=$out/share/emacs/site-lisp/elpa/tsc-${old.version} - install -D ${libtsc_dyn}/lib/libtsc_dyn$ext $dest/tsc-dyn$ext - echo -n "0.15.1" > $dest/DYN-VERSION - ''; - }); + }); tree-sitter-langs = super.tree-sitter-langs.overrideAttrs (old: { postInstall = '' dest=$out/share/emacs/site-lisp/elpa/tree-sitter-langs-${old.version} @@ -61,7 +63,7 @@ in { }); }; }; - home.file.".tree-sitter".source = pkgs.runCommand "grammars" {} '' + home.file.".tree-sitter".source = pkgs.runCommand "grammars" { } '' mkdir -p $out/bin echo -n "0.10.2" > $out/BUNDLE-VERSION ${lib.concatStringsSep "\n" diff --git a/home/modules/fish.nix b/home/modules/fish.nix index dcbc5fc..e10f6b2 100644 --- a/home/modules/fish.nix +++ b/home/modules/fish.nix @@ -1,12 +1,12 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.home.fish; -in { +in +{ options.dadada.home.fish = { enable = mkEnableOption "Enable fish config"; }; @@ -80,6 +80,6 @@ in { }; }; - home.packages = [pkgs.exa]; + home.packages = [ pkgs.exa ]; }; } diff --git a/home/modules/git.nix b/home/modules/git.nix index 1df4884..c85cdd2 100644 --- a/home/modules/git.nix +++ b/home/modules/git.nix @@ -1,12 +1,12 @@ -{ - config, - lib, - pkgs, - ... +{ config +, lib +, pkgs +, ... }: with lib; let cfg = config.dadada.home.git; -in { +in +{ options.dadada.home.git = { enable = mkEnableOption "Enable git config"; }; @@ -19,7 +19,7 @@ in { tab-in-indent = true; tabwidth = 4; }; - alias = {}; + alias = { }; pager = "delta"; }; column.ui = "never"; diff --git a/home/modules/gpg.nix b/home/modules/gpg.nix index cfe7acb..e8c159a 100644 --- a/home/modules/gpg.nix +++ b/home/modules/gpg.nix @@ -1,11 +1,11 @@ -{ - config, - lib, - ... +{ config +, lib +, ... }: with lib; let cfg = config.dadada.home.gpg; -in { +in +{ options.dadada.home.gpg = { enable = mkEnableOption "Enable GnuPG config"; }; @@ -31,7 +31,7 @@ in { }; programs.git.extraConfig = { - commit = {gpgSign = true;}; + commit = { gpgSign = true; }; }; }; } diff --git a/home/modules/gtk.nix b/home/modules/gtk.nix index 5128202..dc91693 100644 --- a/home/modules/gtk.nix +++ b/home/modules/gtk.nix @@ -1,12 +1,12 @@ -{ - config, - lib, - pkgs, - ... +{ config +, lib +, pkgs +, ... }: with lib; let cfg = config.dadada.home.gtk; -in { +in +{ options.dadada.home.gtk = { enable = mkEnableOption "Enable GTK config"; }; diff --git a/home/modules/keyring.nix b/home/modules/keyring.nix index ff00bd7..382ca32 100644 --- a/home/modules/keyring.nix +++ b/home/modules/keyring.nix @@ -1,18 +1,18 @@ -{ - config, - lib, - ... +{ config +, lib +, ... }: with lib; let cfg = config.dadada.home.keyring; -in { +in +{ options.dadada.home.keyring = { enable = mkEnableOption "Enable keyring config"; }; config = mkIf cfg.enable { services.gnome-keyring = { enable = false; - components = ["pkcs11" "secrets"]; + components = [ "pkcs11" "secrets" ]; }; }; } diff --git a/home/modules/kitty/default.nix b/home/modules/kitty/default.nix index b90a61f..982d938 100644 --- a/home/modules/kitty/default.nix +++ b/home/modules/kitty/default.nix @@ -1,12 +1,12 @@ -{ - pkgs, - lib, - config, - ... +{ pkgs +, lib +, config +, ... }: with lib; let cfg = config.dadada.home.kitty; -in { +in +{ options.dadada.home.kitty = { enable = mkEnableOption "Enable kitty config"; }; @@ -15,6 +15,6 @@ in { enable = true; extraConfig = builtins.readFile ./config; }; - home.packages = [pkgs.source-code-pro]; + home.packages = [ pkgs.source-code-pro ]; }; } diff --git a/home/modules/mako.nix b/home/modules/mako.nix index 77d99f7..7fd49b6 100644 --- a/home/modules/mako.nix +++ b/home/modules/mako.nix @@ -1,13 +1,13 @@ -{ - config, - lib, - pkgs, - colors, - ... +{ config +, lib +, pkgs +, colors +, ... }: with lib; let cfg = config.dadada.home.mako; -in { +in +{ options.dadada.home.mako = { enable = mkEnableOption "Enable mako config"; }; diff --git a/home/modules/session.nix b/home/modules/session.nix index 61236eb..4da85a8 100644 --- a/home/modules/session.nix +++ b/home/modules/session.nix @@ -1,17 +1,17 @@ -{ - config, - lib, - ... +{ config +, lib +, ... }: with lib; let cfg = config.dadada.home.session; -in { +in +{ options.dadada.home.session = { enable = mkEnableOption "Enable session variable management"; sessionVars = mkOption { description = "Session variables"; type = types.attrs; - default = {}; + default = { }; example = '' EDITOR = "vim"; PAGER = "less"; diff --git a/home/modules/ssh.nix b/home/modules/ssh.nix index ee4d227..96f4ed3 100644 --- a/home/modules/ssh.nix +++ b/home/modules/ssh.nix @@ -1,11 +1,11 @@ -{ - config, - lib, - ... +{ config +, lib +, ... }: with lib; let cfg = config.dadada.home.ssh; -in { +in +{ options.dadada.home.ssh = { enable = mkEnableOption "Enable SSH config"; }; diff --git a/home/modules/sway/default.nix b/home/modules/sway/default.nix index e28cc33..0f99485 100644 --- a/home/modules/sway/default.nix +++ b/home/modules/sway/default.nix @@ -1,13 +1,13 @@ -{ - config, - pkgs, - lib, - colors, - ... +{ config +, pkgs +, lib +, colors +, ... }: with lib; let cfg = config.dadada.home.sway; -in { +in +{ options.dadada.home.sway = { enable = mkEnableOption "Enable Sway config"; }; diff --git a/home/modules/syncthing.nix b/home/modules/syncthing.nix index b8ac74b..fd566b4 100644 --- a/home/modules/syncthing.nix +++ b/home/modules/syncthing.nix @@ -1,12 +1,12 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.home.syncthing; -in { +in +{ options.dadada.home.syncthing = { enable = mkEnableOption "Enable Syncthing config"; }; diff --git a/home/modules/termite.nix b/home/modules/termite.nix index a3c43db..77bb1e6 100644 --- a/home/modules/termite.nix +++ b/home/modules/termite.nix @@ -1,13 +1,13 @@ -{ - config, - lib, - pkgs, - colors ? ../../lib/colors.nix, - ... +{ config +, lib +, pkgs +, colors ? ../../lib/colors.nix +, ... }: with lib; let cfg = config.dadada.home.termite; -in { +in +{ options.dadada.home.termite = { enable = mkEnableOption "Enable termite config"; }; diff --git a/home/modules/tmux.nix b/home/modules/tmux.nix index cc68bbe..70f2974 100644 --- a/home/modules/tmux.nix +++ b/home/modules/tmux.nix @@ -1,11 +1,11 @@ -{ - config, - lib, - ... +{ config +, lib +, ... }: with lib; let cfg = config.dadada.home.tmux; -in { +in +{ options.dadada.home.tmux = { enable = mkEnableOption "Enable tmux config"; }; diff --git a/home/modules/vim/default.nix b/home/modules/vim/default.nix index efc74ab..fa7e60f 100644 --- a/home/modules/vim/default.nix +++ b/home/modules/vim/default.nix @@ -1,13 +1,13 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.home.vim; - vimPlugins = pkgs.callPackage ../../../pkgs/vimPlugins {}; -in { + vimPlugins = pkgs.callPackage ../../../pkgs/vimPlugins { }; +in +{ options.dadada.home.vim = { enable = mkEnableOption "Enable VIM config"; }; diff --git a/home/modules/xdg.nix b/home/modules/xdg.nix index 85feff5..a034c87 100644 --- a/home/modules/xdg.nix +++ b/home/modules/xdg.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let apps = { @@ -23,7 +22,8 @@ with lib; let "application/pdf" = "org.pwmt.zathura.desktop"; }; cfg = config.dadada.home.xdg; -in { +in +{ options.dadada.home.xdg = { enable = mkEnableOption "Enable XDG config"; }; diff --git a/home/modules/zsh.nix b/home/modules/zsh.nix index c192094..59453c2 100644 --- a/home/modules/zsh.nix +++ b/home/modules/zsh.nix @@ -1,12 +1,12 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.home.zsh; -in { +in +{ options.dadada.home.zsh = { enable = mkEnableOption "Enable ZSH config"; }; diff --git a/home/nixpkgs-config.nix b/home/nixpkgs-config.nix index 8939fc5..83fcdbc 100644 --- a/home/nixpkgs-config.nix +++ b/home/nixpkgs-config.nix @@ -1,4 +1,4 @@ -{pkgs}: { +{ pkgs }: { allowUnfree = true; allowUnfreePredicate = pkg: true; allowBroken = false; diff --git a/lib/default.nix b/lib/default.nix index 7b055cd..0260022 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,4 +1,4 @@ -{pkgs}: +{ pkgs }: with pkgs.lib; { # TODO } diff --git a/nixos/agares/configuration.nix b/nixos/agares/configuration.nix index 9c31239..7832a55 100644 --- a/nixos/agares/configuration.nix +++ b/nixos/agares/configuration.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { imports = [ ./hardware-configuration.nix @@ -48,10 +47,10 @@ networking.bridges = { "br-lan" = { - interfaces = ["lan"]; + interfaces = [ "lan" ]; }; "br-backup" = { - interfaces = ["backup"]; + interfaces = [ "backup" ]; }; }; diff --git a/nixos/agares/hardware-configuration.nix b/nixos/agares/hardware-configuration.nix index d15b480..fdd49d2 100644 --- a/nixos/agares/hardware-configuration.nix +++ b/nixos/agares/hardware-configuration.nix @@ -1,28 +1,27 @@ # 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, - modulesPath, - ... +{ config +, lib +, pkgs +, modulesPath +, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "ehci_pci" "usb_storage" "sd_mod" "sdhci_pci"]; - boot.initrd.kernelModules = []; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "ehci_pci" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/sda1"; fsType = "btrfs"; - options = ["subvol=root"]; + options = [ "subvol=root" ]; }; - swapDevices = []; + swapDevices = [ ]; # The global useDHCP flag is deprecated, therefore explicitly set to false here. # Per-interface useDHCP will be mandatory in the future, so this generated config diff --git a/nixos/configurations.nix b/nixos/configurations.nix index dadf1f9..f7be74d 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -1,31 +1,33 @@ -{ - self, - admins, - nixpkgs, - nixosSystem, - home-manager, - homePage, - nixos-hardware, - nvd, - scripts, - recipemd, -}: let +{ self +, admins +, nixpkgs +, nixosSystem +, home-manager +, homePage +, nixos-hardware +, nvd +, scripts +, recipemd +, +}: +let adapterModule = system: { nixpkgs.config.allowUnfreePredicate = pkg: true; nixpkgs.overlays = (nixpkgs.lib.attrValues self.overlays) ++ [ - (final: prev: {homePage = homePage.defaultPackage.${system};}) - (final: prev: {s = scripts;}) - (final: prev: {n = nvd;}) - (final: prev: {recipemd = recipemd.defaultPackage.${system};}) + (final: prev: { homePage = homePage.defaultPackage.${system}; }) + (final: prev: { s = scripts; }) + (final: prev: { n = nvd; }) + (final: prev: { recipemd = recipemd.defaultPackage.${system}; }) ]; }; lib = nixpkgs.lib; adminConfig = users: { dadada.admin.users = lib.getAttrs users admins; }; -in { +in +{ gorgon = nixosSystem rec { system = "x86_64-linux"; modules = @@ -40,7 +42,7 @@ in { home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules) ++ [ - {manual.manpages.enable = false;} + { manual.manpages.enable = false; } ]; home-manager.users.dadada = import ../home/home; } @@ -53,7 +55,7 @@ in { modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [ - (adminConfig ["dadada"]) + (adminConfig [ "dadada" ]) (adapterModule system) ./modules/profiles/server.nix ./ifrit/configuration.nix @@ -65,7 +67,7 @@ in { modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [ - (adminConfig ["dadada"]) + (adminConfig [ "dadada" ]) (adapterModule system) ./modules/profiles/server.nix ./surgat/configuration.nix @@ -76,7 +78,7 @@ in { modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [ - (adminConfig ["dadada"]) + (adminConfig [ "dadada" ]) (adapterModule system) ./modules/profiles/laptop.nix ./pruflas/configuration.nix @@ -88,7 +90,7 @@ in { modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [ - (adminConfig ["dadada"]) + (adminConfig [ "dadada" ]) (adapterModule system) ./modules/profiles/server.nix ./agares/configuration.nix diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index 00bba50..6a164ba 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -1,20 +1,21 @@ -{ - config, - pkgs, - lib, - ... -}: let +{ config +, pkgs +, lib +, ... +}: +let signHook = pkgs.writeShellScript "/etc/nix/sign-cache.sh" - '' - set -eu - set -f # disable globbing - export IFS=' ' + '' + set -eu + set -f # disable globbing + export IFS=' ' - echo "Signing paths" $OUT_PATHS - nix store sign --key-file /etc/nix/key.private $OUT_PATHS - ''; -in { + echo "Signing paths" $OUT_PATHS + nix store sign --key-file /etc/nix/key.private $OUT_PATHS + ''; +in +{ imports = [ ./hardware-configuration.nix ]; @@ -26,7 +27,7 @@ in { keep-derivations = true ''; - boot.kernelModules = ["kvm-amd"]; + boot.kernelModules = [ "kvm-amd" ]; networking.hostName = "gorgon"; @@ -103,23 +104,23 @@ in { users.users = { dadada = { isNormalUser = true; - extraGroups = ["wheel" "networkmanager" "libvirtd" "adbusers" "kvm" "video" "scanner" "lp" "docker"]; + extraGroups = [ "wheel" "networkmanager" "libvirtd" "adbusers" "kvm" "video" "scanner" "lp" "docker" ]; shell = "/run/current-system/sw/bin/zsh"; }; }; networking.hosts = { - "10.1.2.9" = ["fgprinter.fginfo.tu-bs.de"]; - "127.0.0.2" = ["kanboard.dadada.li"]; + "10.1.2.9" = [ "fgprinter.fginfo.tu-bs.de" ]; + "127.0.0.2" = [ "kanboard.dadada.li" ]; }; networking.wireguard.interfaces.uwupn = { - ips = ["10.11.0.24/32" "fc00:1337:dead:beef::10.11.0.24/128"]; + ips = [ "10.11.0.24/32" "fc00:1337:dead:beef::10.11.0.24/128" ]; privateKeyFile = "/var/lib/wireguard/uwu"; peers = [ { publicKey = "tuoiOWqgHz/lrgTcLjX+xIhvxh9jDH6gmDw2ZMvX5T8="; - allowedIPs = ["10.11.0.0/22" "fc00:1337:dead:beef::10.11.0.0/118" "192.168.178.0/23"]; + allowedIPs = [ "10.11.0.0/22" "fc00:1337:dead:beef::10.11.0.0/118" "192.168.178.0/23" ]; endpoint = "53c70r.de:51820"; persistentKeepalive = 25; } diff --git a/nixos/gorgon/hardware-configuration.nix b/nixos/gorgon/hardware-configuration.nix index 25a7265..4155fae 100644 --- a/nixos/gorgon/hardware-configuration.nix +++ b/nixos/gorgon/hardware-configuration.nix @@ -1,21 +1,20 @@ # 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, - modulesPath, - ... +{ config +, lib +, pkgs +, modulesPath +, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; - boot.initrd.kernelModules = ["dm-snapshot"]; - boot.kernelModules = ["kvm-amd"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/2478e089-e5d6-480c-8530-4ea46988f9f7"; @@ -38,7 +37,7 @@ }; swapDevices = [ - {device = "/dev/disk/by-uuid/92310a00-7f69-4775-85cb-38e1790f71db";} + { device = "/dev/disk/by-uuid/92310a00-7f69-4775-85cb-38e1790f71db"; } ]; nix.settings.max-jobs = lib.mkDefault 16; diff --git a/nixos/ifrit/configuration.nix b/nixos/ifrit/configuration.nix index 5001b9a..0a71801 100644 --- a/nixos/ifrit/configuration.nix +++ b/nixos/ifrit/configuration.nix @@ -1,16 +1,17 @@ -{ - config, - pkgs, - lib, - ... -}: let +{ config +, pkgs +, lib +, ... +}: +let hostAliases = [ "ifrit.dadada.li" "media.dadada.li" "backup0.dadada.li" ]; backups = "/mnt/storage/backup"; -in { +in +{ imports = [ ./hardware-configuration.nix ]; @@ -26,50 +27,50 @@ in { services.borgbackup.repos = { "metis" = { allowSubRepos = false; - authorizedKeysAppendOnly = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDnc1gCi8lbhlLmPKvaExtCxVaAni8RrOuHUQO6wTbzR root@metis"]; - authorizedKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis"]; + authorizedKeysAppendOnly = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDnc1gCi8lbhlLmPKvaExtCxVaAni8RrOuHUQO6wTbzR root@metis" ]; + authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis" ]; path = "${backups}/metis"; quota = "1T"; }; "gorgon" = { allowSubRepos = false; - authorizedKeysAppendOnly = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP6p9b2D7y2W+9BGee2yk2xsCRewNNaE6oS3CqlW61ti root@gorgon"]; - authorizedKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis"]; + authorizedKeysAppendOnly = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP6p9b2D7y2W+9BGee2yk2xsCRewNNaE6oS3CqlW61ti root@gorgon" ]; + authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis" ]; path = "${backups}/gorgon"; quota = "1T"; }; "surgat" = { allowSubRepos = false; - authorizedKeysAppendOnly = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINGhatanrNG+M6jAkU7Yi44mJmTreJkqyZ6Z+qiEgV7O root@surgat"]; - authorizedKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis"]; + authorizedKeysAppendOnly = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINGhatanrNG+M6jAkU7Yi44mJmTreJkqyZ6Z+qiEgV7O root@surgat" ]; + authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis" ]; path = "${backups}/surgat"; quota = "50G"; }; "pruflas" = { allowSubRepos = false; - authorizedKeysAppendOnly = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBk7f9DSnXCOIUsxFsjCKG23vHShV4TSzzPJunPOwa1I root@pruflas"]; - authorizedKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis"]; + authorizedKeysAppendOnly = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBk7f9DSnXCOIUsxFsjCKG23vHShV4TSzzPJunPOwa1I root@pruflas" ]; + authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis" ]; path = "${backups}/pruflas"; quota = "50G"; }; "wohnzimmerpi" = { allowSubRepos = false; - authorizedKeysAppendOnly = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6uZ8mPQJWOL984gZKKPyxp7VLcxk42TpTh5iPP6N6k root@wohnzimmerpi"]; - authorizedKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis"]; + authorizedKeysAppendOnly = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6uZ8mPQJWOL984gZKKPyxp7VLcxk42TpTh5iPP6N6k root@wohnzimmerpi" ]; + authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis" ]; path = "${backups}/wohnzimmerpi"; quota = "50G"; }; "fginfo" = { allowSubRepos = false; - authorizedKeysAppendOnly = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxsyJeZVlVix0FPE8S/Gx0DVutS1ZNESVdYvHBwo36wGlYpSsQoSy/2HSwbpxs88MOGw1QNboxvvpBxCWxZ5HyjxuO5SwYgtmpjPXvmqfVqNXXnLChhSnKgk9b+HesQJCbHyrF9ZAJXEFCOGhOL3YTgd6lTX3lQUXgh/LEDlrPrigUMDNPecPWxpPskP6Vvpe9u+duhL+ihyxXaV+CoPk8nkWrov5jCGPiM48pugbwAfqARyZDgFpmWwL7Xg2UKgVZ1ttHZCWwH+htgioVZMYpdkQW1aq6LLGwN34Hj2VKXzmJN5frh6vQoZr2AFGHNKyJwAMpqnoY//QwuREpZTrh root@fginfo.ibr.cs.tu-bs.de"]; - authorizedKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis"]; + authorizedKeysAppendOnly = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxsyJeZVlVix0FPE8S/Gx0DVutS1ZNESVdYvHBwo36wGlYpSsQoSy/2HSwbpxs88MOGw1QNboxvvpBxCWxZ5HyjxuO5SwYgtmpjPXvmqfVqNXXnLChhSnKgk9b+HesQJCbHyrF9ZAJXEFCOGhOL3YTgd6lTX3lQUXgh/LEDlrPrigUMDNPecPWxpPskP6Vvpe9u+duhL+ihyxXaV+CoPk8nkWrov5jCGPiM48pugbwAfqARyZDgFpmWwL7Xg2UKgVZ1ttHZCWwH+htgioVZMYpdkQW1aq6LLGwN34Hj2VKXzmJN5frh6vQoZr2AFGHNKyJwAMpqnoY//QwuREpZTrh root@fginfo.ibr.cs.tu-bs.de" ]; + authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis" ]; path = "${backups}/fginfo"; quota = "10G"; }; "fginfo-git" = { allowSubRepos = false; - authorizedKeysAppendOnly = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDmI6cUv3j0T9ofFB286sDwXwwczqi41cp4MZyGH3VWQnqBPNjICqAdY3CLhgvGBCxSe6ZgKQ+5YLsGSSlU1uhrJXW2UiVKuIPd0kjMF/9e8hmNoTTh0pdk9THfz9LLAdI1vPin1EeVReuDXlZkCI7DFYuTO9yiyZ1uLZUfT1KBRoqiqyypZhut7zT3UaDs2L+Y5hho6WiTdm7INuz6HEB7qYXzrmx93hlcuLZA7fDfyMO9F4APZFUqefcUIEyDI2b+Q/8Q2/rliT2PoC69XLVlj7HyVhfgKsOnopwBDNF3rRcJ6zz4WICPM18i4ZCmfoDTL/cFr5c41Lan1X7wS5wR root@fginfo-git"]; - authorizedKeys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis"]; + authorizedKeysAppendOnly = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDmI6cUv3j0T9ofFB286sDwXwwczqi41cp4MZyGH3VWQnqBPNjICqAdY3CLhgvGBCxSe6ZgKQ+5YLsGSSlU1uhrJXW2UiVKuIPd0kjMF/9e8hmNoTTh0pdk9THfz9LLAdI1vPin1EeVReuDXlZkCI7DFYuTO9yiyZ1uLZUfT1KBRoqiqyypZhut7zT3UaDs2L+Y5hho6WiTdm7INuz6HEB7qYXzrmx93hlcuLZA7fDfyMO9F4APZFUqefcUIEyDI2b+Q/8Q2/rliT2PoC69XLVlj7HyVhfgKsOnopwBDNF3rRcJ6zz4WICPM18i4ZCmfoDTL/cFr5c41Lan1X7wS5wR root@fginfo-git" ]; + authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJyTgdVPPxQeL5KZo9frZQlDIv2QkelJw3gNGoGtUMfw tim@metis" ]; path = "${backups}/fginfo-git"; quota = "10G"; }; @@ -101,7 +102,7 @@ in { device = "/dev/disk/by-uuid/a34e36fc-d7dd-4ceb-93c4-48f9c2727cb7"; mountPoint = "/mnt/storage"; neededForBoot = false; - options = ["nofail"]; + options = [ "nofail" ]; }; networking.firewall = { @@ -116,7 +117,7 @@ in { isNormalUser = true; }; - environment.systemPackages = [pkgs.curl]; + environment.systemPackages = [ pkgs.curl ]; system.stateVersion = "20.03"; } diff --git a/nixos/ifrit/hardware-configuration.nix b/nixos/ifrit/hardware-configuration.nix index 07e3b3f..125e24d 100644 --- a/nixos/ifrit/hardware-configuration.nix +++ b/nixos/ifrit/hardware-configuration.nix @@ -1,21 +1,20 @@ # 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, - modulesPath, - ... +{ config +, lib +, pkgs +, modulesPath +, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "ehci_pci" "sd_mod" "sr_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/0b4f5f01-5849-4f05-9822-b648abbc2485"; @@ -23,7 +22,7 @@ }; swapDevices = [ - {device = "/dev/disk/by-uuid/53b5715e-2724-4800-9cfc-f892115681b6";} + { device = "/dev/disk/by-uuid/53b5715e-2724-4800-9cfc-f892115681b6"; } ]; nix.settings.max-jobs = lib.mkDefault 2; diff --git a/nixos/modules/admin.nix b/nixos/modules/admin.nix index 90123e7..7dd5eb0 100644 --- a/nixos/modules/admin.nix +++ b/nixos/modules/admin.nix @@ -1,12 +1,11 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.admin; - extraGroups = ["wheel" "libvirtd"]; + extraGroups = [ "wheel" "libvirtd" ]; shells = { "bash" = pkgs.bashInteractive; @@ -16,40 +15,41 @@ with lib; let shellNames = builtins.attrNames shells; - adminOpts = { - name, - config, - ... - }: { - options = { - keys = mkOption { - type = types.listOf types.str; - default = []; - apply = x: assert (builtins.length x > 0 || abort "Please specify at least one key to be able to log in"); x; - description = '' - The keys that should be able to access the account. - ''; - }; - shell = mkOption { - type = types.nullOr types.str; - apply = x: assert (builtins.elem x shellNames || abort "Please specify one of ${builtins.toString shellNames}"); x; - default = "zsh"; - defaultText = literalExpression "zsh"; - example = literalExpression "bash"; - description = '' - One of ${builtins.toString shellNames} - ''; + adminOpts = + { name + , config + , ... + }: { + options = { + keys = mkOption { + type = types.listOf types.str; + default = [ ]; + apply = x: assert (builtins.length x > 0 || abort "Please specify at least one key to be able to log in"); x; + description = '' + The keys that should be able to access the account. + ''; + }; + shell = mkOption { + type = types.nullOr types.str; + apply = x: assert (builtins.elem x shellNames || abort "Please specify one of ${builtins.toString shellNames}"); x; + default = "zsh"; + defaultText = literalExpression "zsh"; + example = literalExpression "bash"; + description = '' + One of ${builtins.toString shellNames} + ''; + }; }; }; - }; -in { +in +{ options = { dadada.admin = { enable = mkEnableOption "Enable admin access"; users = mkOption { type = with types; attrsOf (submodule adminOpts); - default = {}; + default = { }; description = '' Admin users with root access machine. ''; @@ -76,13 +76,13 @@ in { users.users = mapAttrs - (user: keys: { - shell = shells."${keys.shell}"; - extraGroups = extraGroups; - isNormalUser = true; - openssh.authorizedKeys.keys = keys.keys; - }) - cfg.users; + (user: keys: { + shell = shells."${keys.shell}"; + extraGroups = extraGroups; + isNormalUser = true; + openssh.authorizedKeys.keys = keys.keys; + }) + cfg.users; nix.trustedUsers = builtins.attrNames cfg.users; @@ -96,7 +96,7 @@ in { services.tor.relay.onionServices = { "rat" = mkIf cfg.rat.enable { name = "rat"; - map = [{port = 22;}]; + map = [{ port = 22; }]; }; }; }; diff --git a/nixos/modules/backup.nix b/nixos/modules/backup.nix index 8bfe8bb..8887057 100644 --- a/nixos/modules/backup.nix +++ b/nixos/modules/backup.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let backupExcludes = [ @@ -24,7 +23,8 @@ with lib; let "/var/tmp" ]; cfg = config.dadada.backupClient; -in { +in +{ options = { dadada.backupClient = { gs = { @@ -62,7 +62,7 @@ in { "/backup" = { device = "/dev/disk/by-uuid/0fdab735-cc3e-493a-b4ec-cbf6a77d48d5"; fsType = "ext4"; - options = ["x-systemd.automount" "noauto" "x-systemd.idle-timeout=600"]; + options = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=600" ]; }; }; diff --git a/nixos/modules/ddns.nix b/nixos/modules/ddns.nix index b27dd97..47ecbae 100644 --- a/nixos/modules/ddns.nix +++ b/nixos/modules/ddns.nix @@ -1,41 +1,41 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.ddns; ddnsConfig = hostNames: { systemd.timers = listToAttrs (forEach hostNames (hostname: nameValuePair "ddns-${hostname}" - { - wantedBy = ["timers.target"]; - partOf = ["ddns-${hostname}.service"]; - timerConfig.OnCalendar = "hourly"; - })); + { + wantedBy = [ "timers.target" ]; + partOf = [ "ddns-${hostname}.service" ]; + timerConfig.OnCalendar = "hourly"; + })); systemd.services = listToAttrs (forEach hostNames (hostname: nameValuePair "ddns-${hostname}" - { - serviceConfig.Type = "oneshot"; - script = '' - function url() { - echo "https://svc.joker.com/nic/update?username=$1&password=$2&hostname=$3" - } + { + serviceConfig.Type = "oneshot"; + script = '' + function url() { + echo "https://svc.joker.com/nic/update?username=$1&password=$2&hostname=$3" + } - IFS=':' - read -r user password < /var/lib/ddns/credentials - unset IFS + IFS=':' + read -r user password < /var/lib/ddns/credentials + unset IFS - curl_url=$(url "$user" "$password" ${hostname}) + curl_url=$(url "$user" "$password" ${hostname}) - ${pkgs.curl}/bin/curl -4 "$curl_url" - ${pkgs.curl}/bin/curl -6 "$curl_url" - ''; - })); + ${pkgs.curl}/bin/curl -4 "$curl_url" + ${pkgs.curl}/bin/curl -6 "$curl_url" + ''; + })); }; -in { +in +{ options = { dadada.ddns.domains = mkOption { type = types.listOf types.str; @@ -45,7 +45,7 @@ in { example = '' [ "example.com" ] ''; - default = []; + default = [ ]; }; }; diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 72bff58..814e40e 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -1,4 +1,4 @@ -{...} @ inputs: { +{ ... } @ inputs: { admin = import ./admin.nix; backup = import ./backup.nix; ddns = import ./ddns.nix; diff --git a/nixos/modules/element.nix b/nixos/modules/element.nix index 052b0b4..2a45da1 100644 --- a/nixos/modules/element.nix +++ b/nixos/modules/element.nix @@ -1,11 +1,12 @@ -{ - config, - pkgs, - lib, - ... -}: let +{ config +, pkgs +, lib +, ... +}: +let cfg = config.dadada.element; -in { +in +{ options.dadada.element = { enable = lib.mkEnableOption "Enable element webapp"; }; diff --git a/nixos/modules/fido2.nix b/nixos/modules/fido2.nix index 7ec354d..8405798 100644 --- a/nixos/modules/fido2.nix +++ b/nixos/modules/fido2.nix @@ -1,13 +1,13 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let luks = config.dadada.luks; fido2 = config.dadada.fido2; -in { +in +{ options = { dadada.luks = { uuid = mkOption { diff --git a/nixos/modules/fileShare.nix b/nixos/modules/fileShare.nix index 7cd7849..5b6a0f2 100644 --- a/nixos/modules/fileShare.nix +++ b/nixos/modules/fileShare.nix @@ -1,14 +1,14 @@ -{ - config, - lib, - ... +{ config +, lib +, ... }: with lib; let cfg = config.dadada.fileShare; sharePath = "/mnt/storage/share"; ipv6 = "fd42:dead:beef::/48"; ipv4 = "192.168.42.0/24"; -in { +in +{ options.dadada.fileShare = { enable = mkEnableOption "Enable file share server"; }; diff --git a/nixos/modules/gitea.nix b/nixos/modules/gitea.nix index ef40b83..8ab8b11 100644 --- a/nixos/modules/gitea.nix +++ b/nixos/modules/gitea.nix @@ -1,12 +1,13 @@ -{ - config, - pkgs, - lib, - ... -}: let +{ config +, pkgs +, lib +, ... +}: +let redisSocket = "127.0.0.1:6379"; cfg = config.dadada.gitea; -in { +in +{ options.dadada.gitea = { enable = lib.mkEnableOption "Enable gitea"; }; diff --git a/nixos/modules/headphones.nix b/nixos/modules/headphones.nix index 105e67b..585a5dd 100644 --- a/nixos/modules/headphones.nix +++ b/nixos/modules/headphones.nix @@ -1,12 +1,12 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.headphones; -in { +in +{ options = { dadada.headphones = { enable = mkEnableOption "Enable bluetooth headphones with more audio codecs."; @@ -17,7 +17,7 @@ in { bluetooth.enable = true; pulseaudio = { enable = true; - extraModules = [pkgs.pulseaudio-modules-bt]; + extraModules = [ pkgs.pulseaudio-modules-bt ]; extraConfig = '' set-source-volume 1 10000 ''; diff --git a/nixos/modules/homepage.nix b/nixos/modules/homepage.nix index cd68876..ea0f8f9 100644 --- a/nixos/modules/homepage.nix +++ b/nixos/modules/homepage.nix @@ -1,22 +1,22 @@ -{ - config, - pkgs, - lib, - ... -}: let +{ config +, pkgs +, lib +, ... +}: +let cfg = config.dadada.homePage; in - with lib; { - options.dadada.homePage = { - enable = mkEnableOption "Enable home page"; - }; - config = mkIf cfg.enable { - services.nginx.enable = true; +with lib; { + options.dadada.homePage = { + enable = mkEnableOption "Enable home page"; + }; + config = mkIf cfg.enable { + services.nginx.enable = true; - services.nginx.virtualHosts."dadada.li" = { - enableACME = true; - forceSSL = true; - root = "${pkgs.homePage}"; - }; + services.nginx.virtualHosts."dadada.li" = { + enableACME = true; + forceSSL = true; + root = "${pkgs.homePage}"; }; - } + }; +} diff --git a/nixos/modules/kanboard/default.nix b/nixos/modules/kanboard/default.nix index f9063d2..e972977 100644 --- a/nixos/modules/kanboard/default.nix +++ b/nixos/modules/kanboard/default.nix @@ -1,12 +1,13 @@ # Source https://github.com/NixOS/nixpkgs/issues/113384 -{ - config, - lib, - pkgs, - ... -}: let +{ config +, lib +, pkgs +, ... +}: +let cfg = config.dadada.kanboard; -in { +in +{ options = { dadada.kanboard.enable = lib.mkEnableOption "Enable Kanboard"; }; @@ -23,7 +24,7 @@ in { }; users.users.kanboard.isSystemUser = true; users.users.kanboard.group = "kanboard"; - users.groups.kanboard.members = ["kanboard"]; + users.groups.kanboard.members = [ "kanboard" ]; systemd.tmpfiles.rules = [ "d /var/lib/kanboard/data 0750 kanboard nginx - -" @@ -35,7 +36,7 @@ in { root = pkgs.buildEnv { name = "kanboard-configured"; paths = [ - (pkgs.runCommand "kanboard-over" {meta.priority = 0;} '' + (pkgs.runCommand "kanboard-over" { meta.priority = 0; } '' mkdir -p $out for f in index.php jsonrpc.php ; do echo " $out/$f diff --git a/nixos/modules/networking.nix b/nixos/modules/networking.nix index 5cf00bd..734f964 100644 --- a/nixos/modules/networking.nix +++ b/nixos/modules/networking.nix @@ -1,13 +1,13 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.networking; vpnPubKey = "x/y6I59buVzv9Lfzl+b17mGWbzxU+3Ke9mQNa1DLsDI="; -in { +in +{ options = { dadada.networking = { localResolver = { @@ -18,7 +18,7 @@ in { wanInterfaces = mkOption { type = with types; listOf str; description = "WAN network interfaces"; - default = []; + default = [ ]; }; vpnExtension = mkOption { type = with types; nullOr str; @@ -122,7 +122,7 @@ in { networking.wireguard.interfaces = mkIf (cfg.vpnExtension != null) { dadada = { - ips = ["fd42:9c3b:f96d:201::${cfg.vpnExtension}/64"]; + ips = [ "fd42:9c3b:f96d:201::${cfg.vpnExtension}/64" ]; listenPort = 51234; privateKeyFile = "/var/lib/wireguard/privkey"; @@ -130,7 +130,7 @@ in { peers = [ { publicKey = vpnPubKey; - allowedIPs = ["fd42:9c3b:f96d::/48"]; + allowedIPs = [ "fd42:9c3b:f96d::/48" ]; endpoint = "vpn.dadada.li:51234"; persistentKeepalive = 25; } @@ -140,8 +140,8 @@ in { # https://lists.zx2c4.com/pipermail/wireguard/2017-November/002028.html systemd.timers.wg-reresolve-dns = mkIf (cfg.vpnExtension != null) { - wantedBy = ["timers.target"]; - partOf = ["wg-reresolve-dns.service"]; + wantedBy = [ "timers.target" ]; + partOf = [ "wg-reresolve-dns.service" ]; timerConfig.OnCalendar = "hourly"; }; systemd.services.wg-reresolve-dns = mkIf (cfg.vpnExtension != null) { diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index e674a4a..2b2b655 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -1,14 +1,12 @@ -{ - self, - home-manager, - nixpkgs, - ... -}: { - config, - pkgs, - lib, - ... -}: +{ self +, home-manager +, nixpkgs +, ... +}: { config + , pkgs + , lib + , ... + }: # Global settings for nix daemon { nix.nixPath = [ diff --git a/nixos/modules/profiles/laptop.nix b/nixos/modules/profiles/laptop.nix index eae911a..f734585 100644 --- a/nixos/modules/profiles/laptop.nix +++ b/nixos/modules/profiles/laptop.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; { networking.domain = mkDefault "dadada.li"; @@ -29,7 +28,7 @@ with lib; { vteIntegration = true; syntaxHighlighting = { enable = true; - highlighters = ["main" "brackets" "pattern" "root" "line"]; + highlighters = [ "main" "brackets" "pattern" "root" "line" ]; }; }; diff --git a/nixos/modules/profiles/server.nix b/nixos/modules/profiles/server.nix index ce55e42..487000a 100644 --- a/nixos/modules/profiles/server.nix +++ b/nixos/modules/profiles/server.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; { networking.domain = mkDefault "dadada.li"; diff --git a/nixos/modules/share.nix b/nixos/modules/share.nix index 914ff14..a4e5f9c 100644 --- a/nixos/modules/share.nix +++ b/nixos/modules/share.nix @@ -1,12 +1,12 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.share; -in { +in +{ options.dadada.share = { enable = mkEnableOption "Enable file share"; }; diff --git a/nixos/modules/steam.nix b/nixos/modules/steam.nix index 8c83444..82944eb 100644 --- a/nixos/modules/steam.nix +++ b/nixos/modules/steam.nix @@ -1,12 +1,12 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.steam; -in { +in +{ options = { dadada.steam = { enable = mkEnableOption "Enable Steam config"; @@ -18,7 +18,7 @@ in { hardware.opengl = { enable = true; driSupport32Bit = true; - extraPackages32 = with pkgs.pkgsi686Linux; [libva]; + extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; }; hardware.pulseaudio.support32Bit = true; diff --git a/nixos/modules/update.nix b/nixos/modules/update.nix index 023bfbc..aff0885 100644 --- a/nixos/modules/update.nix +++ b/nixos/modules/update.nix @@ -1,12 +1,12 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.autoUpgrade; -in { +in +{ options.dadada.autoUpgrade = { enable = mkEnableOption "Enable automatic upgrades"; }; diff --git a/nixos/modules/vpnServer.nix b/nixos/modules/vpnServer.nix index ef0d3ad..6c0513f 100644 --- a/nixos/modules/vpnServer.nix +++ b/nixos/modules/vpnServer.nix @@ -1,12 +1,11 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.vpnServer; - wgPeer = {name, ...}: { + wgPeer = { name, ... }: { options = { name = mkOption { internal = true; @@ -24,13 +23,14 @@ with lib; let }; }; }; -in { +in +{ options.dadada.vpnServer = { enable = mkEnableOption "Enable wireguard gateway"; peers = mkOption { description = "Set of extensions and public keys of peers"; type = with types; attrsOf (submodule wgPeer); - default = {}; + default = { }; }; }; config = mkIf cfg.enable { @@ -39,15 +39,15 @@ in { interfaces."wg0" = { allowedIPsAsRoutes = true; privateKeyFile = "/var/lib/wireguard/wg0-key"; - ips = ["fd42:9c3b:f96d:0201::0/64"]; + ips = [ "fd42:9c3b:f96d:0201::0/64" ]; listenPort = 51234; peers = map - (peer: { - allowedIPs = ["fd42:9c3b:f96d:0201::${peer.id}/128"]; - publicKey = peer.key; - }) - (attrValues cfg.peers); + (peer: { + allowedIPs = [ "fd42:9c3b:f96d:0201::${peer.id}/128" ]; + publicKey = peer.key; + }) + (attrValues cfg.peers); postSetup = '' wg set wg0 fwmark 51234 ip -6 route add table 2468 fd42:9c3b:f96d::/48 dev ens3 diff --git a/nixos/modules/weechat.nix b/nixos/modules/weechat.nix index a5667ef..340f64c 100644 --- a/nixos/modules/weechat.nix +++ b/nixos/modules/weechat.nix @@ -1,12 +1,12 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; let cfg = config.dadada.weechat; -in { +in +{ options.dadada.weechat = { enable = mkEnableOption "Enable weechat relay"; }; diff --git a/nixos/modules/zsh.nix b/nixos/modules/zsh.nix index 585aa0d..90e32bb 100644 --- a/nixos/modules/zsh.nix +++ b/nixos/modules/zsh.nix @@ -1,8 +1,7 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: { programs.zsh = { enable = true; @@ -12,7 +11,7 @@ vteIntegration = true; syntaxHighlighting = { enable = true; - highlighters = ["main" "brackets" "pattern" "root" "line"]; + highlighters = [ "main" "brackets" "pattern" "root" "line" ]; }; }; } diff --git a/nixos/pruflas/configuration.nix b/nixos/pruflas/configuration.nix index b7d3b54..f0f3208 100644 --- a/nixos/pruflas/configuration.nix +++ b/nixos/pruflas/configuration.nix @@ -1,11 +1,10 @@ -{ - config, - pkgs, - lib, - ... +{ config +, pkgs +, lib +, ... }: with lib; { - imports = [./hardware-configuration.nix]; + imports = [ ./hardware-configuration.nix ]; networking.hostName = "pruflas"; @@ -16,7 +15,7 @@ with lib; { package = pkgs.hydra-unstable; hydraURL = "https://hydra.dadada.li"; notificationSender = "hydra@localhost"; - buildMachinesFiles = []; + buildMachinesFiles = [ ]; useSubstitutes = true; listenHost = "hydra.dadada.li"; port = 3000; @@ -26,7 +25,7 @@ with lib; { { hostName = "localhost"; system = "x86_64-linux"; - supportedFeatures = ["kvm" "nixos-test" "big-parallel" "benchmark"]; + supportedFeatures = [ "kvm" "nixos-test" "big-parallel" "benchmark" ]; maxJobs = 8; } ]; @@ -65,7 +64,7 @@ with lib; { ]; }; - boot.kernelModules = ["kvm-intel"]; + boot.kernelModules = [ "kvm-intel" ]; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; @@ -95,12 +94,12 @@ with lib; { hardware.pulseaudio.enable = false; - environment.systemPackages = [pkgs.spotify pkgs.mpv]; + environment.systemPackages = [ pkgs.spotify pkgs.mpv ]; users.users."media" = { isNormalUser = true; description = "Media playback user"; - extraGroups = ["users" "video"]; + extraGroups = [ "users" "video" ]; }; networking.domain = "dadada.li"; diff --git a/nixos/pruflas/hardware-configuration.nix b/nixos/pruflas/hardware-configuration.nix index d26a55a..ddb2116 100644 --- a/nixos/pruflas/hardware-configuration.nix +++ b/nixos/pruflas/hardware-configuration.nix @@ -1,21 +1,20 @@ # 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, - modulesPath, - ... +{ config +, lib +, pkgs +, modulesPath +, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/6d7ea470-1909-4e84-82a6-d5d5e9eecf78"; @@ -32,7 +31,7 @@ fsType = "vfat"; }; - swapDevices = []; + swapDevices = [ ]; powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; } diff --git a/nixos/surgat/configuration.nix b/nixos/surgat/configuration.nix index 1352303..f7710e6 100644 --- a/nixos/surgat/configuration.nix +++ b/nixos/surgat/configuration.nix @@ -1,11 +1,12 @@ -{ - config, - pkgs, - lib, - ... -}: let +{ config +, pkgs +, lib +, ... +}: +let hostName = "surgat"; -in { +in +{ imports = [ ./hardware-configuration.nix ]; @@ -103,7 +104,7 @@ in { ]; networking.wireguard.interfaces."hydra" = { - ips = ["10.3.3.1/24"]; + ips = [ "10.3.3.1/24" ]; listenPort = 51235; privateKeyFile = "/var/lib/wireguard/hydra"; @@ -111,7 +112,7 @@ in { peers = [ { publicKey = "CTKwL6+SJIqKXr1DIHejMDgjoxlWPaT78Pz3+JqcNlw="; - allowedIPs = ["10.3.3.3/32"]; + allowedIPs = [ "10.3.3.3/32" ]; persistentKeepalive = 25; } ]; diff --git a/nixos/surgat/hardware-configuration.nix b/nixos/surgat/hardware-configuration.nix index 8363cbc..71b7257 100644 --- a/nixos/surgat/hardware-configuration.nix +++ b/nixos/surgat/hardware-configuration.nix @@ -1,21 +1,20 @@ # 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, - modulesPath, - ... +{ config +, lib +, pkgs +, modulesPath +, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = ["ata_piix" "virtio_pci" "xhci_pci" "sd_mod" "sr_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "ata_piix" "virtio_pci" "xhci_pci" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/bd0b4d2d-37e5-444b-82ba-d7629114bf11"; @@ -29,5 +28,5 @@ fsType = "ext2"; }; - swapDevices = []; + swapDevices = [ ]; } diff --git a/outputs.nix b/outputs.nix index 27f4730..abd57e1 100644 --- a/outputs.nix +++ b/outputs.nix @@ -1,62 +1,63 @@ # Adapted from Mic92/dotfiles -{ - self, - flake-utils, - homePage, - nixpkgs, - home-manager, - nix-doom-emacs, - nixos-hardware, - nvd, - scripts, - recipemd, - ... +{ self +, flake-utils +, homePage +, nixpkgs +, home-manager +, nix-doom-emacs +, nixos-hardware +, nvd +, scripts +, recipemd +, ... } @ inputs: -(flake-utils.lib.eachDefaultSystem (system: let - pkgs = nixpkgs.legacyPackages.${system}; - selfPkgs = self.packages.${system}; - formatter = self.formatter.${system}; -in { - apps.nixos-switch = { - type = "app"; - program = toString (pkgs.writeScript "deploy" '' - #!${pkgs.runtimeShell} - flake=$(nix flake metadata --json ${./.} | jq -r .url) - nixos-rebuild switch --flake ".#$1" --use-remote-sudo - ''); - }; - apps.deploy = { - type = "app"; - program = toString (pkgs.writeScript "deploy" '' - #!${pkgs.runtimeShell} - domain='dadada.li' - flake=$(nix flake metadata --json ${./.} | jq -r .url) - nixos-rebuild switch --upgrade --flake "''${flake}#$1" --target-host "''${1}.$domain" --build-host localhost --use-remote-sudo - ''); - }; - apps.hm-switch = { - type = "app"; - program = toString (pkgs.writeScript "hm-switch" '' - #!${pkgs.runtimeShell} - set -eu -o pipefail -x - tmpdir=$(mktemp -d) - export PATH=${pkgs.lib.makeBinPath [pkgs.coreutils pkgs.nixFlakes pkgs.jq]} - trap "rm -rf $tmpdir" EXIT - declare -A profiles=(["gorgon"]="home") - profile=''${profiles[$HOSTNAME]:-common} - flake=$(nix flake metadata --json ${./.} | jq -r .url) - nix build --out-link "$tmpdir/result" "$flake#hmConfigurations.''${profile}.activationPackage" "$@" - link=$(realpath $tmpdir/result) - $link/activate - ''); - }; - devShell = pkgs.callPackage ./shell.nix {}; - formatter = nixpkgs.legacyPackages."${system}".alejandra; - checks = { - format = pkgs.runCommand "check-format" {buildInputs = [formatter];} "${formatter}/bin/alejandra -c ${./.} && touch $out"; - }; -})) -// { +(flake-utils.lib.eachDefaultSystem (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + selfPkgs = self.packages.${system}; + formatter = self.formatter.${system}; + in + { + apps.nixos-switch = { + type = "app"; + program = toString (pkgs.writeScript "deploy" '' + #!${pkgs.runtimeShell} + flake=$(nix flake metadata --json ${./.} | jq -r .url) + nixos-rebuild switch --flake ".#$1" --use-remote-sudo + ''); + }; + apps.deploy = { + type = "app"; + program = toString (pkgs.writeScript "deploy" '' + #!${pkgs.runtimeShell} + domain='dadada.li' + flake=$(nix flake metadata --json ${./.} | jq -r .url) + nixos-rebuild switch --upgrade --flake "''${flake}#$1" --target-host "''${1}.$domain" --build-host localhost --use-remote-sudo + ''); + }; + apps.hm-switch = { + type = "app"; + program = toString (pkgs.writeScript "hm-switch" '' + #!${pkgs.runtimeShell} + set -eu -o pipefail -x + tmpdir=$(mktemp -d) + export PATH=${pkgs.lib.makeBinPath [pkgs.coreutils pkgs.nixFlakes pkgs.jq]} + trap "rm -rf $tmpdir" EXIT + declare -A profiles=(["gorgon"]="home") + profile=''${profiles[$HOSTNAME]:-common} + flake=$(nix flake metadata --json ${./.} | jq -r .url) + nix build --out-link "$tmpdir/result" "$flake#hmConfigurations.''${profile}.activationPackage" "$@" + link=$(realpath $tmpdir/result) + $link/activate + ''); + }; + devShell = pkgs.callPackage ./shell.nix { }; + formatter = nixpkgs.legacyPackages."${system}".nixpkgs-fmt; + checks = { + format = pkgs.runCommand "check-format" { buildInputs = [ formatter ]; } "${formatter}/bin/nixpkgs-fmt --check ${./.} && touch $out"; + }; + })) + // { hmConfigurations = import ./home/configurations.nix { inherit self nixpkgs home-manager; }; @@ -71,13 +72,13 @@ in { hydraJobs = ( nixpkgs.lib.mapAttrs' - (name: config: nixpkgs.lib.nameValuePair name config.config.system.build.toplevel) - self.nixosConfigurations + (name: config: nixpkgs.lib.nameValuePair name config.config.system.build.toplevel) + self.nixosConfigurations ) // ( nixpkgs.lib.mapAttrs' - (name: config: nixpkgs.lib.nameValuePair name config.activation-script) - self.hmConfigurations + (name: config: nixpkgs.lib.nameValuePair name config.activation-script) + self.hmConfigurations ) // (let tests = import ./tests; in flake-utils.lib.eachDefaultSystem tests); } diff --git a/overlays/default.nix b/overlays/default.nix index 491a5a3..8507ceb 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,7 @@ let python3Packages = import ./python3-packages.nix; -in { +in +{ kanboard = final: prev: { kanboard = prev.kanboard.overrideAttrs (oldAttrs: { src = prev.fetchFromGitHub { diff --git a/overlays/python3-packages.nix b/overlays/python3-packages.nix index 5e2371c..6eca900 100644 --- a/overlays/python3-packages.nix +++ b/overlays/python3-packages.nix @@ -2,6 +2,6 @@ self: super: { python3Packages = super.python3Packages // super.recurseIntoAttrs ( - super.python3Packages.callPackage ../pkgs/python-pkgs {} + super.python3Packages.callPackage ../pkgs/python-pkgs { } ); } diff --git a/overlays/tubslatex.nix b/overlays/tubslatex.nix index 220029a..da6843d 100644 --- a/overlays/tubslatex.nix +++ b/overlays/tubslatex.nix @@ -2,27 +2,27 @@ self: super: { # Based on https://gist.github.com/clefru/9ed1186bf0b76d27e0ad20cbd9966b87 tubslatex = super.lib.overrideDerivation - (super.texlive.combine { - inherit (super.texlive) scheme-full; - tubslatex.pkgs = [(super.callPackage ../pkgs/tubslatex {})]; - }) - (oldAttrs: { - postBuild = - '' - # Save the udpmap.cfg because texlive.combine removes it. - cat $out/share/texmf/web2c/updmap.cfg > $out/share/texmf/web2c/updmap.cfg.1 - '' - + oldAttrs.postBuild - + '' - # Move updmap.cfg into its original place and rerun mktexlsr, so that kpsewhich finds it - rm $out/share/texmf/web2c/updmap.cfg || true - cat $out/share/texmf/web2c/updmap.cfg.1 > $out/share/texmf/web2c/updmap.cfg - rm $out/share/texmf/web2c/updmap.cfg.1 - perl `type -P mktexlsr.pl` $out/share/texmf - yes | perl `type -P updmap.pl` --sys --syncwithtrees --force || true - perl `type -P updmap.pl` --sys --enable Map=NexusProSerif.map --enable Map=NexusProSans.map - # Regenerate .map files. - perl `type -P updmap.pl` --sys - ''; - }); + (super.texlive.combine { + inherit (super.texlive) scheme-full; + tubslatex.pkgs = [ (super.callPackage ../pkgs/tubslatex { }) ]; + }) + (oldAttrs: { + postBuild = + '' + # Save the udpmap.cfg because texlive.combine removes it. + cat $out/share/texmf/web2c/updmap.cfg > $out/share/texmf/web2c/updmap.cfg.1 + '' + + oldAttrs.postBuild + + '' + # Move updmap.cfg into its original place and rerun mktexlsr, so that kpsewhich finds it + rm $out/share/texmf/web2c/updmap.cfg || true + cat $out/share/texmf/web2c/updmap.cfg.1 > $out/share/texmf/web2c/updmap.cfg + rm $out/share/texmf/web2c/updmap.cfg.1 + perl `type -P mktexlsr.pl` $out/share/texmf + yes | perl `type -P updmap.pl` --sys --syncwithtrees --force || true + perl `type -P updmap.pl` --sys --enable Map=NexusProSerif.map --enable Map=NexusProSans.map + # Regenerate .map files. + perl `type -P updmap.pl` --sys + ''; + }); } diff --git a/pkgs/python-pkgs/default.nix b/pkgs/python-pkgs/default.nix index e4c33e6..c1c7b48 100644 --- a/pkgs/python-pkgs/default.nix +++ b/pkgs/python-pkgs/default.nix @@ -1,2 +1 @@ -{callPackage}: { -} +{ callPackage }: { } diff --git a/pkgs/scripts.nix b/pkgs/scripts.nix index c7471be..9b186db 100644 --- a/pkgs/scripts.nix +++ b/pkgs/scripts.nix @@ -1,7 +1,7 @@ -{ - pkgs, - stdenv, - lib, +{ pkgs +, stdenv +, lib +, }: (import (pkgs.fetchgit { url = "https://git.dadada.li/dadada/scripts.git"; diff --git a/pkgs/tubslatex/default.nix b/pkgs/tubslatex/default.nix index e7bb963..36b688a 100644 --- a/pkgs/tubslatex/default.nix +++ b/pkgs/tubslatex/default.nix @@ -1,13 +1,13 @@ -{ - stdenv, - fetchzip, - unzip, +{ stdenv +, fetchzip +, unzip +, }: stdenv.mkDerivation rec { src = ./tubslatex_1.3.2.tds.zip; sourceRoot = "."; - nativeBuildInputs = [unzip]; - buildInputs = [unzip]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ unzip ]; installPhase = '' mkdir -p $out cp -r * $out/ diff --git a/pkgs/vimPlugins/default.nix b/pkgs/vimPlugins/default.nix index f9eece2..c513c33 100644 --- a/pkgs/vimPlugins/default.nix +++ b/pkgs/vimPlugins/default.nix @@ -1,8 +1,7 @@ -{ - pkgs, - lib, - fetchFromGitHub, - ... +{ pkgs +, lib +, fetchFromGitHub +, ... }: with lib; { filetype = pkgs.vimUtils.buildVimPluginFrom2Nix { diff --git a/shell.nix b/shell.nix index a297003..e2a7c3d 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,4 @@ -{mkShell}: +{ mkShell }: mkShell { buildInputs = [ ]; diff --git a/tests/default.nix b/tests/default.nix index 15769d2..10daca3 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -1,2 +1 @@ -system: { -} +system: { }