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

Compare commits

base: odie:11d2fae459ebfed5130fba16964debbea0065cdf
Branches Tags
odie:develop
odie:wsl
...
compare: odie:1d36dfeb863be1696b66983c7624a6bc12f58ef4
Branches Tags
odie:develop
odie:wsl

3 Commits
11d2fae459 ... 1d36dfeb86

Author SHA1 Message Date
Patrick Neff 1d36dfeb86 disable lf preview and nixvim phpactor 2024-07-10 07:17:57 +02:00
Patrick Neff cb7f6012eb flake.lock: Update 
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/e3582e5151498bc4d757e8361431ace8529e7bb7' (2024-07-05)
  → 'github:nix-community/home-manager/2fb5c1e0a17bc6059fa09dc411a43d75f35bb192' (2024-07-08)
• Updated input 'neorg-overlay':
    'github:nvim-neorg/nixpkgs-neorg-overlay/f887ecf74846e8b3a47ac5c27d6a20121c6694ab' (2024-07-05)
  → 'github:nvim-neorg/nixpkgs-neorg-overlay/8f13f649b9ce4f5bcdebd14f0a0248ac4e3dba2d' (2024-07-10)
• Updated input 'neorg-overlay/neorg':
    'github:nvim-neorg/neorg/0255c2de18dc558e320b7424dc3daed6cbe94260' (2024-07-05)
  → 'github:nvim-neorg/neorg/db75bb60ba5e565051cf7bb18c8b1a519ed58d3a' (2024-07-09)
• Updated input 'neovim-nightly-overlay':
    'github:nix-community/neovim-nightly-overlay/9e1740926b3910db38a8864e0220d012e14f7e8e' (2024-07-05)
  → 'github:nix-community/neovim-nightly-overlay/b6b51915180e6d2eac488d6f882e4ba36bad380d' (2024-07-09)
• Updated input 'neovim-nightly-overlay/git-hooks':
    'github:cachix/git-hooks.nix/0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07' (2024-06-24)
  → 'github:cachix/git-hooks.nix/2b6bd3c87d3a66fb0b8f2f06c985995e04b4fb96' (2024-07-08)
• Updated input 'neovim-nightly-overlay/neovim-src':
    'github:neovim/neovim/3e6cec0befd41d37ee36cb4f602e84c58c5f0d27' (2024-07-04)
  → 'github:neovim/neovim/fb6c059dc55c8d594102937be4dd70f5ff51614a' (2024-07-08)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/6e253f12b1009053eff5344be5e835f604bb64cd' (2024-07-02)
  → 'github:nixos/nixos-hardware/a111ce6b537df12a39874aa9672caa87f8677eda' (2024-07-09)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/7051b909b9b5e74f19791795bd769de12c5acb3d' (2024-07-05)
  → 'github:nix-community/NixOS-WSL/30ebd0beb2ed26e09bcd245d757504029f807cce' (2024-07-08)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/9f4128e00b0ae8ec65918efeba59db998750ead6' (2024-07-03)
  → 'github:nixos/nixpkgs/655a58a72a6601292512670343087c2d75d859c1' (2024-07-08)
• Updated input 'nixvim':
    'github:nix-community/nixvim/367380bd8462419f0199d262b058fadfb43823ff' (2024-07-05)
  → 'github:nix-community/nixvim/a5e9dbdef1530a76056db12387d489a68eea6f80' (2024-07-09)
• Updated input 'nixvim/git-hooks/flake-compat':
    'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
  → follows 'nixvim/flake-compat'
• Updated input 'nur':
    'github:nix-community/NUR/c33342012b6ef239d05729c8b473c2a83575a9ca' (2024-07-06)
  → 'github:nix-community/NUR/ff62716f986058f217f411504e7a63bfb11f243b' (2024-07-10)
 2024-07-10 06:55:33 +02:00
Patrick Neff d5bbb09e78 simplify nixvim 2024-07-10 06:53:49 +02:00
18 changed files with 108 additions and 157 deletions
Show Stats Expand all files Collapse all files

87
flake.lock
View File

