dave/nix-config
1
0
Fork 0
mirror of https://github.com/davegallant/nix-config synced 2025-08-06 11:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to nixfmt

Browse Source
This commit is contained in:
Dave Gallant
2024-07-28 08:26:07 -04:00
parent a009dd5fe4
commit 1bfd747ebb
13 changed files with 168 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
home/default.nix
View File

@@ -1,12 +1,6 @@
{ lib
, pkgs
, unstable
, ...
}:
let
inherit (pkgs) stdenv;
in
{
{ lib, pkgs, unstable, ... }:
let inherit (pkgs) stdenv;
in {
home.stateVersion = "24.05";
home.packages = with pkgs; [ just ];
@@ -23,13 +17,7 @@ in
opacity.terminal = 1.0;
fonts.sizes =
if stdenv.isLinux
then {
terminal = 20;
}
else {
terminal = 16;
};
if stdenv.isLinux then { terminal = 20; } else { terminal = 16; };
fonts.monospace = {
name = "FiraCode Nerd Font Mono";
@@ -77,14 +65,17 @@ in
d = "diff";
dc = "diff --cached";
dcn = "diff --cached --name-only";
ds = "! git diff origin | sed -r 's/value: (.*)/value: \"************\"/'";
l = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
ds =
"! git diff origin | sed -r 's/value: (.*)/value: \"************\"/'";
l =
"log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
ms = "merge --squash";
p = "push origin";
pf = "push -f";
pl = "! git pull origin $(git rev-parse --abbrev-ref HEAD)";
st = "status";
wip = "for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads";
wip =
"for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads";
};
includes = [{ path = "~/.gitconfig-work"; }];
@@ -118,9 +109,7 @@ in
add_newline = false;
scan_timeout = 10;
character = { error_symbol = "[✖](bold red)"; };
gcloud = {
format = "";
};
gcloud = { format = ""; };
kubernetes = {
disabled = false;
context_aliases = {
@@ -212,9 +201,7 @@ in
v = "nvim";
};
"oh-my-zsh" = {
enable = true;
};
"oh-my-zsh" = { enable = true; };
};
alacritty = {
@@ -233,9 +220,7 @@ in
};
};
go = {
enable = true;
};
go = { enable = true; };
tmux = {
enable = true;
@@ -327,9 +312,7 @@ in
'';
};
fzf = {
enable = true;
};
fzf = { enable = true; };
nixvim = {
enable = true;
@@ -340,14 +323,12 @@ in
key = "<C-n>";
mode = [ "n" ];
action = "<cmd>tabnew<cr>";
options = {
silent = true;
};
options = { silent = true; };
}
{
key = "<leader>y";
mode = [ "v" ];
action = "\"+y"; # copy to OS clipboard
action = ''"+y''; # copy to OS clipboard
}
{
key = "<leader>t";
@@ -425,11 +406,7 @@ in
enable = true;
settings.defaults = {
layout_strategy = "vertical";
layout_config = {
vertical = {
width = 0.9;
};
};
layout_config = { vertical = { width = 0.9; }; };
};
package = pkgs.vimPlugins.telescope-fzy-native-nvim;
};
@@ -438,10 +415,7 @@ in
autoindent = true;
backup = false;
belloff = "all";
completeopt = [
"menuone"
"noselect"
];
completeopt = [ "menuone" "noselect" ];
cursorline = true;
expandtab = true;
fillchars = {
@@ -527,8 +501,7 @@ in
ms-dotnettools.csharp
ms-kubernetes-tools.vscode-kubernetes-tools
redhat.vscode-yaml
]
++ lib.optionals stdenv.isLinux [
] ++ lib.optionals stdenv.isLinux [
ms-vsliveshare.vsliveshare
ms-python.python
];
@@ -549,7 +522,8 @@ in
"dom.push.enabled" = false;
"geo.enabled" = false;
"intl.regional_prefs.use_os_locales" = true;
"services.sync.prefs.sync.intl.regional._prefs.use_os_locates" = false;
"services.sync.prefs.sync.intl.regional._prefs.use_os_locates" =
false;
};
name = "dev-edition-default";
path = "6b7pm104.dev-edition-default";