rework home manager layout

This commit is contained in:
Kopatz
2023-12-11 21:17:56 +01:00
parent 5bcba3d31d
commit b0a9573944
8 changed files with 75 additions and 75 deletions

View File

@@ -4,9 +4,9 @@ let
in
{
imports = [
(
import ./home-manager/nvim/nvim.nix ({ user="${user}"; pkgs=pkgs; })
)
(import ../home-manager/nvim.nix ({ user="${user}"; pkgs = pkgs; }))
(import ../home-manager/direnv.nix ({ user="${user}"; pkgs = pkgs; }))
(import ../home-manager/zsh.nix ({ user="${user}"; pkgs = pkgs; }))
];
home-manager = {
useGlobalPkgs = true;
@@ -17,25 +17,6 @@ in
useUserPackages = true;
users.${user} = {
programs.git.enable = true;
programs.direnv = {
enable = true;
enableZshIntegration = true;
nix-direnv.enable = true;
};
programs.zsh = {
enable = true;
enableCompletion = true;
enableAutosuggestions = true;
shellAliases = {
ll = "ls -l";
update = "sudo nixos-rebuild switch";
};
oh-my-zsh = {
enable = true;
plugins = [ "git" ];
theme = "eastwood";
};
};
home.stateVersion = "23.05";
};
};

View File

@@ -1,25 +0,0 @@
{ user, pkgs, ... }:
{
home-manager.users.${user} = { pkgs, ...}: {
home.file.".config/nvim" = {
enable = true;
recursive = true;
source = ../../../.config/nvim;
target = ".config/nvim";
};
programs.neovim = {
enable = true;
defaultEditor = true;
extraPackages = with pkgs; [
rnix-lsp
gcc
ripgrep
fd
cmake
nodePackages.pyright
nodePackages.eslint
ccls
];
};
};
}

View File

@@ -1,14 +0,0 @@
{ user, pkgs, ... }:
{
home-manager.users.${user} = { pkgs, ...}: {
programs.vscode = {
enable = true;
package = pkgs.vscodium;
extensions = with pkgs.vscode-extensions; [
jnoortheen.nix-ide
rust-lang.rust-analyzer
];
};
};
}

View File

@@ -4,12 +4,12 @@ let
in
{
imports = [
(
import ./home-manager/nvim/nvim.nix ({ user="${user}"; pkgs = pkgs; })
)
(
import ./home-manager/vscode/code.nix ({ user="${user}"; pkgs = pkgs; })
)
(import ../home-manager/nvim.nix ({ user="${user}"; pkgs = pkgs; }))
(import ../home-manager/code.nix ({ user="${user}"; pkgs = pkgs; }))
(import ../home-manager/zsh.nix ({ user="${user}"; pkgs = pkgs; }))
(import ../home-manager/gtk-theme.nix ({ user="${user}"; pkgs = pkgs; }))
(import ../home-manager/direnv.nix ({ user="${user}"; pkgs = pkgs; }))
(import ../home-manager/lf.nix ({ user="${user}"; pkgs = pkgs; }))
];
home-manager = {
useGlobalPkgs = true;
@@ -19,51 +19,7 @@ in
};
useUserPackages = true;
users.${user} = {
gtk = {
enable = true;
theme = {
name = "palenight";
package = pkgs.palenight-theme;
};
cursorTheme = {
package = pkgs.libsForQt5.breeze-gtk;
name = "Breeze-gtk";
};
};
programs.zsh = {
enable = true;
enableCompletion = true;
enableAutosuggestions = true;
shellAliases = {
ll = "ls -l";
update = "sudo nixos-rebuild switch";
};
oh-my-zsh = {
enable = true;
plugins = [ "git" ];
theme = "eastwood";
};
};
programs.git.enable = true;
programs.direnv = {
enable = true;
enableZshIntegration = true;
nix-direnv.enable = true;
};
programs.lf = {
enable = true;
previewer.source = pkgs.writeShellScript "pv.sh" ''
#!/bin/sh
case "$(${pkgs.file}/bin/file -Lb --mime-type -- "$1")" in
#image/*|video/*) ${pkgs.chafa}/bin/chafa -f sixel -s "$2x$3" --animate false $1;;
application/x-tar) tar tf "$1";;
application/vnd.rar) ${pkgs.p7zip}/bin/7z l "$1";;
application/x-7z-compressed) ${pkgs.p7zip}/bin/7z l "$1";;
*) ${pkgs.ctpv}/bin/ctpv "$1";;
esac
'';
};
home.stateVersion = "23.05";
};
};