Compare commits

..

No commits in common. "a4f8657489efaeac2314ca80878312332a48dc88" and "4230e24e6523ecefe688587b9d58a504cf5bb325" have entirely different histories.

6 changed files with 28 additions and 70 deletions

View file

View file

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

View file

@ -1,20 +0,0 @@
{ 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;
}

View file

@ -1,31 +0,0 @@
{ 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;
};
};
};
};
};
}

View file

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