naps62/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code review

Browse Source
This commit is contained in:
Miguel Palhas
2024-10-04 15:59:10 +01:00
parent 482fdf5c48
commit 630c588558
8 changed files with 127 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+107 -21
View File
@@ -195,6 +195,21 @@
}
},
"flake-utils": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
@@ -212,6 +227,26 @@
"type": "github"
}
},
"foundry": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1728033094,
"narHash": "sha256-6v9Nj+8PnALQE3CW6tSu8gmFB9U9UFIRHeo2VIlWblE=",
"owner": "shazow",
"repo": "foundry.nix",
"rev": "84be75ae73447a8c67ab8a0be2bc24d7bee87940",
"type": "github"
},
"original": {
"owner": "shazow",
"ref": "monthly",
"repo": "foundry.nix",
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
@@ -412,7 +447,7 @@
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"systems": "systems",
"xdph": "xdph"
},
@@ -600,7 +635,7 @@
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src",
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1727852635,
@@ -674,18 +709,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1726755586,
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
"lastModified": 1666753130,
"narHash": "sha256-Wff1dGPFSneXJLI2c0kkdWTgxnQ416KE6X4KnFkgPYQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"rev": "f540aeda6f677354f1e7144ab04352f61aaa0118",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs-lib": {
@@ -704,6 +737,22 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1726755586,
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1727747005,
"narHash": "sha256-2PBox0LkPhxirg1asEIpvfFARjq5KLw0EHPCy4unjPs=",
@@ -719,7 +768,7 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs_4": {
"locked": {
"lastModified": 1726937504,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
@@ -735,7 +784,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_5": {
"locked": {
"lastModified": 1727348695,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
@@ -759,7 +808,7 @@
"git-hooks": "git-hooks_2",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_5",
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix"
},
@@ -779,7 +828,7 @@
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixvim",
"nixpkgs"
@@ -804,15 +853,14 @@
"locked": {
"lastModified": 1727828331,
"narHash": "sha256-cb0glXaPYU31Nai8hSCD60DKvU0rH1i769bT7sBxcQ0=",
"owner": "NvChad",
"repo": "starter",
"owner": "naps62",
"repo": "nvchad-starter",
"rev": "76da790a27dbe470a9cb8d7e6e7c874fc0656cc7",
"type": "github"
},
"original": {
"owner": "NvChad",
"ref": "main",
"repo": "starter",
"owner": "naps62",
"repo": "nvchad-starter",
"type": "github"
}
},
@@ -821,7 +869,9 @@
"nixpkgs": [
"nixpkgs"
],
"nvchad-starter": "nvchad-starter"
"nvchad-starter": [
"nvchad-starter"
]
},
"locked": {
"lastModified": 1728010959,
@@ -840,13 +890,16 @@
"root": {
"inputs": {
"catppuccin": "catppuccin",
"foundry": "foundry",
"home-manager": "home-manager",
"hyprland": "hyprland",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-colors": "nix-colors",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_4",
"nixvim": "nixvim",
"nvchad4nix": "nvchad4nix"
"nvchad-starter": "nvchad-starter",
"nvchad4nix": "nvchad4nix",
"utils": "utils"
}
},
"systems": {
@@ -879,6 +932,21 @@
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@@ -900,6 +968,24 @@
"type": "github"
}
},
"utils": {
"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"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
flake.nix
+13 -4
View File
@@ -22,18 +22,26 @@
nvchad4nix = {
url = "github:nix-community/nix4nvchad";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nvchad-starter.follows = "nvchad-starter";
};
nvchad-starter = {
url = "github:naps62/nvchad-starter";
flake = false;
};
foundry = { url = "github:shazow/foundry.nix/monthly"; };
utils.url = "github:numtide/flake-utils";
};
# nixpkgs = { overlays = [ inputs.neovim-nightly-overlay.overlay ]; };
outputs = { self, nixpkgs, home-manager, catppuccin, ... }@inputs:
outputs = { self, nixpkgs, home-manager, catppuccin, foundry, ... }@inputs:
let
inherit (self) outputs;
pkgs = import nixpkgs { };
x86 = nixpkgs.legacyPackages.x86_64-linux;
forEachSystem = nixpkgs.lib.genAttrs [ "x86_64-linux" ];
forEachPkg = f: forEachSystem (sys: f nixpkgs.legacyPackages.${sys});
pkgs = import nixpkgs {
inherit x86;
overlays = [ foundry.overlay ];
};
mkNixOS = extraModules:
nixpkgs.lib.nixosSystem {
inherit extraModules;
@@ -43,6 +51,7 @@
{
nixpkgs = {
overlays = [
foundry.overlay
(final: prev: {
nvchad = inputs.nvchad4nix.packages."${pkgs.system}".nvchad;
})
home-manager/arrakis/default.nix
-1
View File
@@ -32,7 +32,6 @@
home-manager.enable = true;
git.enable = true;
fzf.enable = true;
neovim.enable = true;
};
home = {
home-manager/common/programs/basePrograms.nix
+5 -1
View File
@@ -1 +1,5 @@
{ inputs, ... }: { programs = { gh.enable = true; }; }
{ inputs, pkgs, foundry, ... }: {
# home.packages = [ pkgs.foundry-bin pkgs.solc ];
programs = { gh.enable = true; };
}
home-manager/common/programs/neovim/default.nix
+2 -10
View File
@@ -1,13 +1,5 @@
{ inputs, pkgs, ... }: {
imports = [ inputs.nvchad4nix.homeManagerModule ];
home.sessionVariables = { EDITOR = "nvim"; };
programs.neovim = {
enable = true;
package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
vimAlias = true;
vimdiffAlias = true;
withNodeJs = true;
};
programs.nvchad.enable = true;
programs.nvchad = { enable = true; };
}
home-manager/test/default.nix
-1
View File
@@ -11,7 +11,6 @@
home-manager.enable = true;
git.enable = true;
fzf.enable = true;
neovim.enable = true;
};
home = {
hosts/common/global/cli-tools.nix
-1
View File
@@ -5,7 +5,6 @@
pkgs.home-manager
pkgs.ripgrep
pkgs.git
pkgs.neovim
pkgs.lazygit
pkgs.mise
pkgs.gh
nixpkgs.nix
-9
View File
@@ -1,9 +0,0 @@
# A nixpkgs instance that is grabbed from the pinned nixpkgs commit in the lock file
# This is useful to avoid using channels when using legacy nix commands
let
lock =
(builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
in import (fetchTarball {
url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";
sha256 = lock.narHash;
})