From 1306f250fa1b584206ef5785e42b9684d9ca0b55 Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Tue, 17 Dec 2024 19:11:42 +0100 Subject: [PATCH] update --- flake.lock | 37 ++++++++++++++++++++++++++ flake.nix | 2 +- nixos/home.nix | 2 +- nixos/modules/impermanence/default.nix | 2 +- nixos/modules/impermanence/home.nix | 4 ++- 5 files changed, 43 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 4a57485..670c4e7 100644 --- a/flake.lock +++ b/flake.lock @@ -140,6 +140,26 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734343412, + "narHash": "sha256-b7G8oFp0Nj01BYUJ6ENC9Qf/HsYAIZvN9k/p0Kg/PFU=", + "owner": "nix-community", + "repo": "disko", + "rev": "a08bfe06b39e94eec98dd089a2c1b18af01fef19", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1688025799, @@ -650,6 +670,21 @@ "type": "github" } }, + "impermanence": { + "locked": { + "lastModified": 1734200366, + "narHash": "sha256-0NursoP4BUdnc+wy+Mq3icHkXu/RgP1Sjo0MJxV2+Dw=", + "owner": "nix-community", + "repo": "impermanence", + "rev": "c6323585fa0035d780e3d8906eb1b24b65d19a48", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "impermanence", + "type": "github" + } + }, "ixx": { "inputs": { "flake-utils": [ @@ -873,8 +908,10 @@ "root": { "inputs": { "apple-silicon-support": "apple-silicon-support", + "disko": "disko", "home-manager": "home-manager", "hyprland": "hyprland", + "impermanence": "impermanence", "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index 0aab82a..4eb744a 100644 --- a/flake.nix +++ b/flake.nix @@ -79,7 +79,7 @@ # }; # }; modules = [ - inputs.impermanence.nixosModules.impermamence + inputs.impermanence.nixosModules.impermanence inputs.disko.nixosModules.default (import ./nixos/modules/disko/impermanence-disko.nix { device = "/dev/nvme0n1"; } ) ./nixos/modules/impermanence diff --git a/nixos/home.nix b/nixos/home.nix index 7beffe7..f191ab1 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -17,7 +17,7 @@ ./nixvim ./fastfetch #"${if hostname != "nixosbtw" then ./macos/homemac.nix else ./empty.nix }" - ] ++ if hwconfig.useImpermanence then [ ./modules/impermanence/home.nix ] else []; + ] ++ (if hwconfig.useImpermanence then [ ./modules/impermanence/home.nix ] else []); # Home Manager needs a bit of information about you and the paths it should # manage. home.username = username; diff --git a/nixos/modules/impermanence/default.nix b/nixos/modules/impermanence/default.nix index 8862597..be3ea3a 100644 --- a/nixos/modules/impermanence/default.nix +++ b/nixos/modules/impermanence/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ lib, ... }: { fileSystems."/persist".neededForBoot = true; diff --git a/nixos/modules/impermanence/home.nix b/nixos/modules/impermanence/home.nix index eaaa4fa..56edd6e 100644 --- a/nixos/modules/impermanence/home.nix +++ b/nixos/modules/impermanence/home.nix @@ -1,4 +1,4 @@ -{ username, ... }: +{ username, inputs, ... }: { imports = [ inputs.impermanence.nixosModules.home-manager.impermanence @@ -11,6 +11,8 @@ "Documents" "Videos" "VirtualBox VMs" + "Git" + "blender" ".gnupg" ".ssh" ".nixops"