2 days of work

roles/admin.nix

@@ -1,8 +1,12 @@
 { pkgs, options, ...}:
 
-{
+let
+  unstable = import <nixos-unstable> {};
+in {
   environment.systemPackages = with pkgs; [
     kubectl
+    cryptsetup
+    unstable.kubernetes-helm
 
     # podman
     conmon

roles/base.nix

@@ -5,6 +5,7 @@ let
 in {
   environment.systemPackages = with pkgs; [
     bash
+    bash-completion
     bat
     direnv
     fd
@@ -18,7 +19,9 @@ in {
     ripgrep
     tcpdump
     tmux
+    wget
     z-lua
+    unzip
     unstable.starship
     (import ../packages/neovim.nix)
   ];
@@ -46,28 +49,21 @@ in {
       }
       starship_precmd_user_func=set_win_title
 
-      pw() {
-          len=''${1:-$(( $RANDOM % 24 + 8 ))}
-          tr -dc a-zA-Z0-9 < /dev/urandom | head -c $len
-          echo
-      }
-      cdg() {
-          gitroot=$(until [ -d .git ]; do [ "$PWD" == "/" ] && exit 1; cd ..; done; echo $PWD)
-          if [ $? == 0 ]; then
-precmd_user_func = "title"
-              cd $gitroot
-          else
-              echo "gitroot not found."
-              return 1
-          fi
-      }
-
       . "$(fzf-share)/key-bindings.bash"
       . "$(fzf-share)/completion.bash"
       . <(z --init bash)
       . <(direnv hook bash)
+      . ${pkgs.bash-completion}/etc/profile.d/bash_completion.sh
 
-      if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
+      for script in "$HOME"/dotfiles/bashrc/*.sh; do
+          . "$script"
+      done
+
+      if [[ -z $DISPLAY ]] \
+          && [[ $(tty) = /dev/tty1 ]] \
+          && [[ "$USER" = "stefan" ]] \
+          && [[ -x /run/current-system/sw/bin/startsway ]]
+      then
         exec startsway
       fi
     '';

roles/desktop.nix

@@ -69,7 +69,7 @@ in {
     hicolor-icon-theme
     numix-icon-theme
 
-    alacritty
+    unstable.alacritty
     imv
     inkscape
     libreoffice

roles/dev.nix

@@ -1,31 +1,24 @@
-# 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, ... }:
 
 let
   unstable = import <nixos-unstable> {};
 in {
   environment.systemPackages = with pkgs; [
-    arduino
-    avrdude
-    pkgsCross.avr.avrlibc  
-    pkgsCross.avr.libcCross
-    pkgsCross.avr.buildPackages.gcc8
-    pkgsCross.avr.buildPackages.binutils
-
+    gnumake
     go
     python37
     python37Packages.pyls-black
     python37Packages.pyls-isort
     python37Packages.pyls-mypy
     rustup
+    unstable.golangci-lint
     unstable.gopls
     unstable.rust-analyzer
 
     emacs
     sops
     tig
+    ltrace
 
     openssl pkg-config nasm cmake zlib gcc binutils-unwrapped
   ];

roles/embedded.nix

@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+let
+  unstable = import <nixos-unstable> {};
+in {
+  environment.systemPackages = with pkgs; [
+    arduino
+    avrdude
+    pkgsCross.avr.avrlibc
+    pkgsCross.avr.libcCross
+    pkgsCross.avr.buildPackages.gcc8
+    pkgsCross.avr.buildPackages.binutils
+  ];
+}

roles/network.nix

@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+let
+  unstable = import <nixos-unstable> { config.allowUnfree = true; };
+  cloudstation = pkgs.libsForQt5.callPackage (import ../packages/cloudstation.nix) {};
+in {
+
+  networking.networkmanager.enable = true;
+  users.users.stefan.extraGroups = [ "networkmanager" ];
+
+  environment.systemPackages = with pkgs; [
+    networkmanagerapplet
+    networkmanager-vpnc
+  ];
+}

roles/work.nix

@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+
+let
+  unstable = import <nixos-unstable> { config.allowUnfree = true; };
+  cloudstation = pkgs.libsForQt5.callPackage (import ../packages/cloudstation.nix) {};
+in {
+
+  security.pki.certificateFiles = [
+    ../dotfiles/certs/NetzmarktCA.crt
+    ../dotfiles/certs/vcenter.netzmarkt.lan.crt
+  ];
+
+  networking.extraHosts = ''
+    35.234.109.94 fsi.thomann.de
+  '';
+
+  environment.systemPackages = with pkgs; [
+    (import ../packages/oc311.nix)
+    (import ../packages/oc46.nix)
+    (import ../packages/openshift-install-4.5.nix)
+    astroid
+    cloudstation
+    drone-cli
+    nagstamon
+    python37Packages.pyqt5_with_qtmultimedia # required for nagstamon
+    unstable.slack
+    unstable.velero
+  ];
+}