From 86371535f80c2ac9baff40aeaba7ccb0641a7512 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 2 Jan 2023 11:42:12 -0600 Subject: [PATCH] chore: update steveej-t14 22.05 -> 22.11 --- .../configuration/graphical-fullblown.nix | 2 +- nix/home-manager/profiles/common.nix | 2 ++ nix/os/devices/steveej-t14/versions.nix | 14 +++++++------- nix/os/devices/steveej-t14/versions.tmpl.nix | 8 ++++---- nix/variables/versions.nix | 16 ++++++++++------ nix/variables/versions.tmpl.nix | 8 ++++---- 6 files changed, 28 insertions(+), 22 deletions(-) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 82f9728..e7c515e 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -108,7 +108,7 @@ in { unstablepkgs.zoom-us thunderbird evolution # gnome4.glib_networking - kotatogram-desktop + masterpkgs.kotatogram-desktop gnome.cheese masterpkgs.discord diff --git a/nix/home-manager/profiles/common.nix b/nix/home-manager/profiles/common.nix index 2570684..602de04 100644 --- a/nix/home-manager/profiles/common.nix +++ b/nix/home-manager/profiles/common.nix @@ -52,4 +52,6 @@ in { ripgrep du-dust ]); + + home.stateVersion = "22.05"; } diff --git a/nix/os/devices/steveej-t14/versions.nix b/nix/os/devices/steveej-t14/versions.nix index 74e3de3..3ffb067 100644 --- a/nix/os/devices/steveej-t14/versions.nix +++ b/nix/os/devices/steveej-t14/versions.nix @@ -1,9 +1,9 @@ let nixpkgs = { url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-22.05"; + ref = "nixos-22.11"; rev = '' - 79e63f30ed2ff36cd0d9c2f7dadae5925c1a65db''; + 6a0d2701705c3cf6f42c15aa92b7885f1f8a477f''; }; in { @@ -14,24 +14,24 @@ in { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-unstable"; rev = '' - 652e92b8064949a11bc193b90b74cb727f2a1405''; + 677ed08a50931e38382dbef01cba08a8f7eac8f6''; }; "channels-nixos-unstable-small" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-unstable-small"; rev = '' - 18ee49839ea8817218c3bfe3a62e06f47a10fdd5''; + ac949b889280f7258021d7af4e08d619bd7686a8''; }; "nixpkgs-master" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; rev = '' - aac1f0b25e6b04afad8e05dec5828f5c02398bd1''; + 037d4463a063ccdf4f257a7ee263033b0ba1820d''; }; "home-manager-module" = { url = "https://github.com/nix-community/home-manager"; - ref = "release-22.05"; + ref = "release-22.11"; rev = '' - 6639e3a837fc5deb6f99554072789724997bc8e5''; + 89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706''; }; } diff --git a/nix/os/devices/steveej-t14/versions.tmpl.nix b/nix/os/devices/steveej-t14/versions.tmpl.nix index 9d173c2..0ac19c9 100644 --- a/nix/os/devices/steveej-t14/versions.tmpl.nix +++ b/nix/os/devices/steveej-t14/versions.tmpl.nix @@ -1,9 +1,9 @@ let nixpkgs = { url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-22.05"; + ref = "nixos-22.11"; rev = '' - <% git ls-remote https://github.com/nixos/nixpkgs nixos-22.05 | awk '{ print $1 }' | tr -d ' + <% git ls-remote https://github.com/nixos/nixpkgs nixos-22.11 | awk '{ print $1 }' | tr -d ' ' -%>''; }; @@ -34,9 +34,9 @@ in { }; "home-manager-module" = { url = "https://github.com/nix-community/home-manager"; - ref = "release-22.05"; + ref = "release-22.11"; rev = '' - <% git ls-remote https://github.com/nix-community/home-manager.git release-22.05 | awk '{ print $1 }' | tr -d ' + <% git ls-remote https://github.com/nix-community/home-manager.git release-22.11 | awk '{ print $1 }' | tr -d ' ' -%>''; }; } diff --git a/nix/variables/versions.nix b/nix/variables/versions.nix index 447b563..f5d8a52 100644 --- a/nix/variables/versions.nix +++ b/nix/variables/versions.nix @@ -1,8 +1,9 @@ let nixpkgs = { url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-22.05"; - rev = "08950a6e29cf7bddee466592eb790a417550f7f9"; + ref = "nixos-22.11"; + rev = '' + dac57a4eccf1442e8bf4030df6fcbb55883cb682''; }; in { @@ -12,16 +13,19 @@ in { "channels-nixos-unstable" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-unstable"; - rev = "f1c167688a6f81f4a51ab542e5f476c8c595e457"; + rev = '' + 1eb875e811dd59e21e77f6337f2c1592889b48b3''; }; "nixpkgs-master" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "5ebfb1845b1a77716ecd706b8f589c722584ed2a"; + rev = '' + 590321a5defbbabe96f8def70013d5b45406dee4''; }; "home-manager-module" = { url = "https://github.com/nix-community/home-manager"; - ref = "release-22.05"; - rev = "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675"; + ref = "release-22.11"; + rev = '' + 89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706''; }; } diff --git a/nix/variables/versions.tmpl.nix b/nix/variables/versions.tmpl.nix index 893ee9e..31a95a0 100644 --- a/nix/variables/versions.tmpl.nix +++ b/nix/variables/versions.tmpl.nix @@ -1,9 +1,9 @@ let nixpkgs = { url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-22.05"; + ref = "nixos-22.11"; rev = '' - <% git ls-remote https://github.com/nixos/nixpkgs nixos-22.05 | awk '{ print $1 }' | tr -d ' + <% git ls-remote https://github.com/nixos/nixpkgs nixos-22.11 | awk '{ print $1 }' | tr -d ' ' -%>''; }; @@ -27,9 +27,9 @@ in { }; "home-manager-module" = { url = "https://github.com/nix-community/home-manager"; - ref = "release-22.05"; + ref = "release-22.11"; rev = '' - <% git ls-remote https://github.com/nix-community/home-manager.git release-22.05 | awk '{ print $1 }' | tr -d ' + <% git ls-remote https://github.com/nix-community/home-manager.git release-22.11 | awk '{ print $1 }' | tr -d ' ' -%>''; }; }