diff --git a/configs/sternchen/configuration.nix b/configs/sternchen/configuration.nix index 515d7b2..9088b6b 100644 --- a/configs/sternchen/configuration.nix +++ b/configs/sternchen/configuration.nix @@ -27,7 +27,7 @@ services.kbfs.enable = false; programs.custom.steam.enable = false; - programs.custom.video.enable = false; + programs.custom.video.enable = true; services.printing.enable = true; @@ -77,5 +77,11 @@ 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; + } diff --git a/configs/sternchen/hardware-configuration.nix b/configs/sternchen/hardware-configuration.nix index 94143af..91e4833 100644 --- a/configs/sternchen/hardware-configuration.nix +++ b/configs/sternchen/hardware-configuration.nix @@ -72,7 +72,8 @@ # boot # ---- fileSystems."/boot" = { - device = "/dev/sda1"; + #device = "/dev/sda1"; + device = "/dev/disk/by-uuid/EDD4-9795"; fsType = "vfat"; }; diff --git a/configs/sternchen/packages.nix b/configs/sternchen/packages.nix index 5151b17..8cfe0ec 100644 --- a/configs/sternchen/packages.nix +++ b/configs/sternchen/packages.nix @@ -5,9 +5,16 @@ in { # overlay included #nixpkgs.overlays = [ (import ) ]; + programs.custom.browser.enable = false; + environment.systemPackages = with pkgs; [ + nextcloud-client + gimp + inkscape darktable keepass + firefox + google-chrome ]; } diff --git a/configs/sterni/packages.nix b/configs/sterni/packages.nix index c69fb8c..943c709 100644 --- a/configs/sterni/packages.nix +++ b/configs/sterni/packages.nix @@ -6,6 +6,12 @@ in { nixpkgs.overlays = [ (import ) ]; environment.systemPackages = with pkgs; [ + + nextcloud-client + gimp + inkscape + imagemagick + #bitwig-studio #unstable.sonic-visualiser sononym-crawler diff --git a/modules/system/x11.nix b/modules/system/x11.nix index 8d92263..7bf4c67 100644 --- a/modules/system/x11.nix +++ b/modules/system/x11.nix @@ -33,10 +33,10 @@ in { # window-manager : Xmonad # ----------------------- desktopManager = { xterm.enable = false; }; - displayManager.defaultSession = "none+xmonad"; - displayManager.autoLogin.enable = true; + displayManager.defaultSession = lib.mkDefault "none+xmonad"; + displayManager.autoLogin.enable = lib.mkDefault true; displayManager.autoLogin.user = cfg.autoLoginUser; - displayManager.lightdm = { enable = true; }; + displayManager.lightdm.enable = lib.mkDefault true; windowManager = { xmonad.enable = true; xmonad.enableContribAndExtras = true; diff --git a/shell.nix b/shell.nix index 7f8ff07..8685f3f 100644 --- a/shell.nix +++ b/shell.nix @@ -131,7 +131,9 @@ let }; hostPattern = name: - if name == "porani" then + if name == "sternchen" then + "${name}.secret" + else if name == "porani" then "${name}.secret" else if name == "dummy" then "95.217.223.75" diff --git a/system/all/sshd-known-hosts-private.nix b/system/all/sshd-known-hosts-private.nix index 86cffe6..f5f6154 100644 --- a/system/all/sshd-known-hosts-private.nix +++ b/system/all/sshd-known-hosts-private.nix @@ -2,6 +2,14 @@ { config, lib, ... }: { 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" = { hostNames = [ "sterni.private" diff --git a/system/desktop/browser.nix b/system/desktop/browser.nix index cf241e3..cd4814d 100644 --- a/system/desktop/browser.nix +++ b/system/desktop/browser.nix @@ -4,7 +4,7 @@ let homeFolder = "/browsers"; in { programs.custom.browser = { - enable = true; + enable = lib.mkDefault true; configList = { development = { home = "${homeFolder}/development-browser"; diff --git a/system/desktop/packages.nix b/system/desktop/packages.nix index e31bb2d..febbc84 100644 --- a/system/desktop/packages.nix +++ b/system/desktop/packages.nix @@ -15,14 +15,15 @@ let in pkgs.writers.writeBashBin "all-licenses" (lib.concatStringsSep "\n" licenses); - #zettlr = pkgs.writers.writeBashBin "zettlr" '' - # if [[ ! -x "$HOME/programs/Zettlr.AppImage" ]] - # then - # echo "$HOME/programs/Zettlr.AppImage does not exist or is not executable"; - # exit 1 - # fi - # exec ${pkgs.appimage-run}/bin/appimage-run "$HOME/programs/Zettlr.AppImage" - #''; + zettlr = pkgs.writers.writeBashBin "zettlr" '' + if [[ ! -x "$HOME/programs/Zettlr.AppImage" ]] + then + echo "$HOME/programs/Zettlr.AppImage does not exist or is not executable"; + exit 1 + fi + exec ${pkgs.appimage-run}/bin/appimage-run "$HOME/programs/Zettlr.AppImage" + ''; + #zettlr = unstablePkgs.zettlr; parseUrl = pkgs.writeBashBin "parseUrl" '' echo "$@" | \ @@ -38,8 +39,6 @@ let ${pkgs.xclip}/bin/xclip ''; - zettlr = unstablePkgs.zettlr; - replaceLinks = pkgs.writers.writeBashBin "replace-link-with-content" # sh '' if [ ! -L "$1" ] @@ -135,6 +134,7 @@ let in { + # ffmpeg scripts to encode movies programs.custom.ffmpeg.enable = true; # gnupg setup diff --git a/system/desktop/sshd.nix b/system/desktop/sshd.nix index 19951e3..ed7ca80 100644 --- a/system/desktop/sshd.nix +++ b/system/desktop/sshd.nix @@ -1,6 +1,7 @@ -{ config, ... }: { +{ config, ... }: +{ # make sure ssh is only available trough the tinc - networking.firewall.extraCommands = '' - iptables -t nat -A PREROUTING ! -i tinc.private -p tcp -m tcp --dport 22 -j REDIRECT --to-ports 0 - ''; + #networking.firewall.extraCommands = '' + # iptables -t nat -A PREROUTING ! -i tinc.private -p tcp -m tcp --dport 22 -j REDIRECT --to-ports 0 + #''; } diff --git a/system/desktop/x11.nix b/system/desktop/x11.nix index 626d0b8..6bc867a 100644 --- a/system/desktop/x11.nix +++ b/system/desktop/x11.nix @@ -3,7 +3,7 @@ environment.systemPackages = with pkgs; [ xclip xtrlock-pam xorg.xev ]; system.custom.x11 = { - enable = true; + enable = lib.mkDefault true; autoLoginUser = config.users.users.mainUser.name; };