sloane
/
dotfiles.nix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaks/fixes

work
mat ess 2022-10-16 19:43:04 -04:00
parent cd209ea820
commit 65d5c5f8f9
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -76,11 +76,11 @@ fish shell configuration and integrations
#### darwin #### darwin
various extensions for nix-darwin various extensions for nix-darwin configuration
#### home #### home
customization for kitty terminal and kakoune customization for kitty terminal and other programs
### overlays ### overlays

2
darwin/homebrew.nix
View File

@ -47,6 +47,7 @@ in
homebrew.masApps = { homebrew.masApps = {
Bitwarden = 1352778147; Bitwarden = 1352778147;
"Reeder 5" = 1529448980;
Spark = 1176895641; Spark = 1176895641;
Tailscale = 1475387142; Tailscale = 1475387142;
Xcode = 497799835; Xcode = 497799835;
@ -98,6 +99,7 @@ in
"fileicon" "fileicon"
"fzf" "fzf"
"gifsicle" "gifsicle"
"netlify-cli"
"tarsnap" "tarsnap"
"unison-language" "unison-language"
]; ];

2
home/fish.nix
View File

@ -82,8 +82,10 @@
body = '' body = ''
switch $$env_var switch $$env_var
case 1 case 1
echo "Setting dark mode"
set -U term_background dark set -U term_background dark
case 0 case 0
echo "Setting light mode"
set -U term_background light set -U term_background light
end end
''; '';

2
home/git.nix
View File

@ -10,7 +10,7 @@
programs.git.userName = config.home.primaryUser.fullName; programs.git.userName = config.home.primaryUser.fullName;
programs.git.extraConfig = { programs.git.extraConfig = {
core.editor = "kak"; core.editor = "hx";
diff.colorMoved = "default"; diff.colorMoved = "default";
pull.rebase = true; pull.rebase = true;
init.defaultBranch = "main"; init.defaultBranch = "main";

7
home/programs.nix
View File

@ -2,7 +2,9 @@
{ {
# Programs + packages with configuration --------------------------------------------------------------- {{{ # Programs + packages with configuration --------------------------------------------------------------- {{{
home.sessionVariables = {
EDITOR = "hx";
};
programs = { programs = {
# a nicer cat # a nicer cat
# https://rycee.gitlab.io/home-manager/options.html#opt-programs.bat.enable # https://rycee.gitlab.io/home-manager/options.html#opt-programs.bat.enable
@ -47,10 +49,9 @@
}; };
ssh = { ssh = {
enable = true; enable = true;
matchBlocks."*".extraOptions = { matchBlocks."*".extraOptions = lib.optionalAttrs pkgs.stdenv.isDarwin {
UseKeychain = "yes"; UseKeychain = "yes";
AddKeysToAgent = "yes"; AddKeysToAgent = "yes";
} // lib.optionalAttrs pkgs.stdenv.isDarwin {
IdentityAgent = "${config.home.homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh"; IdentityAgent = "${config.home.homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
}; };
}; };

3
home/services/tarsnap.nix
View File

@ -5,8 +5,9 @@
let let
logPath = "/var/log/tarsnap"; logPath = "/var/log/tarsnap";
tarsnapBackup = pkgs.writeShellScriptBin "tarsnap-backup-helper" '' tarsnapBackup = pkgs.writeShellScriptBin "tarsnap-backup-helper" ''
/opt/homebrew/bin/tarsnap -v -c \ /opt/homebrew/bin/tarsnap -c \
--configfile ${config.home.homeDirectory}/.tarsnaprc \ --configfile ${config.home.homeDirectory}/.tarsnaprc \
--keyfile ${config.xdg.configHome}/tarsnap/write-only.key \
-f $(uname -n)-$(date -u +%Y-%m-%dT%H:%M:%SZ) \ -f $(uname -n)-$(date -u +%Y-%m-%dT%H:%M:%SZ) \
${config.home.homeDirectory}/{dotfiles.nix,Desktop,Development,Documents,Downloads} ${config.home.homeDirectory}/{dotfiles.nix,Desktop,Development,Documents,Downloads}
''; '';

8
modules/darwin/games.nix
View File

@ -1,11 +1,5 @@
{ lib, ... }: { lib, ... }:
let
inherit (lib) mkEnableOption;
in
{ {
options = { options.games.enable = lib.mkEnableOption "Enable games (managed by homebrew)";
games.enable = mkEnableOption "Enable games (managed by homebrew)";
};
} }