From 98ec1cf5387e65cdbfd695772d35c0a04889b0ae Mon Sep 17 00:00:00 2001 From: Tasia Iso Date: Wed, 12 Jun 2024 15:13:06 +0200 Subject: [PATCH] make stable home manager the default and update --- flake.lock | 30 ++++++++++++++-------------- flake.nix | 9 ++++----- home/46d1/home.nix | 2 +- home/tasia-but-old-username/home.nix | 2 +- home/tasia/home.nix | 2 +- home/user/home.nix | 2 +- hosts/yaseen/configuration.nix | 1 - 7 files changed, 23 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index e8c8bd8..9aad6ba 100644 --- a/flake.lock +++ b/flake.lock @@ -36,7 +36,7 @@ "type": "github" } }, - "home-manager-stable": { + "home-manager": { "inputs": { "nixpkgs": [ "stable" @@ -59,11 +59,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717696253, - "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", + "lastModified": 1718086528, + "narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", + "rev": "47b604b07d1e8146d5398b42d3306fdebd343986", "type": "github" }, "original": { @@ -107,7 +107,7 @@ }, "root": { "inputs": { - "home-manager-stable": "home-manager-stable", + "home-manager": "home-manager", "nixpkgs": "nixpkgs", "stable": "stable", "tildefriends": "tildefriends", @@ -117,11 +117,11 @@ }, "stable": { "locked": { - "lastModified": 1717696253, - "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", + "lastModified": 1718086528, + "narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", + "rev": "47b604b07d1e8146d5398b42d3306fdebd343986", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1717720284, - "narHash": "sha256-3po86yRDTToHHIhLnZ3+1C/JUCIYhrELVKQx/4vCfoE=", + "lastModified": 1718068746, + "narHash": "sha256-caqH+CsuzmJTQ8F1/sH+8q2whKT4nNTBFViMdTonauc=", "ref": "main", - "rev": "9497d7cf64af4eb8ad7798d5fa086d6f32e5213b", - "revCount": 1658, + "rev": "c29378c2f88efa9329b62a68e6d219a04de20755", + "revCount": 1667, "type": "git", "url": "https://dev.tildefriends.net/cory/tildefriends" }, @@ -183,11 +183,11 @@ }, "unstable": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "nixos", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4cbe9ca..f812eca 100644 --- a/flake.nix +++ b/flake.nix @@ -7,18 +7,17 @@ stable.url = "github:nixos/nixpkgs/nixos-24.05"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - # home-manager = { + # home-manager-unstable = { # url = "github:nix-community/home-manager"; # inputs.nixpkgs.follows = "unstable"; # }; - home-manager-stable = { + home-manager = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "stable"; }; tildefriends.url = "git+https://dev.tildefriends.net/cory/tildefriends?ref=main"; - vedirect-reader.url = "git+https://gitea.com/tasiaiso/vedirect-reader"; # nixos-conf-editor.url = "github:snowfallorg/nixos-conf-editor"; @@ -30,8 +29,8 @@ nixpkgs, stable, unstable, - # home-manager, - home-manager-stable, + # home-manager-unstable, + home-manager, vedirect-reader, # nixos-conf-editor, # nix-software-center, diff --git a/home/46d1/home.nix b/home/46d1/home.nix index ebd9ccd..6d8e6ca 100644 --- a/home/46d1/home.nix +++ b/home/46d1/home.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - inputs.home-manager-stable.nixosModules.home-manager + inputs.home-manager.nixosModules.home-manager ]; users.users.user = { isNormalUser = true; diff --git a/home/tasia-but-old-username/home.nix b/home/tasia-but-old-username/home.nix index 70ac7ca..6d0d901 100644 --- a/home/tasia-but-old-username/home.nix +++ b/home/tasia-but-old-username/home.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - inputs.home-manager-stable.nixosModules.home-manager + inputs.home-manager.nixosModules.home-manager ]; users.users.user = { isNormalUser = true; diff --git a/home/tasia/home.nix b/home/tasia/home.nix index 200b552..54abf7c 100644 --- a/home/tasia/home.nix +++ b/home/tasia/home.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - inputs.home-manager-stable.nixosModules.home-manager + inputs.home-manager.nixosModules.home-manager ]; users.users.tasia = { isNormalUser = true; diff --git a/home/user/home.nix b/home/user/home.nix index 9c8f6d1..cbb31ca 100644 --- a/home/user/home.nix +++ b/home/user/home.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - inputs.home-manager-stable.nixosModules.home-manager + inputs.home-manager.nixosModules.home-manager ]; users.users.user = { isNormalUser = true; diff --git a/hosts/yaseen/configuration.nix b/hosts/yaseen/configuration.nix index 27ec943..6c1b6f8 100644 --- a/hosts/yaseen/configuration.nix +++ b/hosts/yaseen/configuration.nix @@ -100,7 +100,6 @@ in { osu-lazer-bin prismlauncher - procs ];