switch to nixpkgs-fmt

This commit is contained in:
Tim Schubert 2022-08-04 21:13:54 +02:00
parent 8cd6ed1502
commit c43341a8b2
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
69 changed files with 664 additions and 665 deletions

View file

@ -1,14 +1,16 @@
{ { self
self, , nixpkgs
nixpkgs, , home-manager
home-manager, ,
} @ inputs: let } @ inputs:
hmConfiguration = { let
homeDirectory ? "/home/dadada", hmConfiguration =
extraModules ? [], { homeDirectory ? "/home/dadada"
system ? "x86_64-linux", , extraModules ? [ ]
username ? "dadada", , system ? "x86_64-linux"
stateVersion, , username ? "dadada"
, stateVersion
,
}: (home-manager.lib.homeManagerConfiguration { }: (home-manager.lib.homeManagerConfiguration {
configuration = { ... }: { configuration = { ... }: {
imports = (nixpkgs.lib.attrValues self.hmModules) ++ extraModules; imports = (nixpkgs.lib.attrValues self.hmModules) ++ extraModules;
@ -21,7 +23,8 @@
}; };
inherit system homeDirectory username stateVersion; inherit system homeDirectory username stateVersion;
}); });
in { in
{
home = hmConfiguration { home = hmConfiguration {
extraModules = [ ./home ]; extraModules = [ ./home ];
stateVersion = "20.09"; stateVersion = "20.09";

View file

@ -1,9 +1,9 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
... }:
}: let let
useFeatures = [ useFeatures = [
"alacritty" "alacritty"
#"emacs" #"emacs"
@ -18,7 +18,8 @@
"xdg" "xdg"
"zsh" "zsh"
]; ];
in { in
{
programs.git = { programs.git = {
signing = { signing = {
key = "D68C84695C087E0F733A28D0EEB8D1CE62C4DFEA"; key = "D68C84695C087E0F733A28D0EEB8D1CE62C4DFEA";

View file

@ -1,12 +1,12 @@
{ { pkgs
pkgs, , lib
lib, , config
config, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.alacritty; cfg = config.dadada.home.alacritty;
in { in
{
options.dadada.home.alacritty = { options.dadada.home.alacritty = {
enable = mkEnableOption "Enable alacritty config"; enable = mkEnableOption "Enable alacritty config";
}; };

View file

@ -1,7 +1,6 @@
{ { config
config, , lib
lib, , ...
...
}: }:
with lib; { with lib; {
options.dadada.home.colors = mkOption { options.dadada.home.colors = mkOption {

View file

@ -1,7 +1,6 @@
{ { self
self, , nix-doom-emacs
nix-doom-emacs, , ...
...
} @ inputs: { } @ inputs: {
alacritty = import ./alacritty; alacritty = import ./alacritty;
colors = import ./colors.nix; colors = import ./colors.nix;

View file

@ -1,12 +1,12 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.direnv; cfg = config.dadada.home.direnv;
in { in
{
options.dadada.home.direnv = { options.dadada.home.direnv = {
enable = mkEnableOption "Enable direnv config"; enable = mkEnableOption "Enable direnv config";
}; };

View file

@ -1,12 +1,12 @@
{nix-doom-emacs, ...}: { { nix-doom-emacs, ... }: { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.emacs; cfg = config.dadada.home.emacs;
in { in
{
imports = [ nix-doom-emacs.hmModule ]; imports = [ nix-doom-emacs.hmModule ];
options.dadada.home.emacs = { options.dadada.home.emacs = {
enable = mkEnableOption "Enable dadada emacs config"; enable = mkEnableOption "Enable dadada emacs config";
@ -17,7 +17,8 @@ in {
doomPrivateDir = ./doom.d; doomPrivateDir = ./doom.d;
emacsPackagesOverlay = self: super: emacsPackagesOverlay = self: super:
with pkgs; { with pkgs; {
tsc = super.tsc.overrideAttrs (old: let tsc = super.tsc.overrideAttrs (old:
let
libtsc_dyn = rustPlatform.buildRustPackage rec { libtsc_dyn = rustPlatform.buildRustPackage rec {
pname = "emacs-tree-sitter"; pname = "emacs-tree-sitter";
version = "0.15.1"; version = "0.15.1";
@ -42,7 +43,8 @@ in {
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
cargoHash = "sha256-HB5tFR1slY2D6jb2mt4KrGrGBUUVrxiBjmVycO+qfYY="; cargoHash = "sha256-HB5tFR1slY2D6jb2mt4KrGrGBUUVrxiBjmVycO+qfYY=";
}; };
in { in
{
inherit (libtsc_dyn) src; inherit (libtsc_dyn) src;
preBuild = '' preBuild = ''
ext=${stdenv.hostPlatform.extensions.sharedLibrary} ext=${stdenv.hostPlatform.extensions.sharedLibrary}

View file

@ -1,12 +1,12 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.fish; cfg = config.dadada.home.fish;
in { in
{
options.dadada.home.fish = { options.dadada.home.fish = {
enable = mkEnableOption "Enable fish config"; enable = mkEnableOption "Enable fish config";
}; };

View file

@ -1,12 +1,12 @@
{ { config
config, , lib
lib, , pkgs
pkgs, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.git; cfg = config.dadada.home.git;
in { in
{
options.dadada.home.git = { options.dadada.home.git = {
enable = mkEnableOption "Enable git config"; enable = mkEnableOption "Enable git config";
}; };

View file

@ -1,11 +1,11 @@
{ { config
config, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.gpg; cfg = config.dadada.home.gpg;
in { in
{
options.dadada.home.gpg = { options.dadada.home.gpg = {
enable = mkEnableOption "Enable GnuPG config"; enable = mkEnableOption "Enable GnuPG config";
}; };

View file

@ -1,12 +1,12 @@
{ { config
config, , lib
lib, , pkgs
pkgs, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.gtk; cfg = config.dadada.home.gtk;
in { in
{
options.dadada.home.gtk = { options.dadada.home.gtk = {
enable = mkEnableOption "Enable GTK config"; enable = mkEnableOption "Enable GTK config";
}; };

View file

@ -1,11 +1,11 @@
{ { config
config, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.keyring; cfg = config.dadada.home.keyring;
in { in
{
options.dadada.home.keyring = { options.dadada.home.keyring = {
enable = mkEnableOption "Enable keyring config"; enable = mkEnableOption "Enable keyring config";
}; };

View file

@ -1,12 +1,12 @@
{ { pkgs
pkgs, , lib
lib, , config
config, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.kitty; cfg = config.dadada.home.kitty;
in { in
{
options.dadada.home.kitty = { options.dadada.home.kitty = {
enable = mkEnableOption "Enable kitty config"; enable = mkEnableOption "Enable kitty config";
}; };

View file

@ -1,13 +1,13 @@
{ { config
config, , lib
lib, , pkgs
pkgs, , colors
colors, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.mako; cfg = config.dadada.home.mako;
in { in
{
options.dadada.home.mako = { options.dadada.home.mako = {
enable = mkEnableOption "Enable mako config"; enable = mkEnableOption "Enable mako config";
}; };

View file

@ -1,11 +1,11 @@
{ { config
config, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.session; cfg = config.dadada.home.session;
in { in
{
options.dadada.home.session = { options.dadada.home.session = {
enable = mkEnableOption "Enable session variable management"; enable = mkEnableOption "Enable session variable management";
sessionVars = mkOption { sessionVars = mkOption {

View file

@ -1,11 +1,11 @@
{ { config
config, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.ssh; cfg = config.dadada.home.ssh;
in { in
{
options.dadada.home.ssh = { options.dadada.home.ssh = {
enable = mkEnableOption "Enable SSH config"; enable = mkEnableOption "Enable SSH config";
}; };

View file

@ -1,13 +1,13 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , colors
colors, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.sway; cfg = config.dadada.home.sway;
in { in
{
options.dadada.home.sway = { options.dadada.home.sway = {
enable = mkEnableOption "Enable Sway config"; enable = mkEnableOption "Enable Sway config";
}; };

View file

@ -1,12 +1,12 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.syncthing; cfg = config.dadada.home.syncthing;
in { in
{
options.dadada.home.syncthing = { options.dadada.home.syncthing = {
enable = mkEnableOption "Enable Syncthing config"; enable = mkEnableOption "Enable Syncthing config";
}; };

View file

@ -1,13 +1,13 @@
{ { config
config, , lib
lib, , pkgs
pkgs, , colors ? ../../lib/colors.nix
colors ? ../../lib/colors.nix, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.termite; cfg = config.dadada.home.termite;
in { in
{
options.dadada.home.termite = { options.dadada.home.termite = {
enable = mkEnableOption "Enable termite config"; enable = mkEnableOption "Enable termite config";
}; };

View file

@ -1,11 +1,11 @@
{ { config
config, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.tmux; cfg = config.dadada.home.tmux;
in { in
{
options.dadada.home.tmux = { options.dadada.home.tmux = {
enable = mkEnableOption "Enable tmux config"; enable = mkEnableOption "Enable tmux config";
}; };

View file

@ -1,13 +1,13 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.vim; cfg = config.dadada.home.vim;
vimPlugins = pkgs.callPackage ../../../pkgs/vimPlugins { }; vimPlugins = pkgs.callPackage ../../../pkgs/vimPlugins { };
in { in
{
options.dadada.home.vim = { options.dadada.home.vim = {
enable = mkEnableOption "Enable VIM config"; enable = mkEnableOption "Enable VIM config";
}; };

View file

@ -1,8 +1,7 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
apps = { apps = {
@ -23,7 +22,8 @@ with lib; let
"application/pdf" = "org.pwmt.zathura.desktop"; "application/pdf" = "org.pwmt.zathura.desktop";
}; };
cfg = config.dadada.home.xdg; cfg = config.dadada.home.xdg;
in { in
{
options.dadada.home.xdg = { options.dadada.home.xdg = {
enable = mkEnableOption "Enable XDG config"; enable = mkEnableOption "Enable XDG config";
}; };

View file

@ -1,12 +1,12 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.home.zsh; cfg = config.dadada.home.zsh;
in { in
{
options.dadada.home.zsh = { options.dadada.home.zsh = {
enable = mkEnableOption "Enable ZSH config"; enable = mkEnableOption "Enable ZSH config";
}; };

View file

@ -1,8 +1,7 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: { }: {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix

View file

@ -1,12 +1,11 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config
config, , lib
lib, , pkgs
pkgs, , modulesPath
modulesPath, , ...
...
}: { }: {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")

View file

@ -1,15 +1,16 @@
{ { self
self, , admins
admins, , nixpkgs
nixpkgs, , nixosSystem
nixosSystem, , home-manager
home-manager, , homePage
homePage, , nixos-hardware
nixos-hardware, , nvd
nvd, , scripts
scripts, , recipemd
recipemd, ,
}: let }:
let
adapterModule = system: { adapterModule = system: {
nixpkgs.config.allowUnfreePredicate = pkg: true; nixpkgs.config.allowUnfreePredicate = pkg: true;
nixpkgs.overlays = nixpkgs.overlays =
@ -25,7 +26,8 @@
adminConfig = users: { adminConfig = users: {
dadada.admin.users = lib.getAttrs users admins; dadada.admin.users = lib.getAttrs users admins;
}; };
in { in
{
gorgon = nixosSystem rec { gorgon = nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules =

View file

@ -1,9 +1,9 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
... }:
}: let let
signHook = signHook =
pkgs.writeShellScript "/etc/nix/sign-cache.sh" pkgs.writeShellScript "/etc/nix/sign-cache.sh"
'' ''
@ -14,7 +14,8 @@
echo "Signing paths" $OUT_PATHS echo "Signing paths" $OUT_PATHS
nix store sign --key-file /etc/nix/key.private $OUT_PATHS nix store sign --key-file /etc/nix/key.private $OUT_PATHS
''; '';
in { in
{
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
]; ];

View file

@ -1,12 +1,11 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config
config, , lib
lib, , pkgs
pkgs, , modulesPath
modulesPath, , ...
...
}: { }: {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")

View file

@ -1,16 +1,17 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
... }:
}: let let
hostAliases = [ hostAliases = [
"ifrit.dadada.li" "ifrit.dadada.li"
"media.dadada.li" "media.dadada.li"
"backup0.dadada.li" "backup0.dadada.li"
]; ];
backups = "/mnt/storage/backup"; backups = "/mnt/storage/backup";
in { in
{
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
]; ];

View file

@ -1,12 +1,11 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config
config, , lib
lib, , pkgs
pkgs, , modulesPath
modulesPath, , ...
...
}: { }: {
imports = [ imports = [
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")

View file

@ -1,8 +1,7 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.admin; cfg = config.dadada.admin;
@ -16,10 +15,10 @@ with lib; let
shellNames = builtins.attrNames shells; shellNames = builtins.attrNames shells;
adminOpts = { adminOpts =
name, { name
config, , config
... , ...
}: { }: {
options = { options = {
keys = mkOption { keys = mkOption {
@ -42,7 +41,8 @@ with lib; let
}; };
}; };
}; };
in { in
{
options = { options = {
dadada.admin = { dadada.admin = {
enable = mkEnableOption "Enable admin access"; enable = mkEnableOption "Enable admin access";

View file

@ -1,8 +1,7 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
backupExcludes = [ backupExcludes = [
@ -24,7 +23,8 @@ with lib; let
"/var/tmp" "/var/tmp"
]; ];
cfg = config.dadada.backupClient; cfg = config.dadada.backupClient;
in { in
{
options = { options = {
dadada.backupClient = { dadada.backupClient = {
gs = { gs = {

View file

@ -1,8 +1,7 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.ddns; cfg = config.dadada.ddns;
@ -35,7 +34,8 @@ with lib; let
''; '';
})); }));
}; };
in { in
{
options = { options = {
dadada.ddns.domains = mkOption { dadada.ddns.domains = mkOption {
type = types.listOf types.str; type = types.listOf types.str;

View file

@ -1,11 +1,12 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
... }:
}: let let
cfg = config.dadada.element; cfg = config.dadada.element;
in { in
{
options.dadada.element = { options.dadada.element = {
enable = lib.mkEnableOption "Enable element webapp"; enable = lib.mkEnableOption "Enable element webapp";
}; };

View file

@ -1,13 +1,13 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
luks = config.dadada.luks; luks = config.dadada.luks;
fido2 = config.dadada.fido2; fido2 = config.dadada.fido2;
in { in
{
options = { options = {
dadada.luks = { dadada.luks = {
uuid = mkOption { uuid = mkOption {

View file

@ -1,14 +1,14 @@
{ { config
config, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.fileShare; cfg = config.dadada.fileShare;
sharePath = "/mnt/storage/share"; sharePath = "/mnt/storage/share";
ipv6 = "fd42:dead:beef::/48"; ipv6 = "fd42:dead:beef::/48";
ipv4 = "192.168.42.0/24"; ipv4 = "192.168.42.0/24";
in { in
{
options.dadada.fileShare = { options.dadada.fileShare = {
enable = mkEnableOption "Enable file share server"; enable = mkEnableOption "Enable file share server";
}; };

View file

@ -1,12 +1,13 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
... }:
}: let let
redisSocket = "127.0.0.1:6379"; redisSocket = "127.0.0.1:6379";
cfg = config.dadada.gitea; cfg = config.dadada.gitea;
in { in
{
options.dadada.gitea = { options.dadada.gitea = {
enable = lib.mkEnableOption "Enable gitea"; enable = lib.mkEnableOption "Enable gitea";
}; };

View file

@ -1,12 +1,12 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.headphones; cfg = config.dadada.headphones;
in { in
{
options = { options = {
dadada.headphones = { dadada.headphones = {
enable = mkEnableOption "Enable bluetooth headphones with more audio codecs."; enable = mkEnableOption "Enable bluetooth headphones with more audio codecs.";

View file

@ -1,9 +1,9 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
... }:
}: let let
cfg = config.dadada.homePage; cfg = config.dadada.homePage;
in in
with lib; { with lib; {

View file

@ -1,12 +1,13 @@
# Source https://github.com/NixOS/nixpkgs/issues/113384 # Source https://github.com/NixOS/nixpkgs/issues/113384
{ { config
config, , lib
lib, , pkgs
pkgs, , ...
... }:
}: let let
cfg = config.dadada.kanboard; cfg = config.dadada.kanboard;
in { in
{
options = { options = {
dadada.kanboard.enable = lib.mkEnableOption "Enable Kanboard"; dadada.kanboard.enable = lib.mkEnableOption "Enable Kanboard";
}; };

View file

@ -1,13 +1,13 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.networking; cfg = config.dadada.networking;
vpnPubKey = "x/y6I59buVzv9Lfzl+b17mGWbzxU+3Ke9mQNa1DLsDI="; vpnPubKey = "x/y6I59buVzv9Lfzl+b17mGWbzxU+3Ke9mQNa1DLsDI=";
in { in
{
options = { options = {
dadada.networking = { dadada.networking = {
localResolver = { localResolver = {

View file

@ -1,13 +1,11 @@
{ { self
self, , home-manager
home-manager, , nixpkgs
nixpkgs, , ...
... }: { config
}: { , pkgs
config, , lib
pkgs, , ...
lib,
...
}: }:
# Global settings for nix daemon # Global settings for nix daemon
{ {

View file

@ -1,8 +1,7 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; { with lib; {
networking.domain = mkDefault "dadada.li"; networking.domain = mkDefault "dadada.li";

View file

@ -1,8 +1,7 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; { with lib; {
networking.domain = mkDefault "dadada.li"; networking.domain = mkDefault "dadada.li";

View file

@ -1,12 +1,12 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.share; cfg = config.dadada.share;
in { in
{
options.dadada.share = { options.dadada.share = {
enable = mkEnableOption "Enable file share"; enable = mkEnableOption "Enable file share";
}; };

View file

@ -1,12 +1,12 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.steam; cfg = config.dadada.steam;
in { in
{
options = { options = {
dadada.steam = { dadada.steam = {
enable = mkEnableOption "Enable Steam config"; enable = mkEnableOption "Enable Steam config";

View file

@ -1,12 +1,12 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.autoUpgrade; cfg = config.dadada.autoUpgrade;
in { in
{
options.dadada.autoUpgrade = { options.dadada.autoUpgrade = {
enable = mkEnableOption "Enable automatic upgrades"; enable = mkEnableOption "Enable automatic upgrades";
}; };

View file

@ -1,8 +1,7 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.vpnServer; cfg = config.dadada.vpnServer;
@ -24,7 +23,8 @@ with lib; let
}; };
}; };
}; };
in { in
{
options.dadada.vpnServer = { options.dadada.vpnServer = {
enable = mkEnableOption "Enable wireguard gateway"; enable = mkEnableOption "Enable wireguard gateway";
peers = mkOption { peers = mkOption {

View file

@ -1,12 +1,12 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
cfg = config.dadada.weechat; cfg = config.dadada.weechat;
in { in
{
options.dadada.weechat = { options.dadada.weechat = {
enable = mkEnableOption "Enable weechat relay"; enable = mkEnableOption "Enable weechat relay";
}; };

View file

@ -1,8 +1,7 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: { }: {
programs.zsh = { programs.zsh = {
enable = true; enable = true;

View file

@ -1,8 +1,7 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; { with lib; {
imports = [ ./hardware-configuration.nix ]; imports = [ ./hardware-configuration.nix ];

View file

@ -1,12 +1,11 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config
config, , lib
lib, , pkgs
pkgs, , modulesPath
modulesPath, , ...
...
}: { }: {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")

View file

@ -1,11 +1,12 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
... }:
}: let let
hostName = "surgat"; hostName = "surgat";
in { in
{
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
]; ];

View file

@ -1,12 +1,11 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config
config, , lib
lib, , pkgs
pkgs, , modulesPath
modulesPath, , ...
...
}: { }: {
imports = [ imports = [
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")

View file

@ -1,22 +1,23 @@
# Adapted from Mic92/dotfiles # Adapted from Mic92/dotfiles
{ { self
self, , flake-utils
flake-utils, , homePage
homePage, , nixpkgs
nixpkgs, , home-manager
home-manager, , nix-doom-emacs
nix-doom-emacs, , nixos-hardware
nixos-hardware, , nvd
nvd, , scripts
scripts, , recipemd
recipemd, , ...
...
} @ inputs: } @ inputs:
(flake-utils.lib.eachDefaultSystem (system: let (flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
selfPkgs = self.packages.${system}; selfPkgs = self.packages.${system};
formatter = self.formatter.${system}; formatter = self.formatter.${system};
in { in
{
apps.nixos-switch = { apps.nixos-switch = {
type = "app"; type = "app";
program = toString (pkgs.writeScript "deploy" '' program = toString (pkgs.writeScript "deploy" ''
@ -51,9 +52,9 @@ in {
''); '');
}; };
devShell = pkgs.callPackage ./shell.nix { }; devShell = pkgs.callPackage ./shell.nix { };
formatter = nixpkgs.legacyPackages."${system}".alejandra; formatter = nixpkgs.legacyPackages."${system}".nixpkgs-fmt;
checks = { checks = {
format = pkgs.runCommand "check-format" {buildInputs = [formatter];} "${formatter}/bin/alejandra -c ${./.} && touch $out"; format = pkgs.runCommand "check-format" { buildInputs = [ formatter ]; } "${formatter}/bin/nixpkgs-fmt --check ${./.} && touch $out";
}; };
})) }))
// { // {

View file

@ -1,6 +1,7 @@
let let
python3Packages = import ./python3-packages.nix; python3Packages = import ./python3-packages.nix;
in { in
{
kanboard = final: prev: { kanboard = final: prev: {
kanboard = prev.kanboard.overrideAttrs (oldAttrs: { kanboard = prev.kanboard.overrideAttrs (oldAttrs: {
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {

View file

@ -1,2 +1 @@
{callPackage}: { { callPackage }: { }
}

View file

@ -1,7 +1,7 @@
{ { pkgs
pkgs, , stdenv
stdenv, , lib
lib, ,
}: (import }: (import
(pkgs.fetchgit { (pkgs.fetchgit {
url = "https://git.dadada.li/dadada/scripts.git"; url = "https://git.dadada.li/dadada/scripts.git";

View file

@ -1,7 +1,7 @@
{ { stdenv
stdenv, , fetchzip
fetchzip, , unzip
unzip, ,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
src = ./tubslatex_1.3.2.tds.zip; src = ./tubslatex_1.3.2.tds.zip;

View file

@ -1,8 +1,7 @@
{ { pkgs
pkgs, , lib
lib, , fetchFromGitHub
fetchFromGitHub, , ...
...
}: }:
with lib; { with lib; {
filetype = pkgs.vimUtils.buildVimPluginFrom2Nix { filetype = pkgs.vimUtils.buildVimPluginFrom2Nix {

View file

@ -1,2 +1 @@
system: { system: { }
}