diff --git a/configuration.nix b/configuration.nix index 31110a0..e43a601 100755 --- a/configuration.nix +++ b/configuration.nix @@ -64,7 +64,7 @@ useDHCP = true; networkmanager.enable = false; wireless = { - userControlled.enable = true; + userControlled = true; enable = true; secretsFile = config.sops.secrets."networkPasswords".path; networks = { @@ -125,26 +125,29 @@ shell = pkgs.fish; }; - # Delete root on reboot - boot.initrd.systemd.services = { - rollback = { - description = "Rollback root zfs dataset to blank snapshot"; - wantedBy = [ "initrd.target" ]; - before = [ "sysroot.mount" ]; - after = [ "zfs-import-zroot.service" ]; - path = with pkgs; [ - zfs - ]; + boot.zfs.forceImportRoot = false; + /* + # Delete root on reboot disable for now while broken + boot.initrd.systemd.services = { + rollback = { + description = "Rollback root zfs dataset to blank snapshot"; + wantedBy = [ "initrd.target" ]; + before = [ "sysroot.mount" ]; + after = [ "zfs-import-zroot.service" ]; + path = with pkgs; [ + zfs + ]; - serviceConfig = { - Type = "oneshot"; - ExecStart = '' - zfs rollback -r zroot/root@blank && echo "blank rollback complete" - ''; + serviceConfig = { + Type = "oneshot"; + ExecStart = '' + zfs rollback -r zroot/root@blank && echo "blank rollback complete" + ''; + }; + + }; }; - - }; - }; + */ nix = { settings.experimental-features = [ @@ -156,7 +159,7 @@ automatic = true; persistent = true; dates = [ "daily" ]; - options = "--delete-older-than 7d"; + options = "--delete-older-than 30d"; }; }; diff --git a/flake.lock b/flake.lock index da44ce3..4fa8d07 100755 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1780977789, - "narHash": "sha256-UFJfQlvInbsVaTK5XC2lafdqWlwiNP5LuQFYfDKq6Dc=", + "lastModified": 1781064146, + "narHash": "sha256-HjjvV8nCE6/sTgghlTW1ht8Rs3VZB55tV8wWces8DwY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0b627f105ea3baa2fa10308a6a67a8f8cbbb3e2a", + "rev": "5213e7922ccfed3b070bf125c103504bc37852eb", "type": "gitlab" }, "original": { @@ -156,12 +156,26 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1780453794, + "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-26.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_3", "systems": "systems" }, "locked": { diff --git a/home.nix b/home.nix index 108dc23..8c5114d 100755 --- a/home.nix +++ b/home.nix @@ -44,14 +44,15 @@ settings = { user.name = "Roy Dumblauskas"; user.email = "roydumblauskas@gmail.com"; + + alias = { + gp = "push"; + gc = "commit -am"; + ga = "git add ."; + gs = "git status"; + }; }; - aliases = { - gp = "push"; - gc = "commit -am"; - ga = "git add ."; - gs = "git status"; - }; }; # user program config files @@ -94,6 +95,7 @@ # Configure firefox to be resilient against reboot # Source = https://github.com/johnmpost/nixos-config programs.firefox = { + configPath = ".mozilla/firefox"; enable = true; profiles.roy = {