build: nix flake update

yurrriq · May 2, 2023 · f748d73 · f748d73
1 parent 231b3bc
commit f748d73
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 64 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,6 +6,7 @@
     deadnix = {
       url = "github:astro/deadnix";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.utils.follows = "flake-utils";
     };
     emacs-overlay = {
       url = "github:nix-community/emacs-overlay";
@@ -14,7 +15,7 @@
     };
     flake-utils.url = "github:numtide/flake-utils";
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager/release-22.11";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.utils.follows = "flake-utils";
     };
@@ -24,8 +25,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixos-hardware.url = "github:nixos/nixos-hardware";
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/release-22.11";
+    nixpkgs.url = "github:nixos/nixpkgs/release-22.11";
+    # nixpkgs-stable.url = "github:nixos/nixpkgs/release-22.11";
     nur.url = "github:nix-community/nur";
   };
 

diff --git a/machines/sruxps/home.nix b/machines/sruxps/home.nix
@@ -50,7 +50,7 @@
     aws-iam-authenticator
     awscli2
     python3Packages.ec2instanceconnectcli
-    bpytop
+    btop
     fd
     gomplate
     powertop

diff --git a/src/flake.nw b/src/flake.nw
@@ -37,6 +37,7 @@ The main entrypoint \hrefootnote{https://github.com/yurrriq/dotfiles/blob/main/f
 deadnix = {
   url = "github:astro/deadnix";
   inputs.nixpkgs.follows = "nixpkgs";
+  inputs.utils.follows = "flake-utils";
 };
 @
 
@@ -74,7 +75,7 @@ invaluable tool for managing a deterministic \bash{$HOME}.  Pin a version and fo
 
 <<inputs>>=
 home-manager = {
-  url = "github:nix-community/home-manager";
+  url = "github:nix-community/home-manager/release-22.11";
   inputs.nixpkgs.follows = "nixpkgs";
   inputs.utils.follows = "flake-utils";
 };
@@ -103,17 +104,17 @@ nixos-hardware.url = "github:nixos/nixos-hardware";
 
 \subsection{nixpkgs}
 
-Prefer to live on the edge and pin \nix{nixpkgs} to the \textit{nixpkgs-unstable} branch.
+Someday soon again, prefer to live on the edge and pin \nix{nixpkgs} to the \textit{nixpkgs-unstable} branch.
 
 <<inputs>>=
-nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+nixpkgs.url = "github:nixos/nixpkgs/release-22.11";
 @
 
-Additionally, pin a stable version of the
-\hrefootnote{https://github.com/NixOS/nixpkgs}{Nix Packages collection}.
+%% Additionally, pin a stable version of the
+%% \hrefootnote{https://github.com/NixOS/nixpkgs}{Nix Packages collection}.
 
 <<inputs>>=
-nixpkgs-stable.url = "github:nixos/nixpkgs/release-22.11";
+# nixpkgs-stable.url = "github:nixos/nixpkgs/release-22.11";
 @
 
 \subsection{NUR}

diff --git a/src/machines/sruxps/home.nw b/src/machines/sruxps/home.nw
@@ -107,7 +107,7 @@ python3Packages.ec2instanceconnectcli
 \end{itemize}
 
 <<Install some user packages>>=
-bpytop
+btop
 fd
 gomplate
 powertop