Formatting
This commit is contained in:
parent
52f703ac70
commit
6423921275
GPG key ID:
451F95EFB8BECD0F
|
|
@ -21,7 +21,7 @@
|
|||
networking.hostId = "68438432";
|
||||
# Pick only one of the below networking options.
|
||||
networking.wireless.iwd.enable = true;
|
||||
# I would advise against pushing your secrets
|
||||
# I would advise against pushing your secrets
|
||||
#system.activationScripts.getIWD.text = ''
|
||||
# cp -r /etc/nixos/iwd /var/lib/
|
||||
#'';
|
||||
|
|
|
|||
|
|
@ -1,71 +1,92 @@
|
|||
{ config, pkgs, ...} :
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.fzf.enable = true;
|
||||
|
||||
programs.fzf.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
sqlite
|
||||
bat
|
||||
ripgrep
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
sqlite
|
||||
bat
|
||||
ripgrep
|
||||
];
|
||||
programs.gpg = {
|
||||
enable = true;
|
||||
scdaemonSettings.disable-ccid = true;
|
||||
publicKeys = [
|
||||
{
|
||||
source = ../../data/pubkey.gpg;
|
||||
trust = 5;
|
||||
}
|
||||
{
|
||||
source = ../../data/newpubkey.gpg;
|
||||
trust = 5;
|
||||
}
|
||||
];
|
||||
};
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
vimdiffAlias = true;
|
||||
defaultEditor = true;
|
||||
withNodeJs = true;
|
||||
};
|
||||
|
||||
programs.gpg = {
|
||||
enable = true;
|
||||
scdaemonSettings.disable-ccid = true;
|
||||
publicKeys = [
|
||||
{ source = ../../data/pubkey.gpg;
|
||||
trust = 5;
|
||||
}
|
||||
{ source = ../../data/newpubkey.gpg;
|
||||
trust = 5;
|
||||
}
|
||||
];
|
||||
};
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
enableSshSupport = true;
|
||||
};
|
||||
xdg.configFile.nvim = {
|
||||
recursive = true;
|
||||
source = ../../data/nvim;
|
||||
};
|
||||
programs.git.enable = true;
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
enableSshSupport = true;
|
||||
};
|
||||
|
||||
programs.git.signing = {
|
||||
key = null;
|
||||
signByDefault = true;
|
||||
};
|
||||
programs.git.signing = {
|
||||
key = null;
|
||||
signByDefault = true;
|
||||
};
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
initExtra = builtins.readFile ../../data/zshrc;
|
||||
plugins = [
|
||||
{ name = "powerlevel10k";
|
||||
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
|
||||
src = pkgs.zsh-powerlevel10k;
|
||||
}
|
||||
{ name = "fzf-tab";
|
||||
file = "share/fzf-tab/fzf-tab.plugin.zsh";
|
||||
src = pkgs.zsh-fzf-tab;
|
||||
}
|
||||
{ name = "fast-syntax-highlighting";
|
||||
file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
|
||||
src = pkgs.zsh-fast-syntax-highlighting;
|
||||
}
|
||||
{ name = "zsh-histdb";
|
||||
file = "sqlite-history.zsh";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "larkery";
|
||||
repo = "zsh-histdb";
|
||||
rev = "30797f0";
|
||||
sha256 = "PQIFF8kz+baqmZWiSr+wc4EleZ/KD8Y+lxW2NT35/bg=";
|
||||
};
|
||||
}
|
||||
#{ name = "zsh-histdb-skim";
|
||||
# file = "zsh-histdb-skim.zsh";
|
||||
# src = pkgs.fetchFromGitHub {
|
||||
# owner = "m42e";
|
||||
# repo = "zsh-histdb-skim";
|
||||
# rev = "v0.8.1";
|
||||
# sha256 = "pcXSGjOKhN2nrRErggb8JAjw/3/bvTy1rvFhClta1Vs=";
|
||||
# };
|
||||
#}
|
||||
];
|
||||
|
||||
};
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
initExtra = builtins.readFile ../../data/zshrc;
|
||||
plugins = [
|
||||
{
|
||||
name = "powerlevel10k";
|
||||
file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
|
||||
src = pkgs.zsh-powerlevel10k;
|
||||
}
|
||||
{
|
||||
name = "fzf-tab";
|
||||
file = "share/fzf-tab/fzf-tab.plugin.zsh";
|
||||
src = pkgs.zsh-fzf-tab;
|
||||
}
|
||||
{
|
||||
name = "fast-syntax-highlighting";
|
||||
file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
|
||||
src = pkgs.zsh-fast-syntax-highlighting;
|
||||
}
|
||||
{
|
||||
name = "zsh-histdb";
|
||||
file = "sqlite-history.zsh";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "larkery";
|
||||
repo = "zsh-histdb";
|
||||
rev = "30797f0";
|
||||
sha256 = "PQIFF8kz+baqmZWiSr+wc4EleZ/KD8Y+lxW2NT35/bg=";
|
||||
};
|
||||
}
|
||||
#{ name = "zsh-histdb-skim";
|
||||
# file = "zsh-histdb-skim.zsh";
|
||||
# src = pkgs.fetchFromGitHub {
|
||||
# owner = "m42e";
|
||||
# repo = "zsh-histdb-skim";
|
||||
# rev = "v0.8.1";
|
||||
# sha256 = "pcXSGjOKhN2nrRErggb8JAjw/3/bvTy1rvFhClta1Vs=";
|
||||
# };
|
||||
#}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...}:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
zathura
|
||||
pinentry
|
||||
arandr
|
||||
];
|
||||
}
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [
|
||||
zathura
|
||||
pinentry
|
||||
arandr
|
||||
feh
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,13 +10,7 @@ in {
|
|||
];
|
||||
home-manager.users.patrick.imports = [./patrick.nix];
|
||||
home-manager.users.root = {
|
||||
imports = [ ./common ];
|
||||
programs.neovim.enable = true;
|
||||
programs.git.enable = true;
|
||||
xdg.configFile.nvim = {
|
||||
recursive = true;
|
||||
source = ../data/nvim;
|
||||
};
|
||||
imports = [./common];
|
||||
home.stateVersion = "23.05";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,25 +12,12 @@
|
|||
];
|
||||
};
|
||||
imports = [
|
||||
common/kitty.nix
|
||||
common/herbstluftwm.nix
|
||||
common/desktop.nix
|
||||
./common ];
|
||||
common/kitty.nix
|
||||
common/herbstluftwm.nix
|
||||
common/desktop.nix
|
||||
./common
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
xsession.enable = true;
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
vimdiffAlias = true;
|
||||
#withNodes = true;
|
||||
};
|
||||
programs.git.enable = true;
|
||||
|
||||
programs.zsh.enable = true;
|
||||
|
||||
xdg.configFile.nvim = {
|
||||
recursive = true;
|
||||
source = ../data/nvim;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue