From 051e7d428014b67b970f3761ab586c41e724d70a Mon Sep 17 00:00:00 2001 From: Raiden Date: Thu, 21 Mar 2024 14:05:07 -0500 Subject: [PATCH] feat: using 'nixpkgs-extra' --- flake.lock | 79 +++++++++++++++++++++++++++++++------ flake.nix | 11 ++++-- pkgs/default.nix | 10 ----- pkgs/ecsview.nix | 20 ---------- pkgs/ght.nix | 17 -------- pkgs/stu.nix | 17 -------- pkgs/vimix-cursor-theme.nix | 25 ------------ 7 files changed, 75 insertions(+), 104 deletions(-) delete mode 100644 pkgs/default.nix delete mode 100644 pkgs/ecsview.nix delete mode 100644 pkgs/ght.nix delete mode 100644 pkgs/stu.nix delete mode 100644 pkgs/vimix-cursor-theme.nix diff --git a/flake.lock b/flake.lock index 17df18e..67cb34d 100644 --- a/flake.lock +++ b/flake.lock @@ -61,6 +61,24 @@ "inputs": { "systems": "systems_4" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_5" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -75,9 +93,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1689068808, @@ -93,9 +111,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1685518550, @@ -317,6 +335,27 @@ "type": "github" } }, + "nixpkgs-extra": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1711046732, + "narHash": "sha256-kS4ARkb09wIYAXZPjoeQXuIwARECUDbGwcyd/AlS8jo=", + "owner": "luisnquin", + "repo": "nixpkgs-extra", + "rev": "da59f4dfe7425b3ef6ca4441b7a918e6bac3dfbd", + "type": "github" + }, + "original": { + "owner": "luisnquin", + "repo": "nixpkgs-extra", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "dir": "lib", @@ -547,10 +586,10 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs_9", - "systems": "systems_5", + "systems": "systems_6", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -575,6 +614,7 @@ "hyprland-contrib": "hyprland-contrib", "nao": "nao", "nixpkgs": "nixpkgs_5", + "nixpkgs-extra": "nixpkgs-extra", "nixpkgs_mysql_57": "nixpkgs_mysql_57", "nixtheplanet": "nixtheplanet", "scripts": "scripts", @@ -586,7 +626,7 @@ "inputs": { "nixpkgs": "nixpkgs_8", "poetry2nix": "poetry2nix", - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1706318424, @@ -604,7 +644,7 @@ }, "senv": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_10" }, "locked": { @@ -623,7 +663,7 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_11" }, "locked": { @@ -701,6 +741,21 @@ } }, "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" + } + }, + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -714,7 +769,7 @@ "type": "indirect" } }, - "systems_6": { + "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -729,7 +784,7 @@ "type": "github" } }, - "systems_7": { + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -744,7 +799,7 @@ "type": "github" } }, - "systems_8": { + "systems_9": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 00eec5a..8aaa643 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,10 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixpkgs-extra = { + url = "github:luisnquin/nixpkgs-extra"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixpkgs_mysql_57.url = "github:NixOS/nixpkgs?rev=06c9198cbf48559191bf6c9b76c0f370f96b8c33"; nixtheplanet.url = "github:matthewcroughan/nixtheplanet"; spicetify-nix.url = "github:the-argus/spicetify-nix"; @@ -54,8 +58,9 @@ }; user = { - fullName = "Guest user"; - alias = "guest"; + fullName = "Raiden"; + alias = "raiden"; + gitEmail = "luis.quinones@inversiones.io"; }; dotfilesDir = "~/.dotfiles"; @@ -63,7 +68,7 @@ specialArgs = { grub-pkgs = grub-themes.packages.${system}; - pkgsx = import ./pkgs {inherit pkgs;}; + pkgsx = nixpkgs-extra.packages.${system}; # // import ./pkgs {inherit pkgs;}; mysql_57 = (import nixpkgs_mysql_57 {inherit system;}).mysql57; spicetify = spicetify-nix.packages.${pkgs.system}.default; diff --git a/pkgs/default.nix b/pkgs/default.nix deleted file mode 100644 index 6541ff6..0000000 --- a/pkgs/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{pkgs ? import {}, ...}: -with pkgs.lib; let - packages = { - vimix-cursor-theme = ./vimix-cursor-theme.nix; - ecsview = ./ecsview.nix; - ght = ./ght.nix; - stu = ./stu.nix; - }; -in - attrsets.mapAttrs (_name: packagePath: pkgs.callPackage packagePath {}) packages diff --git a/pkgs/ecsview.nix b/pkgs/ecsview.nix deleted file mode 100644 index d063d7b..0000000 --- a/pkgs/ecsview.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - fetchFromGitHub, - buildGoModule, -}: -buildGoModule rec { - pname = "ecsview"; - version = "v0.1.3"; - src = fetchFromGitHub { - owner = "swartzrock"; - repo = pname; - rev = "v0.1.3"; - hash = "sha256-54PR4spA9d/M3G2BqcVFIvMyxPTF3Sc7q4dgCzD1O+I="; - }; - - ldflags = ["-X main.version=${version}"]; - buildTarget = "."; - - vendorHash = "sha256-K5UHOpAwnAHubzFcaQxrPdad0QzvZGcP39/INYgK6EQ="; - doCheck = false; -} diff --git a/pkgs/ght.nix b/pkgs/ght.nix deleted file mode 100644 index 2714901..0000000 --- a/pkgs/ght.nix +++ /dev/null @@ -1,17 +0,0 @@ -{pkgs ? import {}}: -pkgs.buildGoModule rec { - pname = "github-tui"; - version = "unstable"; - src = pkgs.fetchFromGitHub { - name = "${pname}-source"; - owner = "skanehira"; - repo = "github-tui"; - rev = "ecc4a3c5953c5cc2b8cac0c9fb308033ae7396f9"; - hash = "sha256-c4mrGP9phHlCvg4YuQmWOWVzwtqKhP53vWsfYkrLkFo="; - }; - - buildTarget = "./cmd/ght"; - - vendorHash = "sha256-ph4Fb4dvI6htw6i9ypmhu1YMUi054+KkGkPz5CI/aA4="; - doCheck = true; -} diff --git a/pkgs/stu.nix b/pkgs/stu.nix deleted file mode 100644 index bde87d2..0000000 --- a/pkgs/stu.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - fetchFromGitHub, - rustPlatform, -}: -rustPlatform.buildRustPackage rec { - pname = "s3-tui"; - version = "unstable"; - - src = fetchFromGitHub { - owner = "lusingander"; - repo = "stu"; - rev = "94b919c7f989150c6b68fc76d2e70375d8a35ba0"; - hash = "sha256-gB9jYJSuDtqt5EJdqSOo4Jz0j8Ei9eBKeoYdaA389s0="; - }; - - cargoSha256 = "sha256-jQs1HCrZN2Avb+9hhs3dq7KluRaKMAGF5/gP/SS77MQ="; -} diff --git a/pkgs/vimix-cursor-theme.nix b/pkgs/vimix-cursor-theme.nix deleted file mode 100644 index 9cde02f..0000000 --- a/pkgs/vimix-cursor-theme.nix +++ /dev/null @@ -1,25 +0,0 @@ -# Source: https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/data/icons/vimix-cursor-theme/default.nix#L27 -{ - fetchFromGitHub, - stdenvNoCC, -}: -stdenvNoCC.mkDerivation rec { - pname = "vimix-cursor-theme"; - version = "2020-02-24"; - - src = fetchFromGitHub { - owner = "vinceliuice"; - repo = "Vimix-cursors"; - rev = version; - hash = "sha256-TfcDer85+UOtDMJVZJQr81dDy4ekjYgEvH1RE1IHMi4="; - }; - - installPhase = '' - sed -i 's/Vimix Cursors$/Vimix-Cursors/g' dist{,-white}/index.theme - - install -dm 755 $out/share/icons/Vimix-Cursors{,-White} - - cp -dr --no-preserve='ownership' dist/* $out/share/icons/Vimix-Cursors - cp -dr --no-preserve='ownership' dist-white/* $out/share/icons/Vimix-Cursors-White - ''; -}