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

fix neorg in nvim; add doom engines

This commit is contained in:
Patrick Neff 2024-07-06 06:51:46 +02:00
parent 4025bb6c1b
commit 2745f32d73
12 changed files with 123 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configs/home-manager/zsh/zshrc.zsh
View File

@ -92,11 +92,3 @@ _gitignoreio () {
}
compdef _gitignoreio gi
compdef _symfony_complete symfony
compdef _symfony_complete composer
compdef _symfony_complete console
compdef _symfony_complete artisan
compdef _symfony_complete phpstan
compdef _symfony_complete php-cs-fixer
compdef _symfony_complete phpspec

160
flake.lock
View File

@ -51,11 +51,11 @@
]
},
"locked": {
"lastModified": 1713532798,
"narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
"lastModified": 1717408969,
"narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
"owner": "numtide",
"repo": "devshell",
"rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
"rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
"type": "github"
},
"original": {
@ -179,11 +179,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"lastModified": 1719745305,
"narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9",
"type": "github"
},
"original": {
@ -242,11 +242,11 @@
]
},
"locked": {
"lastModified": 1715865404,
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github"
},
"original": {
@ -255,21 +255,6 @@
"type": "github"
}
},
"flake-root": {
"locked": {
"lastModified": 1713493429,
"narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
"owner": "srid",
"repo": "flake-root",
"rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": [
@ -340,11 +325,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@ -385,11 +370,11 @@
]
},
"locked": {
"lastModified": 1716213921,
"narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
"lastModified": 1719259945,
"narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
"rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
"type": "github"
},
"original": {
@ -412,11 +397,11 @@
]
},
"locked": {
"lastModified": 1716213921,
"narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
"lastModified": 1719259945,
"narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
"rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
"type": "github"
},
"original": {
@ -478,11 +463,11 @@
]
},
"locked": {
"lastModified": 1713898448,
"narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=",
"lastModified": 1719226092,
"narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "c0302ec12d569532a6b6bd218f698bc402e93adc",
"rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5",
"type": "github"
},
"original": {
@ -498,11 +483,11 @@
]
},
"locked": {
"lastModified": 1717316182,
"narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=",
"lastModified": 1719677234,
"narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af",
"rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d",
"type": "github"
},
"original": {
@ -519,11 +504,11 @@
]
},
"locked": {
"lastModified": 1717052710,
"narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=",
"lastModified": 1719588253,
"narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae",
"rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e",
"type": "github"
},
"original": {
@ -535,11 +520,11 @@
"neorg": {
"flake": false,
"locked": {
"lastModified": 1717185418,
"narHash": "sha256-RXiPzLN/1Lwi4W1bfTh50nDe8hgF1C4VIob4H7omMJU=",
"lastModified": 1719684575,
"narHash": "sha256-eYy8SPKS8FRpHi3HhrEQKRl9tprpV4qMPAWVvdP7vg0=",
"owner": "nvim-neorg",
"repo": "neorg",
"rev": "b17a33ede3ff91de614c735c1617bf9dc61372d5",
"rev": "be332f580ae5c93b68785b077ecd13672599062f",
"type": "github"
},
"original": {
@ -562,11 +547,11 @@
"norg-meta": "norg-meta"
},
"locked": {
"lastModified": 1717445661,
"narHash": "sha256-65STT6ZNRfprxXlsdO9/eUWZV79ThIKkaJz8X2SYZ38=",
"lastModified": 1719685027,
"narHash": "sha256-Wvoyo0fqnJW+7t+jeWXxUBcsVQ8nC4tZVDsUfEPT2t4=",
"owner": "nvim-neorg",
"repo": "nixpkgs-neorg-overlay",
"rev": "c1e744d86597c86b7b543d2510eea6c00f11d685",
"rev": "21617eb31e9bd139848b620d4d687b5ed9e49be7",
"type": "github"
},
"original": {
@ -578,11 +563,11 @@
"neorg-telescope": {
"flake": false,
"locked": {
"lastModified": 1716308299,
"narHash": "sha256-zR+r57qnfJ0V1EtsN+gyfHYTTI0I5i/GtjoAYvVmH5Y=",
"lastModified": 1718775458,
"narHash": "sha256-VZbmetQyPHiduMlmHTaFQJZUt4bYPS5vxMc5dwHUBnE=",
"owner": "nvim-neorg",
"repo": "neorg-telescope",
"rev": "6069bf428fac56f8c028864eb1bf8beb668fca09",
"rev": "fe255a3432ce639de7a374ccfb8602f517244dcd",
"type": "github"
},
"original": {
@ -603,11 +588,11 @@
]
},
"locked": {
"lastModified": 1717427132,
"narHash": "sha256-wfywzgALSyKTfn/1fbHeSMg1QK9YHO/zMnVzNBN49uA=",
"lastModified": 1719764240,
"narHash": "sha256-bsZDPD08s8FKCGyy1OMMuM+cOjO1M8vPREkhgyqkRQM=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "5d7499a492d5c41e943c7521b7d95d561cf1f606",
"rev": "643ec69ac0cfcc1cd26523c3816fb111e5bb3a41",
"type": "github"
},
"original": {
@ -619,11 +604,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1717364286,
"narHash": "sha256-+Oc54rm7Rx6XQJ1+fz3BF/8srzYCQLc+d24ad+HMVnU=",
"lastModified": 1719700831,
"narHash": "sha256-d89hDFBBtuQ7rwS/Q3lKYyfE0ekVCwubMN9q1qCZ3m0=",
"owner": "neovim",
"repo": "neovim",
"rev": "3a1515bfee59710b4da9bfdf0fc4ecb5b13a00db",
"rev": "e7020306a19a5211c834966ec067fff3b981bdb9",
"type": "github"
},
"original": {
@ -659,11 +644,11 @@
]
},
"locked": {
"lastModified": 1716993688,
"narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
"lastModified": 1719128254,
"narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
"rev": "50581970f37f06a4719001735828519925ef8310",
"type": "github"
},
"original": {
@ -696,11 +681,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1712909959,
"narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
"lastModified": 1719681865,
"narHash": "sha256-Lp+l1IsREVbz8WM35OJYZz8sAH0XOjrZWUXVB5bJ2qg=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
"rev": "a59f00f5ac65b19382617ba00f360f8bc07ed3ac",
"type": "github"
},
"original": {
@ -718,11 +703,11 @@
]
},
"locked": {
"lastModified": 1710519878,
"narHash": "sha256-0dbc10OBFUVYyXC+C+N6vRUd8xyBSRxkcZ4Egipbx0M=",
"lastModified": 1719220171,
"narHash": "sha256-xywM6JoGT8AwfoOFJBTv8GRlvNu8LYqqqMS/OQ6uCgE=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "aef95bdb6800a3a2af7aa7083d6df03067da6592",
"rev": "269411cfed6aab694e46f719277c972de96177bb",
"type": "github"
},
"original": {
@ -749,20 +734,14 @@
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1711703276,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github"
"lastModified": 1717284937,
"narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
}
},
"nixpkgs-lib_2": {
@ -798,11 +777,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1717196966,
"narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
"lastModified": 1719506693,
"narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
"rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
"type": "github"
},
"original": {
@ -817,7 +796,6 @@
"devshell": "devshell",
"flake-compat": "flake-compat_6",
"flake-parts": "flake-parts_4",
"flake-root": "flake-root",
"git-hooks": "git-hooks_2",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
@ -827,11 +805,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1717444597,
"narHash": "sha256-8enVHsN7hLn1hPkY1U5Cfr3rzij4FsWRUx4jjHUHZQE=",
"lastModified": 1719768179,
"narHash": "sha256-gS+EB9iYftAxcnaMM648Ht/JGMocfRctBJh3yGAslUM=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "b7a8b0319098fdbaa719ef4dc375337ec4543c6e",
"rev": "1391a64cf6f216315a6ce904db7144949585839a",
"type": "github"
},
"original": {
@ -883,11 +861,11 @@
},
"nur": {
"locked": {
"lastModified": 1712577859,
"narHash": "sha256-Dj/v0G964gStuJQ4AZlU/BXhfUbboCeegfPEGOM0x9c=",
"lastModified": 1719799005,
"narHash": "sha256-3EeevUnGwIWGHUEKpLVfUvZ4/UssLOdXbZcp4o5uQIU=",
"owner": "nix-community",
"repo": "NUR",
"rev": "47a8f374c33c567f9b0c63f6a953f38e3b6eb921",
"rev": "07c5cb4ac5db517553ab60d6914eb5b9f54a7ea1",
"type": "github"
},
"original": {
@ -967,11 +945,11 @@
]
},
"locked": {
"lastModified": 1715940852,
"narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
"lastModified": 1719243788,
"narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
"rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf",
"type": "github"
},
"original": {

2
flake.nix
View File

@ -27,10 +27,8 @@
};
overlays = [
inputs.nixvim.overlays.default
inputs.neovim-nightly-overlay.overlays.default
inputs.nur.overlay
inputs.nixgl.overlay
inputs.neorg-overlay.overlays.default
outputs.overlays.kodi
];
in

