diff --git a/flake.lock b/flake.lock index 1e36a78b..f603a025 100644 --- a/flake.lock +++ b/flake.lock @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1746171682, - "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", + "lastModified": 1747020534, + "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", "owner": "nix-community", "repo": "home-manager", - "rev": "50eee705bbdbac942074a8c120e8194185633675", + "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", "type": "github" }, "original": { @@ -287,11 +287,11 @@ ] }, "locked": { - "lastModified": 1746681524, - "narHash": "sha256-c5kDVFh+vVfQSEXdVIudFRzPH3LO8j2ImgsBeo8v+Eo=", + "lastModified": 1747109298, + "narHash": "sha256-v6P2Lm2ucRhFpVdY2feQKxJIGfaud3CVHV5GWoCNji8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "14eb8f7d2b0cca74691db620292037bdb813ceb7", + "rev": "7ceb01d01e02fa55699db1ecb99df1295b47b499", "type": "github" }, "original": { @@ -358,11 +358,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1746842210, - "narHash": "sha256-bGJ3q4BEJEEz9MNo2QwXgQULmSUItxn52lMQLNImZ+w=", + "lastModified": 1747188102, + "narHash": "sha256-h/J6hSskrsR+YFCjWW4x4qXm1oGcUUvXH8TEZDZnLqk=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "9acdd362e10b50cb36234544b5b80b3d0372456d", + "rev": "cc53b6b79022c9dd31b9d426bb5a5f39246196e1", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746906291, - "narHash": "sha256-dX85SDSt4h7281Dkox9NnTPjCIDs5JxkJQB9Czd7ajc=", + "lastModified": 1747196235, + "narHash": "sha256-41VHCKCevxL7Luqwc9A2r3DPTOz6Ky+nRkHp1eurtmA=", "owner": "nix-community", "repo": "NUR", - "rev": "7c77c4255a4cda029257090a72806dbd48ea14e3", + "rev": "2378adbb9ebb4654dc0d41786609839b6ad4a7ef", "type": "github" }, "original": { diff --git a/hosts/detritus/filesystems/default.nix b/hosts/detritus/filesystems/default.nix index f25a8d19..5dc1f325 100644 --- a/hosts/detritus/filesystems/default.nix +++ b/hosts/detritus/filesystems/default.nix @@ -12,7 +12,17 @@ # Network mounts "/home/${config.sysusers.main}/Network/Midas" = { - device = "sv.nixfox.ca:/storage"; + device = "10.2.0.1:/storage"; + fsType = "nfs4"; + options = [ + "noatime" + "noauto" + "soft" + "x-systemd.automount" + ]; + }; + "/home/${config.sysusers.main}/Network/Kitty" = { + device = "10.2.0.2:/storage/bun"; fsType = "nfs4"; options = [ "noatime" diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix index 954d8875..11a0ef0a 100644 --- a/modules/home/programs/gui/librewolf/default.nix +++ b/modules/home/programs/gui/librewolf/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, nur, ... }: +{ config, lib, pkgs, ... }: { config = lib.mkIf config.home.desktop.enable { programs.firefox = { diff --git a/modules/home/settings/impermanence/default.nix b/modules/home/settings/impermanence/default.nix index 77bb60b6..e8e25295 100644 --- a/modules/home/settings/impermanence/default.nix +++ b/modules/home/settings/impermanence/default.nix @@ -3,7 +3,6 @@ imports = [ impermanence.homeManagerModules.default ]; home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}" = { - enable = !config.targets.genericLinux.enable; allowOther = false; removePrefixDirectory = true; directories = [ diff --git a/modules/home/settings/xdg/folders/default.nix b/modules/home/settings/xdg/folders/default.nix index 0bd155ae..72486278 100644 --- a/modules/home/settings/xdg/folders/default.nix +++ b/modules/home/settings/xdg/folders/default.nix @@ -11,8 +11,8 @@ templates = null; extraConfig = { + XDG_PERSIST_DIR = if !config.targets.genericLinux.enable then "/persist${config.home.homeDirectory}" else "${config.home.homeDirectory}/.stow"; XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots"; - XDG_PERSIST_DIR = "/persist${config.home.homeDirectory}"; }; }; }