Merge branch 'master' of github.com:kmein/niveum

config.nix

@@ -183,7 +183,7 @@ in {
     };
 
     home.file = {
-      ".background-image".source = ./art/37333571_p0_master1200.jpg;
+      # ".background-image".source = ./art/37333571_p0_master1200.jpg;
       ".config/mpv/input.conf".text = import ./dot/mpv.nix;
       ".config/xfce4/terminal/terminalrc".text = import ./dot/terminal.nix;
       ".config/zathura/zathurarc".text = "set selection-clipboard clipboard";

configs/graphics.nix

@@ -285,11 +285,12 @@ in {
     };
     displayManager.auto = { enable = true; user = "kfm"; };
     displayManager.sessionCommands = ''
-      ${pkgs.dropbox-cli}/bin/dropbox start
+      ${pkgs.feh}/bin/feh --bg-fill $(find ${../art} -type f | shuf -n 1) &
+      ${pkgs.dropbox-cli}/bin/dropbox start &
       ${pkgs.seafile-client}/bin/seafile-applet &
     '';
     desktopManager.xterm.enable = false;
-    desktopManager.wallpaper.mode = "fill";
+    # desktopManager.wallpaper.mode = "fill";
     windowManager.default = "i3";
     windowManager.i3 = {
       enable = true;

configs/networks.nix

@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 let
   eduroam = (import ../secrets.nix).eduroam;
   eduroamConfig = {
@@ -6,10 +7,13 @@ let
         eap=TTLS
         proto=RSN
         identity="${eduroam.identity}"
-        anonymous_identity="anonymous@cms.hu-berlin.de"
+        anonymous_identity="anonymous@wlan.hu-berlin.de"
         altsubject_match="DNS:srv1-radius.cms.hu-berlin.de;DNS:srv2-radius.cms.hu-berlin.de"
         password="${eduroam.password}"
-        ca_cert="${builtins.fetchurl https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/t-telesec_globalroot_class_2.pem}"
+        ca_cert="${pkgs.fetchurl {
+          url = https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/t-telesec_globalroot_class_2.pem;
+          sha256 = "b30989fd9e45c74bf417df74d1da639d1f04d4fd0900be813a2d6a031a56c845";
+        }}"
         phase2="auth=PAP"
       '';
     };
@@ -22,11 +26,11 @@ in {
   networking.wireless.userControlled.enable = true;
   networking.wireless.networks = {
     Aether = { pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a"; };
+    eduroam_5GHz = eduroamConfig;
+    eduroam = eduroamConfig;
     "Asoziales Netzwerk" = { pskRaw = "8e234041ec5f0cd1b6a14e9adeee9840ed51b2f18856a52137485523e46b0cb6"; };
     "c-base-public" = {};
     "FlixBus" = {};
     "FlixBus Wi-Fi" = {};
-    eduroam = eduroamConfig;
-    eduroam_5GHz = eduroamConfig;
   };
 }

configs/packages.nix

@@ -6,8 +6,7 @@ with pkgs;
     packageOverrides =
       let nix-writers = builtins.fetchGit {
         url = https://cgit.krebsco.de/nix-writers/;
-        ref = "tags/v3.0.0";
-        # sha256 = "066y18q19d35x5jjr3kdn1dwi7s1l12icr90s2vxwzif6ahnzmb3";
+        rev = "0660cc1a1169e799bda356c6fadb245a96345816";
       }; in import "${nix-writers}/pkgs" pkgs;
   };
 
@@ -110,6 +109,7 @@ with pkgs;
     seafile-client
     shellcheck
     spotify
+    stack
     swiProlog
     tinycc
     zeroad