noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-11-25 07:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up flake and reset neovim plugin versions

Browse Source
This commit is contained in:
Noah Masur 2023-07-01 20:22:03 -06:00
parent 5348cbdf61
commit 1cf5f46adf
12 changed files with 70 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
flake.lock
View File

@ -3,15 +3,16 @@
"Comment-nvim-src": { "Comment-nvim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1686546603, "lastModified": 1681214440,
"narHash": "sha256-XM9yhp+SGxfAOdN/eDunzM0TMoCJhVth3wpFKNCGf3g=", "narHash": "sha256-48hy+hiaDJLlgWqC7IeZI3dT+VwWkRo4atQbyPxu/ys=",
"owner": "numToStr", "owner": "numToStr",
"repo": "Comment.nvim", "repo": "Comment.nvim",
"rev": "176e85eeb63f1a5970d6b88f1725039d85ca0055", "rev": "e51f2b142d88bb666dcaa77d93a07f4b419aca70",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numToStr", "owner": "numToStr",
"ref": "v0.8.0",
"repo": "Comment.nvim", "repo": "Comment.nvim",
"type": "github" "type": "github"
} }
@ -19,15 +20,16 @@
"bufferline-nvim-src": { "bufferline-nvim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1687007546, "lastModified": 1687763763,
"narHash": "sha256-NRuk9RBj7etUv+2mBlJ3lTbJCRkYmluqZ5V2t78ile4=", "narHash": "sha256-wbOeylzjjScQXkrDbBU2HtrOZrp2YUK+wQ2aOkgxmRQ=",
"owner": "akinsho", "owner": "akinsho",
"repo": "bufferline.nvim", "repo": "bufferline.nvim",
"rev": "60734264a8655a7db3595159fb50076dc24c2f2c", "rev": "bf2f6b7edd0abf6b0732f5e5c0a8f30e51611c75",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "akinsho", "owner": "akinsho",
"ref": "v4.2.0",
"repo": "bufferline.nvim", "repo": "bufferline.nvim",
"type": "github" "type": "github"
} }
@ -371,15 +373,16 @@
"nvim-lspconfig-src": { "nvim-lspconfig-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1687509658, "lastModified": 1675639052,
"narHash": "sha256-t3b57T/Pc0F+rLe954gNk7cfi0L76eTrDOfiNCt14Yo=", "narHash": "sha256-B8IgpypxzCACZ5VcqM6KiWyClaN+KrmemtkwMznmj5Y=",
"owner": "neovim", "owner": "neovim",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"rev": "b6b34b9acf84949f0ac1c00747765e62b81fb38d", "rev": "255e07ce2a05627d482d2de77308bba51b90470c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "neovim", "owner": "neovim",
"ref": "v0.1.6",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"type": "github" "type": "github"
} }
@ -403,16 +406,16 @@
"nvim-treesitter-src": { "nvim-treesitter-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1677248832, "lastModified": 1681121236,
"narHash": "sha256-4TmtrufxjVpnSNfFpn6GQStEhq3KQb3JfmfMEJnSI8k=", "narHash": "sha256-iPsPDLhVKJ14iP1/2cCgcY9SCKK/DQz9Y0mQB1DqNiM=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter", "repo": "nvim-treesitter",
"rev": "b401b7423d18c78371c5ff1a5f8d3c14292b2047", "rev": "cc360a9beb1b30d172438f640e2c3450358c4086",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"ref": "v0.8.5.2", "ref": "v0.9.0",
"repo": "nvim-treesitter", "repo": "nvim-treesitter",
"type": "github" "type": "github"
} }
@ -500,15 +503,16 @@
"telescope-nvim-src": { "telescope-nvim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1687382735, "lastModified": 1686302912,
"narHash": "sha256-0wsj/v2ZoY8yFMENSB32WYJx8kHd+QtQHt9aHicZTM0=", "narHash": "sha256-fV3LLRwAPykVGc4ImOnUSP+WTrPp9Ad9OTfBJ6wqTMk=",
"owner": "nvim-telescope", "owner": "nvim-telescope",
"repo": "telescope.nvim", "repo": "telescope.nvim",
"rev": "ffe35cb433192fcb5080b557c1aef14d37092035", "rev": "776b509f80dd49d8205b9b0d94485568236d1192",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nvim-telescope", "owner": "nvim-telescope",
"ref": "0.1.2",
"repo": "telescope.nvim", "repo": "telescope.nvim",
"type": "github" "type": "github"
} }
@ -532,15 +536,16 @@
"toggleterm-nvim-src": { "toggleterm-nvim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1685434137, "lastModified": 1685434104,
"narHash": "sha256-Qjhod1cmzAYuMl6Z0JlYtOq8CLdmQJ9esCwmynuzkYs=", "narHash": "sha256-oiCnBrvft6XxiQtQH8E4F842xhh348SaTpHzaeb+iDY=",
"owner": "akinsho", "owner": "akinsho",
"repo": "toggleterm.nvim", "repo": "toggleterm.nvim",
"rev": "cf146a267a6a7db62b1e2aff40414b20081048a1", "rev": "95204ece0f2a54c89c4395295432f9aeedca7b5f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "akinsho", "owner": "akinsho",
"ref": "v2.7.0",
"repo": "toggleterm.nvim", "repo": "toggleterm.nvim",
"type": "github" "type": "github"
} }

