odie
/
nixos-combined-flake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: odie:f9c23515e330376f2ca90cb6a9f144ae8f7cd94f
Branches Tags
odie:develop
odie:wsl
..
compare: odie:42a76e8b1b64b30735c25914918c1a8dc3d51f24
Branches Tags
odie:develop
odie:wsl

No commits in common. "f9c23515e330376f2ca90cb6a9f144ae8f7cd94f" and "42a76e8b1b64b30735c25914918c1a8dc3d51f24" have entirely different histories.
f9c23515e3 ... 42a76e8b1b

12 changed files with 361 additions and 461 deletions
Show Stats Expand all files Collapse all files

640
flake.lock
View File

File diff suppressed because it is too large Load Diff

84
flake.nix
View File

@ -10,7 +10,6 @@
let let
inherit (self) inputs outputs; inherit (self) inputs outputs;
flakeLib = import ./lib; flakeLib = import ./lib;
neorgWorkspaces = [ "default" "general" "games" "btc" ]; neorgWorkspaces = [ "default" "general" "games" "btc" ];
@ -32,7 +31,6 @@
domain = "odie.home.arpa"; domain = "odie.home.arpa";
neorg.workspaces = genNeorgWorkspaces "${homeDirectory}/Notes" neorgWorkspaces; neorg.workspaces = genNeorgWorkspaces "${homeDirectory}/Notes" neorgWorkspaces;
}; };
overlays = import ./overlays { inherit inputs; }; overlays = import ./overlays { inherit inputs; };
in in
{ {
@ -108,43 +106,36 @@
templates = { templates = {
empty = { empty = {
path = ./templates/empty; path = ./templates/empty;
description = "";
}; };
go = { go = {
path = ./templates/go; path = ./templates/go;
description = "";
}; };
rust = { rust = {
path = ./templates/rust; path = ./templates/rust;
description = "";
}; };
cpp = { cpp = {
path = ./templates/cpp; path = ./templates/cpp;
description = "";
}; };
}; };
} }
// flake-utils.lib.eachDefaultSystem (system: { }); // flake-utils.lib.eachDefaultSystem (system: {
packages = {
neovim-ide = import ./pkgs/nixvim { inherit inputs system flakeLib nixpkgs vars overlays; };
};
});
inputs = { inputs = {
# System # System
nixpkgs.url = "github:nixos/nixpkgs"; # Use master nixpkgs.url = "github:nixos/nixpkgs"; # Use master
#nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use unstable #nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use unstable
nur = { nur.url = "github:nix-community/NUR";
url = "github:nix-community/NUR";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
};
};
nix-colors.url = "github:misterio77/nix-colors"; nix-colors.url = "github:misterio77/nix-colors";
systems.url = "github:nix-systems/default"; systems.url = "github:nix-systems/default";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
flake-compat.url = "github:edolstra/flake-compat";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
#inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-utils = { flake-utils = {
url = "github:numtide/flake-utils"; url = "github:numtide/flake-utils";
@ -152,58 +143,49 @@
}; };
nixos-wsl = { nixos-wsl = {
url = "github:nix-community/NixOS-WSL"; url = "github:nix-community/NixOS-WSL";
inputs = { inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
flake-compat.follows = "flake-compat";
};
}; };
nixgl = { nixgl = {
url = "github:nix-community/nixGL"; url = "github:nix-community/nixGL";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
}; };
catppuccin.url = "github:catppuccin/nix"; catppuccin.url = "github:catppuccin/nix";
# Neovim # Neovim
nixvim = { nixvim = {
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs = { inputs.nixpkgs.follows = "nixpkgs";
#nixpkgs.follows = "nixpkgs";
#home-manager.follows = "home-manager";
#flake-parts.follows = "flake-parts";
#flake-compat.follows = "flake-compat";
};
}; };
neovim-nightly-overlay = { neovim-nightly-overlay = {
url = "github:nix-community/neovim-nightly-overlay"; url = "github:nix-community/neovim-nightly-overlay";
inputs = { inputs.nixpkgs.follows = "nixpkgs";
#nixpkgs.follows = "nixpkgs";
#flake-parts.follows = "flake-parts";
#flake-compat.follows = "flake-compat";
};
}; };
nvim-spell-de-utf8-dictionary = { nvim-spell-de-utf8-dictionary = {
url = "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.utf-8.spl"; url = "http://ftp.vim.org/vim/runtime/spell/de.utf-8.spl";
flake = false; flake = false;
}; };
nvim-spell-de-utf8-suggestions = { nvim-spell-de-utf8-suggestions = {
url = "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.utf-8.sug"; url = "http://ftp.vim.org/vim/runtime/spell/de.utf-8.sug";
flake = false; flake = false;
}; };
nvim-spell-de-latin1-dictionary = { nvim-spell-de-latin1-dictionary = {
url = "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.latin1.spl"; url = "http://ftp.vim.org/vim/runtime/spell/de.latin1.spl";
flake = false; flake = false;
}; };
nvim-spell-de-latin1-suggestions = { nvim-spell-de-latin1-suggestions = {
url = "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.latin1.sug"; url = "http://ftp.vim.org/vim/runtime/spell/de.latin1.sug";
flake = false; flake = false;
}; };
guihua = { guihua = {
url = "github:ray-x/guihua.lua"; url = "github:ray-x/guihua.lua";
flake = false; flake = false;
}; };
vim-mcfunction = {
url = "github:RubixTheSlime/vim-mcfunction";
flake = false;
};
/*
neorg-overlay = { neorg-overlay = {
url = "github:nvim-neorg/nixpkgs-neorg-overlay"; url = "github:nvim-neorg/nixpkgs-neorg-overlay";
inputs = { inputs = {
@ -211,6 +193,7 @@
flake-utils.follows = "flake-utils"; flake-utils.follows = "flake-utils";
}; };
}; };
*/
lazydev = { lazydev = {
url = "github:folke/lazydev.nvim"; url = "github:folke/lazydev.nvim";
@ -221,22 +204,8 @@
flake = false; flake = false;
}; };
norg = { norg.url = "github:nvim-neorg/tree-sitter-norg/dev";
url = "github:nvim-neorg/tree-sitter-norg/dev"; norg-meta.url = "github:nvim-neorg/tree-sitter-norg-meta";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
flake-compat.follows = "flake-compat";
};
};
norg-meta = {
url = "github:nvim-neorg/tree-sitter-norg-meta";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
flake-compat.follows = "flake-compat";
};
};
neorg = { neorg = {
url = "github:nvim-neorg/neorg"; url = "github:nvim-neorg/neorg";
flake = false; flake = false;
@ -245,23 +214,16 @@
url = "github:nvim-neorg/neorg-telescope"; url = "github:nvim-neorg/neorg-telescope";
flake = false; flake = false;
}; };
vim-mcfunction = {
url = "github:CrystalAlpha358/vim-mcfunction";
flake = false;
};
# Games # Games
nix-minecraft = { nix-minecraft = {
url = "github:Infinidoge/nix-minecraft"; url = "github:Infinidoge/nix-minecraft";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils"; flake-utils.follows = "flake-utils";
flake-compat.follows = "flake-compat";
}; };
}; };
minecraft-server-flake = { minecraft-server-flake = {
#url = "git+ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git"; url = "git+ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git";
url = "git+file:///home/odie/Code/nix/minecraft-server-flake";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils"; flake-utils.follows = "flake-utils";

3
modules/home-manager/shell/default.nix
View File

@ -24,9 +24,6 @@
gdu gdu
jq jq
python3Packages.argcomplete python3Packages.argcomplete
zip
unzip
p7zip
]; ];
programs = { programs = {

1
modules/nixos/base/nixos/default.nix
View File

@ -9,7 +9,6 @@
automatic = true; automatic = true;
}; };
settings = { settings = {
trusted-users = [ "root" "@wheel" ];
experimental-features = [ "nix-command" "flakes" ]; experimental-features = [ "nix-command" "flakes" ];
auto-optimise-store = true; auto-optimise-store = true;
}; };

