dadada/nix-config
dadada/nix-config
1
0
Fork 0
Code Issues 2 Pull requests 5 Projects Releases Packages Wiki Activity Actions

switch to nixpkgs-fmt

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -30,5 +30,5 @@
};
};
outputs = {...} @ args: import ./outputs.nix args;
outputs = { ... } @ args: import ./outputs.nix args;
}

31
home/configurations.nix
View file

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

25
home/home/default.nix
View file

@ -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; };
}

2
home/home/pkgs.nix
View file

@ -1,4 +1,4 @@
{pkgs}:
{ pkgs }:
with pkgs; [
anki
aqbanking

12
home/modules/alacritty/default.nix
View file

@ -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";
};

7
home/modules/colors.nix
View file

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

9
home/modules/default.nix
View file

@ -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;

12
home/modules/direnv.nix
View file

@ -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";
};

24
home/modules/emacs/default.nix
View file

@ -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,7 +17,8 @@ in {
doomPrivateDir = ./doom.d;
emacsPackagesOverlay = self: super:
with pkgs; {
tsc = super.tsc.overrideAttrs (old: let
tsc = super.tsc.overrideAttrs (old:
let
libtsc_dyn = rustPlatform.buildRustPackage rec {
pname = "emacs-tree-sitter";
version = "0.15.1";
@ -42,7 +43,8 @@ in {
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
cargoHash = "sha256-HB5tFR1slY2D6jb2mt4KrGrGBUUVrxiBjmVycO+qfYY=";
};
in {
in
{
inherit (libtsc_dyn) src;
preBuild = ''
ext=${stdenv.hostPlatform.extensions.sharedLibrary}
@ -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"

14
home/modules/fish.nix
View file

@ -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 ];
};
}

14
home/modules/git.nix
View file

@ -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";

12
home/modules/gpg.nix
View file

@ -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; };
};
};
}

12
home/modules/gtk.nix
View file

@ -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";
};

12
home/modules/keyring.nix
View file

@ -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" ];
};
};
}

14
home/modules/kitty/default.nix
View file

@ -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 ];
};
}

14
home/modules/mako.nix
View file

@ -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";
};

12
home/modules/session.nix
View file

@ -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";

10
home/modules/ssh.nix
View file

@ -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";
};

14
home/modules/sway/default.nix
View file

@ -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";
};

12
home/modules/syncthing.nix
View file

@ -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";
};

14
home/modules/termite.nix
View file

@ -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";
};

10
home/modules/tmux.nix
View file

@ -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";
};

14
home/modules/vim/default.nix
View file

@ -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";
};

12
home/modules/xdg.nix
View file

@ -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";
};

12
home/modules/zsh.nix
View file

@ -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";
};

2
home/nixpkgs-config.nix
View file

@ -1,4 +1,4 @@
{pkgs}: {
{ pkgs }: {
allowUnfree = true;
allowUnfreePredicate = pkg: true;
allowBroken = false;

2
lib/default.nix
View file

@ -1,4 +1,4 @@
{pkgs}:
{ pkgs }:
with pkgs.lib; {
# TODO
}

13
nixos/agares/configuration.nix
View file

@ -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" ];
};
};

21
nixos/agares/hardware-configuration.nix
View file

@ -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

46
nixos/configurations.nix
View file

@ -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

27
nixos/gorgon/configuration.nix
View file

@ -1,9 +1,9 @@
{
config,
pkgs,
lib,
...
}: let
{ config
, pkgs
, lib
, ...
}:
let
signHook =
pkgs.writeShellScript "/etc/nix/sign-cache.sh"
''
@ -14,7 +14,8 @@
echo "Signing paths" $OUT_PATHS
nix store sign --key-file /etc/nix/key.private $OUT_PATHS
'';
in {
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;
}

21
nixos/gorgon/hardware-configuration.nix
View file

@ -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;

47
nixos/ifrit/configuration.nix
View file

@ -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";
}

21
nixos/ifrit/hardware-configuration.nix
View file

@ -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;

28
nixos/modules/admin.nix
View file

@ -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,15 +15,15 @@ with lib; let
shellNames = builtins.attrNames shells;
adminOpts = {
name,
config,
...
adminOpts =
{ name
, config
, ...
}: {
options = {
keys = mkOption {
type = types.listOf types.str;
default = [];
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.
@ -42,14 +41,15 @@ with lib; let
};
};
};
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.
'';
@ -96,7 +96,7 @@ in {
services.tor.relay.onionServices = {
"rat" = mkIf cfg.rat.enable {
name = "rat";
map = [{port = 22;}];
map = [{ port = 22; }];
};
};
};

14
nixos/modules/backup.nix
View file

@ -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" ];
};
};

18
nixos/modules/ddns.nix
View file