40
flake.nix
View File

@ -58,7 +58,7 @@
# Neovim plugins # Neovim plugins
nvim-lspconfig-src = { nvim-lspconfig-src = {
url = "github:neovim/nvim-lspconfig"; url = "github:neovim/nvim-lspconfig/v0.1.6";
flake = false; flake = false;
}; };
cmp-nvim-lsp-src = { cmp-nvim-lsp-src = {
@ -70,15 +70,15 @@
flake = false; flake = false;
}; };
Comment-nvim-src = { Comment-nvim-src = {
url = "github:numToStr/Comment.nvim"; url = "github:numToStr/Comment.nvim/v0.8.0";
flake = false; flake = false;
}; };
nvim-treesitter-src = { nvim-treesitter-src = {
url = "github:nvim-treesitter/nvim-treesitter/v0.8.5.2"; url = "github:nvim-treesitter/nvim-treesitter/v0.9.0";
flake = false; flake = false;
}; };
telescope-nvim-src = { telescope-nvim-src = {
url = "github:nvim-telescope/telescope.nvim"; url = "github:nvim-telescope/telescope.nvim/0.1.2";
flake = false; flake = false;
}; };
telescope-project-nvim-src = { telescope-project-nvim-src = {
@ -86,11 +86,11 @@
flake = false; flake = false;
}; };
toggleterm-nvim-src = { toggleterm-nvim-src = {
url = "github:akinsho/toggleterm.nvim"; url = "github:akinsho/toggleterm.nvim/v2.7.0";
flake = false; flake = false;
}; };
bufferline-nvim-src = { bufferline-nvim-src = {
url = "github:akinsho/bufferline.nvim"; url = "github:akinsho/bufferline.nvim/v4.2.0";
flake = false; flake = false;
}; };
nvim-tree-lua-src = { nvim-tree-lua-src = {
@ -123,6 +123,7 @@
(import ./overlays/neovim-plugins.nix inputs) (import ./overlays/neovim-plugins.nix inputs)
(import ./overlays/lib.nix) (import ./overlays/lib.nix)
(import ./overlays/calibre-web.nix) (import ./overlays/calibre-web.nix)
(import ./overlays/disko.nix inputs)
]; ];
# System types to support. # System types to support.
@ -186,15 +187,7 @@
# Programs that can be run by calling this flake # Programs that can be run by calling this flake
apps = forAllSystems (system: apps = forAllSystems (system:
let let pkgs = import nixpkgs { inherit system overlays; };
pkgs = import nixpkgs {
inherit system;
overlays = overlays ++ [
(final: prev: {
disko-packaged = inputs.disko.packages.${system}.disko;
})
];
};
in import ./apps { inherit pkgs; }); in import ./apps { inherit pkgs; });
# Development environments # Development environments
@ -207,23 +200,6 @@
buildInputs = with pkgs; [ git stylua nixfmt shfmt shellcheck ]; buildInputs = with pkgs; [ git stylua nixfmt shfmt shellcheck ];
}; };
# Used for cloud and systems development and administration
devops = pkgs.mkShell {
buildInputs = with pkgs; [
git
terraform
consul
vault
awscli2
google-cloud-sdk
ansible
kubectl
kubernetes-helm
kustomize
fluxcd
];
};
}); });
# Templates for starting other projects quickly # Templates for starting other projects quickly

