setup sternchen

feature/hass
Ingolf Wagner 2021-03-05 16:01:24 +01:00
parent 6f793e7e38
commit 22dbeab3f8
Signed by: palo
GPG Key ID: 76BF5F1928B9618B
11 changed files with 53 additions and 22 deletions

View File

@ -27,7 +27,7 @@
services.kbfs.enable = false; services.kbfs.enable = false;
programs.custom.steam.enable = false; programs.custom.steam.enable = false;
programs.custom.video.enable = false; programs.custom.video.enable = true;
services.printing.enable = true; services.printing.enable = true;
@ -77,5 +77,11 @@
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
}; };
services.xserver.displayManager.defaultSession = "plasma5";
services.xserver.desktopManager.pantheon.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
services.xserver.desktopManager.xfce.enable = true;
} }

View File

@ -72,7 +72,8 @@
# boot # boot
# ---- # ----
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/sda1"; #device = "/dev/sda1";
device = "/dev/disk/by-uuid/EDD4-9795";
fsType = "vfat"; fsType = "vfat";
}; };

View File

@ -5,9 +5,16 @@ in {
# overlay included # overlay included
#nixpkgs.overlays = [ (import <mozilla-overlay/rust-overlay.nix>) ]; #nixpkgs.overlays = [ (import <mozilla-overlay/rust-overlay.nix>) ];
programs.custom.browser.enable = false;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
nextcloud-client
gimp
inkscape
darktable darktable
keepass keepass
firefox
google-chrome
]; ];
} }

View File

@ -6,6 +6,12 @@ in {
nixpkgs.overlays = [ (import <mozilla-overlay/rust-overlay.nix>) ]; nixpkgs.overlays = [ (import <mozilla-overlay/rust-overlay.nix>) ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
nextcloud-client
gimp
inkscape
imagemagick
#bitwig-studio #bitwig-studio
#unstable.sonic-visualiser #unstable.sonic-visualiser
sononym-crawler sononym-crawler

View File

@ -33,10 +33,10 @@ in {
# window-manager : Xmonad # window-manager : Xmonad
# ----------------------- # -----------------------
desktopManager = { xterm.enable = false; }; desktopManager = { xterm.enable = false; };
displayManager.defaultSession = "none+xmonad"; displayManager.defaultSession = lib.mkDefault "none+xmonad";
displayManager.autoLogin.enable = true; displayManager.autoLogin.enable = lib.mkDefault true;
displayManager.autoLogin.user = cfg.autoLoginUser; displayManager.autoLogin.user = cfg.autoLoginUser;
displayManager.lightdm = { enable = true; }; displayManager.lightdm.enable = lib.mkDefault true;
windowManager = { windowManager = {
xmonad.enable = true; xmonad.enable = true;
xmonad.enableContribAndExtras = true; xmonad.enableContribAndExtras = true;

View File

@ -131,7 +131,9 @@ let
}; };
hostPattern = name: hostPattern = name:
if name == "porani" then if name == "sternchen" then
"${name}.secret"
else if name == "porani" then
"${name}.secret" "${name}.secret"
else if name == "dummy" then else if name == "dummy" then
"95.217.223.75" "95.217.223.75"

View File

@ -2,6 +2,14 @@
{ config, lib, ... }: { { config, lib, ... }: {
services.openssh.knownHosts = { services.openssh.knownHosts = {
"sternchen.secret" = {
hostNames = [
"sternchen.secret"
config.module.cluster.services.tinc.secret.hosts.sternchen.tincIp
];
publicKey =
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILriD/0+65L1mkbjKENwpvB3wUMXz/rEf9J8wuJjJa0q";
};
"sterni.private" = { "sterni.private" = {
hostNames = [ hostNames = [
"sterni.private" "sterni.private"

View File

@ -4,7 +4,7 @@ let
homeFolder = "/browsers"; homeFolder = "/browsers";
in { in {
programs.custom.browser = { programs.custom.browser = {
enable = true; enable = lib.mkDefault true;
configList = { configList = {
development = { development = {
home = "${homeFolder}/development-browser"; home = "${homeFolder}/development-browser";

View File

@ -15,14 +15,15 @@ let
in pkgs.writers.writeBashBin "all-licenses" in pkgs.writers.writeBashBin "all-licenses"
(lib.concatStringsSep "\n" licenses); (lib.concatStringsSep "\n" licenses);
#zettlr = pkgs.writers.writeBashBin "zettlr" '' zettlr = pkgs.writers.writeBashBin "zettlr" ''
# if [[ ! -x "$HOME/programs/Zettlr.AppImage" ]] if [[ ! -x "$HOME/programs/Zettlr.AppImage" ]]
# then then
# echo "$HOME/programs/Zettlr.AppImage does not exist or is not executable"; echo "$HOME/programs/Zettlr.AppImage does not exist or is not executable";
# exit 1 exit 1
# fi fi
# exec ${pkgs.appimage-run}/bin/appimage-run "$HOME/programs/Zettlr.AppImage" exec ${pkgs.appimage-run}/bin/appimage-run "$HOME/programs/Zettlr.AppImage"
#''; '';
#zettlr = unstablePkgs.zettlr;
parseUrl = pkgs.writeBashBin "parseUrl" '' parseUrl = pkgs.writeBashBin "parseUrl" ''
echo "$@" | \ echo "$@" | \
@ -38,8 +39,6 @@ let
${pkgs.xclip}/bin/xclip ${pkgs.xclip}/bin/xclip
''; '';
zettlr = unstablePkgs.zettlr;
replaceLinks = pkgs.writers.writeBashBin "replace-link-with-content" # sh replaceLinks = pkgs.writers.writeBashBin "replace-link-with-content" # sh
'' ''
if [ ! -L "$1" ] if [ ! -L "$1" ]
@ -135,6 +134,7 @@ let
in { in {
# ffmpeg scripts to encode movies
programs.custom.ffmpeg.enable = true; programs.custom.ffmpeg.enable = true;
# gnupg setup # gnupg setup

View File

@ -1,6 +1,7 @@
{ config, ... }: { { config, ... }:
{
# make sure ssh is only available trough the tinc # make sure ssh is only available trough the tinc
networking.firewall.extraCommands = '' #networking.firewall.extraCommands = ''
iptables -t nat -A PREROUTING ! -i tinc.private -p tcp -m tcp --dport 22 -j REDIRECT --to-ports 0 # iptables -t nat -A PREROUTING ! -i tinc.private -p tcp -m tcp --dport 22 -j REDIRECT --to-ports 0
''; #'';
} }

View File

@ -3,7 +3,7 @@
environment.systemPackages = with pkgs; [ xclip xtrlock-pam xorg.xev ]; environment.systemPackages = with pkgs; [ xclip xtrlock-pam xorg.xev ];
system.custom.x11 = { system.custom.x11 = {
enable = true; enable = lib.mkDefault true;
autoLoginUser = config.users.users.mainUser.name; autoLoginUser = config.users.users.mainUser.name;
}; };