@ -158,22 +158,6 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_7": {
"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-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@ -370,11 +354,11 @@
]
},
"locked": {
"lastModified": 1719259945,
"narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
"lastModified": 1720450253,
"narHash": "sha256-1in42htN3g3MnE3/AO5Qgs6pMWUzmtPQ7s675brO8uw=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
"rev": "2b6bd3c87d3a66fb0b8f2f06c985995e04b4fb96",
"type": "github"
},
"original": {
@ -385,7 +369,10 @@
},
"git-hooks_2": {
"inputs": {
"flake-compat": "flake-compat_7",
"flake-compat": [
"nixvim",
"flake-compat"
],
"gitignore": "gitignore_2",
"nixpkgs": [
"nixvim",
@ -483,11 +470,11 @@
]
},
"locked": {
"lastModified": 1720188602,
"narHash": "sha256-lC3byBmhVZFzWl/dCic8+cKUEEAXAswWOYjq4paFmbo=",
"lastModified": 1720470846,
"narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e3582e5151498bc4d757e8361431ace8529e7bb7",
"rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192",
"type": "github"
},
"original": {
@ -520,11 +507,11 @@
"neorg": {
"flake": false,
"locked": {
"lastModified": 1720213524,
"narHash": "sha256-qJTjLp5bCKhoZSUXb8J7cTKLbB7pztQTBeP4MaaujMo=",
"lastModified": 1720531316,
"narHash": "sha256-vtpra0ub46Y9nIvUQAWJ1sePfPyxBFcFBneAGHDYQok=",
"owner": "nvim-neorg",
"repo": "neorg",
"rev": "0255c2de18dc558e320b7424dc3daed6cbe94260",
"rev": "db75bb60ba5e565051cf7bb18c8b1a519ed58d3a",
"type": "github"
},
"original": {
@ -547,11 +534,11 @@
"norg-meta": "norg-meta"
},
"locked": {
"lastModified": 1720217665,
"narHash": "sha256-o8NvIK0+YZcq/TrK3f0+vxrlOg/kDxan7kgKIWwpBls=",
"lastModified": 1720578710,
"narHash": "sha256-fWyaDs/FIQHFh4j2a9e7OODRa78ovAK7V0UnNWlA4kY=",
"owner": "nvim-neorg",
"repo": "nixpkgs-neorg-overlay",
"rev": "f887ecf74846e8b3a47ac5c27d6a20121c6694ab",
"rev": "8f13f649b9ce4f5bcdebd14f0a0248ac4e3dba2d",
"type": "github"
},
"original": {
@ -588,11 +575,11 @@
]
},
"locked": {
"lastModified": 1720161606,
"narHash": "sha256-B0n9ZIrXGPN0oS1DKBYZu2P1fTsnYMmXQkFtj/6mEQ8=",
"lastModified": 1720483510,
"narHash": "sha256-IG/g4l/W0R2M/jxEyu/Sl3BmR/OK5D1jiahpc0wlpvE=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "9e1740926b3910db38a8864e0220d012e14f7e8e",
"rev": "b6b51915180e6d2eac488d6f882e4ba36bad380d",
"type": "github"
},
"original": {
@ -604,11 +591,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1720137094,
"narHash": "sha256-K3iDLJy3K/ivR0uTlu2EXT+zrwMYNRn+CBGo+0kxxoc=",
"lastModified": 1720478486,
"narHash": "sha256-66u+yzjk6NrFr2jj2svD3jwNX8P2B8/DNH9A51V4kh8=",
"owner": "neovim",
"repo": "neovim",
"rev": "3e6cec0befd41d37ee36cb4f602e84c58c5f0d27",
"rev": "fb6c059dc55c8d594102937be4dd70f5ff51614a",
"type": "github"
},
"original": {
@ -681,11 +668,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1719895800,
"narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
"lastModified": 1720515935,
"narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
"rev": "a111ce6b537df12a39874aa9672caa87f8677eda",
"type": "github"
},
"original": {
@ -703,11 +690,11 @@
]
},
"locked": {
"lastModified": 1720188460,
"narHash": "sha256-ydD3UPIPlOkEDStwNxzGwFhAi5vGcobn2EofOmUvKDA=",
"lastModified": 1720428387,
"narHash": "sha256-0vHxVNWTql555MZLb2kngrcjfNtsJKoYdyUivTibgnc=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "7051b909b9b5e74f19791795bd769de12c5acb3d",
"rev": "30ebd0beb2ed26e09bcd245d757504029f807cce",
"type": "github"
},
"original": {
@ -777,11 +764,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1720031269,
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"lastModified": 1720418205,
"narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
"rev": "655a58a72a6601292512670343087c2d75d859c1",
"type": "github"
},
"original": {
@ -805,11 +792,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1720210105,
"narHash": "sha256-AjcTv44xEAOxGqpoMxbfYcUwhCWLHESQIOIMcBFUCKk=",
"lastModified": 1720530938,
"narHash": "sha256-kUmpiyPfVFKPPLKfq3p50ddi6MdwcW7g4IqM8b7bRxg=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "367380bd8462419f0199d262b058fadfb43823ff",
"rev": "a5e9dbdef1530a76056db12387d489a68eea6f80",
"type": "github"
},
"original": {
@ -861,11 +848,11 @@
},
"nur": {
"locked": {
"lastModified": 1720240924,
"narHash": "sha256-XO61O4liEecHHB85c0K4Iy8iit5WK8OWh9QMgS9CtZA=",
"lastModified": 1720585878,
"narHash": "sha256-Ioa3bxQY2Ll7CuT7u0xDNYiCYgJ1OQxsC9AzE2sJXZ8=",
"owner": "nix-community",
"repo": "NUR",
"rev": "c33342012b6ef239d05729c8b473c2a83575a9ca",
"rev": "ff62716f986058f217f411504e7a63bfb11f243b",
"type": "github"
},
"original": {

11
flake.nix
View File

@ -24,6 +24,13 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINs89u4Kvwlmq67eV+H/n+x9M8gsKDxQU+dCPSEb2vJe odie"
];
domain = "odie.home.arpa";
notes = rec {
root = "${homeDirectory}/Notes/";
workspaces = {
general = "${root}/general";
games = "${root}/games";
};
};
};
overlays = [
inputs.nixvim.overlays.default
@ -107,14 +114,14 @@
vars
// {
hostName = "odie-dev";
domain = "niederkasse.neff-steindesign.de";
domain = "niederkassel.neff-steindesign.de";
};
system = "x86_64-linux";
};
}
// flake-utils.lib.eachDefaultSystem (system: {
packages = {
neovim-ide = import ./pkgs/nixvim {inherit inputs system flakeLib nixpkgs;};
neovim-ide = import ./pkgs/nixvim {inherit inputs system flakeLib nixpkgs vars;};
};
});

