From 455e6a2781ca243b503a30f4b7c5f1c0f1ec1cec Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 5 Nov 2020 19:48:32 +0100 Subject: [PATCH 1/5] 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 76eaec8..5e963e4 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -2,7 +2,7 @@ let nixpkgs = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-20.09"; - rev = "13d0c311e3ae923a00f734b43fd1d35b47d8943a"; + rev = "d105075a1fd870b1d1617a6008cb38b443e65433"; }; in @@ -15,16 +15,16 @@ in "channels-nixos-unstable" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-unstable"; - rev = "1dc37370c489b610f8b91d7fdd40633163ffbafd"; + rev = "34ad166a830d3ac1541dcce571c52231f2f0865a"; }; "nixpkgs-master" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "3d04e9a779a3ca28230e0e8f3c4310264960e979"; + rev = "aaa75ab998373bd0dd73fe0535456e27e6b02d06"; }; "home-manager-module" = { url = "https://github.com/nix-community/home-manager"; ref = "release-20.09"; - rev = "abaebf3b346c4bef500c5bd2fdebbed109261a0c"; + rev = "63f299b3347aea183fc5088e4d6c4a193b334a41"; }; } From 24a7f64d27ff7e2566c34648e21324c5b74c1d26 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 19 Nov 2020 20:39:08 +0100 Subject: [PATCH 2/5] 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 5e963e4..a8f5a2d 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -2,7 +2,7 @@ let nixpkgs = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-20.09"; - rev = "d105075a1fd870b1d1617a6008cb38b443e65433"; + rev = "58f9c4c7d3a42c912362ca68577162e38ea8edfb"; }; in @@ -15,12 +15,12 @@ in "channels-nixos-unstable" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-unstable"; - rev = "34ad166a830d3ac1541dcce571c52231f2f0865a"; + rev = "2deeb58f49480f468adca6b08291322de4dbce6b"; }; "nixpkgs-master" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "aaa75ab998373bd0dd73fe0535456e27e6b02d06"; + rev = "c81c3c3daff4a96980da2fce2d80a9e57f9db953"; }; "home-manager-module" = { url = "https://github.com/nix-community/home-manager"; From 276ab6be3eb1a74047bb3b0da3e5c0a12e872888 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 19 Nov 2020 20:46:30 +0100 Subject: [PATCH 3/5] t480s-work: add ledger hw support and desktop app --- nix/home-manager/configuration/graphical-fullblown.nix | 2 ++ nix/os/devices/steveej-t480s-work/system.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 53c469e..77d7d3e 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -312,5 +312,7 @@ in { screenkey # shotcut # openshot-qt + + ledger-live-desktop ]); } diff --git a/nix/os/devices/steveej-t480s-work/system.nix b/nix/os/devices/steveej-t480s-work/system.nix index 4a8f712..06a03d3 100644 --- a/nix/os/devices/steveej-t480s-work/system.nix +++ b/nix/os/devices/steveej-t480s-work/system.nix @@ -138,4 +138,6 @@ in { } ''; }; + + hardware.ledger.enable = true; } From fdc69b25c15fe8fab8c393acd0314ca1221f3389 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 19 Nov 2020 20:47:02 +0100 Subject: [PATCH 4/5] devices: clean up up obsolete printer drivers --- nix/os/devices/steveej-laptop/system.nix | 3 --- nix/os/devices/steveej-t480s-work/system.nix | 3 --- 2 files changed, 6 deletions(-) diff --git a/nix/os/devices/steveej-laptop/system.nix b/nix/os/devices/steveej-laptop/system.nix index ae87f1d..c75bfde 100644 --- a/nix/os/devices/steveej-laptop/system.nix +++ b/nix/os/devices/steveej-laptop/system.nix @@ -31,9 +31,6 @@ in { enable = true; drivers = with pkgs; [ hplip - cups-kyodialog3 - mfcj6510dwlpr - mfcj6510dw-cupswrapper ]; }; diff --git a/nix/os/devices/steveej-t480s-work/system.nix b/nix/os/devices/steveej-t480s-work/system.nix index 06a03d3..8f17b3c 100644 --- a/nix/os/devices/steveej-t480s-work/system.nix +++ b/nix/os/devices/steveej-t480s-work/system.nix @@ -32,9 +32,6 @@ in { enable = true; drivers = with pkgs; [ hplip - cups-kyodialog3 - mfcj6510dwlpr - mfcj6510dw-cupswrapper mfcl3770cdw.driver mfcl3770cdw.cupswrapper ]; From f874b049876df4124cf2caf68313cf287fbdbc54 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 22 Nov 2020 21:21:16 +0100 Subject: [PATCH 5/5] graphical-fullblown: add smartmontools and appimage-run --- nix/home-manager/configuration/graphical-fullblown.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 77d7d3e..e3a7e81 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -133,6 +133,8 @@ in { # (builtins.fetchurl { url ="https://patch-diff.githubusercontent.com/raw/kubernetes/minikube/pull/2517.diff"; }) # ]; # })) + appimage-run + # Remote Control Tools remmina @@ -267,7 +269,7 @@ in { python38Packages.binwalk gptfdisk gparted - + smartmontools ## Android androidenv.androidPkgs_9_0.platform-tools