From 6129d401eccb8cda1feffc4d74bf39eeed526819 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Wed, 3 Apr 2024 17:57:01 -0300 Subject: [PATCH] add awscli-console --- flake.lock | 56 ++++++++++---------------- flake.nix | 5 ++- home/misterio/electra.nix | 5 --- home/misterio/features/cli/default.nix | 3 ++ home/misterio/features/cli/fish.nix | 5 +-- 5 files changed, 30 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 52825f47..43241652 100644 --- a/flake.lock +++ b/flake.lock @@ -2,19 +2,21 @@ "nodes": { "awscli-console": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems" }, "locked": { - "lastModified": 1710238207, - "narHash": "sha256-4n5YtwbQqUoVSBcv24zg7C6lqBdNoYDFK/0H2U0z9rI=", - "owner": "misterio77", + "lastModified": 1712177337, + "narHash": "sha256-g4jauveuma7Re5Mpa3WMy8DTWrs7HnDjYyZt8vG40oE=", + "owner": "zoocha", "repo": "awscli-console", - "rev": "7a0fb2df9682b00af51b01d50ab0cdbd0072b78c", + "rev": "e453f6e9ea7d3e19af4abefd3619ea2b6bd3b477", "type": "github" }, "original": { - "owner": "misterio77", + "owner": "zoocha", "repo": "awscli-console", "type": "github" } @@ -70,7 +72,7 @@ }, "disconic": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" }, "locked": { @@ -492,7 +494,7 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1711501815, @@ -555,11 +557,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1686331006, + "narHash": "sha256-hElRDWUNG655aqF0awu+h5cmDN+I/dQcChRt2tGuGGU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "85bcb95aa83be667e562e781e9d186c57a07d757", "type": "github" }, "original": { @@ -603,22 +605,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1686331006, - "narHash": "sha256-hElRDWUNG655aqF0awu+h5cmDN+I/dQcChRt2tGuGGU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "85bcb95aa83be667e562e781e9d186c57a07d757", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1711200738, "narHash": "sha256-dkJmk/ET/tRV4007O6kU101UEg1svUwiyk/zEEX9Tdg=", @@ -634,7 +620,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1711523803, "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", @@ -650,7 +636,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1701263465, "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=", @@ -666,7 +652,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1701539137, "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", @@ -682,7 +668,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1670543317, "narHash": "sha256-4mMR56rtxKr+Gwz399jFr4i76SQZxsLWxxyfQlPXRm0=", @@ -700,7 +686,7 @@ }, "paste-misterio-me": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1701655110, @@ -732,7 +718,7 @@ "nix-gaming": "nix-gaming", "nix-minecraft": "nix-minecraft", "nixos-mailserver": "nixos-mailserver", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "paste-misterio-me": "paste-misterio-me", "sops-nix": "sops-nix", "website": "website", @@ -909,7 +895,7 @@ }, "website": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "systems": "systems_7" }, "locked": { @@ -980,7 +966,7 @@ }, "yrmos": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1697654110, diff --git a/flake.nix b/flake.nix index 592ab121..994173d4 100644 --- a/flake.nix +++ b/flake.nix @@ -52,13 +52,16 @@ url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; + awscli-console = { + url = "github:zoocha/awscli-console"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nix-gaming.url = "github:fufexan/nix-gaming"; disconic.url = "github:misterio77/disconic"; website.url = "github:misterio77/website"; paste-misterio-me.url = "github:misterio77/paste.misterio.me"; yrmos.url = "github:misterio77/yrmos"; - awscli-console.url = "github:misterio77/awscli-console"; }; outputs = { self, nixpkgs, home-manager, ... }@inputs: diff --git a/home/misterio/electra.nix b/home/misterio/electra.nix index a0917c3f..fa799578 100644 --- a/home/misterio/electra.nix +++ b/home/misterio/electra.nix @@ -32,9 +32,4 @@ in { ]; # programs.git.userEmail = "gabriel@zoocha.com"; - - home.packages = [ - pkgs.inputs.awscli-console.default - ]; - programs.awscli.enable = true; } diff --git a/home/misterio/features/cli/default.nix b/home/misterio/features/cli/default.nix index c68c15ad..18606f20 100644 --- a/home/misterio/features/cli/default.nix +++ b/home/misterio/features/cli/default.nix @@ -44,5 +44,8 @@ ltex-ls # Spell checking LSP tly # Tally counter + + awscli2 + inputs.awscli-console.default ]; } diff --git a/home/misterio/features/cli/fish.nix b/home/misterio/features/cli/fish.nix index cd65517f..9d1f3968 100644 --- a/home/misterio/features/cli/fish.nix +++ b/home/misterio/features/cli/fish.nix @@ -6,12 +6,12 @@ let hasRipgrep = hasPackage "ripgrep"; hasExa = hasPackage "eza"; hasSpecialisationCli = hasPackage "specialisation"; + hasAwsCli = hasPackage "awscli2"; hasNeovim = config.programs.neovim.enable; hasEmacs = config.programs.emacs.enable; hasNeomutt = config.programs.neomutt.enable; hasShellColor = config.programs.shellcolor.enable; hasKitty = config.programs.kitty.enable; - hasAwsCli = config.programs.awscli.enable; shellcolor = "${pkgs.shellcolord}/bin/shellcolor"; in { @@ -42,7 +42,6 @@ in e = mkIf hasEmacs "emacsclient -t"; - vrg = mkIf (hasNeomutt && hasRipgrep) "nvimrg"; vim = mkIf hasNeovim "nvim"; vi = vim; v = vim; @@ -64,7 +63,7 @@ in # Disable greeting fish_greeting = ""; # Grep using ripgrep and pass to nvim - nvimrg = mkIf (hasNeomutt && hasRipgrep) "nvim -q (rg --vimgrep $argv | psub)"; + nvimrg = mkIf (hasNeovim && hasRipgrep) "nvim -q (rg --vimgrep $argv | psub)"; # Merge history upon doing up-or-search # This lets multiple fish instances share history up-or-search = /* fish */ ''