1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00

refactor: move full neovim config to only myuser

This commit is contained in:
oddlama 2023-09-04 16:43:57 +02:00
parent 4c377b260e
commit 14329a9a5d
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
22 changed files with 23 additions and 40 deletions

View file

@ -1,11 +1,10 @@
{pkgs, ...}: {
imports = [
./modules/uid.nix
./modules/minimal.nix
./git.nix
./htop.nix
./neovim
./neovim.nix
./shell
./utils.nix
];

View file

@ -1,5 +0,0 @@
{lib, ...}: {
options = {
home.minimal = lib.mkEnableOption "minimal setup only (e.g. for virtual machines)";
};
}

View file

@ -1,23 +0,0 @@
{
config,
lib,
pkgs,
...
}: {
imports = [
./minimal.nix
];
config = lib.mkIf (!config.home.minimal) {
programs.neovim = {
withPython3 = true;
extraPython3Packages = pyPkgs: with pyPkgs; [openai];
withNodeJs = true;
};
xdg.configFile = {
"nvim/lua".source = ./lua;
"nvim/init.lua".source = ./init.lua;
};
home.packages = with pkgs; [gcc shellcheck stylua];
};
}

View file

@ -16,9 +16,7 @@ in {
inherit (config.repo.secrets.global.myuser) hashedPassword;
createHome = true;
group = myuser;
extraGroups =
["wheel" "input" "video"]
++ lib.optionals config.sound.enable ["audio"];
extraGroups = ["wheel" "input" "video"];
isNormalUser = true;
autoSubUidGidRange = false;
shell = pkgs.zsh;
@ -69,6 +67,7 @@ in {
imports = [
../common
./graphical
./neovim
./dev.nix
./gpg.nix
@ -78,11 +77,6 @@ in {
home = {
inherit (config.users.users.${myuser}) uid;
username = config.users.users.${myuser}.name;
# TODO this shall be moved!
shellAliases = {
p = "cd ~/projects";
zf = "zathura --fork";
};
};
};
}

View file

@ -44,6 +44,10 @@
# TODO mouse speed
# TODO persist tmp malte ddelete.
# TODO ncdu
home.shellAliases = {
p = "cd ~/projects";
zf = "zathura --fork";
};
# Needed to fix cursors in firefox under wayland, see https://github.com/NixOS/nixpkgs/issues/207339#issuecomment-1374497558
gtk = {

View file

@ -0,0 +1,15 @@
{pkgs, ...}: {
programs.neovim = {
withPython3 = true;
extraPython3Packages = pyPkgs: with pyPkgs; [openai];
withNodeJs = true;
};
xdg.configFile = {
"nvim/lua".source = ./lua;
"nvim/init.lua".source = ./init.lua;
};
# TODO NO! NO! all of this goes away
home.packages = with pkgs; [gcc shellcheck stylua];
}