samw/home
1
Fork 0
mirror of https://github.com/wlcx/home.git synced 2026-09-28 18:38:23 +01:00
Code Issues Projects Releases Wiki Activity

Format with alejandra

Browse Source
This commit is contained in:
samw
2022-06-14 02:17:01 +01:00
parent 500bcd20eb
commit 35d07641b6
17 changed files with 125 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
home/aws.nix
+1 -1
View File
@@ -1 +1 @@
{ pkgs, ... }: { home.packages = with pkgs; [ awscli2 ]; }
{pkgs, ...}: {home.packages = with pkgs; [awscli2];}
home/default.nix
+9 -8
View File
@@ -1,6 +1,9 @@
{ pkgs, lib, ... }:
let packages = pkgs.callPackage ./packages.nix {};
{
pkgs,
lib,
...
}: let
packages = pkgs.callPackage ./packages.nix {};
in {
home.packages = packages.all;
home.sessionVariables = {
@@ -74,11 +77,10 @@ in {
enable = true;
settings = {
add_newline = false;
format =
"$username$hostname$shlvl$directory$git_branch$git_commit$git_state$git_metrics$git_status$hg_branch$docker_context$golang$kotlin$nodejs$python$rust$terraform$nix_shell$memory_usage$aws$gcloud$openstack$azure$env_var$crystal$custom$sudo$cmd_duration$line_break$jobs$status$shell$character";
format = "$username$hostname$shlvl$directory$git_branch$git_commit$git_state$git_metrics$git_status$hg_branch$docker_context$golang$kotlin$nodejs$python$rust$terraform$nix_shell$memory_usage$aws$gcloud$openstack$azure$env_var$crystal$custom$sudo$cmd_duration$line_break$jobs$status$shell$character";
username.format = "[$user]($style) ";
hostname.format = "[$hostname]($style) ";
directory = { truncation_length = -1; };
directory = {truncation_length = -1;};
git_branch.format = "[$symbol$branch]($style) ";
python.format = "[py \${pyenv_prefix}(\${version} )(\\($virtualenv\\) )]($style)";
nodejs.format = "[js ($version )]($style)";
@@ -98,9 +100,8 @@ in {
ssh = {
enable = true;
includes = [ "~/.ssh/config.local" ];
includes = ["~/.ssh/config.local"];
matchBlocks."*".user = "samw";
};
};
}
home/docker.nix
+1 -1
View File
@@ -1 +1 @@
{ pkgs, ... }: { home.packages = with pkgs; [ docker colima ]; }
{pkgs, ...}: {home.packages = with pkgs; [docker colima];}
home/git.nix
+4 -3
View File
@@ -1,12 +1,13 @@
{ ... }: {
{...}: {
programs.git = {
enable = true;
userName = "Sam Willcocks";
userEmail = "sam@wlcx.cc";
delta = { # Better diffs
delta = {
# Better diffs
enable = true;
options = { line-numbers = true; };
options = {line-numbers = true;};
};
aliases = {
home/gpg.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
programs.gpg = {
enable = true;
mutableKeys = false;
@@ -19,6 +19,6 @@
];
# make yubikey work on macos? lolgpg
# https://github.com/NixOS/nixpkgs/issues/155629
scdaemonSettings = { disable-ccid = true; };
scdaemonSettings = {disable-ccid = true;};
};
}
home/macs.nix
+7 -4
View File
@@ -1,12 +1,15 @@
{ pkgs, lib, ... }: {
{
pkgs,
lib,
...
}: {
# Mac specific packages.
# TODO: have this in a central packages place rather than here
home.packages = with pkgs; [ pngpaste mypkgs.qrclip ];
home.packages = with pkgs; [pngpaste mypkgs.qrclip];
# Use secretive for SSH agent
programs.ssh.matchBlocks.all = lib.mkIf pkgs.stdenv.isDarwin {
host = "*";
extraOptions."IdentityAgent" =
"~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
extraOptions."IdentityAgent" = "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
};
programs.zsh.initExtra = "eval $(/opt/homebrew/bin/brew shellenv)";
}
home/packages.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ pkgs }:
{pkgs}:
with pkgs; rec {
# The stuff you want installed everywhere. The necessities.
base = [
@@ -15,10 +15,10 @@ with pkgs; rec {
];
# Networking shit
net = [ iperf3 nmap socat tcpdump ];
net = [iperf3 nmap socat tcpdump];
# development tools
dev = [ jq nixfmt gh glab hexyl ];
dev = [jq nixfmt gh glab hexyl];
all = (base ++ net ++ dev);
all = base ++ net ++ dev;
}
home/passwords.nix
+4 -4
View File
@@ -1,9 +1,9 @@
{ pkgs, ... }: {
home.packages = with pkgs; [ yubikey-manager ];
{pkgs, ...}: {
home.packages = with pkgs; [yubikey-manager];
programs.password-store = {
enable = true;
settings = { PASSWORD_STORE_DIR = "$HOME/.password-store"; };
package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
settings = {PASSWORD_STORE_DIR = "$HOME/.password-store";};
package = pkgs.pass.withExtensions (exts: [exts.pass-otp]);
};
programs.zsh.shellAliases = {
p = "pass";
home/profiles.nix
+4 -4
View File
@@ -1,8 +1,8 @@
{
dev = { ... }: {
imports = [ ./default.nix ./git.nix ./rust.nix ./vim.nix ./vim-dev.nix ];
dev = {...}: {
imports = [./default.nix ./git.nix ./rust.nix ./vim.nix ./vim-dev.nix];
};
laptop = { ... }: {
laptop = {...}: {
imports = [
./default.nix
./git.nix
@@ -14,5 +14,5 @@
./gpg.nix
];
};
server = { ... }: { imports = [ ./default.nix ./git.nix ./vim.nix ]; };
server = {...}: {imports = [./default.nix ./git.nix ./vim.nix];};
}
home/rust.nix
+1 -1
View File
@@ -1 +1 @@
{ pkgs, ... }: { home.packages = [ pkgs.rustup pkgs.rust-analyzer ]; }
{pkgs, ...}: {home.packages = [pkgs.rustup pkgs.rust-analyzer];}
home/vim-dev/default.nix
+7 -3
View File
@@ -1,5 +1,9 @@
{ pkgs, lib, system, ... }:
let
{
pkgs,
lib,
system,
...
}: let
vim-vue-plugin = pkgs.vimUtils.buildVimPlugin {
name = "vim-vue-plugin";
src = pkgs.fetchFromGitHub {
@@ -26,7 +30,7 @@ in {
]
# delve is unsupported on aarch64-linux and golangci-lint is broken on darwin
# (see https://github.com/NixOS/nixpkgs/issues/168984).
++ lib.optionals (system != "aarch64-linux" && !pkgs.stdenv.isDarwin ) [ vim-go ];
++ lib.optionals (system != "aarch64-linux" && !pkgs.stdenv.isDarwin) [vim-go];
programs.neovim.extraConfig = ''
lua <<EOF
${builtins.readFile ./dev.lua}
home/vim.nix
+8 -3
View File
@@ -1,8 +1,13 @@
# This module sets up a "full" neovim install with plugins and unicorns. It
# also makes neovim the default editor and aliases vim to nvim.
{ pkgs, lib, strings, ... }: {
home.sessionVariables = { "EDITOR" = "nvim"; };
home.packages = with pkgs; [ rnix-lsp ripgrep ];
{
pkgs,
lib,
strings,
...
}: {
home.sessionVariables = {"EDITOR" = "nvim";};
home.packages = with pkgs; [rnix-lsp ripgrep];
programs.neovim = {
enable = true;
viAlias = true;