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

nvchad

Browse Source
This commit is contained in:
Miguel Palhas
2024-10-04 14:51:02 +01:00
parent 62a05a4648
commit 482fdf5c48
9 changed files with 312 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+248 -8
View File
@@ -86,6 +86,38 @@
}
},
"flake-compat": {
"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_2": {
"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_3": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -100,6 +132,48 @@
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"neovim-nightly-overlay",
"hercules-ci-effects",
"nixpkgs"
]
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github"
},
"original": {
"id": "flake-parts",
"type": "indirect"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
@@ -139,12 +213,39 @@
}
},
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
"gitignore": "gitignore",
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
],
"nixpkgs-stable": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"lastModified": 1727805723,
"narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"git-hooks_2": {
"inputs": {
"flake-compat": [
"nixvim",
"flake-compat"
],
"gitignore": "gitignore",
"gitignore": "gitignore_2",
"nixpkgs": [
"nixvim",
"nixpkgs"
@@ -169,6 +270,28 @@
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"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"
}
},
"gitignore_2": {
"inputs": {
"nixpkgs": [
"nixvim",
@@ -190,6 +313,28 @@
"type": "github"
}
},
"hercules-ci-effects": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724947644,
"narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -448,6 +593,45 @@
"type": "github"
}
},
"neovim-nightly-overlay": {
"inputs": {
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1727852635,
"narHash": "sha256-eY0Y5ZDMo5IS+K42kMwAMCLsYHoAgPW3R4UxeGfzP0U=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "377cf41246ee443c86c4ae48f66f5100038fe158",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"type": "github"
}
},
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1727825968,
"narHash": "sha256-7DbbGIAbJesqYEkZh2FaEo5wycZ/cRbvZP6k01Z5+ZM=",
"owner": "neovim",
"repo": "neovim",
"rev": "2168d772b864fd05109fb4299e409d4bdc1df39d",
"type": "github"
},
"original": {
"owner": "neovim",
"repo": "neovim",
"type": "github"
}
},
"nix-colors": {
"inputs": {
"base16-schemes": "base16-schemes",
@@ -520,6 +704,22 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1727747005,
"narHash": "sha256-2PBox0LkPhxirg1asEIpvfFARjq5KLw0EHPCy4unjPs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9682b2197dabc185fcca802ac1ac21136e48fcc2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1726937504,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
@@ -535,7 +735,7 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs_4": {
"locked": {
"lastModified": 1727348695,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
@@ -554,12 +754,12 @@
"nixvim": {
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"git-hooks": "git-hooks",
"flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_3",
"git-hooks": "git-hooks_2",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_4",
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix"
},
@@ -599,14 +799,54 @@
"type": "github"
}
},
"nvchad-starter": {
"flake": false,
"locked": {
"lastModified": 1727828331,
"narHash": "sha256-cb0glXaPYU31Nai8hSCD60DKvU0rH1i769bT7sBxcQ0=",
"owner": "NvChad",
"repo": "starter",
"rev": "76da790a27dbe470a9cb8d7e6e7c874fc0656cc7",
"type": "github"
},
"original": {
"owner": "NvChad",
"ref": "main",
"repo": "starter",
"type": "github"
}
},
"nvchad4nix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"nvchad-starter": "nvchad-starter"
},
"locked": {
"lastModified": 1728010959,
"narHash": "sha256-X+v33SZtir3yMUgeGn8ggFHqpiZ12VOxcf65NvVlrZU=",
"owner": "nix-community",
"repo": "nix4nvchad",
"rev": "e7ce4ed7a6d7f1c1e529a8cfe8096f96d8448fb0",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix4nvchad",
"type": "github"
}
},
"root": {
"inputs": {
"catppuccin": "catppuccin",
"home-manager": "home-manager",
"hyprland": "hyprland",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-colors": "nix-colors",
"nixpkgs": "nixpkgs_2",
"nixvim": "nixvim"
"nixpkgs": "nixpkgs_3",
"nixvim": "nixvim",
"nvchad4nix": "nvchad4nix"
}
},
"systems": {
flake.nix
+19 -1
View File
@@ -18,8 +18,15 @@
nix-colors.url = "github:misterio77/nix-colors";
nixvim.url = "github:nix-community/nixvim";
catppuccin.url = "github:catppuccin/nix";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
nvchad4nix = {
url = "github:nix-community/nix4nvchad";
inputs.nixpkgs.follows = "nixpkgs";
};
};
# nixpkgs = { overlays = [ inputs.neovim-nightly-overlay.overlay ]; };
outputs = { self, nixpkgs, home-manager, catppuccin, ... }@inputs:
let
inherit (self) outputs;
@@ -31,7 +38,18 @@
nixpkgs.lib.nixosSystem {
inherit extraModules;
specialArgs = { inherit inputs outputs; };
modules = extraModules ++ [ catppuccin.nixosModules.catppuccin ];
modules = extraModules ++ [
catppuccin.nixosModules.catppuccin
{
nixpkgs = {
overlays = [
(final: prev: {
nvchad = inputs.nvchad4nix.packages."${pkgs.system}".nvchad;
})
];
};
}
];
};
mkHome = modules: pkgs:
home-manager/common/programs/default.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ lib, config, ... }: {
imports = [ ./basePrograms.nix ./neovim.nix ./zsh.nix ];
imports = [ ./basePrograms.nix ./zsh.nix ./neovim ];
home = {
homeDirectory = lib.mkDefault "/home/${config.home.username}";
home-manager/common/programs/hyprland.nix
+8 -2
View File
@@ -54,8 +54,14 @@
};
dwindle = { preserve_split = "yes"; };
master = { orientation = "center"; };
dwindle = {
preserve_split = "yes";
no_gaps_when_only = true;
};
master = {
orientation = "center";
no_gaps_when_only = true;
};
"exec-once" = [
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
home-manager/common/programs/kitty.nix
+9 -1
View File
@@ -14,11 +14,19 @@
bold_italic_font = "VictorMono Nerd Font Mono Bold Oblique";
disable_ligatures = "cursor";
# tab-style
tab_bar_edge = "bottom";
tab_bar_style = "powerline";
tab_powerline_style = "slanted";
tab_title_template =
"{title}{' :{}'.format(num_windows) if num_windows > 1 else ''}";
# keys
kitty_mod = "alt";
};
keybindings = {
"kitty_mod+t" = "new_tab_with_cmd";
"kitty_mod+t" = "new_tab_with_cwd";
"kitty_mod+enter" = "new_window_with_cwd";
"kitty_mod+r" = "set_tab_title";
home-manager/common/programs/neovim.nix
-1
View File
@@ -1 +0,0 @@
{ inputs, ... }: { programs.neovim.enable = true; }
home-manager/common/programs/neovim/default.nix
+13
View File
@@ -0,0 +1,13 @@
{ inputs, pkgs, ... }: {
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;
}
home-manager/common/programs/zsh.nix
+13 -1
View File
@@ -1,4 +1,4 @@
{ inputs, config, ... }: {
{ inputs, config, pkgs, ... }: {
programs.zsh = {
enable = true;
enableCompletion = true;
@@ -17,6 +17,11 @@
ls = "eza";
cat = "bat";
ps = "procs";
# cd
".." = "cd ..";
"..2" = "cd ../..";
"..3" = "cd ../../..";
};
history = {
@@ -31,7 +36,11 @@
};
initExtra = ''
# mise
eval "$(mise activate zsh)"
# asdf
${pkgs.asdf-vm}/share/asdf-vm/asdf.sh
'';
};
@@ -44,4 +53,7 @@
enable = true;
settings = { add_newline = true; };
};
home.sessionPath =
[ "./.git/safe/../../node_modules/.bin" "./.git/safe/../../bin" ];
}
hosts/common/global/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@
./ssh.nix
];
environment.systemPackages = [ pkgs.home-manager pkgs.zsh ];
environment.systemPackages = [ pkgs.home-manager pkgs.zsh pkgs.asdf-vm ];
time = { timeZone = "Europe/Lisbon"; };