From fc3e307d0c3f47203efcae99404d04c075610ad2 Mon Sep 17 00:00:00 2001 From: Annika Merris Date: Sat, 18 May 2024 10:02:52 -0400 Subject: [PATCH] Why? --- flake.lock | 87 ++++---------------------------------- flake.nix | 16 +++---- hosts/virt-nix/default.nix | 2 +- 3 files changed, 17 insertions(+), 88 deletions(-) diff --git a/flake.lock b/flake.lock index a59ecbb..c0c2b9c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,36 +1,5 @@ { "nodes": { - "catppuccin-vsc": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1713966373, - "narHash": "sha256-8bMRH+z426e6zWcS15QZsQ8moSAKbEDjtBnAE10+DW8=", - "type": "tarball", - "url": "https://flakehub.com/f/catppuccin/vscode/%2A.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/catppuccin/vscode/%2A.tar.gz" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -128,18 +97,14 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", - "type": "github" + "lastModified": 0, + "narHash": "sha256-/vno6oUIZDSLpqS/WOqNTHwVIakrNR7R+UutJVmfohs=", + "path": "/nix/store/hqzz459vrv62vjc470vig5lf5qm7d897-source", + "type": "path" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-stable": { @@ -159,18 +124,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 0, - "narHash": "sha256-/vno6oUIZDSLpqS/WOqNTHwVIakrNR7R+UutJVmfohs=", - "path": "/nix/store/hqzz459vrv62vjc470vig5lf5qm7d897-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1715413075, "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=", @@ -188,40 +141,16 @@ }, "root": { "inputs": { - "catppuccin-vsc": "catppuccin-vsc", "home-manager": "home-manager", "lix": "lix", "lix-module": "lix-module", - "nixpkgs": "nixpkgs_2", - "solaar": "solaar", + "nixpkgs": "nixpkgs", "sops-nix": "sops-nix" } }, - "solaar": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715441983, - "narHash": "sha256-CWRwtvZtcK8CDQCZhmv4nNp1Qmx3JXEidFQi/JMnX/M=", - "owner": "Svenum", - "repo": "Solaar-Flake", - "rev": "ee38dd45276fcb03174aec5301144514e66f4775", - "type": "github" - }, - "original": { - "owner": "Svenum", - "ref": "latest", - "repo": "Solaar-Flake", - "type": "github" - } - }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { diff --git a/flake.nix b/flake.nix index 8b5683b..43f4084 100644 --- a/flake.nix +++ b/flake.nix @@ -23,17 +23,17 @@ url = "github:Mic92/sops-nix"; }; - catppuccin-vsc = { - url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz"; - }; + # catppuccin-vsc = { + # url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz"; + # }; - solaar = { - url = "github:Svenum/Solaar-Flake/latest"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # solaar = { + # url = "github:Svenum/Solaar-Flake/latest"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; }; - outputs = { self, nixpkgs, lix-module, solaar, ... }@inputs: + outputs = { self, nixpkgs, lix-module, ... }@inputs: let system = "x86_64"; globals = rec { diff --git a/hosts/virt-nix/default.nix b/hosts/virt-nix/default.nix index 1f65c57..2ccf207 100644 --- a/hosts/virt-nix/default.nix +++ b/hosts/virt-nix/default.nix @@ -1,7 +1,7 @@ # Kim # System configuration for my desktop -{ inputs, globals, overlays, ... }: +{ inputs, globals, ... }: with inputs;