state Sun Oct 24 09:29:25 PM CEST 2021

This commit is contained in:
Alexander Kobjolke 2021-10-24 21:29:25 +02:00
parent 65146e772d
commit e345e400db
2 changed files with 42 additions and 35 deletions

View file

@ -21,7 +21,7 @@
#unrar #unrar
# nix tools # nix tools
nix-index nix-index
nixpkgs-fmt nixfmt
# misc # misc
fd # better find fd # better find
file # info about files file # info about files
@ -30,8 +30,13 @@
gnumake gnumake
ripgrep # better grep ripgrep # better grep
sqlite sqlite
pass # pass
pandoc pandoc
hledger
hledger-web
hledger-iadd
hledger-ui
smos
# editors # editors
emacs-nox emacs-nox
@ -40,11 +45,14 @@
clang_12 clang_12
# haskell # haskell
ghcid
ghc
cabal2nix cabal2nix
nix-prefetch-git nix-prefetch-git
cabal-install cabal-install
haskellPackages.cabal-fmt haskellPackages.cabal-fmt
haskellPackages.stylish-haskell haskellPackages.stylish-haskell
haskellPackages.ormolu
]; ];
home.extraOutputsToInstall = [ "doc" "info" "devdoc" ]; home.extraOutputsToInstall = [ "doc" "info" "devdoc" ];
@ -53,6 +61,16 @@
# "emacs".source = ./emacs.d; # "emacs".source = ./emacs.d;
# }; # };
xdg.configFile.tmux = {
target = "tmux/tmux.conf";
text = ''
set -g default-terminal "tmux-256color"
set -g prefix C-z
bind-key C-z send-prefix
set -g renumber-windows on
'';
};
programs = { programs = {
direnv = { direnv = {
enable = true; enable = true;
@ -61,6 +79,7 @@
enableFlakes = true; enableFlakes = true;
}; };
enableZshIntegration = true; enableZshIntegration = true;
enableBashIntegration = true;
}; };
gh = { gh = {
@ -70,12 +89,7 @@
git = { git = {
enable = true; enable = true;
ignores = [ ignores = [ "*~" "*.swp" "result" "dist-newstyle" ];
"*~"
"*.swp"
"result"
"dist-newstyle"
];
userEmail = "me@failco.de"; userEmail = "me@failco.de";
userName = "Alexander Kobjolke"; userName = "Alexander Kobjolke";
}; };

View file

@ -5,14 +5,13 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [ # Include the results of the hardware scan.
[ # Include the results of the hardware scan. ./hardware-configuration.nix
./hardware-configuration.nix ];
];
nix.package = pkgs.nixUnstable; nix.package = pkgs.nixUnstable;
nix.extraOptions = '' nix.extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes ca-derivations ca-references
''; '';
#nix.registry.nixpkgs.flake = nixpkgs; #nix.registry.nixpkgs.flake = nixpkgs;
# Use the GRUB 2 boot loader. # Use the GRUB 2 boot loader.
@ -52,7 +51,7 @@
defaultGateway = "195.90.208.1"; defaultGateway = "195.90.208.1";
nameservers = [ "1.1.1.1" "8.8.8.8" ]; nameservers = [ "1.1.1.1" "8.8.8.8" ];
firewall = { firewall = {
allowedTCPPorts = [ 22 80 443 ]; allowedTCPPorts = [ 22 80 443 5000 ];
allowedUDPPorts = [ 42666 ]; allowedUDPPorts = [ 42666 ];
}; };
@ -74,13 +73,11 @@
''; '';
privateKeyFile = config.age.secrets.wireguard-thrall.path; privateKeyFile = config.age.secrets.wireguard-thrall.path;
peers = [ peers = [{
{ # my phone
# my phone publicKey = "9EaBSNsJW0W/xPMLJ54zr3UNK3bZ/2ULOmhV1gPfSXk=";
publicKey = "9EaBSNsJW0W/xPMLJ54zr3UNK3bZ/2ULOmhV1gPfSXk="; allowedIPs = [ "10.0.0.2/32" ];
allowedIPs = [ "10.0.0.2/32" ]; }];
}
];
}; };
}; };
}; };
@ -97,15 +94,13 @@
security.sudo = { security.sudo = {
enable = true; enable = true;
execWheelOnly = true; execWheelOnly = true;
extraRules = [ extraRules = [{
{ groups = [ "wheel" ]; groups = [ "wheel" ];
commands = [ commands = [{
{ command = "/run/current-system/sw/bin/nixos-rebuild"; command = "/run/current-system/sw/bin/nixos-rebuild";
options = [ "NOPASSWD" ]; options = [ "NOPASSWD" ];
} }];
]; }];
}
];
}; };
# Select internationalisation properties. # Select internationalisation properties.
@ -175,7 +170,7 @@
"failco.de" = { "failco.de" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
root = "/var/www/blog"; root = "/srv/www/failco.de";
serverAliases = [ "www.failco.de" "mail.failco.de" ]; serverAliases = [ "www.failco.de" "mail.failco.de" ];
}; };
}; };
@ -189,11 +184,9 @@
"me@failco.de" = { "me@failco.de" = {
hashedPasswordFile = config.age.secrets.mailPass.path; hashedPasswordFile = config.age.secrets.mailPass.path;
aliases = [ aliases = [ "jakalx@failco.de" ];
"jakalx@failco.de"
];
catchAll = [ "failco.de" ]; catchAll = [ "failco.de" ];
}; };
}; };