4
generators/staff/default.nix
View File

@ -3,9 +3,7 @@
{ inputs, system, overlays, ... }: { inputs, system, overlays, ... }:
with inputs; inputs.nixos-generators.nixosGenerate {
nixos-generators.nixosGenerate {
inherit system; inherit system;
format = "install-iso"; format = "install-iso";
modules = [{ modules = [{

8
hosts/flame/default.nix
View File

@ -6,14 +6,12 @@
{ inputs, globals, overlays, ... }: { inputs, globals, overlays, ... }:
with inputs; inputs.nixpkgs.lib.nixosSystem {
nixpkgs.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
specialArgs = { }; specialArgs = { };
modules = [ modules = [
(removeAttrs globals [ "mail.server" ]) (removeAttrs globals [ "mail.server" ])
home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
../../modules/common ../../modules/common
../../modules/nixos ../../modules/nixos
{ {
@ -23,7 +21,7 @@ nixpkgs.lib.nixosSystem {
server = true; server = true;
networking.hostName = "flame"; networking.hostName = "flame";
imports = [ (nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ]; imports = [ (inputs.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" ];
fileSystems."/" = { fileSystems."/" = {

12
hosts/hydra/default.nix
View File

@ -3,9 +3,7 @@
{ inputs, globals, overlays, ... }: { inputs, globals, overlays, ... }:
with inputs; inputs.nixpkgs.lib.nixosSystem {
nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { }; specialArgs = { };
modules = [ modules = [
@ -13,20 +11,18 @@ nixpkgs.lib.nixosSystem {
../../modules/nixos ../../modules/nixos
../../modules/wsl ../../modules/wsl
globals globals
wsl.nixosModules.wsl inputs.wsl.nixosModules.wsl
home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
{ {
networking.hostName = "hydra"; networking.hostName = "hydra";
nixpkgs.overlays = overlays; nixpkgs.overlays = overlays;
# Set registry to flake packages, used for nix X commands
nix.registry.nixpkgs.flake = nixpkgs;
identityFile = "/home/${globals.user}/.ssh/id_ed25519"; identityFile = "/home/${globals.user}/.ssh/id_ed25519";
gui.enable = false; gui.enable = false;
theme = { theme = {
colors = (import ../../colorscheme/gruvbox).dark; colors = (import ../../colorscheme/gruvbox).dark;
dark = true; dark = true;
}; };
passwordHash = nixpkgs.lib.fileContents ../../password.sha512; passwordHash = inputs.nixpkgs.lib.fileContents ../../password.sha512;
wsl = { wsl = {
enable = true; enable = true;
wslConf.automount.root = "/mnt"; wslConf.automount.root = "/mnt";

8
hosts/lookingglass/default.nix
View File

@ -3,9 +3,7 @@
{ inputs, globals, overlays, ... }: { inputs, globals, overlays, ... }:
with inputs; inputs.darwin.lib.darwinSystem {
darwin.lib.darwinSystem {
system = "x86_64-darwin"; system = "x86_64-darwin";
specialArgs = { }; specialArgs = { };
modules = [ modules = [
@ -16,9 +14,9 @@ darwin.lib.darwinSystem {
gitName = "Noah-Masur_1701"; gitName = "Noah-Masur_1701";
gitEmail = "${user}@take2games.com"; gitEmail = "${user}@take2games.com";
}) })
home-manager.darwinModules.home-manager inputs.home-manager.darwinModules.home-manager
{ {
nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays; nixpkgs.overlays = [ inputs.firefox-darwin.overlay ] ++ overlays;
networking.hostName = "lookingglass"; networking.hostName = "lookingglass";
identityFile = "/Users/Noah.Masur/.ssh/id_ed25519"; identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
gui.enable = true; gui.enable = true;

8
hosts/swan/default.nix
View File

@ -3,15 +3,13 @@
{ inputs, globals, overlays, ... }: { inputs, globals, overlays, ... }:
with inputs; inputs.nixpkgs.lib.nixosSystem {
nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { }; specialArgs = { };
modules = [ modules = [
globals globals
home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
disko.nixosModules.disko inputs.disko.nixosModules.disko
../../modules/common ../../modules/common
../../modules/nixos ../../modules/nixos
{ {

14
hosts/tempest/default.nix
View File

@ -3,17 +3,15 @@
{ inputs, globals, overlays, ... }: { inputs, globals, overlays, ... }:
with inputs; inputs.nixpkgs.lib.nixosSystem {
nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
globals globals
home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
../../modules/common ../../modules/common
../../modules/nixos ../../modules/nixos
{ {
nixpkgs.overlays = [ nur.overlay ] ++ overlays; nixpkgs.overlays = overlays;
# Hardware # Hardware
physical = true; physical = true;
@ -55,7 +53,7 @@ nixpkgs.lib.nixosSystem {
# Must be prepared ahead # Must be prepared ahead
identityFile = "/home/${globals.user}/.ssh/id_ed25519"; identityFile = "/home/${globals.user}/.ssh/id_ed25519";
passwordHash = nixpkgs.lib.fileContents ../../password.sha512; passwordHash = inputs.nixpkgs.lib.fileContents ../../password.sha512;
# Theming # Theming
gui.enable = true; gui.enable = true;
@ -63,8 +61,8 @@ nixpkgs.lib.nixosSystem {
colors = (import ../../colorscheme/gruvbox-dark).dark; colors = (import ../../colorscheme/gruvbox-dark).dark;
dark = true; dark = true;
}; };
wallpaper = "${wallpapers}/gruvbox/road.jpg"; wallpaper = "${inputs.wallpapers}/gruvbox/road.jpg";
gtk.theme.name = nixpkgs.lib.mkDefault "Adwaita-dark"; gtk.theme.name = inputs.nixpkgs.lib.mkDefault "Adwaita-dark";
# Programs and services # Programs and services
charm.enable = true; charm.enable = true;

3
modules/common/applications/kitty.nix
View File

@ -85,8 +85,7 @@
# Scrollback # Scrollback
scrolling_lines = 10000; scrolling_lines = 10000;
scrollback_pager_history_size = 10; # MB scrollback_pager_history_size = 10; # MB
scrollback_pager = '' scrollback_pager = "${pkgs.neovim}/bin/nvim -c 'normal G'";
${pkgs.neovim}/bin/nvim -c 'setlocal nonumber nolist showtabline=0 foldcolumn=0|Man!' -c "autocmd VimEnter * normal G" -'';
# Window # Window
window_padding_width = 6; window_padding_width = 6;

12
modules/common/neovim/config/syntax.nix
View File

@ -1,7 +1,17 @@
{ pkgs, ... }: { { pkgs, ... }: {
plugins = [ plugins = [
pkgs.vimPlugins.nvim-treesitter.withAllGrammars (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
with pkgs.tree-sitter-grammars; [
tree-sitter-hcl
tree-sitter-python
tree-sitter-lua
tree-sitter-nix
tree-sitter-fish
tree-sitter-toml
tree-sitter-yaml
tree-sitter-json
]))
pkgs.vimPlugins.vim-matchup # Better % jumping in languages pkgs.vimPlugins.vim-matchup # Better % jumping in languages
pkgs.vimPlugins.nginx-vim pkgs.vimPlugins.nginx-vim
pkgs.vimPlugins.vim-helm pkgs.vimPlugins.vim-helm

2
modules/common/neovim/lua/settings.lua
View File

@ -5,7 +5,7 @@
vim.filetype.add({ vim.filetype.add({
pattern = { pattern = {
[".*%.tfvars"] = "hcl", [".*%.tfvars"] = "hcl",
-- [".*%.tf"] = "hcl", [".*%.tf"] = "hcl",
[".*%.rasi"] = "css", [".*%.rasi"] = "css",
}, },
}) })

5
overlays/disko.nix Normal file
View File

@ -0,0 +1,5 @@
# Add disko to nixpkgs from its input flake
inputs: _final: prev: {
disko = inputs.disko.packages.${prev.system}.disko;
}