8
modules/home-manager/games/default.nix
View File

@ -7,7 +7,11 @@ with lib; {
];
config = {
games.unnethack.enable = mkDefault true;
games.dsda-doom.enable = mkDefault true;
games = {
unnethack.enable = mkDefault true;
dsda-doom.enable = mkDefault true;
woof.enable = mkDefault true;
eternity.enable = mkDefault true;
};
};
}

2
modules/home-manager/games/doom/default.nix
View File

@ -1,5 +1,7 @@
{
imports = [
./dsda-doom.nix
./woof.nix
./eternity.nix
];
}

18
modules/home-manager/games/doom/eternity.nix Normal file
View File

@ -0,0 +1,18 @@
{
pkgs,
config,
lib,
...
}: let
cfg = config.games.eternity;
in
with lib; {
options = {
games.eternity.enable = mkEnableOption "eternity-engine";
};
config = mkIf cfg.enable {
home.packages = with pkgs; [
eternity
];
};
}

18
modules/home-manager/games/doom/woof.nix Normal file
View File

@ -0,0 +1,18 @@
{
pkgs,
config,
lib,
...
}: let
cfg = config.games.dsda-doom;
in
with lib; {
options = {
games.woof.enable = mkEnableOption "woof-doom";
};
config = mkIf cfg.enable {
home.packages = with pkgs; [
woof-doom
];
};
}

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

