From d39fe1a271db9c0291576af2580d5a53816e2329 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 29 Feb 2020 10:08:58 +0100 Subject: [PATCH 1/8] nix/home/graphical-fullblown: add signal-desktop --- nix/home-manager/configuration/graphical-fullblown.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 64dfa02..49c8fd7 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -133,6 +133,7 @@ in { hunspellDicts.de-de # Messaging/Communication + signal-desktop pidgin hexchat aspellDicts.en From f7924021b05380a095982070cd5d409b7dcfa0ec Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 29 Feb 2020 10:21:35 +0100 Subject: [PATCH 2/8] 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 1dabb6a..b299414 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-19.09"; - rev = "8731aaaf8b30888bc24994096db830993090d7c4"; + rev = "ce9f1aaa39ee2a5b76a9c9580c859a74de65ead5"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "8130f3c1c2bb0e533b5e150c39911d6e61dcecc2"; + rev = "e97dfe73bba2a43ee7ca41273e1fe76a21cb723f"; }; nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "329102c47bd1c68f0acdf4feec64232202948c7a"; + rev = "a83ffc02d4c886c8f6950fea139547d0aad76dd1"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; From 6832c056024f5dcc32d42613f42143f28f4181c0 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 2 Mar 2020 20:55:44 +0100 Subject: [PATCH 3/8] 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 b299414..5ad5ebe 100644 --- a/nix/os/devices/steveej-t480s-work/versions.nix +++ b/nix/os/devices/steveej-t480s-work/versions.nix @@ -5,12 +5,12 @@ }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "e97dfe73bba2a43ee7ca41273e1fe76a21cb723f"; + rev = "42f0be81ae05a8fe6d6e8e7f1c28652e7746e046"; }; nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "a83ffc02d4c886c8f6950fea139547d0aad76dd1"; + rev = "96c1a2b15e719664936d352d0e38ac67a30332c0"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; From 93c5ba9b7e1c9e04d18099bbeed4c2c84b2073c5 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 12 Mar 2020 17:20:31 +0100 Subject: [PATCH 4/8] 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 5ad5ebe..ce37a40 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-19.09"; - rev = "ce9f1aaa39ee2a5b76a9c9580c859a74de65ead5"; + ref = "nixos-20.03"; + rev = "dbacfa172f9a6399f180bcd0aef7998fdec0d55a"; }; channelsNixosUnstable = { ref = "nixos-unstable"; - rev = "42f0be81ae05a8fe6d6e8e7f1c28652e7746e046"; + rev = "82b54d490663b6d87b7b34b9cfc0985df8b49c7d"; }; nixpkgsMaster = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "96c1a2b15e719664936d352d0e38ac67a30332c0"; + rev = "a1bcb3a83ffdd3b50063a24e6d490c69455268ee"; }; homeManagerModule = { url = "https://github.com/rycee/home-manager"; From 07c0ebe3c1e0af0b5b11362205adf63f3796f9d7 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 13 Mar 2020 08:55:13 +0100 Subject: [PATCH 5/8] graphicacl-fullblown: remove rkt due to CVEs --- nix/home-manager/configuration/graphical-fullblown.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 49c8fd7..6edde81 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -151,7 +151,6 @@ in { (pkgs.lib.hiPrio qemu) # virtualbox vagrant - rkt docker_compose # unstablepkgs.kubernetes unstablepkgs.minikube From de0de83c5bbf5e9919d48e1f115721e32fe9bf88 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 13 Mar 2020 08:57:12 +0100 Subject: [PATCH 6/8] nix: bump template and t480s-work to nixos 20.03 Notable changes: * add extraConfig for gpg-agent to define the path to the pinentry-program * removed X11 session directory activation script --- .../configuration/graphical-fullblown.nix | 2 ++ nix/home-manager/profiles/qtile-desktop.nix | 4 +++- nix/os/devices/steveej-t480s-work/hw.nix | 2 -- nix/os/profiles/common/system.nix | 21 +++++++++++-------- nix/pkgs/default.nix | 1 - nix/variables/versions.tmpl.nix | 4 ++-- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 6edde81..0a8c378 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -346,6 +346,8 @@ in { unstablepkgs.swagger-codegen # Misc Desktop Tools + # TODO: this may be required if brightness control isn't working + # brightnessctl ltunify # solaar # TODO: conflicts with solar over udev rules dex diff --git a/nix/home-manager/profiles/qtile-desktop.nix b/nix/home-manager/profiles/qtile-desktop.nix index f563181..c9f6c72 100644 --- a/nix/home-manager/profiles/qtile-desktop.nix +++ b/nix/home-manager/profiles/qtile-desktop.nix @@ -259,7 +259,8 @@ in { services = { gnome-keyring.enable = true; - blueman-applet.enable = true; + # TODO: this has been broken for a while, removing for now. + # blueman-applet.enable = true; screen-locker = { enable = true; inactiveInterval = 7; @@ -273,6 +274,7 @@ in { enableScDaemon = true; enableSshSupport = true; grabKeyboardAndMouse = true; + extraConfig = "pinentry-program ${pkgs.pinentry-gtk2}/bin/pinentry"; }; flameshot.enable = true; }; diff --git a/nix/os/devices/steveej-t480s-work/hw.nix b/nix/os/devices/steveej-t480s-work/hw.nix index a5ed9af..1390696 100644 --- a/nix/os/devices/steveej-t480s-work/hw.nix +++ b/nix/os/devices/steveej-t480s-work/hw.nix @@ -31,6 +31,4 @@ in options kvm-intel enable_apicv=1 options kvm-intel ept=1 ''; - - hardware.brightnessctl.enable = false; } diff --git a/nix/os/profiles/common/system.nix b/nix/os/profiles/common/system.nix index b00e912..a8e26c0 100644 --- a/nix/os/profiles/common/system.nix +++ b/nix/os/profiles/common/system.nix @@ -30,9 +30,9 @@ ''; # Fonts, I18N, Date ... - fonts = { - enableCoreFonts = true; - }; + fonts.fonts = [ + pkgs.corefonts + ]; i18n = { consoleFont = "lat9w-16"; @@ -52,12 +52,15 @@ ln -sfT ${pkgs.bash}/bin/bash /bin/.bash mv -Tf /bin/.bash /bin/bash ''; - system.activationScripts.etcX11sessinos = '' - echo "setting up /etc/X11/sessions..." - mkdir -p /etc/X11 - ln -sfT ${config.services.xserver.displayManager.session.desktops} /etc/X11/.sessions - mv -Tf /etc/X11/.sessions /etc/X11/sessions - ''; + + # TODO: find out if this workaround is still required from nixos 20.03 onwards + # system.activationScripts.etcX11sessinos = '' + # echo "setting up /etc/X11/sessions..." + # mkdir -p /etc/X11 + # ln -sfT ${config.services.xserver.displayManager.session.desktops} /etc/X11/.sessions + # mv -Tf /etc/X11/.sessions /etc/X11/sessions + # ''; + system.activationScripts.lib64 = '' echo "setting up /lib64..." mkdir -p /lib64 diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index f1c275a..fabac52 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -64,7 +64,6 @@ in rec { }); duplicacy = pkgs.callPackage ../pkgs/duplicacy {}; - just = pkgs.callPackage ../pkgs/just.nix {}; mfcl3770cdw = pkgs.callPackage ../pkgs/mfcl3770cdw.nix {}; staruml = pkgs.callPackage ../pkgs/staruml.nix { inherit (pkgs.gnome2) GConf; libgcrypt = pkgs.libgcrypt_1_5; }; } diff --git a/nix/variables/versions.tmpl.nix b/nix/variables/versions.tmpl.nix index 08c7589..08c03dc 100644 --- a/nix/variables/versions.tmpl.nix +++ b/nix/variables/versions.tmpl.nix @@ -1,7 +1,7 @@ { channelsNixosStable = { - ref = "nixos-19.09"; - rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-19.09 | awk '{ print $1 }' | tr -d '\n' -%>"; + ref = "nixos-20.03"; + rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-20.03 | awk '{ print $1 }' | tr -d '\n' -%>"; }; channelsNixosUnstable = { ref = "nixos-unstable"; From 90d7a5d7ee011d5fa700bbaad6a8057e13e7aa62 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 13 Mar 2020 09:35:14 +0100 Subject: [PATCH 7/8] nix/qtile-desktop: disable natural scrolling for the ErgoDox mouse emulation --- nix/home-manager/profiles/qtile-desktop.nix | 1 + shell.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nix/home-manager/profiles/qtile-desktop.nix b/nix/home-manager/profiles/qtile-desktop.nix index c9f6c72..fa90bde 100644 --- a/nix/home-manager/profiles/qtile-desktop.nix +++ b/nix/home-manager/profiles/qtile-desktop.nix @@ -283,6 +283,7 @@ in { enable = true; windowManager.command = "${pkgs.qtile}/bin/qtile -c ${qtileConfig}"; initExtra = '' + ${pkgs.xinput}/bin/xinput set-prop "ErgoDox EZ ErgoDox EZ Mouse" "libinput Natural Scrolling Enabled" ${pkgs.autorandr}/bin/autorandr -c ${pkgs.feh}/bin/feh --bg-scale ${pkgs.nixos-artwork.wallpapers.simple-blue}/share/artwork/gnome/nix-wallpaper-simple-blue.png ''; diff --git a/shell.nix b/shell.nix index 2ece22a..be78033 100644 --- a/shell.nix +++ b/shell.nix @@ -1,7 +1,7 @@ { ... }: let - channels-nixos-stable-path = (builtins.fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/7e88992a8c7b2de0bcb89182d8686b27bd93e46a.tar.gz); + channels-nixos-stable-path = (builtins.fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/dbacfa172f9a6399f180bcd0aef7998fdec0d55a.tar.gz); channels-nixos-stable = import channels-nixos-stable-path { overlays = builtins.attrValues (import ./nix/overlays); }; in From f158afa9904b764e80ea45d946de73d2c2e9a1e9 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 13 Mar 2020 09:34:55 +0100 Subject: [PATCH 8/8] nix/pkgs: remove just It's now in stable --- nix/pkgs/just.nix | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 nix/pkgs/just.nix diff --git a/nix/pkgs/just.nix b/nix/pkgs/just.nix deleted file mode 100644 index 24b37a0..0000000 --- a/nix/pkgs/just.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ rustPlatform -, stdenv -, fetchFromGitHub -, callPackage -, bash -}: - -let - naersk = callPackage (import (fetchFromGitHub { - owner = "nmattia"; - repo = "naersk"; - rev = "b3b328b088009972e6844f57c97807f6090fa004"; - sha256 = "152fl2c174zisl2bcky7xspwhc2s8ys2qdv6nvfhqav5x1rbngbp"; - })) {}; - -in - naersk.buildPackage rec { - version = "5acc112a9749063a554e3626a6055bb88f093468"; - - src = builtins.fetchGit { - url = "https://github.com/casey/just.git"; - rev = version; - }; - doDoc = false; - doCheck = false; - }