From be403404ba52858e4b13a84fd2564d5cbde128fe Mon Sep 17 00:00:00 2001 From: Kyler Clay Date: Wed, 25 Sep 2024 02:48:10 -0400 Subject: [PATCH] Commit for generation 62 --- flake.lock | 161 ++++++++++++++++-------------------- glasshouse-desktop/home.nix | 2 +- 2 files changed, 72 insertions(+), 91 deletions(-) diff --git a/flake.lock b/flake.lock index e9b9523..7316011 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,9 @@ { "nodes": { - "desktop-utils": { - "inputs": { - "nixpkgs": "nixpkgs", - "nixvim": "nixvim", - "toilet": "toilet" - }, - "locked": { - "lastModified": 1727202946, - "narHash": "sha256-STukUX0XmB/RKl6+MutElrC+1ULUnMH69SqCnGNhXak=", - "path": "/home/pagedmov/sysflakes/glasshouse-desktop/dotfiles", - "type": "path" - }, - "original": { - "path": "/home/pagedmov/sysflakes/glasshouse-desktop/dotfiles", - "type": "path" - } - }, "devshell": { "inputs": { "nixpkgs": [ - "desktop-utils", - "nixvim", + "nvim", "nixvim", "nixpkgs" ] @@ -91,8 +73,7 @@ "flake-parts_2": { "inputs": { "nixpkgs-lib": [ - "desktop-utils", - "nixvim", + "nvim", "nixvim", "nixpkgs" ] @@ -132,21 +113,18 @@ "git-hooks": { "inputs": { "flake-compat": [ - "desktop-utils", - "nixvim", + "nvim", "nixvim", "flake-compat" ], "gitignore": "gitignore", "nixpkgs": [ - "desktop-utils", - "nixvim", + "nvim", "nixvim", "nixpkgs" ], "nixpkgs-stable": [ - "desktop-utils", - "nixvim", + "nvim", "nixvim", "nixpkgs" ] @@ -168,8 +146,7 @@ "gitignore": { "inputs": { "nixpkgs": [ - "desktop-utils", - "nixvim", + "nvim", "nixvim", "git-hooks", "nixpkgs" @@ -192,8 +169,7 @@ "gitignore_2": { "inputs": { "nixpkgs": [ - "desktop-utils", - "nixvim", + "nvim", "pre-commit-hooks", "nixpkgs" ] @@ -215,8 +191,27 @@ "home-manager": { "inputs": { "nixpkgs": [ - "desktop-utils", - "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727111745, + "narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "21c021862fa696c8199934e2153214ab57150cb6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nvim", "nixvim", "nixpkgs" ] @@ -235,31 +230,10 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727111745, - "narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "21c021862fa696c8199934e2153214ab57150cb6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ - "desktop-utils", - "nixvim", + "nvim", "nixvim", "nixpkgs" ] @@ -338,38 +312,32 @@ "type": "github" } }, - "nixvim": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "desktop-utils", - "nixpkgs" - ], - "nixvim": "nixvim_2", - "pre-commit-hooks": "pre-commit-hooks" - }, + "nixpkgs_3": { "locked": { - "lastModified": 1, - "narHash": "sha256-Y+21IYiPTQWOuHzD+KucrdVnBokpyDRZTrFp0Ir8qVE=", - "path": "./packages/nixvim/", - "type": "path" + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "type": "github" }, "original": { - "path": "./packages/nixvim/", - "type": "path" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, - "nixvim_2": { + "nixvim": { "inputs": { "devshell": "devshell", "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": [ - "desktop-utils", - "nixvim", + "nvim", "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", @@ -393,8 +361,7 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ - "desktop-utils", - "nixvim", + "nvim", "nixvim", "nixpkgs" ] @@ -413,13 +380,30 @@ "type": "github" } }, + "nvim": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_2", + "nixvim": "nixvim", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-Y+21IYiPTQWOuHzD+KucrdVnBokpyDRZTrFp0Ir8qVE=", + "path": "glasshouse-desktop/dotfiles/packages/nixvim", + "type": "path" + }, + "original": { + "path": "glasshouse-desktop/dotfiles/packages/nixvim", + "type": "path" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", "gitignore": "gitignore_2", "nixpkgs": [ - "desktop-utils", - "nixvim", + "nvim", "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable" @@ -440,9 +424,10 @@ }, "root": { "inputs": { - "desktop-utils": "desktop-utils", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_2" + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "nvim": "nvim", + "toilet": "toilet" } }, "systems": { @@ -462,27 +447,23 @@ }, "toilet": { "inputs": { - "nixpkgs": [ - "desktop-utils", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1, "narHash": "sha256-S3crmqg/CDKf+QTwnZUR6udyjsvqS0P0y56wGuJmOno=", - "path": "./packages/toilet/", + "path": "glasshouse-desktop/dotfiles/packages/toilet", "type": "path" }, "original": { - "path": "./packages/toilet/", + "path": "glasshouse-desktop/dotfiles/packages/toilet", "type": "path" } }, "treefmt-nix": { "inputs": { "nixpkgs": [ - "desktop-utils", - "nixvim", + "nvim", "nixvim", "nixpkgs" ] diff --git a/glasshouse-desktop/home.nix b/glasshouse-desktop/home.nix index ee37d4e..980d01f 100644 --- a/glasshouse-desktop/home.nix +++ b/glasshouse-desktop/home.nix @@ -56,7 +56,7 @@ x11.enable = true; name = name; size = 48; - package = pkgs.runcommand "moveUp" {} '' + package = pkgs.runCommand "moveUp" {} '' mkdir -p $out/share/icons ln -s ${pkgs.fetchzip { url = url;