From 4a2ee46f7f0d9eb6597303001afb7255e2e9e3a1 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 2 Jun 2022 11:34:21 +0200 Subject: [PATCH] feat(common,steveej-t14,graphical): udpate to nixos-22.05 --- .../configuration/graphical-fullblown.nix | 16 +++++----- .../configuration/graphical-gnome3.nix | 10 +++---- .../configuration/graphical-removable.nix | 10 +++---- .../configuration/text-minimal.nix | 2 +- nix/home-manager/profiles/qtile-desktop.nix | 8 ++--- nix/home-manager/programs/pass.nix | 2 +- nix/os/devices/steveej-t14/versions.tmpl.nix | 14 +++------ nix/os/profiles/common/boot.nix | 4 +-- nix/os/profiles/common/system.nix | 2 +- nix/pkgs/browserpass/default.nix | 2 +- nix/pkgs/nomad/default.nix | 29 ------------------- nix/variables/versions.nix | 18 ++++-------- nix/variables/versions.tmpl.nix | 14 +++------ 13 files changed, 42 insertions(+), 89 deletions(-) delete mode 100644 nix/pkgs/nomad/default.nix diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 2988abf..c7e9d54 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -76,13 +76,13 @@ in { # Process/System Administration htop - gnome3.gnome-tweak-tool + gnome.gnome-tweaks xorg.xhost dmidecode evtest # Archive Managers - sshfsFuse + sshfs-fuse xarchive p7zip zip @@ -96,8 +96,8 @@ in { yubikey-manager-qt yubikey-personalization yubikey-personalization-gui - gnome3.gnome_keyring - gnome3.seahorse + gnome.gnome-keyring + gnome.seahorse # Language Support hunspellDicts.en-us @@ -109,13 +109,13 @@ in { hexchat aspellDicts.en aspellDicts.de - skype + skypeforlinux unstablepkgs.jitsi-meet-electron unstablepkgs.zoom-us thunderbird evolution # gnome4.glib_networking unstablepkgs.kotatogram-desktop - gnome3.cheese + gnome.cheese discord # Virtualization @@ -170,7 +170,7 @@ in { xsel # Image/Graphic/Design Tools - gnome3.eog + gnome.eog gimp imagemagick exiv2 @@ -284,7 +284,7 @@ in { xdotool xdg_utils xdg-user-dirs - gnome3.dconf + dconf picocom glib.dev # contains gdbus tool alacritty diff --git a/nix/home-manager/configuration/graphical-gnome3.nix b/nix/home-manager/configuration/graphical-gnome3.nix index 18ca755..7face1e 100644 --- a/nix/home-manager/configuration/graphical-gnome3.nix +++ b/nix/home-manager/configuration/graphical-gnome3.nix @@ -50,13 +50,13 @@ in { # Process/System Administration htop - gnome3.gnome-tweak-tool + gnome.gnome-tweaks xorg.xhost dmidecode evtest # Archive Managers - sshfsFuse + sshfs-fuse xarchive p7zip zip @@ -65,8 +65,8 @@ in { lzop # Password Management - gnome3.gnome_keyring - gnome3.seahorse + gnome.gnome-keyring + gnome.seahorse # Remote Control Tools remmina @@ -91,7 +91,7 @@ in { unstablepkgs.vscode # Image/Graphic/Design Tools - gnome3.eog + gnome.eog gimp inkscape diff --git a/nix/home-manager/configuration/graphical-removable.nix b/nix/home-manager/configuration/graphical-removable.nix index ac52b36..7d7b6a0 100644 --- a/nix/home-manager/configuration/graphical-removable.nix +++ b/nix/home-manager/configuration/graphical-removable.nix @@ -52,13 +52,13 @@ in { # Process/System Administration htop - gnome3.gnome-tweak-tool + gnome.gnome-tweaks xorg.xhost dmidecode evtest # Archive Managers - sshfsFuse + sshfs-fuse xarchive p7zip zip @@ -67,8 +67,8 @@ in { lzop # Password Management - gnome3.gnome_keyring - gnome3.seahorse + gnome.gnome-keyring + gnome.seahorse # Remote Control Tools remmina @@ -93,7 +93,7 @@ in { unstablepkgs.vscode # Image/Graphic/Design Tools - gnome3.eog + gnome.eog gimp inkscape diff --git a/nix/home-manager/configuration/text-minimal.nix b/nix/home-manager/configuration/text-minimal.nix index 5937909..32dcb3d 100644 --- a/nix/home-manager/configuration/text-minimal.nix +++ b/nix/home-manager/configuration/text-minimal.nix @@ -29,7 +29,7 @@ in { home.packages = extraPackages ++ (with pkgs; [ iperf3 - telnet + inetutils speedtest-cli ]); } diff --git a/nix/home-manager/profiles/qtile-desktop.nix b/nix/home-manager/profiles/qtile-desktop.nix index 858c55e..376b272 100644 --- a/nix/home-manager/profiles/qtile-desktop.nix +++ b/nix/home-manager/profiles/qtile-desktop.nix @@ -37,7 +37,7 @@ let dpmsScript = pkgs.writeScript "dpmsScript" '' #!${pkgs.bash}/bin/bash export PATH=${with pkgs; lib.makeBinPath [ - xlibs.xset + xorg.xset ]}:$PATH set -xe @@ -307,11 +307,11 @@ in { home.packages = with pkgs; [ # X Tools/Libraries lightdm - gnome3.networkmanagerapplet + networkmanagerapplet autorandr arandr - gnome3.gnome_themes_standard - gnome3.adwaita-icon-theme + gnome.gnome-themes-extra + gnome.adwaita-icon-theme lxappearance xorg.xcursorthemes pavucontrol diff --git a/nix/home-manager/programs/pass.nix b/nix/home-manager/programs/pass.nix index 5b892f5..ea6f4ce 100644 --- a/nix/home-manager/programs/pass.nix +++ b/nix/home-manager/programs/pass.nix @@ -14,7 +14,7 @@ }; home.packages = with pkgs; [ - pass-otp + pass qtpass rofi-pass gnupg diff --git a/nix/os/devices/steveej-t14/versions.tmpl.nix b/nix/os/devices/steveej-t14/versions.tmpl.nix index 964e2ca..b1af001 100644 --- a/nix/os/devices/steveej-t14/versions.tmpl.nix +++ b/nix/os/devices/steveej-t14/versions.tmpl.nix @@ -1,8 +1,8 @@ let nixpkgs = { url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-21.11"; - rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>"; + ref = "nixos-22.05"; + rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-22.05 | awk '{ print $1 }' | tr -d '\n' -%>"; }; in @@ -12,12 +12,6 @@ in suffix = "/nixos"; }; "channels-nixos-stable" = nixpkgs; - - "channels-nixos-21.05" = { - url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-21.05"; - rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>"; - }; "channels-nixos-unstable" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-unstable"; @@ -30,7 +24,7 @@ in }; "home-manager-module" = { url = "https://github.com/nix-community/home-manager"; - ref = "release-21.11"; - rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.11 | awk '{ print $1 }' | tr -d '\n' -%>"; + ref = "release-22.05"; + rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-22.05 | awk '{ print $1 }' | tr -d '\n' -%>"; }; } diff --git a/nix/os/profiles/common/boot.nix b/nix/os/profiles/common/boot.nix index 3d2d00c..dba7c70 100644 --- a/nix/os/profiles/common/boot.nix +++ b/nix/os/profiles/common/boot.nix @@ -5,13 +5,13 @@ { boot.kernelPackages = pkgs.linuxPackages; boot.loader.grub = { + enable = true; efiSupport = true; efiInstallAsRemovable = false; - enable = true; version = 2; }; - boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.enable = false; boot.loader.efi.canTouchEfiVariables = true; boot.tmpOnTmpfs = true; diff --git a/nix/os/profiles/common/system.nix b/nix/os/profiles/common/system.nix index f07f618..b3f81c3 100644 --- a/nix/os/profiles/common/system.nix +++ b/nix/os/profiles/common/system.nix @@ -70,7 +70,7 @@ system.activationScripts.lib64 = '' echo "setting up /lib64..." mkdir -p /lib64 - ln -sfT ${pkgs.stdenv.glibc}/lib/ld-linux-x86-64.so.2 /lib64/.ld-linux-x86-64.so.2 + ln -sfT ${pkgs.glibc}/lib/ld-linux-x86-64.so.2 /lib64/.ld-linux-x86-64.so.2 mv -Tf /lib64/.ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 ''; diff --git a/nix/pkgs/browserpass/default.nix b/nix/pkgs/browserpass/default.nix index a98268e..a1d1d6e 100644 --- a/nix/pkgs/browserpass/default.nix +++ b/nix/pkgs/browserpass/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ ]; installPhase = '' set -x - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 browserpass-linux64 + patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 browserpass-linux64 mkdir -p $out/bin cp -a * $out/bin/ diff --git a/nix/pkgs/nomad/default.nix b/nix/pkgs/nomad/default.nix deleted file mode 100644 index 4214ce9..0000000 --- a/nix/pkgs/nomad/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -with import {}; - -stdenv.mkDerivation rec { - name = "nomad"; - version = "0.1.2"; - filename = "nomad_${version}_linux_amd64.zip"; - - src = fetchurl { - url = "https://releases.hashicorp.com/nomad/${version}/${filename}"; - sha256 = "0d3r3n1wwlic1kg3hgghds7f3b0qhh97v8xf36mcmsnmn2ngfd9k"; - }; - - unpackPhase = '' - unzip ${src} - ''; - - - buildInputs = [ makeWrapper unzip ]; - libPath = lib.makeLibraryPath [ ]; - installPhase = '' - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 ./nomad - - mkdir -p $out/bin - cp ./nomad $out/bin/nomad -# wrapProgram $out/bin/nomad \ -# --prefix LD_LIBRARY_PATH : "${libPath}" -# - ''; -} diff --git a/nix/variables/versions.nix b/nix/variables/versions.nix index 3883b92..476241e 100644 --- a/nix/variables/versions.nix +++ b/nix/variables/versions.nix @@ -1,8 +1,8 @@ let nixpkgs = { url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-21.11"; - rev = "00acdb2aa817048fbe1f91ece18fe7de09762531"; + ref = "nixos-22.05"; + rev = "08950a6e29cf7bddee466592eb790a417550f7f9"; }; in @@ -12,25 +12,19 @@ in suffix = "/nixos"; }; "channels-nixos-stable" = nixpkgs; - -# "channels-nixos-21.05" = { -# url = "https://github.com/NixOS/nixpkgs/"; -# ref = "nixos-21.05"; -# rev = "88579effa7e88c25087faf6de6388d0cd1738dc0"; -# }; "channels-nixos-unstable" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-unstable"; - rev = "ff377a78794d412a35245e05428c8f95fef3951f"; + rev = "f1c167688a6f81f4a51ab542e5f476c8c595e457"; }; "nixpkgs-master" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "2ac65dd85b7fbe81b88e3c2a80d351aba4c4a9d8"; + rev = "5ebfb1845b1a77716ecd706b8f589c722584ed2a"; }; "home-manager-module" = { url = "https://github.com/nix-community/home-manager"; - ref = "release-21.11"; - rev = "697cc8c68ed6a606296efbbe9614c32537078756"; + ref = "release-22.05"; + rev = "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675"; }; } diff --git a/nix/variables/versions.tmpl.nix b/nix/variables/versions.tmpl.nix index 7461f29..b1af001 100644 --- a/nix/variables/versions.tmpl.nix +++ b/nix/variables/versions.tmpl.nix @@ -1,8 +1,8 @@ let nixpkgs = { url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-21.11"; - rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>"; + ref = "nixos-22.05"; + rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-22.05 | awk '{ print $1 }' | tr -d '\n' -%>"; }; in @@ -12,12 +12,6 @@ in suffix = "/nixos"; }; "channels-nixos-stable" = nixpkgs; - -# "channels-nixos-21.05" = { -# url = "https://github.com/NixOS/nixpkgs/"; -# ref = "nixos-21.05"; -# rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>"; -# }; "channels-nixos-unstable" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-unstable"; @@ -30,7 +24,7 @@ in }; "home-manager-module" = { url = "https://github.com/nix-community/home-manager"; - ref = "release-21.11"; - rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.11 | awk '{ print $1 }' | tr -d '\n' -%>"; + ref = "release-22.05"; + rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-22.05 | awk '{ print $1 }' | tr -d '\n' -%>"; }; }