diff --git a/flake.lock b/flake.lock index 18296db5..beee5021 100644 --- a/flake.lock +++ b/flake.lock @@ -105,6 +105,42 @@ "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -161,6 +197,28 @@ "type": "github" } }, + "imab": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1712072547, + "narHash": "sha256-Qwk4jrr2eckkrT0al3J+JOXvG5XGPVzYJqbwSswihhc=", + "owner": "ulyssa", + "repo": "iamb", + "rev": "e5b284ed19cb99f79a0cbaca9e2339b9171e6d6d", + "type": "github" + }, + "original": { + "owner": "ulyssa", + "repo": "iamb", + "type": "github" + } + }, "impermanence": { "locked": { "lastModified": 1708968331, @@ -252,16 +310,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710162809, - "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=", + "lastModified": 1706487304, + "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2", + "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -316,6 +374,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1710162809, + "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nnn-nvim": { "flake": false, "locked": { @@ -382,7 +456,7 @@ }, "pnpm2nix": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_3", "nixpkgs": [ "lolpizza", "nixpkgs" @@ -408,12 +482,13 @@ "agkozak-zsh-prompt": "agkozak-zsh-prompt", "darwin": "darwin_2", "home-manager": "home-manager_2", + "imab": "imab", "impermanence": "impermanence", "lolpizza": "lolpizza", "miro": "miro", "nixd": "nixd", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-master": "nixpkgs-master", "nnn-nvim": "nnn-nvim", @@ -431,6 +506,25 @@ "zsh-vim-mode": "zsh-vim-mode" } }, + "rust-overlay": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1709863839, + "narHash": "sha256-QpEL5FmZNi2By3sKZY55wGniFXc4wEn9PQczlE8TG0o=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e5ab9ee98f479081ad971473d2bc13c59e9fbc0a", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "spoons": { "flake": false, "locked": { @@ -492,9 +586,39 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index fd397fc2..e8d296c0 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,8 @@ lolpizza.inputs.nixpkgs.follows = "nixpkgs"; x.url = "github:thexyno/x"; x.inputs.nixpkgs.follows = "nixpkgs"; + imab.url = "github:ulyssa/iamb"; + imab.inputs.nixpkgs.follows = "nixpkgs"; ## editor stuff nixd.url = "github:nix-community/nixd"; diff --git a/hosts/ds9/hardware-configuration.nix b/hosts/ds9/hardware-configuration.nix index 89b544be..ec4722da 100644 --- a/hosts/ds9/hardware-configuration.nix +++ b/hosts/ds9/hardware-configuration.nix @@ -40,6 +40,10 @@ device = "rpool/content/safe/data/media"; fsType = "zfs"; }; + fileSystems."/backups/DaedalusTimeMachine" = { + device = "rpool/content/local/backups/daedalus"; + fsType = "zfs"; + }; fileSystems."/backups" = { device = "rpool/content/local/backups"; fsType = "zfs";