58
modules/nixos/games/minecraft/default.nix
View File

@ -1,68 +1,30 @@
{ inputs, ... }: { inputs, ... }: {
let
whitelist = {
masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30";
Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e";
};
operators = {
masterodie = {
uuid = whitelist.masterodie;
level = 4;
bypassesPlayerLimit = true;
};
};
in
{
imports = [ imports = [
inputs.minecraft-server-flake.nixosModules.minecraft-servers inputs.minecraft-server-flake.nixosModules.minecraft-servers
]; ];
services.minecraft-servers = { services.minecraft-servers = {
velocitySecret = "01KqxtMy3kEH";
openFirewall = true;
domain = "odie.home.arpa";
servers = { servers = {
vanilla-plus = { vanilla-plus.enable = true;
inherit whitelist operators; flat.enable = true;
enable = true;
autoStart = false;
openFirewall = true;
serverProperties = {
online-mode = false;
enforce-secure-profile = true;
};
};
flat = {
inherit whitelist operators;
enable = true;
autoStart = false;
serverProperties = {
online-mode = false;
enforce-secure-profile = true;
};
};
velocity.enable = true;
}; };
extraOptions = { extraOptions = {
flat = { flat = {
memory = "2G";
port = 25567; port = 25567;
mapPort = 8101; mapPort = 8101;
voicePort = 24455; voicePort = 24455;
blacklist = [ "Discord" "bluemap" "bmm-fabric" ]; whitelist = {
whitelist = [ "worldedit" ]; masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30";
Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e";
};
}; };
vanilla-plus = { vanilla-plus = {
memory = "2G";
port = 25566; port = 25566;
mapPort = 8100; mapPort = 8100;
voicePort = 24454; voicePort = 24454;
blacklist = [ "Discord" "bluemap" "bmm-fabric" ]; whitelist = {
whitelist = [ "worldedit" ]; masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30";
Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e";
}; };
velocity = {
port = 25565;
mapPort = 8100;
voicePort = 24454;
}; };
}; };
}; };

2
modules/nixvim/plugins/avante.nix
View File

@ -9,7 +9,7 @@
model = "gemma2:2b"; model = "gemma2:2b";
temperature = 0; temperature = 0;
max_tokens = 4096; max_tokens = 4096;
api_key_name = ""; local = true;
parse_curl_args = lib.nixvim.mkRaw '' parse_curl_args = lib.nixvim.mkRaw ''
function(opts, code_opts) function(opts, code_opts)
return { return {

2
modules/nixvim/plugins/default.nix
View File

@ -33,7 +33,7 @@
zen-mode.enable = true; zen-mode.enable = true;
web-devicons.enable = true; web-devicons.enable = true;
lazygit.enable = true; lazygit.enable = true;
colorizer.enable = true; nvim-colorizer.enable = true;
headlines.enable = true; headlines.enable = true;
cmake-tools = { cmake-tools = {

8
modules/nixvim/plugins/lsp/languages/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ... }: { {
imports = [ imports = [
./emmet.nix ./emmet.nix
./go.nix ./go.nix
@ -15,16 +15,12 @@
jsonls.enable = true; jsonls.enable = true;
lua_ls.enable = true; lua_ls.enable = true;
phpactor.enable = true; phpactor.enable = true;
ruff.enable = true; ruff_lsp.enable = true;
pyright.enable = true; pyright.enable = true;
sqls.enable = true; sqls.enable = true;
tailwindcss.enable = true; tailwindcss.enable = true;
templ.enable = true; templ.enable = true;
ts_ls.enable = true; ts_ls.enable = true;
yamlls.enable = true; yamlls.enable = true;
spyglassmc_language_server = {
enable = true;
package = pkgs.callPackage ../../../../../pkgs/spyglass {};
};
}; };
} }

3
modules/nixvim/plugins/neorg.nix
View File

@ -1,8 +1,7 @@
{ vars, lib, ... }: { { vars, lib, ... }: {
plugins.neorg = { plugins.neorg = {
enable = true; enable = true;
telescopeIntegration.enable = true; modules = {
settings.load = {
"core.defaults" = lib.nixvim.emptyTable; "core.defaults" = lib.nixvim.emptyTable;
"core.dirman" = { "core.dirman" = {
config = { config = {

4
modules/nixvim/plugins/treesitter.nix
View File

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { _: {
plugins = { plugins = {
treesitter = { treesitter = {
enable = true; enable = true;
@ -8,8 +8,6 @@
}; };
folding = true; folding = true;
nixGrammars = true; nixGrammars = true;
grammarPackages = config.plugins.treesitter.package.passthru.allGrammars;
nixvimInjections = true;
}; };
treesitter-context.enable = true; treesitter-context.enable = true;
ts-autotag.enable = true; ts-autotag.enable = true;

5
overlays/default.nix
View File

@ -1,9 +1,8 @@
{ inputs, ... }: [ { inputs, ... }: [
#(import ./neorg.nix { inherit inputs; }) (import ./neorg.nix { inherit inputs; })
(import ./kodi.nix { }) (import ./kodi.nix { })
inputs.neovim-nightly-overlay.overlays.default inputs.neovim-nightly-overlay.overlays.default
inputs.neorg-overlay.overlays.default
inputs.nixvim.overlays.default inputs.nixvim.overlays.default
inputs.nur.overlays.default inputs.nur.overlay
inputs.nixgl.overlay inputs.nixgl.overlay
] ]

2
profiles/nixos/wsl-dev/configuration.nix
View File

@ -22,7 +22,7 @@
services = { services = {
postgresql.enable = true; postgresql.enable = true;
open-webui = { open-webui = {
enable = false; enable = true;
host = "0.0.0.0"; host = "0.0.0.0";
environment = { environment = {
OLLAMA_API_BASE_URL = "http://10.0.20.10:11434"; OLLAMA_API_BASE_URL = "http://10.0.20.10:11434";