From 0697bd88d46c23ec52ee00e3123c2aeba89866bd Mon Sep 17 00:00:00 2001 From: Jimbo Date: Mon, 9 Sep 2024 01:06:30 -0400 Subject: [PATCH] Update the nixdate command to actually update the system/flake --- flake.lock | 42 +++++++++++++++++----------------- home-manager/jimbo_deck.nix | 7 +++--- home-manager/jimbo_desktop.nix | 7 +++--- home-manager/jimbo_lenovo.nix | 7 +++--- home-manager/jimbo_server.nix | 7 +++--- 5 files changed, 37 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index ce60128..45532cb 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1725703823, + "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "type": "github" }, "original": { @@ -110,11 +110,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1725153537, - "narHash": "sha256-8+BJdXM1WBAttY+C63pEMUmUtSEWXHEhXOkLK4k1s2E=", + "lastModified": 1725600800, + "narHash": "sha256-wst7p3RZ9kZUNzN22d27wU8YSBB7Grlx6Q03A7boRaU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b13488a1f8ab01db6a3d18629f7b22a430f03984", + "rev": "2d050e65a71e02a1f19d1a35c086bd2e3dfb2cdb", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1725414050, - "narHash": "sha256-apEL1vA8A8skxokuNoaH1Jfx32XybeQpOo8uJDKPcjY=", + "lastModified": 1725846230, + "narHash": "sha256-zk4fRuYct4FcCrXM7uguQLhoqytM4y0MoUeiPBbVlZc=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "55a9a8faee81d758e09f28ad395f9a4f29273c39", + "rev": "7ba553bbdf244f0c88f3306cf4e5dc36d2c0fc37", "type": "github" }, "original": { @@ -167,11 +167,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725477728, - "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", + "lastModified": 1725716377, + "narHash": "sha256-7NzW9O/cAw7iWzRfh7Oo/SuSudL4a1YTKS6yoh3tMck=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", + "rev": "04a1cda0c1725094a4db703cccbb956b7558f5a6", "type": "github" }, "original": { @@ -235,11 +235,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725432240, - "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad416d066ca1222956472ab7d0555a6946746a80", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -298,11 +298,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1725407940, - "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", + "lastModified": 1725693463, + "narHash": "sha256-ZPzhebbWBOr0zRWW10FfqfbJlan3G96/h3uqhiFqmwg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", + "rev": "68e7dce0a6532e876980764167ad158174402c6f", "type": "github" }, "original": { @@ -314,11 +314,11 @@ }, "nur": { "locked": { - "lastModified": 1725541414, - "narHash": "sha256-2btQOiIw+yMrxAHzVCp5ou9IbWkzYhQ5dIS3vRO7Sd8=", + "lastModified": 1725854666, + "narHash": "sha256-Peccz5solKBUlGtN5vfWHxbd0Mxks+feh1TU/A7hZTg=", "owner": "nix-community", "repo": "NUR", - "rev": "72c08881a42221c2de613b425b735c4cd7f85d86", + "rev": "4448858f13f127db4c8055e2bf6fe6e1257ba8ea", "type": "github" }, "original": { diff --git a/home-manager/jimbo_deck.nix b/home-manager/jimbo_deck.nix index e79c573..b9180ad 100644 --- a/home-manager/jimbo_deck.nix +++ b/home-manager/jimbo_deck.nix @@ -43,9 +43,10 @@ auth = import ./common/auth.nix; hostname = "JimDeck"; in { - sysdate = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#${hostname}"; - homedate = "home-manager switch --flake /etc/nixos/.#jimbo@${hostname}"; - nixdate = "sysdate; homedate; notify-send 'NixOS switch done.'"; + flakedate = "${auth.method} nix flake update /etc/nixos"; + sysswitch = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#${hostname}"; + homeswitch = "home-manager switch --flake /etc/nixos/.#jimbo@${hostname}"; + nixdate = "flakedate; sysswitch; homeswitch; notify-send 'NixOS switch done.'"; }; }; } diff --git a/home-manager/jimbo_desktop.nix b/home-manager/jimbo_desktop.nix index 6a794cc..e39d1d9 100644 --- a/home-manager/jimbo_desktop.nix +++ b/home-manager/jimbo_desktop.nix @@ -45,9 +45,10 @@ auth = import ./common/auth.nix; hostname = "JimDesktop"; in { - sysdate = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#${hostname}"; - homedate = "home-manager switch --flake /etc/nixos/.#jimbo@${hostname}"; - nixdate = "sysdate; homedate; notify-send 'NixOS switch done.'"; + flakedate = "${auth.method} nix flake update /etc/nixos"; + sysswitch = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#${hostname}"; + homeswitch = "home-manager switch --flake /etc/nixos/.#jimbo@${hostname}"; + nixdate = "flakedate; sysswitch; homeswitch; notify-send 'NixOS switch done.'"; }; }; diff --git a/home-manager/jimbo_lenovo.nix b/home-manager/jimbo_lenovo.nix index 6514742..d76a135 100644 --- a/home-manager/jimbo_lenovo.nix +++ b/home-manager/jimbo_lenovo.nix @@ -43,9 +43,10 @@ auth = import ./common/auth.nix; hostname = "JimLenovo"; in { - sysdate = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#${hostname}"; - homedate = "home-manager switch --flake /etc/nixos/.#jimbo@${hostname}"; - nixdate = "sysdate; homedate; notify-send 'NixOS switch done.'"; + flakedate = "${auth.method} nix flake update /etc/nixos"; + sysswitch = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#${hostname}"; + homeswitch = "home-manager switch --flake /etc/nixos/.#jimbo@${hostname}"; + nixdate = "flakedate; sysswitch; homeswitch; notify-send 'NixOS switch done.'"; }; }; diff --git a/home-manager/jimbo_server.nix b/home-manager/jimbo_server.nix index d94f4aa..0f7997c 100644 --- a/home-manager/jimbo_server.nix +++ b/home-manager/jimbo_server.nix @@ -12,9 +12,10 @@ auth = import ./common/auth.nix; hostname = "JimServer"; in { - sysdate = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#${hostname}"; - homedate = "home-manager switch --flake /etc/nixos/.#jimbo@${hostname}"; - nixdate = "sysdate; homedate; notify-send 'NixOS switch done.'"; + flakedate = "${auth.method} nix flake update /etc/nixos"; + sysswitch = "${auth.method} nixos-rebuild switch --flake /etc/nixos/.#${hostname}"; + homeswitch = "home-manager switch --flake /etc/nixos/.#jimbo@${hostname}"; + nixdate = "flakedate; sysswitch; homeswitch; notify-send 'NixOS switch done.'"; }; }; }