Merge branch 'pr/bump' into 'master'

Bump versions and cleanup graphical profile

See merge request steveeJ/infra!47

Justfile

@@ -26,7 +26,7 @@ _device recipe dir +moreargs="":
 _render_templates:
 	#!/usr/bin/env bash
 	set -ex
-	if ! ip route get 0.0.0.0; then
+	if ! ip route get 1.1.1.1; then
 		echo No route to WAN. Skipping template rendering...
 	else
 		source $(just -v _get_nix_path {{invocation_directory()}}/nix/variables/versions.nix)

nix/home-manager/configuration/graphical-fullblown.nix

@@ -130,9 +130,9 @@ in {
       hexchat
       aspellDicts.en
       aspellDicts.de
-      unstablepkgs.skype
+      skype
       zoom-us # broken as of 2019-10-30
-      unstablepkgs.bluejeans-gui
+      bluejeans-gui
       thunderbird
       gnome3.evolution # gnome4.glib_networking
       tdesktop
@@ -156,7 +156,6 @@ in {
       # Remote Control Tools
       remmina
       freerdp
-      x2goclient
       teamviewer
 
       # Audio/Video Players

nix/home-manager/configuration/graphical-removable.nix

@@ -91,7 +91,6 @@ in {
       # Remote Control Tools
       remmina
       freerdp
-      x2goclient
 
       # Network Tools
       openvpn

nix/home-manager/profiles/dotfiles/vcsh.tmpl.nix

@@ -5,16 +5,17 @@
 }:
 
 let
-  repoHttps = "https://gitlab.com/steveeJ/dotfiles.git";
-  repoSsh = "git@gitlab.com:/steveeJ/dotfiles.git";
   repoBareLocal = pkgs.runCommand "fetchbare" {
       outputHashMode = "recursive";
       outputHashAlgo = "sha256";
       outputHash = "0000000000000000000000000000000000000000000000000000";
     } ''
+    (
+      set -xe
       export GIT_SSL_CAINFO=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt
       export SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt
       ${pkgs.git}/bin/git clone --mirror ${repoHttps} $out
+    )
     '';
 
 in pkgs.writeScript "activation-script" ''

nix/os/devices/steveej-t480s-work/versions.nix

@@ -1,16 +1,16 @@
 {
   channelsNixosStable = {
-    ref = "nixos-20.03";
-    rev = "14006b724f3d1f25ecf38238ee723d38b0c2f4ce";
+    ref = "nixos-20.03-small";
+    rev = "57a83122d927015efaa242b33c76cdf3c0df8540";
   };
   channelsNixosUnstable = {
     ref = "nixos-unstable";
-    rev = "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38";
+    rev = "61525137fd1002f6f2a5eb0ea27d480713362cd5";
   };
   nixpkgsMaster = {
     url = "https://github.com/NixOS/nixpkgs/";
     ref = "master";
-    rev = "a26ffb006b8d3c2d1f3c52345783a8d043b828cd";
+    rev = "a4a1c016a332c270924f7901a2cb10f97034645c";
   };
   homeManagerModule = {
     url = "https://github.com/rycee/home-manager";

nix/os/devices/steveej-t480s-work/versions.tmpl.nix

@@ -0,0 +1,20 @@
+{
+  channelsNixosStable = {
+    ref = "nixos-20.03-small";
+    rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-20.03-small | awk '{ print $1 }' | tr -d '\n' -%>";
+  };
+  channelsNixosUnstable = {
+    ref = "nixos-unstable";
+    rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-unstable | awk '{ print $1 }' | tr -d '\n' -%>";
+  };
+  nixpkgsMaster = {
+    url = "https://github.com/NixOS/nixpkgs/";
+    ref = "master";
+    rev = "<% git ls-remote https://github.com/NixOS/nixpkgs.git master | head -n1 | awk '{ print $1 }' | tr -d '\n' -%>";
+  };
+  homeManagerModule = {
+    url = "https://github.com/rycee/home-manager";
+    ref = "release-20.03";
+    rev = "<% git ls-remote https://github.com/rycee/home-manager.git release-20.03 | awk '{ print $1 }' | tr -d '\n' -%>";
+  };
+}

shell.nix

@@ -22,6 +22,7 @@ stdenv.mkDerivation {
     esh
 
     xorg.xwininfo
+    nmap
   ];
 
   # Set Environment Variables