From 462575fa3b90e02d3aaa469973f4e54bbe81bc00 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 27 Mar 2019 13:46:01 +0100 Subject: [PATCH 01/21] 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 d9b6e17..14bca20 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -1,15 +1,15 @@ { channelsNixosStable = { ref = "nixos-19.03"; - rev = "07e2b59812de95deeedde95fb6ba22d581d12fbc"; + rev = "23fd1394dc6bef03a2ff010278a24403a97f0647"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "34aa254f9ebf5899636a9927ceefbc9df80230f4"; + rev = "07b42ccf2de451342982b550657636d891c4ba35"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; ref = "master"; - rev = "52fdf5b7ecab93eaf2a2ee83777b73f8ee126614"; + rev = "f77d6b7a2d8e404a9ad125ea2409af7f6e4b7fbc"; }; } From 6b1615791e2c49396d564dab1aec2bfc23daf1ea Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 28 Mar 2019 16:56:15 +0100 Subject: [PATCH 02/21] 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 14bca20..24214ec 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -10,6 +10,6 @@ homeManagerModule = { url = "https://github.com/rycee/home-manager"; ref = "master"; - rev = "f77d6b7a2d8e404a9ad125ea2409af7f6e4b7fbc"; + rev = "bc2b7d4f0972412f6f0d5792560a90adc4f2d4c1"; }; } From 91bcf9c15b86481fb211aaa65340c00701969f58 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 31 Mar 2019 22:44:13 +0200 Subject: [PATCH 03/21] nix/os/devices/steveej-t480s-work: bump versions --- nix/os/devices/steveej-t480s-work/versions.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix index 24214ec..3d8fc1c 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -1,15 +1,20 @@ { channelsNixosStable = { ref = "nixos-19.03"; - rev = "23fd1394dc6bef03a2ff010278a24403a97f0647"; + rev = "3a4ffdd38b56801ce616aa08791121d36769e884"; }; channelsNixosUnstable = { ref = "nixos-unstable"; rev = "07b42ccf2de451342982b550657636d891c4ba35"; }; + nixpkgsMaster = { + url = "https://github.com/NixOS/nixpkgs/"; + ref = "master"; + rev = "d8c7f0bd3f42bc9e687b12ce7f0a4ef747f27933"; + }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; ref = "master"; - rev = "bc2b7d4f0972412f6f0d5792560a90adc4f2d4c1"; + rev = "03162970cd6dadfac58f169cd50aed5a5aeec14f"; }; } From 115bef2513fadcc5cd50a434ff13b69c10c4fa83 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 31 Mar 2019 22:47:58 +0200 Subject: [PATCH 04/21] Justfile: add command for updating the default versions --- Justfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Justfile b/Justfile index 5b66483..51314c2 100755 --- a/Justfile +++ b/Justfile @@ -1,9 +1,18 @@ _DEFAULT_VERSION_TMPL: echo "{{invocation_directory()}}/nix/variables/versions.tmpl.nix" +_DEFAULT_VERSION: + echo "{{invocation_directory()}}/nix/variables/versions.nix" + _usage: just -l +update-default-versions: + #!/usr/bin/env bash + template="$(just _DEFAULT_VERSION_TMPL)" + outfile="$(just _DEFAULT_VERSION)" + esh -o ${outfile} ${template} + _get_nix_path versionsPath: echo $(set -x; nix-build --no-link --show-trace {{invocation_directory()}}/nix/default.nix -A channelSources --argstr versionsPath {{versionsPath}} --argstr rebuildarg "dummy") From d4d3d6bc40db544691298aeae6402e726743e707 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 31 Mar 2019 22:48:33 +0200 Subject: [PATCH 05/21] nix/versions bump default versions with new nixpkgs/master --- nix/default.nix | 1 + nix/variables/versions.nix | 17 +++++++++++------ nix/variables/versions.tmpl.nix | 5 +++++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 1bead1c..2d730ca 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -22,6 +22,7 @@ [ "nixos" (mkChannelSource "channelsNixosStable" + "/nixos") ] [ "channels-nixos-stable" (mkChannelSource "channelsNixosStable") ] [ "channels-nixos-unstable" (mkChannelSource "channelsNixosUnstable") ] + [ "nixpkgs-master" (mkChannelSource "nixpkgsMaster") ] [ "home-manager-module" (mkChannelSource "homeManagerModule") ] ]; in (import (mkChannelSource "channelsNixosStable") {}).writeText "channels.rc" '' diff --git a/nix/variables/versions.nix b/nix/variables/versions.nix index 75928de..3d8fc1c 100644 --- a/nix/variables/versions.nix +++ b/nix/variables/versions.nix @@ -1,15 +1,20 @@ { channelsNixosStable = { - ref = "nixos-18.09"; - rev = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a"; + ref = "nixos-19.03"; + rev = "3a4ffdd38b56801ce616aa08791121d36769e884"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "44b02b52ea6a49674f124f50009299f192ed78bb"; + rev = "07b42ccf2de451342982b550657636d891c4ba35"; + }; + nixpkgsMaster = { + url = "https://github.com/NixOS/nixpkgs/"; + ref = "master"; + rev = "d8c7f0bd3f42bc9e687b12ce7f0a4ef747f27933"; }; homeManagerModule = { - url = "https://github.com/rycee/home-manager/"; - ref = "release-18.09"; - rev = "dd94a849df69fe62fe2cb23a74c2b9330f1189ed"; + url = "https://github.com/rycee/home-manager"; + ref = "master"; + rev = "03162970cd6dadfac58f169cd50aed5a5aeec14f"; }; } diff --git a/nix/variables/versions.tmpl.nix b/nix/variables/versions.tmpl.nix index 93b44b8..9f35d77 100644 --- a/nix/variables/versions.tmpl.nix +++ b/nix/variables/versions.tmpl.nix @@ -7,6 +7,11 @@ 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 = "master"; From a6b2fdf1be1188311da6a71d20665b3672a6a0be Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 31 Mar 2019 22:49:50 +0200 Subject: [PATCH 06/21] Justfile: fallback to default version tmpl on render --- Justfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Justfile b/Justfile index 51314c2..de2e276 100755 --- a/Justfile +++ b/Justfile @@ -115,6 +115,10 @@ update-this-device rebuild-mode='switch': template=nix/os/devices/$(hostname -s)/versions.tmpl.nix outfile=nix/os/devices/$(hostname -s)/versions.nix + if ! test -e ${template}; then + template="$(just _DEFAULT_VERSION_TMPL)" + fi + esh -o ${outfile} ${template} if ! test "$(git diff ${outfile})"; then echo Already on latest versions From ea7574d7aad158570edd8f8170bc4f08cd0a3e6d Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 31 Mar 2019 22:50:19 +0200 Subject: [PATCH 07/21] nix/devices/steveej-t480s-work: remove specific versions tmpl --- .../devices/steveej-t480s-work/versions.tmpl.nix | 15 --------------- 1 file changed, 15 deletions(-) delete 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 deleted file mode 100644 index 93b44b8..0000000 --- a/nix/os/devices/steveej-t480s-work/versions.tmpl.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - channelsNixosStable = { - ref = "nixos-19.03"; - rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-19.03 | 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' -%>"; - }; - homeManagerModule = { - url = "https://github.com/rycee/home-manager"; - ref = "master"; - rev = "<% git ls-remote https://github.com/rycee/home-manager.git master | awk '{ print $1 }' | tr -d '\n' -%>"; - }; -} From 563fb4da5f91bb09ddd12a6022304c9dadbd8fbf Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 31 Mar 2019 22:50:58 +0200 Subject: [PATCH 08/21] nix/home/graphical-fullblown: use virtmanager from master Currently broken on channel 19.03 thus resorting to including https://github.com/NixOS/nixpkgs/pull/57385. --- nix/home-manager/configuration/graphical-fullblown.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 9ce39a0..1d77c26 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -5,6 +5,7 @@ let # gitpkgs = import /home/steveej/src/github/NixOS/nixpkgs {}; unstablepkgs = import { config = config.nixpkgs.config; }; + masterpkgs = import { config = config.nixpkgs.config; }; in { imports = [ @@ -145,7 +146,7 @@ in { gnome3.cheese # Virtualization - virtmanager + masterpkgs.virtmanager (pkgs.lib.hiPrio qemu) # virtualbox vagrant From 2dfe4313bd494e57f0da3960b5306e1b0fae65ea Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 31 Mar 2019 22:53:01 +0200 Subject: [PATCH 09/21] nix/home/qtile-desktop: switch to gnome-terminal For some reason roxterm terminates all instances when terminating a single one. --- nix/home-manager/profiles/qtile-desktop.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nix/home-manager/profiles/qtile-desktop.nix b/nix/home-manager/profiles/qtile-desktop.nix index e1c31b3..1301da0 100644 --- a/nix/home-manager/profiles/qtile-desktop.nix +++ b/nix/home-manager/profiles/qtile-desktop.nix @@ -31,9 +31,10 @@ let exit 1 ;; esac - ''; + terminal = "${pkgs.gnome3.gnome_terminal}/bin/gnome-terminal"; + qtileConfig = pkgs.writeScript "qtile_config.py" '' from libqtile.config import Key, Screen, Group, Drag, Click from libqtile.command import lazy @@ -97,9 +98,9 @@ key_control = "control" keys = [ # https://github.com/qtile/qtile/blob/develop/libqtile/xkeysyms.py - Key([key_super], "Return", lazy.spawn("${pkgs.roxterm}/bin/roxterm")), - Key([key_super], "backslash", lazy.spawn("${pkgs.roxterm}/bin/roxterm")), - Key([key_super], "apostrophe", lazy.spawn("${pkgs.roxterm}/bin/roxterm")), + Key([key_super], "Return", lazy.spawn("${terminal}")), + Key([key_super], "backslash", lazy.spawn("${terminal}")), + Key([key_super], "apostrophe", lazy.spawn("${terminal}")), Key([key_super], "r", lazy.spawncmd()), Key([key_super], "w", lazy.window.kill()), From 7081f7449875918e029474b4787feed0d3abefd0 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 1 Apr 2019 13:48:27 +0200 Subject: [PATCH 10/21] 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 3d8fc1c..5d3df39 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 = "d8c7f0bd3f42bc9e687b12ce7f0a4ef747f27933"; + rev = "96b6a8fb0eb22eaec9e15b7a2e34fb70ea2ef09a"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; From f79ef1649b5089710f65fcbba81296429a5e6c00 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 8 Apr 2019 22:09:57 +0200 Subject: [PATCH 11/21] nix/os/devices/steveej-t480s-work: bump versions --- nix/os/devices/steveej-t480s-work/versions.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix index 5d3df39..782f6cd 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -1,20 +1,20 @@ { channelsNixosStable = { ref = "nixos-19.03"; - rev = "3a4ffdd38b56801ce616aa08791121d36769e884"; + rev = "67bc63f9a7ac1b4d1a7114c88ca1a4df03bfdb0e"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "07b42ccf2de451342982b550657636d891c4ba35"; + rev = "acbdaa569f4ee387386ebe1b9e60b9f95b4ab21b"; }; nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "96b6a8fb0eb22eaec9e15b7a2e34fb70ea2ef09a"; + rev = "cb601bbfedf43fa116a538f818227c1464f73095"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; ref = "master"; - rev = "03162970cd6dadfac58f169cd50aed5a5aeec14f"; + rev = "f8b03f5750679d6686eefa60d5de8cfd932b8997"; }; } From 90868cd049b252a2f8cf76583c3a546e1a7be199 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 12 Apr 2019 22:33:32 +0200 Subject: [PATCH 12/21] 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 782f6cd..69ee732 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-19.03"; - rev = "67bc63f9a7ac1b4d1a7114c88ca1a4df03bfdb0e"; + rev = "5c52b25283a6cccca443ffb7a358de6fe14b4a81"; }; channelsNixosUnstable = { ref = "nixos-unstable"; @@ -10,11 +10,11 @@ nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "cb601bbfedf43fa116a538f818227c1464f73095"; + rev = "78d5ba39c0c62bf1cf53235ebdaa67c6c5b6469c"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; ref = "master"; - rev = "f8b03f5750679d6686eefa60d5de8cfd932b8997"; + rev = "30a16e3a87d509735731706379dce9c0223fe5b9"; }; } From 24449ab8a669cd3fc4dfa9c52460cf8af9137a84 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 20 Apr 2019 14:43:55 +0200 Subject: [PATCH 13/21] home-manager: remove duplicate EDITOR setting --- nix/home-manager/programs/pass.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nix/home-manager/programs/pass.nix b/nix/home-manager/programs/pass.nix index 39cdb19..5b892f5 100644 --- a/nix/home-manager/programs/pass.nix +++ b/nix/home-manager/programs/pass.nix @@ -4,8 +4,6 @@ { home.sessionVariables = { - EDITOR = "nvim"; - # required by pass-otp PASSWORD_STORE_EXTENSIONS_DIR = "$HOME/.nix-profile/lib/password-store/extensions"; PASSWORD_STORE_ENABLE_EXTENSIONS = "true"; From 4797c89e12aa066039f1bcbd0205d73a2c52fd48 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 20 Apr 2019 14:44:15 +0200 Subject: [PATCH 14/21] nix/os/devices/steveej-t480s-work: refacor openshift dnsmasq snippet --- nix/os/devices/steveej-t480s-work/system.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nix/os/devices/steveej-t480s-work/system.nix b/nix/os/devices/steveej-t480s-work/system.nix index 7d3aa74..30b26d5 100644 --- a/nix/os/devices/steveej-t480s-work/system.nix +++ b/nix/os/devices/steveej-t480s-work/system.nix @@ -11,8 +11,14 @@ in { networking.hostName = "steveej-t480s-work"; # Define your hostname. # Used for testing local Openshift clusters - environment.etc."NetworkManager/dnsmasq.d/tectonic.conf".text = '' - server=/openshift.testing/192.168.126.1 + environment.etc."NetworkManager/dnsmasq.d/openshift.conf".text = + let + openshiftClusterName = "openshift-steveej"; + openshiftDomain = "openshift.testing"; + openshiftSubnetBase = "192.168.126"; + in '' + server=/${openshiftDomain}/${openshiftSubnetBase}.1 + address=/.apps.${openshiftClusterName}.${openshiftDomain}/${openshiftSubnetBase}.51 ''; networking.firewall.enable = lib.mkForce false; networking.firewall.checkReversePath = false; From 27d1b57302299b19c3c7d1e669902abe677bbe0b Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 26 Apr 2019 23:28:50 +0200 Subject: [PATCH 15/21] nix/os/devices/steveej-t480s-work: bump versions --- nix/os/devices/steveej-t480s-work/versions.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix index 69ee732..e26ab41 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -1,20 +1,20 @@ { channelsNixosStable = { ref = "nixos-19.03"; - rev = "5c52b25283a6cccca443ffb7a358de6fe14b4a81"; + rev = "cf3e277dd0bd710af0df667e9364f4bd80c72713"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "acbdaa569f4ee387386ebe1b9e60b9f95b4ab21b"; + rev = "dfd8f84aef129f1978e446b5d45ef05cd4421821"; }; nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "78d5ba39c0c62bf1cf53235ebdaa67c6c5b6469c"; + rev = "58c473985c14801d4c3cf36fa8d2b3ef9020b709"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; ref = "master"; - rev = "30a16e3a87d509735731706379dce9c0223fe5b9"; + rev = "ba0375bf06e0e0c3b2377edf913b7fddfd5a0b40"; }; } From e3a2e926bd1f9f2ffb4bfd6ee7c5d0fe80dd2689 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 29 Apr 2019 19:41:46 +0200 Subject: [PATCH 16/21] 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 e26ab41..59c145a 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -10,11 +10,11 @@ nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "58c473985c14801d4c3cf36fa8d2b3ef9020b709"; + rev = "36d5d3083c463eceac07307005cdbc22fca3b2cb"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; ref = "master"; - rev = "ba0375bf06e0e0c3b2377edf913b7fddfd5a0b40"; + rev = "2f819d1647d4c73aad6ca8fec8348beaae4bb870"; }; } From 4e142cecf047f39e41811f1b9e3294b0040b2e77 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 4 May 2019 08:23:51 +0200 Subject: [PATCH 17/21] nix/os/devices/steveej-t480s-work: bump versions --- nix/os/devices/steveej-t480s-work/versions.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix index 59c145a..b53af8b 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -1,20 +1,20 @@ { channelsNixosStable = { ref = "nixos-19.03"; - rev = "cf3e277dd0bd710af0df667e9364f4bd80c72713"; + rev = "915ce0f1e1a75adec7079ddb6cd3ffba5036b3fc"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "dfd8f84aef129f1978e446b5d45ef05cd4421821"; + rev = "190727db4ea7e0d083e7dbcb66ced11f31b340f0"; }; nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "36d5d3083c463eceac07307005cdbc22fca3b2cb"; + rev = "ebf4a5a600512aeca322f7c62137483b9ecf116d"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; ref = "master"; - rev = "2f819d1647d4c73aad6ca8fec8348beaae4bb870"; + rev = "f99d4ba7c4d02a2b46c45ec3ee1f0d3112a51dd8"; }; } From 066cafa2cc168194d161255aa88f74bfda2c8c86 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 7 Jun 2019 22:24:51 +0200 Subject: [PATCH 18/21] nix/os/devices/steveej-t480s-work: bump versions --- nix/os/devices/steveej-t480s-work/versions.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix index b53af8b..d7d8947 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -1,20 +1,20 @@ { channelsNixosStable = { ref = "nixos-19.03"; - rev = "915ce0f1e1a75adec7079ddb6cd3ffba5036b3fc"; + rev = "00322ccb73ed5d5204b7d9e4fad41573337f1470"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "190727db4ea7e0d083e7dbcb66ced11f31b340f0"; + rev = "1dc26c32edffdb73adb0a82b430834d3404aa8f3"; }; nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "ebf4a5a600512aeca322f7c62137483b9ecf116d"; + rev = "2ef3b5200a419787604ca922be6fd4db69228489"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; ref = "master"; - rev = "f99d4ba7c4d02a2b46c45ec3ee1f0d3112a51dd8"; + rev = "29824a8cf6eabb32343a4af63d27ad6775c238ff"; }; } From 76e940bc06a99aa5b709e400423dc77bc451a25d Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 12 Jun 2019 15:38:47 +0200 Subject: [PATCH 19/21] nix/os/graphical: ignore closing the lid on external power --- nix/os/profiles/graphical/system.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nix/os/profiles/graphical/system.nix b/nix/os/profiles/graphical/system.nix index ee322df..287a6d5 100644 --- a/nix/os/profiles/graphical/system.nix +++ b/nix/os/profiles/graphical/system.nix @@ -109,4 +109,6 @@ services.samba.extraConfig = '' client max protocol = SMB3 ''; + + services.logind.lidSwitchExternalPower = "ignore"; } From 91a196691be68b6f95765f3134947f7bf06ec8ef Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 16 Jun 2019 11:44:39 +0200 Subject: [PATCH 20/21] nix/home/graphical-fullblown: use unstable skype --- nix/home-manager/configuration/graphical-fullblown.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 1d77c26..b5ab574 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -137,7 +137,7 @@ in { hexchat aspellDicts.en aspellDicts.de - skype + unstablepkgs.skype zoom-us unstablepkgs.bluejeans-gui thunderbird From 29d27f9bd4f07d9f95d143958f5561b895117d8d Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 16 Jun 2019 11:53:40 +0200 Subject: [PATCH 21/21] nix/os/devices/steveej-t480s-work: bump versions --- nix/os/devices/steveej-t480s-work/versions.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/os/devices/steveej-t480s-work/versions.nix b/nix/os/devices/steveej-t480s-work/versions.nix index 27dd426..0d93e08 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -1,20 +1,20 @@ { channelsNixosStable = { ref = "nixos-19.03"; - rev = "00322ccb73ed5d5204b7d9e4fad41573337f1470"; + rev = "1601f559e89ba71091faa26888711d4dd24c2d4d"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "1222e289b5014d17884a8b1c99f220c5e3df0b14"; + rev = "7815c86c104a99417db844791dcda34fe7a7965f"; }; nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "3574dbb9767a2af89d07aeee79cadbdeb0964f84"; + rev = "aa2f3eb8b102ffed4258a7e7fbc0a7d17b7ba319"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; ref = "master"; - rev = "95e36dfe74b8d161c28601e33646e2d636026f83"; + rev = "cf0aad391c10473fa7613dcc41b1f6a366d03148"; }; }