@ -20,6 +20,7 @@
ripgrep
fd
gdu
python3Packages.argcomplete
];
programs = {

4
modules/home-manager/shell/zsh/default.nix
View File

@ -8,6 +8,7 @@
ji = "zi";
};
initExtra = builtins.readFile ../../../../configs/home-manager/zsh/zshrc.zsh;
autosuggestion.enable = true;
completionInit = ''
autoload -U compinit bashcompinit
compinit
@ -31,14 +32,13 @@
zplug = {
enable = true;
plugins = [
{ name = "zsh-users/zsh-completions"; }
{ name = "zdharma-continuum/fast-syntax-highlighting"; }
{ name = "zsh-users/zsh-autosuggestions"; }
{ name = "nix-community/nix-zsh-completions"; }
];
};
envExtra = ''
export DIRENV_LOG_FORMAT=$'\033[2mdirenv: %s\033[0m'
export DOOMWADDIR=$HOME/Games/doom/IWADs
'';
};
};

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

@ -1,4 +1,4 @@
{
{pkgs, ...}: {
imports = [
./gitsigns.nix
./harpoon.nix
@ -23,4 +23,8 @@
./undotree.nix
./lsp
];
extraPlugins = with pkgs.vimPlugins;
[
vim-nftables
];
}

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

@ -1,6 +1,6 @@
_: {
plugins.neorg = {
enable = false;
enable = true;
modules = {
"core.defaults" = {
__empty = null;
@ -26,9 +26,6 @@ _: {
"core.summary" = {
__empty = null;
};
"core.manoeuvre" = {
__empty = null;
};
"core.tangle" = {
__empty = null;
};

1
pkgs/nixvim/default.nix
View File

@ -9,6 +9,7 @@
inherit system nixpkgs;
overlays = [
inputs.neovim-nightly-overlay.overlays.default
inputs.neorg-overlay.overlays.default
];
};
module = flakeLib.mkNixVimModule {