From 38b4bd6adb8117df00899a7ddf87ac7b07be8ac6 Mon Sep 17 00:00:00 2001 From: MaeIsBad Date: Wed, 23 Nov 2022 09:41:54 +0100 Subject: [PATCH] Fix portable home-manager profiles --- flake.lock | 78 +++++++++++++++++++++++++++----------- flake.nix | 2 +- users/maekasza/default.nix | 1 + 3 files changed, 58 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index c647fa4..92aff3f 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,21 @@ "type": "github" } }, + "blank": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -110,6 +125,7 @@ }, "digga": { "inputs": { + "blank": "blank", "darwin": "darwin_2", "deploy": [ "deploy" @@ -120,6 +136,7 @@ "home-manager": [ "home" ], + "latest": "latest", "nixlib": [ "nixos" ], @@ -131,15 +148,16 @@ ] }, "locked": { - "lastModified": 1668250948, - "narHash": "sha256-qqyzJQHgb/Bgq3Zxwa0gmaDEpkuyVhvynnq6a0akMWw=", + "lastModified": 1659623226, + "narHash": "sha256-ewEjGFjQf37ymcqBoO8q2SrvfKGgm8nW91NJ+0NQufw=", "owner": "divnix", "repo": "digga", - "rev": "54ede8e591d288c176a09d6fcf4b123896c0bf0f", + "rev": "34877733b78cb9e8a1345328a7e1a380101bee41", "type": "github" }, "original": { "owner": "divnix", + "ref": "home-manager-22.11", "repo": "digga", "type": "github" } @@ -150,11 +168,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1669012127, - "narHash": "sha256-fTvPcUlzrxAqMMivJgnV6AjYRPd6+Yz+hnLTs0AF+EM=", + "lastModified": 1669098469, + "narHash": "sha256-7c+SHudkWvquFy66KIj+K48LbCMUxU9313DWIsQVBck=", "owner": "nix-community", "repo": "fenix", - "rev": "fa7082d03914c5bf0f15acda849f34d048953ed5", + "rev": "4597d578b8da5d43ce8cf7cd757bec238dc00ea2", "type": "github" }, "original": { @@ -346,11 +364,11 @@ ] }, "locked": { - "lastModified": 1668900402, - "narHash": "sha256-IhVlueHoQNoN0SOHZIceKU3LyEL00g2ei0aUlaNypbQ=", + "lastModified": 1669071065, + "narHash": "sha256-KBpgj3JkvlPsJ3duOZqFJe6tgr+wc75t8sFmgRbBSbw=", "owner": "nix-community", "repo": "home-manager", - "rev": "c0f9cbcf93ca22e4f0ca66843be61a4bdf6f0a44", + "rev": "f7641a3ff398ccce952e19a199d775934e518c1d", "type": "github" }, "original": { @@ -377,11 +395,27 @@ }, "latest": { "locked": { - "lastModified": 1669019068, - "narHash": "sha256-L8TFuvYyrHjkViZufh83qfDHdVjyqcKbulTkbE0JBkU=", + "lastModified": 1668994630, + "narHash": "sha256-1lqx6HLyw6fMNX/hXrrETG1vMvZRGm2XVC9O/Jt0T6c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "73eab78fd8ece416345ddfa7595cd959e0a45515", + "rev": "af50806f7c6ab40df3e6b239099e8f8385f6c78b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "latest_2": { + "locked": { + "lastModified": 1669114045, + "narHash": "sha256-+/siFvmpRER84gdKV/KG3nKYD1lnjK50LeMmusL+eyE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "758e5af4cd3e9d73d4f94fec1e2b02130e04c727", "type": "github" }, "original": { @@ -432,11 +466,11 @@ }, "nixos": { "locked": { - "lastModified": 1668905981, - "narHash": "sha256-RBQa/+9Uk1eFTqIOXBSBezlEbA3v5OkgP+qptQs1OxY=", + "lastModified": 1668994630, + "narHash": "sha256-1lqx6HLyw6fMNX/hXrrETG1vMvZRGm2XVC9O/Jt0T6c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "690ffff026b4e635b46f69002c0f4e81c65dfc2e", + "rev": "af50806f7c6ab40df3e6b239099e8f8385f6c78b", "type": "github" }, "original": { @@ -463,11 +497,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668905981, - "narHash": "sha256-RBQa/+9Uk1eFTqIOXBSBezlEbA3v5OkgP+qptQs1OxY=", + "lastModified": 1668994630, + "narHash": "sha256-1lqx6HLyw6fMNX/hXrrETG1vMvZRGm2XVC9O/Jt0T6c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "690ffff026b4e635b46f69002c0f4e81c65dfc2e", + "rev": "af50806f7c6ab40df3e6b239099e8f8385f6c78b", "type": "github" }, "original": { @@ -587,7 +621,7 @@ "fenix": "fenix", "flake-utils": "flake-utils_3", "home": "home", - "latest": "latest", + "latest": "latest_2", "naersk": "naersk", "nixgl": "nixgl", "nixos": "nixos", @@ -617,11 +651,11 @@ }, "stable": { "locked": { - "lastModified": 1668908668, - "narHash": "sha256-oimCE4rY7Btuo/VYmA8khIyTHSMV7qUWTpz9w8yc9LQ=", + "lastModified": 1668984258, + "narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b68a6a27adb452879ab66c0eaac0c133e32823b2", + "rev": "cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 84b56bb..6fdee25 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ flake-utils.url = "github:numtide/flake-utils"; - digga.url = "github:divnix/digga"; + digga.url = "github:divnix/digga/home-manager-22.11"; digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixpkgs-unstable.follows = "latest"; digga.inputs.nixlib.follows = "nixos"; diff --git a/users/maekasza/default.nix b/users/maekasza/default.nix index f12775b..a294e3a 100644 --- a/users/maekasza/default.nix +++ b/users/maekasza/default.nix @@ -1,5 +1,6 @@ { pkgs, ... }: { imports = [ ../profiles/core ../profiles/direnv ../profiles/zsh ../profiles/neovim ../profiles/syncthing ../profiles/kdeconnect ../profiles/tmux ../profiles/mpv ../profiles/sway ]; + home.stateVersion = "22.11"; targets.genericLinux.enable = true; home.packages = [ pkgs.home-manager ]; wayland.windowManager.sway.extraSessionCommands = ''