From 4b63f4865c5ab2baf84b5a353aa63b44f58bd18a Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 9 Sep 2020 19:54:44 +0200 Subject: [PATCH 1/9] nix/os/devices/steveej-t480s-work: bump versions --- nix/os/devices/steveej-t480s-work/versions.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix index 9192d01..5e1bb0a 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -1,16 +1,16 @@ { channelsNixosStable = { ref = "nixos-20.03"; - rev = "14006b724f3d1f25ecf38238ee723d38b0c2f4ce"; + rev = "4bd1938e03e1caa49a6da1ec8cff802348458f05"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38"; + rev = "61525137fd1002f6f2a5eb0ea27d480713362cd5"; }; nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "a26ffb006b8d3c2d1f3c52345783a8d043b828cd"; + rev = "1b344f26953e59736f65acadf5ab3be60e8844c2"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; From 2c2609078a02ada84cf2471ad1506c36cc2349ad Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 10 Sep 2020 09:58:38 +0200 Subject: [PATCH 2/9] nix/os/devices/steveej-t480s-work: bump versions --- nix/os/devices/steveej-t480s-work/versions.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix index 5e1bb0a..43dd99b 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -10,7 +10,7 @@ nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "1b344f26953e59736f65acadf5ab3be60e8844c2"; + rev = "c1a0dfadea3c0f56d5213a677dbbd7b3e89ee98f"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; From 71c0063fd1e0b3b67c1fe75981d0cf800e445b4d Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 10 Sep 2020 10:21:34 +0200 Subject: [PATCH 3/9] nix/os/devices/steveej-t480s-work: bump versions --- nix/os/devices/steveej-t480s-work/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix index 43dd99b..de0d777 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -1,7 +1,7 @@ { channelsNixosStable = { - ref = "nixos-20.03"; - rev = "4bd1938e03e1caa49a6da1ec8cff802348458f05"; + ref = "nixos-20.03-small"; + rev = "57a83122d927015efaa242b33c76cdf3c0df8540"; }; channelsNixosUnstable = { ref = "nixos-unstable"; From 1a203cd3b681db2e11a46faa1383ccbf6b0eb574 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 10 Sep 2020 10:24:42 +0200 Subject: [PATCH 4/9] nix/os/devices/steveej-t480s-work: bump versions --- nix/os/devices/steveej-t480s-work/versions.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix index de0d777..03b84a7 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -10,7 +10,7 @@ nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "c1a0dfadea3c0f56d5213a677dbbd7b3e89ee98f"; + rev = "a4a1c016a332c270924f7901a2cb10f97034645c"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; From b93edc0001820595412be43b3216c2b7bcc9dcf8 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 14 Sep 2020 19:44:41 +0200 Subject: [PATCH 5/9] fixup! nix/os/devices/steveej-t480s-work: bump versions --- .../steveej-t480s-work/versions.tmpl.nix | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 nix/os/devices/steveej-t480s-work/versions.tmpl.nix diff --git a/nix/os/devices/steveej-t480s-work/versions.tmpl.nix b/nix/os/devices/steveej-t480s-work/versions.tmpl.nix new file mode 100644 index 0000000..af80588 --- /dev/null +++ b/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' -%>"; + }; +} From 45fb8f8397a7e16fafd207ccc11182b1cfe9450e Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 14 Sep 2020 19:40:36 +0200 Subject: [PATCH 6/9] graphical: use stable packages when possible --- nix/home-manager/configuration/graphical-fullblown.nix | 5 ++--- nix/home-manager/configuration/graphical-removable.nix | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index c791761..d4cfe2c 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/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 diff --git a/nix/home-manager/configuration/graphical-removable.nix b/nix/home-manager/configuration/graphical-removable.nix index ec34ea1..4eb7a78 100644 --- a/nix/home-manager/configuration/graphical-removable.nix +++ b/nix/home-manager/configuration/graphical-removable.nix @@ -91,7 +91,6 @@ in { # Remote Control Tools remmina freerdp - x2goclient # Network Tools openvpn From ec3d385d9648a900b3a59846740f7c0b57e7a32b Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 14 Sep 2020 19:41:00 +0200 Subject: [PATCH 7/9] Justfile: fix online detection --- Justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Justfile b/Justfile index dfff21d..8e4291a 100755 --- a/Justfile +++ b/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) From 9c7709b9a40c7d0fd7141fc9115512d1b277acf7 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 14 Sep 2020 19:41:45 +0200 Subject: [PATCH 8/9] shell: add nmap --- shell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/shell.nix b/shell.nix index be78033..492e98a 100644 --- a/shell.nix +++ b/shell.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation { esh xorg.xwininfo + nmap ]; # Set Environment Variables From 5721fe78611b8fabf9c7f00f62c5fc0eb7c9833d Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 14 Sep 2020 19:42:05 +0200 Subject: [PATCH 9/9] vcsh template: debug statements and fix var assignments --- nix/home-manager/profiles/dotfiles/vcsh.tmpl.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nix/home-manager/profiles/dotfiles/vcsh.tmpl.nix b/nix/home-manager/profiles/dotfiles/vcsh.tmpl.nix index 16a5d80..521a126 100644 --- a/nix/home-manager/profiles/dotfiles/vcsh.tmpl.nix +++ b/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" ''