From 596e5ef023299c3bae9b521a800018ac4247d282 Mon Sep 17 00:00:00 2001 From: "Gustavo L de Mello (Guz)" Date: Thu, 9 Jan 2025 23:10:54 -0300 Subject: [PATCH] feat: add dot013-shell --- flake.lock | 534 ++++++++++++++++++++++++++++++---- flake.nix | 8 +- hosts/battleship/packages.nix | 51 ++-- hosts/fighter/packages.nix | 30 +- 4 files changed, 534 insertions(+), 89 deletions(-) diff --git a/flake.lock b/flake.lock index c8fdb0d..63d14e0 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,32 @@ "yazi": "yazi" }, "locked": { - "lastModified": 1734038903, - "narHash": "sha256-I+ekLBVmWPyQbbh8jFsDNh4Q9Kj5wtqqUU3aeN/aF7w=", + "lastModified": 1735224983, + "narHash": "sha256-wwYIB8gdOCMKdhbupmIme/zwNZ4ORBizZc4+iVc4XZw=", "ref": "refs/heads/main", - "rev": "d69c197fa41d3ea916014faaeb191ec1a76a8180", - "revCount": 82, + "rev": "bff3f7b24ee6059a54a1acb60e440a5a58780e5f", + "revCount": 90, + "type": "git", + "url": "https://forge.capytal.company/dot013/nvim" + }, + "original": { + "type": "git", + "url": "https://forge.capytal.company/dot013/nvim" + } + }, + "dot013-shell": { + "inputs": { + "go-grip": "go-grip_2", + "neovim-nightly-overlay": "neovim-nightly-overlay_3", + "nixpkgs": "nixpkgs_9", + "yazi": "yazi_2" + }, + "locked": { + "lastModified": 1735910393, + "narHash": "sha256-bxT6ZtD/Y1LZRtvbjTtApzvPz/mAuSPsWi9lqnS73VY=", + "ref": "refs/heads/main", + "rev": "7082a250be946ddd09e6622d49dea53bee19ab3a", + "revCount": 92, "type": "git", "url": "https://forge.capytal.company/dot013/nvim" }, @@ -58,18 +79,18 @@ }, "firefox-addons": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ] }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1734031485, - "narHash": "sha256-l4UzRn49+O39/5KrwjDlHtvt59Ce50Cxb+inpj7Ne1o=", + "lastModified": 1735736119, + "narHash": "sha256-LlFTsG0yk8OZ+HjuxnpEzliG0bf+BEWLvKHQZkFtQ+U=", "owner": "rycee", "repo": "nur-expressions", - "rev": "e714db5186e9f8c8996de093bd085a616355a91e", + "rev": "4da6d4129925b1884cf0d1eb79ba6983abfa6933", "type": "gitlab" }, "original": { @@ -144,6 +165,38 @@ } }, "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { + "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-compat_7": { "flake": false, "locked": { "lastModified": 1673956053, @@ -247,6 +300,50 @@ "type": "indirect" } }, + "flake-parts_5": { + "inputs": { + "nixpkgs-lib": [ + "dot013-shell", + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_6": { + "inputs": { + "nixpkgs-lib": [ + "dot013-shell", + "neovim-nightly-overlay", + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -284,6 +381,42 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { "locked": { "lastModified": 1629284811, "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", @@ -298,9 +431,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_6": { "inputs": { - "systems": "systems_4" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -318,11 +451,11 @@ }, "flatpaks": { "locked": { - "lastModified": 1733863840, - "narHash": "sha256-OO/yx700wpyKjFmsNlxep57pUIVCA1OlfEN1qUrxgCY=", + "lastModified": 1735500379, + "narHash": "sha256-5qmX6YYjYfVYBbsmd2XxbTi7A59YuuN9IwfXU7qFquQ=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "eb6f90693f91a7ce082c0c2c78627049265bc599", + "rev": "c31b6cbd11707fe2c74ad805ef085d59d75116ae", "type": "github" }, "original": { @@ -389,6 +522,35 @@ "type": "github" } }, + "git-hooks_3": { + "inputs": { + "flake-compat": "flake-compat_6", + "gitignore": "gitignore_3", + "nixpkgs": [ + "dot013-shell", + "neovim-nightly-overlay", + "nixpkgs" + ], + "nixpkgs-stable": [ + "dot013-shell", + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733665616, + "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -435,6 +597,29 @@ "type": "github" } }, + "gitignore_3": { + "inputs": { + "nixpkgs": [ + "dot013-shell", + "neovim-nightly-overlay", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "go-grip": { "inputs": { "flake-utils": "flake-utils", @@ -454,6 +639,25 @@ "type": "github" } }, + "go-grip_2": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1733702535, + "narHash": "sha256-PHv+pxgdJE8MgM5AS2Yu9+vdD0I4kpRekgHMN5uRIHg=", + "owner": "guz013", + "repo": "go-grip", + "rev": "d67368388939be8513cd52a9e1d86d71543dbcde", + "type": "github" + }, + "original": { + "owner": "guz013", + "repo": "go-grip", + "type": "github" + } + }, "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_2", @@ -500,6 +704,29 @@ "type": "github" } }, + "hercules-ci-effects_3": { + "inputs": { + "flake-parts": "flake-parts_6", + "nixpkgs": [ + "dot013-shell", + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733333617, + "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -556,8 +783,8 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_7", - "systems": "systems_3", + "nixpkgs": "nixpkgs_11", + "systems": "systems_5", "xdph": "xdph" }, "locked": { @@ -664,7 +891,7 @@ "xdg-desktop-portal-hyprland", "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_7" }, "locked": { "lastModified": 1713121246, @@ -777,6 +1004,30 @@ "type": "github" } }, + "neovim-nightly-overlay_3": { + "inputs": { + "flake-compat": "flake-compat_5", + "flake-parts": "flake-parts_5", + "git-hooks": "git-hooks_3", + "hercules-ci-effects": "hercules-ci-effects_3", + "neovim-src": "neovim-src_3", + "nixpkgs": "nixpkgs_8", + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1733962285, + "narHash": "sha256-djpjqhPZkqfe1USsuu+eT4ZyGO+dVvAf3l4FUCZEb6Y=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "2025aef04baf723bfa4cb8225fc11a319a5681f1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, "neovim-src": { "flake": false, "locked": { @@ -809,6 +1060,22 @@ "type": "github" } }, + "neovim-src_3": { + "flake": false, + "locked": { + "lastModified": 1733924897, + "narHash": "sha256-Fxzl754uzyNebXW54LUliFliMbw30XG+bdb0AVtPSM0=", + "owner": "neovim", + "repo": "neovim", + "rev": "442d338cb50e4cf08c58cb82b6d33b6d5df9fb1b", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -835,11 +1102,11 @@ ] }, "locked": { - "lastModified": 1733629314, - "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=", + "lastModified": 1735443188, + "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8", + "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", "type": "github" }, "original": { @@ -850,18 +1117,18 @@ }, "nix-minecraft": { "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1733968549, - "narHash": "sha256-r18fyuignDxOTgmgSRAvR2XRvdwoZOtPxqgRBuafqFQ=", + "lastModified": 1735696450, + "narHash": "sha256-pGnjPsPPrWoDIf+KAVo6rliSCcE4b3D2q4In7fYWllg=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "8f4795cc29b2a1e62e0d1856d9f7dcf219829748", + "rev": "94fb5a22a3b02ded59c825f85875a5d9e028fea9", "type": "github" }, "original": { @@ -903,11 +1170,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -917,6 +1184,70 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_13": { + "locked": { + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1733015953, @@ -999,15 +1330,15 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", - "owner": "NixOS", + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1015,31 +1346,31 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1733730953, - "narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=", - "owner": "nixos", + "lastModified": 1733749988, + "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "7109b680d161993918b0a126f38bc39763e5a709", + "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-24.05", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", - "owner": "NixOS", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1069,6 +1400,7 @@ "inputs": { "dot013-environment": "dot013-environment", "dot013-neovim": "dot013-neovim", + "dot013-shell": "dot013-shell", "firefox-addons": "firefox-addons", "flatpaks": "flatpaks", "home-manager": "home-manager", @@ -1076,7 +1408,7 @@ "nix-colors": "nix-colors", "nix-index-database": "nix-index-database", "nix-minecraft": "nix-minecraft", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_12", "nixpkgs-unstable": "nixpkgs-unstable", "rec-sh": "rec-sh", "sops-nix": "sops-nix", @@ -1106,6 +1438,28 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "dot013-shell", + "yazi", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729391507, + "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "784981a9feeba406de38c1c9a3decf966d853cca", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -1113,11 +1467,11 @@ ] }, "locked": { - "lastModified": 1733965552, - "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", + "lastModified": 1735468296, + "narHash": "sha256-ZjUjbvS06jf4fElOF4ve8EHjbpbRVHHypStoY8HGzk8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", + "rev": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27", "type": "github" }, "original": { @@ -1158,16 +1512,16 @@ }, "systems_3": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1202,6 +1556,36 @@ } }, "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_8": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1254,12 +1638,34 @@ "type": "github" } }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "dot013-shell", + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "xdg-desktop-portal-hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_9", - "systems": "systems_6" + "nixpkgs": "nixpkgs_13", + "systems": "systems_8" }, "locked": { "lastModified": 1718272114, @@ -1325,6 +1731,26 @@ "repo": "yazi", "type": "github" } + }, + "yazi_2": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_10", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1733925272, + "narHash": "sha256-HFr9MykhffcIa++uxjg5Mk69x5C/poiaKf+QV2REnSY=", + "owner": "sxyazi", + "repo": "yazi", + "rev": "c78f39b50f04fb23c8376369d6c9a21226002d9c", + "type": "github" + }, + "original": { + "owner": "sxyazi", + "repo": "yazi", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 9997e9f..e0ff356 100644 --- a/flake.nix +++ b/flake.nix @@ -48,11 +48,15 @@ }; dot013-environment = { - # url = "git+file:///home/guz/.projects/dot013/environment"; + # url = "git+file:///home/guz/.projects/dot013-environment"; url = "git+https://forge.capytal.company/dot013/environment"; }; dot013-neovim = { - # url = "git+file:///home/guz/.projects/dot013/nvim"; + # url = "git+file:///home/guz/.projects/dot013-nvim"; + url = "git+https://forge.capytal.company/dot013/nvim"; + }; + dot013-shell = { + # url = "git+file:///home/guz/.projects/dot013-shell"; url = "git+https://forge.capytal.company/dot013/nvim"; }; diff --git a/hosts/battleship/packages.nix b/hosts/battleship/packages.nix index 8fa2621..6edf21a 100644 --- a/hosts/battleship/packages.nix +++ b/hosts/battleship/packages.nix @@ -5,8 +5,9 @@ ... } @ args: { imports = [ - inputs.dot013-environment.homeManagerModule inputs.rec-sh.homeManagerModules.rec-sh + + inputs.dot013-environment.homeManagerModule inputs.dot013-neovim.homeManagerModules.neovim ]; @@ -96,25 +97,31 @@ }; nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfreePredicate = _: true; - home.packages = with pkgs; [ - chromium - blender - vesktop - gimp - gamemode - lutris - pavucontrol - libreoffice - # lmms - pinentry - gnome.nautilus - inkscape - latexrun - zathura - ferdium - act - protonup - showmethekey - bluetuith - ]; + home.packages = with pkgs; + [ + chromium + blender + vesktop + gimp + gamemode + lutris + pavucontrol + libreoffice + # lmms + pinentry + gnome.nautilus + inkscape + latexrun + zathura + ferdium + act + protonup + showmethekey + bluetuith + ] + ++ (with inputs.dot013-shell.packages.${pkgs.system}; [ + neovim + yazi + zellij + ]); } diff --git a/hosts/fighter/packages.nix b/hosts/fighter/packages.nix index f358dbb..5003284 100644 --- a/hosts/fighter/packages.nix +++ b/hosts/fighter/packages.nix @@ -5,9 +5,10 @@ ... } @ args: { imports = [ - inputs.dot013-environment.homeManagerModule inputs.rec-sh.homeManagerModules.rec-sh + inputs.dot013-neovim.homeManagerModules.neovim + inputs.dot013-environment.homeManagerModule ]; programs.rec-sh.enable = true; @@ -89,14 +90,21 @@ nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfreePredicate = _: true; - home.packages = with pkgs; [ - pavucontrol - libreoffice - pinentry - gnome.nautilus - ferdium - act - showmethekey - bluetuith - ]; + home.packages = with pkgs; + [ + ungoogled-chromium + pavucontrol + libreoffice + pinentry + gnome.nautilus + ferdium + act + showmethekey + bluetuith + ] + ++ (with inputs.dot013-shell.packages.${pkgs.system}; [ + neovim + yazi + zellij + ]); }