@ -1,8 +1,7 @@
{
config,
pkgs,
lib,
...
{ config
, pkgs
, lib
, ...
}:
with lib; let
cfg = config.dadada.ddns;
@ -10,8 +9,8 @@ with lib; let
systemd.timers = listToAttrs (forEach hostNames (hostname:
nameValuePair "ddns-${hostname}"
{
wantedBy = ["timers.target"];
partOf = ["ddns-${hostname}.service"];
wantedBy = [ "timers.target" ];
partOf = [ "ddns-${hostname}.service" ];
timerConfig.OnCalendar = "hourly";
}));
@ -35,7 +34,8 @@ with lib; let
'';
}));
};
in {
in
{
options = {
dadada.ddns.domains = mkOption {
type = types.listOf types.str;
@ -45,7 +45,7 @@ in {
example = ''
[ "example.com" ]
'';
default = [];
default = [ ];
};
};

2
nixos/modules/default.nix
View file

@ -1,4 +1,4 @@
{...} @ inputs: {
{ ... } @ inputs: {
admin = import ./admin.nix;
backup = import ./backup.nix;
ddns = import ./ddns.nix;

15
nixos/modules/element.nix
View file

@ -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";
};

12
nixos/modules/fido2.nix
View file

@ -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 {

10
nixos/modules/fileShare.nix
View file

@ -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";
};

15
nixos/modules/gitea.nix
View file

@ -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";
};

14
nixos/modules/headphones.nix
View file

@ -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
'';

16
nixos/modules/homepage.nix
View file

@ -1,12 +1,12 @@
{
config,
pkgs,
lib,
...
}: let
{ config
, pkgs
, lib
, ...
}:
let
cfg = config.dadada.homePage;
in
with lib; {
with lib; {
options.dadada.homePage = {
enable = mkEnableOption "Enable home page";
};
@ -19,4 +19,4 @@ in
root = "${pkgs.homePage}";
};
};
}
}

19
nixos/modules/kanboard/default.nix
View file

@ -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 "<?php require('$out/config.php');" > $out/$f

22
nixos/modules/networking.nix
View file

@ -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) {

20
nixos/modules/nix.nix
View file

@ -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 = [

11
nixos/modules/profiles/laptop.nix
View file

@ -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" ];
};
};

9
nixos/modules/profiles/server.nix
View file

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

12
nixos/modules/share.nix
View file

@ -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";
};

14
nixos/modules/steam.nix
View file

@ -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;

12
nixos/modules/update.nix
View file

@ -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";
};

20
nixos/modules/vpnServer.nix
View file

@ -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,12 +39,12 @@ 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"];
allowedIPs = [ "fd42:9c3b:f96d:0201::${peer.id}/128" ];
publicKey = peer.key;
})
(attrValues cfg.peers);

12
nixos/modules/weechat.nix
View file

@ -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";
};

11
nixos/modules/zsh.nix
View file

@ -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" ];
};
};
}

21
nixos/pruflas/configuration.nix
View file

@ -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";

21
nixos/pruflas/hardware-configuration.nix
View file

@ -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";
}

19
nixos/surgat/configuration.nix
View file

@ -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;
}
];

21
nixos/surgat/hardware-configuration.nix
View file

@ -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 = [ ];
}

39
outputs.nix
View file

@ -1,22 +1,23 @@
# 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
(flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system};
selfPkgs = self.packages.${system};
formatter = self.formatter.${system};
in {
in
{
apps.nixos-switch = {
type = "app";
program = toString (pkgs.writeScript "deploy" ''
@ -50,13 +51,13 @@ in {
$link/activate
'');
};
devShell = pkgs.callPackage ./shell.nix {};
formatter = nixpkgs.legacyPackages."${system}".alejandra;
devShell = pkgs.callPackage ./shell.nix { };
formatter = nixpkgs.legacyPackages."${system}".nixpkgs-fmt;
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";
};
}))
// {
}))
// {
hmConfigurations = import ./home/configurations.nix {
inherit self nixpkgs home-manager;
};

3
overlays/default.nix
View file

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

2
overlays/python3-packages.nix
View file

@ -2,6 +2,6 @@ self: super: {
python3Packages =
super.python3Packages
// super.recurseIntoAttrs (
super.python3Packages.callPackage ../pkgs/python-pkgs {}
super.python3Packages.callPackage ../pkgs/python-pkgs { }
);
}

2
overlays/tubslatex.nix
View file

@ -4,7 +4,7 @@ self: super: {
super.lib.overrideDerivation
(super.texlive.combine {
inherit (super.texlive) scheme-full;
tubslatex.pkgs = [(super.callPackage ../pkgs/tubslatex {})];
tubslatex.pkgs = [ (super.callPackage ../pkgs/tubslatex { }) ];
})
(oldAttrs: {
postBuild =

3
pkgs/python-pkgs/default.nix
View file

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

8
pkgs/scripts.nix
View file

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

12
pkgs/tubslatex/default.nix
View file

@ -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/

9
pkgs/vimPlugins/default.nix
View file

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

2
shell.nix
View file

@ -1,4 +1,4 @@
{mkShell}:
{ mkShell }:
mkShell {
buildInputs = [
];

3
tests/default.nix
View file

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