From cf591c1e2d730c44f29f22a18e2aac86e0e42b22 Mon Sep 17 00:00:00 2001 From: Madeleine Sydney Date: Tue, 1 Apr 2025 06:04:55 -0600 Subject: [PATCH] refactor(deertopia): Rename config files --- flake.lock | 124 ++++++++---------- flake.nix | 9 +- hosts/deertopia/configuration.nix | 4 +- .../deertopia/{disko-config.nix => disks.nix} | 0 ...ardware-configuration.nix => hardware.nix} | 0 5 files changed, 64 insertions(+), 73 deletions(-) rename hosts/deertopia/{disko-config.nix => disks.nix} (100%) rename hosts/deertopia/{hardware-configuration.nix => hardware.nix} (100%) diff --git a/flake.lock b/flake.lock index ccab0a9..832287d 100755 --- a/flake.lock +++ b/flake.lock @@ -71,7 +71,7 @@ "inputs": { "devshell": "devshell", "nix-fetcher-data": "nix-fetcher-data", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1732920288, @@ -90,7 +90,9 @@ "copyparty": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1742772485, @@ -130,7 +132,7 @@ }, "disko": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1741786315, @@ -148,7 +150,7 @@ }, "emacs-overlay": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -408,17 +410,20 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1742856449, - "narHash": "sha256-J0qKDH7bTrzDYjLzwXiaGE2pdaL/OycvRy/6h6Ih2oo=", - "path": "/home/crumb/git/home-manager", - "type": "path" + "lastModified": 1743482579, + "narHash": "sha256-u81nqA4UuRatKDkzUuIfVYdLMw8birEy+99oXpdyXhY=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c21383b556609ce1ad901aa08b4c6fbd9e0c7af0", + "type": "github" }, "original": { - "path": "/home/crumb/git/home-manager", - "type": "path" + "owner": "nix-community", + "repo": "home-manager", + "type": "github" } }, "home-manager_2": { @@ -461,7 +466,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -539,7 +544,7 @@ "nixcord": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "systems": "systems", "treefmt-nix": "treefmt-nix" }, @@ -560,17 +565,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1680334310, - "narHash": "sha256-ISWz16oGxBhF7wqAxefMPwFag6SlsA9up8muV79V9ck=", + "lastModified": 1741402956, + "narHash": "sha256-y2hByvBM03s9T2fpeLjW6iprbxnhV9mJMmSwCHc41ZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "884e3b68be02ff9d61a042bc9bd9dd2a358f95da", + "rev": "ed0b1881565c1ffef490c10d663d4f542031dad3", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -618,22 +624,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1728492678, "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", @@ -649,7 +639,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1737632463, "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", @@ -667,27 +657,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741402956, - "narHash": "sha256-y2hByvBM03s9T2fpeLjW6iprbxnhV9mJMmSwCHc41ZQ=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed0b1881565c1ffef490c10d663d4f542031dad3", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -714,22 +704,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1742169275, "narHash": "sha256-nkH2Edu9rClcsQp2PYBe8E6fp8LDPi2uDBQ6wyMdeXI=", @@ -745,7 +719,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1735554305, "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", @@ -761,7 +735,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1742738698, "narHash": "sha256-KCtAXWwQs03JmEhP4ss59QVzT+rHZkhQO85KjNy8Crc=", @@ -777,7 +751,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1742578646, "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=", @@ -793,6 +767,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": "flake-parts", @@ -847,7 +837,7 @@ "impermanence": "impermanence", "niri": "niri", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nur": "nur", "sops-nix": "sops-nix", "stylix": "stylix", @@ -856,7 +846,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1742700801, @@ -884,7 +874,7 @@ "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nur": "nur_2", "systems": "systems_2", "tinted-foot": "tinted-foot", @@ -911,7 +901,7 @@ "inputs": { "clj-nix": "clj-nix", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1742246510, @@ -1052,7 +1042,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1739829690, diff --git a/flake.nix b/flake.nix index e942670..bf37542 100755 --- a/flake.nix +++ b/flake.nix @@ -5,12 +5,13 @@ disko.url = "github:nix-community/disko"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; impermanence.url = "github:nix-community/impermanence"; - # We're using my branch until #6259 is merged. - # home-manager.url = "github:msyds/home-manager/service-mpdscribble"; - home-manager.url = "path:///home/crumb/git/home-manager"; + home-manager.url = "github:nix-community/home-manager"; sops-nix.url = "github:Mic92/sops-nix"; sydnix-cli.url = "path:///persist/dots/scripts/sydnix-cli"; - copyparty.url = "github:9001/copyparty"; + copyparty = { + url = "github:9001/copyparty"; + inputs.nixpkgs.follows = "nixpkgs"; + }; emacs-overlay.url = "github:nix-community/emacs-overlay"; niri.url = "github:sodiboo/niri-flake"; stylix.url = "github:danth/stylix"; diff --git a/hosts/deertopia/configuration.nix b/hosts/deertopia/configuration.nix index c68f3e1..9effec6 100755 --- a/hosts/deertopia/configuration.nix +++ b/hosts/deertopia/configuration.nix @@ -1,8 +1,8 @@ { config, pkgs, lib, disko, sydnix-cli, ... }: { imports = [ - ./hardware-configuration.nix - ./disko-config.nix + ./hardware.nix + ./disks.nix ]; sydnix = { diff --git a/hosts/deertopia/disko-config.nix b/hosts/deertopia/disks.nix similarity index 100% rename from hosts/deertopia/disko-config.nix rename to hosts/deertopia/disks.nix diff --git a/hosts/deertopia/hardware-configuration.nix b/hosts/deertopia/hardware.nix similarity index 100% rename from hosts/deertopia/hardware-configuration.nix rename to hosts/deertopia/hardware.nix