noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-08-24 11:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: noah:4b9eea276b3f820704dc7ad29be88461ca9007a5
Branches Tags
noah:master noah:platform noah:home-manager-fix noah:immich-proxy noah:microcode noah:nixd noah:eblume-mole noah:language-checks noah:keyd-2.4.3 noah:sway noah:nixosmodules noah:unfree-predicate-by-pkgs noah:darwin-ssl
noah:pre-platform noah:begin-nixos noah:begin-nix noah:neovim-lua noah:pre-nix noah:legacy
..
compare: noah:nixd
Branches Tags
noah:master noah:platform noah:home-manager-fix noah:immich-proxy noah:microcode noah:nixd noah:eblume-mole noah:language-checks noah:keyd-2.4.3 noah:sway noah:nixosmodules noah:unfree-predicate-by-pkgs noah:darwin-ssl
noah:pre-platform noah:begin-nixos noah:begin-nix noah:neovim-lua noah:pre-nix noah:legacy

1 Commits
4b9eea276b ... nixd

Author SHA1 Message Date
Noah Masur
6cf5f08fd5 nixd neovim setup 2024-10-25 08:53:27 -04:00
7 changed files with 105 additions and 83 deletions
Expand all files Collapse all files

152
flake.lock generated
View File

@@ -87,11 +87,11 @@
]
},
"locked": {
"lastModified": 1729826725,
"narHash": "sha256-w3WNlYxqWYsuzm/jgFPyhncduoDNjot28aC8j39TW0U=",
"lastModified": 1728385805,
"narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "7840909b00fbd5a183008a6eb251ea307fe4a76e",
"rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc",
"type": "github"
},
"original": {
@@ -108,11 +108,11 @@
]
},
"locked": {
"lastModified": 1729712798,
"narHash": "sha256-a+Aakkb+amHw4biOZ0iMo8xYl37uUL48YEXIC5PYJ/8=",
"lastModified": 1728687662,
"narHash": "sha256-D9TChzb00eTG1YWBx8eN2s6lJJnBjB5Y7RpxkAzGvyQ=",
"owner": "nix-community",
"repo": "disko",
"rev": "09a776702b004fdf9c41a024e1299d575ee18a7d",
"rev": "bdbdb725d632863bdedb80baabf21327614dd237",
"type": "github"
},
"original": {
@@ -145,11 +145,11 @@
]
},
"locked": {
"lastModified": 1729904094,
"narHash": "sha256-BSluUxgTde//mnSQ5YtsEfykgJrRngT/vCQzQEBZ6q8=",
"lastModified": 1728694479,
"narHash": "sha256-NFFW6RrOTBuIk29LKtAO3MU5Y0ll7zAp9Skd9HvCGfs=",
"owner": "bandithedoge",
"repo": "nixpkgs-firefox-darwin",
"rev": "adf52e031127c5c22abf16d9c2ffcd9c2ad27cc2",
"rev": "8a3143c1ce147481db4463e71bc3b7002e6ebc56",
"type": "github"
},
"original": {
@@ -263,11 +263,11 @@
"hmts-nvim-src": {
"flake": false,
"locked": {
"lastModified": 1729786258,
"narHash": "sha256-V5dwIJdxBulFVKk1iSlf4H5NRz1UH7uYQeMvwtgkpIs=",
"lastModified": 1727357627,
"narHash": "sha256-8FJlLw5LApQs7S8xEh2UE9wdYCAweZTbvgozCGPfQJc=",
"owner": "calops",
"repo": "hmts.nvim",
"rev": "c7ff4c3ad96cd05664b18fb5bbbe2abbd7682dd2",
"rev": "1ecb68b9f89abdb23d2754f9d69f90eab2d33eaa",
"type": "github"
},
"original": {
@@ -283,11 +283,11 @@
]
},
"locked": {
"lastModified": 1729894599,
"narHash": "sha256-nL9nzNE5/re/P+zOv7NX6bRm5e+DeS1HIufQUJ01w20=",
"lastModified": 1728685293,
"narHash": "sha256-1WowL96pksT/XCi+ZXHgqiQ9NiU5oxWuNIQYWqOoEYc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "93435d27d250fa986bfec6b2ff263161ff8288cb",
"rev": "2b13611eaed8326789f76f70d21d06fbb14e3e47",
"type": "github"
},
"original": {
@@ -323,53 +323,53 @@
"nextcloud-cookbook": {
"flake": false,
"locked": {
"lastModified": 1726214817,
"narHash": "sha256-Pfa+Xbopg20os+pnGgg+wpEX1MI5fz5JMb0K4a8rBhs=",
"lastModified": 1719431638,
"narHash": "sha256-a8ekMnEzudHGiqHF53jPtgsVTOTc2QLuPg6YtTw5h68=",
"type": "tarball",
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz"
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz"
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
}
},
"nextcloud-external": {
"flake": false,
"locked": {
"lastModified": 1729501349,
"narHash": "sha256-OV6HhFBzmnQBO5btGEnqmKlaUMY7/t2Qm3XebclpBlM=",
"lastModified": 1710338675,
"narHash": "sha256-bJJ/dVmE1o04QCyrxD0sko0okRsnxJmT6sOTOmBiifs=",
"type": "tarball",
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz"
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz"
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
}
},
"nextcloud-news": {
"flake": false,
"locked": {
"lastModified": 1729667621,
"narHash": "sha256-pnvyMZQ+NYMgH0Unfh5S19HdZSjnghgoUDAoi2KIXNI=",
"lastModified": 1718102703,
"narHash": "sha256-XNGjf7SWgJYFdVNOh3ED0jxSG0GJwWImVQq4cJT1Lo4=",
"type": "tarball",
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz"
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz"
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
}
},
"nextcloud-snappymail": {
"flake": false,
"locked": {
"lastModified": 1728746479,
"narHash": "sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E=",
"lastModified": 1728704544,
"narHash": "sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q=",
"type": "tarball",
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
}
},
"nix2vim": {
@@ -380,11 +380,11 @@
]
},
"locked": {
"lastModified": 1729103549,
"narHash": "sha256-9caCn1wB0bD39bwwjnTsHoDveCUKs06nBe212fs5TKU=",
"lastModified": 1727867024,
"narHash": "sha256-yimXLupF3hG57imRMpqWho/Wstcj7P8Yh8t0SBiX+dQ=",
"owner": "gytis-ivaskevicius",
"repo": "nix2vim",
"rev": "b3900e6d79233573f318006505d9ad3fb7170b92",
"rev": "da26caae6c7776eedbc6514a0f57f1ccd6a759ed",
"type": "github"
},
"original": {
@@ -395,11 +395,11 @@
},
"nixlib": {
"locked": {
"lastModified": 1729386149,
"narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
"lastModified": 1728176478,
"narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "cce4521b6df014e79a7b7afc58c703ed683c916e",
"rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c",
"type": "github"
},
"original": {
@@ -416,11 +416,11 @@
]
},
"locked": {
"lastModified": 1729472750,
"narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=",
"lastModified": 1728522165,
"narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565",
"rev": "40c8d30c490414910fc63626ad1b67af7db40cd3",
"type": "github"
},
"original": {
@@ -431,11 +431,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1729665710,
"narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
"lastModified": 1728492678,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
"type": "github"
},
"original": {
@@ -463,11 +463,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1729691686,
"narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=",
"lastModified": 1728627514,
"narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37",
"rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
"type": "github"
},
"original": {
@@ -479,11 +479,11 @@
},
"nur": {
"locked": {
"lastModified": 1729908348,
"narHash": "sha256-VK4GLHP+cpjMxLp+R4Xa7icdz4ByI2K7NCAVwcZvEdE=",
"lastModified": 1728704557,
"narHash": "sha256-HnYBB+oE+03rNDzTTVazBcysPOu5udRpTOGpP7/A5Ow=",
"owner": "nix-community",
"repo": "nur",
"rev": "bdb41713712fcd619a678cde0dba1ae89d15392e",
"rev": "1d143f52b0a046924ee7fe74bce0bd2e10e07c3d",
"type": "github"
},
"original": {
@@ -495,11 +495,11 @@
"nvim-lint-src": {
"flake": false,
"locked": {
"lastModified": 1729155978,
"narHash": "sha256-4sGU9yKrIJRlnyRGYVi2aNNycsS+KABTheNnawLGMM8=",
"lastModified": 1728582620,
"narHash": "sha256-wfui4kE3oxveCJPjJfkJSbE69zVTeAsasDdfJkElmn8=",
"owner": "mfussenegger",
"repo": "nvim-lint",
"rev": "16b21a7d04d06661f92f273a0744fd81fb19e09e",
"rev": "f707b3ae50417067fa63fdfe179b0bff6b380da1",
"type": "github"
},
"original": {
@@ -528,11 +528,11 @@
"nvim-tree-lua-src": {
"flake": false,
"locked": {
"lastModified": 1729827348,
"narHash": "sha256-ffj+EMkfV7VREiqRfJZpLDkvXS2mztuGDbjTPpK3fQ0=",
"lastModified": 1728614821,
"narHash": "sha256-WYtu+jtsQSFqruTxdzkHE9UQJBE2TGoNoFar36AAoqo=",
"owner": "kyazdani42",
"repo": "nvim-tree.lua",
"rev": "8760d76c1d316aa46f141f3f2b80b853a2acc41e",
"rev": "5ad87620ec9d1190d15c88171a3f0122bc16b0fe",
"type": "github"
},
"original": {
@@ -640,11 +640,11 @@
"snipe-nvim-src": {
"flake": false,
"locked": {
"lastModified": 1729430130,
"narHash": "sha256-iRAX0xestLjPPP8IMimGJJfNqgQINb5lp6eoi6J+BSQ=",
"lastModified": 1724418876,
"narHash": "sha256-G4g/OzyXhDhX84HkxlhFSy6E+EAGxH+HL1Bw5s5FWHE=",
"owner": "leath-dub",
"repo": "snipe.nvim",
"rev": "4e162869cf0a777180c38afdf18f6364dadf877c",
"rev": "f1abd4aaaef6398b45dcddc9f1a40dd982f732b0",
"type": "github"
},
"original": {
@@ -734,11 +734,11 @@
"tiny-inline-diagnostic-nvim-src": {
"flake": false,
"locked": {
"lastModified": 1729329080,
"narHash": "sha256-ggpNNyo1ir68N4G+sqXi7uAF+QNiQDQhPrion4f7EGY=",
"lastModified": 1726582328,
"narHash": "sha256-NBcUVUSnk2TlbSr/vFTbp3Rh35ms8lAcfDqpmE1KTq4=",
"owner": "rachartier",
"repo": "tiny-inline-diagnostic.nvim",
"rev": "ccb67504f93b20f36775d3aad620f9dc9ed98bd9",
"rev": "1a83e7ce5c9d0ae4d89fc5c812b55ff8ed1d39e7",
"type": "github"
},
"original": {
@@ -767,11 +767,11 @@
"tree-sitter-bash": {
"flake": false,
"locked": {
"lastModified": 1728963142,
"narHash": "sha256-h6L5eIItu3IOJBKSZCajHMhhencN1Fk/4dXgBMuVxYc=",
"lastModified": 1725407033,
"narHash": "sha256-xqiUJhl7nfOlS6wBYWpmrGLCvWoJCA5fz8DCX85Lxog=",
"owner": "tree-sitter",
"repo": "tree-sitter-bash",
"rev": "597a5ed6ed4d932fd44697feec988f977081ae59",
"rev": "c8713e50f0bd77d080832fc61ad128bc8f2934e9",
"type": "github"
},
"original": {
@@ -800,11 +800,11 @@
"tree-sitter-lua": {
"flake": false,
"locked": {
"lastModified": 1729494737,
"narHash": "sha256-v+fFcIOv+bu+2IGI/Lh/Xbqd5BzbBjaa51ECd0hG7Ow=",
"lastModified": 1725894603,
"narHash": "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M=",
"owner": "MunifTanjim",
"repo": "tree-sitter-lua",
"rev": "34e60e7f45fc313463c68090d88d742a55d1bd7a",
"rev": "99fc677e6971c425e8d407f59c77ab897e585c92",
"type": "github"
},
"original": {
@@ -833,11 +833,11 @@
"tree-sitter-python": {
"flake": false,
"locked": {
"lastModified": 1728966077,
"narHash": "sha256-pD4JedYrnz6d5pgzRPtKPY0XPRoot1FMI9XgTgONOyw=",
"lastModified": 1725324041,
"narHash": "sha256-8mdBN1vP64PJKxN2y0GoaObLs6j/lcsU47sr+8/8oTQ=",
"owner": "tree-sitter",
"repo": "tree-sitter-python",
"rev": "7f4b9c2d8039701b0579b7c060a918f8548aa7cd",
"rev": "8c65e256f971812276ff2a69a2f515c218ed7f82",
"type": "github"
},
"original": {
@@ -866,11 +866,11 @@
"tree-sitter-vimdoc": {
"flake": false,
"locked": {
"lastModified": 1729686839,
"narHash": "sha256-Vrl4/cZL+TWlUMEeWZoHCAWhvlefcl3ajGcwyTNKOhI=",
"lastModified": 1717834376,
"narHash": "sha256-v+XSWGm2Wdn9/rxNFMqXYACkGn6AvxZdxkClLuKnWGU=",
"owner": "neovim",
"repo": "tree-sitter-vimdoc",
"rev": "d2e4b5c172a109966c2ce0378f73df6cede39400",
"rev": "2249c44ecd3f5cf22da3dcccfb74f816ddb29245",
"type": "github"
},
"original": {
@@ -904,11 +904,11 @@
]
},
"locked": {
"lastModified": 1729717678,
"narHash": "sha256-XEfYT1D+4KT9c0mMwsmZdWS2JgKsboAZbnuJvrjBQKg=",
"lastModified": 1728588346,
"narHash": "sha256-P1j+Nf+pzxPYK2Qe7lF2yB0vR3YvW8Td5sD0ZvrKIq8=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "5a965cb108fb1f30b29a26dbc29b473f49e80b41",
"rev": "0fc8d9bb51cc46b31d950513df6d088905c8fe55",
"type": "github"
},
"original": {

8
flake.nix
View File

@@ -193,23 +193,23 @@
# Nextcloud Apps
nextcloud-news = {
# https://github.com/nextcloud/news/releases
url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz";
url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz";
flake = false;
};
nextcloud-external = {
# https://github.com/nextcloud-releases/external/releases
url = "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz";
url = "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz";
flake = false;
};
nextcloud-cookbook = {
# https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz";
url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz";
flake = false;
};
nextcloud-snappymail = {
# https://github.com/the-djmaze/snappymail/releases
# https://snappymail.eu/repository/nextcloud
url = "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz";
url = "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz";
# url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
flake = false;
};

20
modules/common/neovim/config/lsp.nix
View File

@@ -11,6 +11,11 @@
options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
options.github = lib.mkEnableOption "Whether to enable GitHub features";
options.kubernetes = lib.mkEnableOption "Whether to enable Kubernetes features";
options.nixosConfiguration = lib.mkOption {
type = lib.types.str;
description = "Configuration to use for nixd options checking";
default = "default";
};
config = {
plugins = [
@@ -43,6 +48,21 @@
use.lspconfig.nixd.setup = dsl.callWith {
cmd = [ "${pkgs.nixd}/bin/nixd" ];
capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
# settings = {
# nixd = {
# options = {
# nixos = {
# expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).nixosConfigurations.${config.nixosConfiguration}.options";
# };
# home-manager = {
# expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).homeConfigurations.${config.nixosConfiguration}.options";
# };
# darwin = {
# expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).darwinConfigurations.${config.nixosConfiguration}.options";
# };
# };
# };
# };
};
use.lspconfig.pyright.setup = dsl.callWith {

1
modules/common/neovim/default.nix
View File

@@ -13,6 +13,7 @@ let
terraform = config.terraform.enable;
github = true;
kubernetes = config.kubernetes.enable;
nixosConfiguration = config.networking.hostName; # Used for Nixd
};
in
{

2
modules/common/neovim/package/default.nix
View File

@@ -32,6 +32,7 @@
terraform ? false,
github ? false,
kubernetes ? false,
nixosConfiguration ? "default",
...
}:
@@ -44,6 +45,7 @@ pkgs.neovimBuilder {
terraform
github
kubernetes
nixosConfiguration
;
imports = [
../config/align.nix

3
modules/nixos/gaming/steam.nix
View File

@@ -15,7 +15,6 @@
"steam-original"
"steamcmd"
"steam-run"
"steam-unwrapped"
];
programs.steam = {
@@ -28,7 +27,7 @@
environment.systemPackages = with pkgs; [
# Enable terminal interaction
steamcmd
steamPackages.steamcmd
steam-tui
# Overlay with performance monitoring

2
modules/nixos/services/nextcloud.nix
View File

@@ -9,7 +9,7 @@
config = lib.mkIf config.services.nextcloud.enable {
services.nextcloud = {
package = pkgs.nextcloud30; # Required to specify
package = pkgs.nextcloud29; # Required to specify
configureRedis = true;
datadir = "/data/nextcloud";
database.createLocally = true;