Compare commits

..

5 commits

Author SHA1 Message Date
Alyxia Sother
a4f8657489
[common/hc] Disable reactDevelopment on the desktop too 2023-06-09 23:11:15 +02:00
Alyxia Sother
9b82c68138
[nix] Install npm packages in the home dir 2023-06-09 23:04:58 +02:00
Alyxia Sother
3afd67e5cd
[nix] Fix bugs and switch to nil for nix lsp 2023-06-09 18:50:35 +02:00
Alyxia Sother
849c0fef38
[nix] Split up program configs into files
Co-Authored-By: Winter <winter@winter.cafe>
2023-06-09 18:25:33 +02:00
Alyxia Sother
3530a88e81
[nix] Manage the neovim config 2023-06-09 16:46:44 +02:00
6 changed files with 70 additions and 28 deletions

View file

@ -8,7 +8,6 @@ let
libtool
patchelf
pcre
pinentry
pkg-config
];
@ -22,7 +21,6 @@ let
ffmpeg
fzf
gh
# git # already managed by home-manager
git-crypt
gitui
gnupg
@ -30,7 +28,6 @@ let
kubectl
kubelogin-oidc
mosh
neovim
nixpkgs-fmt
ripgrep
sops
@ -70,8 +67,6 @@ let
in
{
imports = [];
# Absolutely proprietary.
nixpkgs.config.allowUnfree = true;
@ -95,36 +90,18 @@ in
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = { inherit dotfiles; };
users.alyxia = { pkgs, ... }: {
imports = [ ./zsh.nix ./git.nix ./nvim.nix ];
home = {
packages = packageSets.everything;
};
programs.zsh = {
enable = true;
initExtra = ''
export GPG_TTY=$(tty)
source ${dotfiles}/zsh/zshrc
file.".npmrc".text = ''
prefix = ''${HOME}/.npm-packages
'';
};
programs.git = {
enable = true;
package = pkgs.gitAndTools.gitFull; # contains git send-email et al
userName = "Alyxia Sother";
userEmail = "alyxia@riseup.net";
signing = {
key = "01E16C4E775A37E4";
signByDefault = true;
};
delta.enable = true;
};
programs.gitui.enable = true;
# DO NOT CHANGE UNLESS YOU ARE ABSOLUTELY SURE ALL STATE AFFECTED BY THIS
# OPTION IS APPROPRIATELY MIGRATED!!!
home.stateVersion = "23.05"; # did you read the comment?
@ -151,6 +128,7 @@ in
"croc"
"ddev"
"mkcert"
"pinentry-mac"
"pkg-config"
"sdl2"
];

20
nix/hosts/alymac/git.nix Normal file
View file

@ -0,0 +1,20 @@
{ pkgs, dotfiles, ... }:
{
programs.git = {
enable = true;
package = pkgs.gitAndTools.gitFull; # contains git send-email et al
userName = "Alyxia Sother";
userEmail = "alyxia@riseup.net";
signing = {
key = "01E16C4E775A37E4";
signByDefault = true;
};
delta.enable = true;
};
programs.gitui.enable = true;
}

31
nix/hosts/alymac/nvim.nix Normal file
View file

@ -0,0 +1,31 @@
{ pkgs, dotfiles, ... }:
{
programs.neovim = {
enable = true;
package = pkgs.neovim-unwrapped;
extraConfig = "source ${dotfiles}/nvim/init.vim";
coc = {
enable = true;
settings = {
languageserver = {
nix = {
command = "nil";
filetypes = [ "nix" ];
rootPatterns = [ "flake.nix" ];
"settings.nil" = {
"formatting.command" = ["nixpkgs-fmt"];
};
};
"go.goPlsOptions" = {
completion = true;
completeUnimported = true;
};
};
};
};
};
}

13
nix/hosts/alymac/zsh.nix Normal file
View file

@ -0,0 +1,13 @@
{ dotfiles, ... }:
{
programs.zsh = {
enable = true;
initExtra = ''
export GPG_TTY=$(tty)
source ${dotfiles}/zsh/zshrc
export PATH="$PATH:$HOME/.npm-packages/bin"
'';
};
}