5
lib/default.nix
View File

@ -1,10 +1,5 @@
{
mkPkgs = import ./mkPkgs.nix;
mkNixVim = import ./mkNixVim.nix;
mkNixVimLib = import ./mkNixVimLib.nix;
mkNixVimModule = import ./mkNixVimModule.nix;
mkNixosConfiguration = import ./mkNixosConfiguration.nix;
mkHomeConfiguration = import ./mkHomeConfiguration.nix;
mkHomeManagerDefaults = import ./mkHomeManagerDefaults.nix;
mkNixosHomeConfiguration = import ./mkNixosHomeConfiguration.nix;
}

11
lib/mkHomeConfiguration.nix
View File

@ -1,6 +1,7 @@
moduleInputs @ {
{
nixpkgs,
inputs,
outputs,
flakeLib,
system,
vars,
@ -11,14 +12,18 @@ moduleInputs @ {
profile = "${username}@${hostName}";
in {
${profile} = let
config = flakeLib.mkHomeManagerDefaults moduleInputs;
pkgs = flakeLib.mkPkgs {
inherit nixpkgs system overlays;
};
in
inputs.home-manager.lib.homeManagerConfiguration {
inherit pkgs;
inherit (config) extraSpecialArgs;
extraSpecialArgs = {
inherit inputs outputs vars flakeLib;
inherit (inputs) nix-colors;
};
useGlobalPkgs = true;
useUserPackages = true;
modules = [
../profiles/home-manager/${profile}/home.nix

14
lib/mkHomeManagerDefaults.nix
View File

@ -1,14 +0,0 @@
{
inputs,
outputs,
vars,
flakeLib,
...
}: {
extraSpecialArgs = {
inherit inputs outputs vars flakeLib;
inherit (inputs) nix-colors;
};
useGlobalPkgs = true;
useUserPackages = true;
}

10
lib/mkNixVim.nix
View File

@ -1,10 +0,0 @@
{
pkgs,
module,
inputs,
...
}: let
nixvim' = inputs.nixvim.legacyPackages.${pkgs.system};
nvim = nixvim'.makeNixvimWithModule module;
in
nvim

11
lib/mkNixVimLib.nix
View File

@ -1,11 +0,0 @@
let
mkNixVimLib = {
inputs,
system,
...
}: let
nixvimLib = inputs.nixvim.lib.${system};
in
nixvimLib;
in
mkNixVimLib

8
lib/mkNixVimModule.nix
View File

@ -1,8 +0,0 @@
{
pkgs,
module,
extraSpecialArgs ? {},
...
}: {
inherit pkgs module extraSpecialArgs;
}

10
lib/mkNixosHomeConfiguration.nix
View File

@ -1,10 +0,0 @@
{vars, ...}: let
inherit (vars) username hostName;
profile = "${username}@${hostName}";
in {
${username} = {
imports = [
../profiles/home-manager/${profile}/home.nix
];
};
}

2
modules/home-manager/shell/lf/default.nix
View File

@ -2,7 +2,7 @@
home = {
packages = with pkgs; [
chafa
ctpv
#ctpv
];
file = {
".config/lf/icons" = {

24
modules/nixos/home-manager/default.nix
View File

@ -1,10 +1,28 @@
moduleInputs @ {flakeLib, inputs, ...}: let
config = flakeLib.mkHomeManagerDefaults moduleInputs;
{
flakeLib,
inputs,
outputs,
vars,
...
}: let
inherit (vars) username hostName;
profile = "${username}@${hostName}";
in {
imports = [
inputs.home-manager.nixosModules.home-manager
];
home-manager = {
inherit (config) extraSpecialArgs useGlobalPkgs useUserPackages;
extraSpecialArgs = {
inherit inputs outputs vars flakeLib;
inherit (inputs) nix-colors;
};
useGlobalPkgs = true;
useUserPackages = true;
users.${username} = {
imports = [
../../../profiles/home-manager/${profile}/home.nix
];
};
};
}

2
modules/nixvim/plugins/lsp/cmp.nix
View File

@ -69,11 +69,11 @@
'';
completion.completeopt = "menu,preview";
sources = [
{name = "luasnip";}
{name = "nvim_lsp";}
{name = "nvim_lsp_signature_help";}
{name = "nvim_lsp_document_symbol";}
{name = "codeium";}
{name = "luasnip";}
{name = "path";}
{name = "buffer";}
{name = "treesitter";}

2
modules/nixvim/plugins/lsp/languages/php.nix
View File

@ -1,7 +1,7 @@
{
plugins.lsp = {
servers = {
phpactor.enable = true;
#phpactor.enable = true;
};
};
}

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

@ -1,4 +1,4 @@
_: {
{vars, ...}: {
plugins.neorg = {
enable = true;
modules = {
@ -12,10 +12,8 @@ _: {
};
"core.dirman" = {
config = {
workspaces = {
notes = "~/Sync/norg/notes";
};
default_workspace = "notes";
inherit (vars.notes) workspaces;
default_workspace = "general";
};
};
"core.completion" = {
@ -40,11 +38,15 @@ _: {
"core.esupports.metagen" = {
config = {
type = "auto";
author = vars.name;
};
};
"core.integrations.telescope" = {
__empty = null;
};
"core.ui.calendar" = {
__empty = null;
};
};
};
keymaps = [
@ -52,5 +54,17 @@ _: {
key = "<leader>ni";
action = ":Neorg index<CR>";
}
{
key = "<leader>nt";
action = ":Neorg toc<CR>";
}
{
key = "<leader>nw";
action = ":Telescope neorg switch-workspace<CR>";
}
{
key = "<leader>nc";
action = ":Neorg toggle-concealer<CR>";
}
];
}

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

@ -1,7 +1,9 @@
{
plugins.treesitter = {
enable = true;
indent = true;
settings = {
indent.enable = true;
};
folding = true;
};
}

18
modules/nixvim/plugins/trouble.nix
View File

@ -3,28 +3,14 @@
keymaps = [
{
key = "<leader>xx";
action = "<cmd>TroubleToggle<CR>";
options = {
silent = true;
};
}
{
key = "<leader>xd";
action = "<cmd>TroubleToggle document_diagnostics<CR>";
options = {
silent = true;
};
}
{
key = "<leader>xw";
action = "<cmd>TroubleToggle workspace_diagnostics<CR>";
action = "<cmd>Trouble diagnostics toggle<CR>";
options = {
silent = true;
};
}
{
key = "<leader>xq";
action = "<cmd>TroubleToggle quickfix<CR>";
action = "<cmd>TroubleToggle quickfix toggle<CR>";
options = {
silent = true;
};

11
pkgs/nixvim/default.nix
View File

@ -3,8 +3,10 @@
system,
inputs,
flakeLib,
vars,
...
}: let
nixvim' = inputs.nixvim.legacyPackages.${system};
pkgs = flakeLib.mkPkgs {
inherit system nixpkgs;
overlays = [
@ -12,15 +14,12 @@
inputs.neorg-overlay.overlays.default
];
};
module = flakeLib.mkNixVimModule {
module = {
inherit pkgs;
extraSpecialArgs = {
inherit inputs;
inherit inputs vars;
};
module = import ../../modules/nixvim;
};
nvim = flakeLib.mkNixVim {
inherit pkgs inputs module;
};
in
nvim
nixvim'.makeNixvimWithModule module

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

@ -1,12 +1,9 @@
{
inputs,
outputs,
vars,
flakeLib,
...
}: {
imports = [
#inputs.home-manager.nixosModules.home-manager
outputs.nixosModules.home-manager
outputs.nixosModules.base
outputs.nixosModules.wsl
@ -19,11 +16,5 @@
inherit (vars) hostName domain;
};
home-manager.extraSpecialArgs = {
inherit inputs outputs vars;
};
home-manager.users = flakeLib.mkNixosHomeConfiguration {inherit vars;};
system.stateVersion = "23.11";
}