From c807f8e68bf4b22bffd51517e0902348a9a90d12 Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Mon, 30 Sep 2024 08:55:37 +0200 Subject: [PATCH] repo: add nix-colors --- flake.lock | 151 ++++++++++++++++++++++++++++++---------------- flake.nix | 4 +- home/default.nix | 7 ++- hosts/default.nix | 5 +- 4 files changed, 111 insertions(+), 56 deletions(-) diff --git a/flake.lock b/flake.lock index 88d3f92..19af291 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "base16-schemes": { + "flake": false, + "locked": { + "lastModified": 1696158499, + "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", + "owner": "tinted-theming", + "repo": "base16-schemes", + "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-schemes", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -22,7 +38,7 @@ }, "flake-parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1715865404, @@ -228,6 +244,25 @@ "type": "github" } }, + "nix-colors": { + "inputs": { + "base16-schemes": "base16-schemes", + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1707825078, + "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", + "owner": "misterio77", + "repo": "nix-colors", + "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", + "type": "github" + }, + "original": { + "owner": "misterio77", + "repo": "nix-colors", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1727040444, @@ -260,6 +295,21 @@ } }, "nixpkgs-lib": { + "locked": { + "lastModified": 1697935651, + "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "lastModified": 1714640452, "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=", @@ -272,22 +322,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1656753965, - "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1726871744, "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", @@ -303,13 +337,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1656753965, + "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", "type": "github" }, "original": { @@ -319,6 +353,22 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1726871744, + "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nmd": { "flake": false, "locked": { @@ -341,9 +391,7 @@ "flake-utils": "flake-utils_2", "mnw": "mnw", "nil": "nil", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "nmd": "nmd", "plugin-alpha-nvim": "plugin-alpha-nvim", "plugin-bufdelete-nvim": "plugin-bufdelete-nvim", @@ -421,6 +469,7 @@ "plugin-obsidian-nvim": "plugin-obsidian-nvim", "plugin-onedark": "plugin-onedark", "plugin-orgmode-nvim": "plugin-orgmode-nvim", + "plugin-otter-nvim": "plugin-otter-nvim", "plugin-oxocarbon": "plugin-oxocarbon", "plugin-plenary-nvim": "plugin-plenary-nvim", "plugin-project-nvim": "plugin-project-nvim", @@ -449,11 +498,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1727179231, - "narHash": "sha256-Jm9w3lBmX5D2IKhmpGUvb4XXEK8h3rqGv1LETphJEiY=", + "lastModified": 1727647833, + "narHash": "sha256-menRc90CF1uLC+XEaYjzrV7QjVAWDs9EZwhyiU5ppn4=", "owner": "notashelf", "repo": "nvf", - "rev": "8e96f0aaa325b992d17a3e7c9613344680375791", + "rev": "3cba3ca30c167d484dbf85f25685ed6cf4f87014", "type": "github" }, "original": { @@ -1169,11 +1218,11 @@ "plugin-neo-tree-nvim": { "flake": false, "locked": { - "lastModified": 1713050882, - "narHash": "sha256-cZwOVpdMT0NCtp6Ha592QA2RzKVS6LhXXcjfDBCQ+0k=", + "lastModified": 1726542367, + "narHash": "sha256-Lqt0KJNT9HmpJwZoWChYeVBrDWhscRe8COqVCwgcTwk=", "owner": "nvim-neo-tree", "repo": "neo-tree.nvim", - "rev": "22e566aeb075c94f670f34077e05ba95190dfb4a", + "rev": "a77af2e764c5ed4038d27d1c463fa49cd4794e07", "type": "github" }, "original": { @@ -1679,6 +1728,22 @@ "type": "github" } }, + "plugin-otter-nvim": { + "flake": false, + "locked": { + "lastModified": 1724585935, + "narHash": "sha256-euHwoK2WHLF/hrjLY2P4yGrIbYyBN38FL3q4CKNZmLY=", + "owner": "jmbuhr", + "repo": "otter.nvim", + "rev": "ca9ce67d0399380b659923381b58d174344c9ee7", + "type": "github" + }, + "original": { + "owner": "jmbuhr", + "repo": "otter.nvim", + "type": "github" + } + }, "plugin-oxocarbon": { "flake": false, "locked": { @@ -2066,7 +2131,7 @@ "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { @@ -2088,13 +2153,13 @@ "flake-parts": "flake-parts", "flake-utils": "flake-utils", "home-manager": "home-manager", + "nix-colors": "nix-colors", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nvf": "nvf", "systems": "systems_3", "treefmt-nix": "treefmt-nix", - "wezterm": "wezterm", - "zen-browser": "zen-browser" + "wezterm": "wezterm" } }, "rust-overlay": { @@ -2207,7 +2272,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1727252110, @@ -2267,24 +2332,6 @@ "type": "github" } }, - "zen-browser": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1726001766, - "narHash": "sha256-ADvEWfo0AuHR06ah1nnzOyhsG05/b5QpUc7vFNbiEfM=", - "owner": "MarceColl", - "repo": "zen-browser-flake", - "rev": "06505a088396e2c0b9ad100302502783a6bcdb40", - "type": "github" - }, - "original": { - "owner": "MarceColl", - "repo": "zen-browser-flake", - "type": "github" - } - }, "zlib": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 943b3de..d3fd2a9 100644 --- a/flake.nix +++ b/flake.nix @@ -47,12 +47,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser.url = "github:MarceColl/zen-browser-flake"; nvf = { url = "github:notashelf/nvf"; - inputs.nixpkgs.follows = "nixpkgs"; }; + nix-colors.url = "github:misterio77/nix-colors"; + treefmt-nix.url = "github:numtide/treefmt-nix"; nixos-hardware.url = "github:NixOS/nixos-hardware"; diff --git a/home/default.nix b/home/default.nix index 029681d..5b668f4 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,7 +1,12 @@ -{self, ...}: { +{ + self, + nix-colors, + ... +}: { imports = [ ./terminal self.nixosModules.theme + nix-colors.homeManagerModules.default ]; home = { username = "nezia"; diff --git a/hosts/default.nix b/hosts/default.nix index 382cf41..cc7125f 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -8,7 +8,10 @@ homeImports = import "${self}/home/profiles"; mod = "${self}/system"; inherit (import mod) laptop desktop; - specialArgs = {inherit inputs self;}; + specialArgs = { + inherit inputs self; + inherit (inputs) nix-colors; + }; in { vamos = nixosSystem { inherit specialArgs;