Tweaks/fixes
parent
cd209ea820
commit
65d5c5f8f9
|
@ -76,11 +76,11 @@ fish shell configuration and integrations
|
|||
|
||||
#### darwin
|
||||
|
||||
various extensions for nix-darwin
|
||||
various extensions for nix-darwin configuration
|
||||
|
||||
#### home
|
||||
|
||||
customization for kitty terminal and kakoune
|
||||
customization for kitty terminal and other programs
|
||||
|
||||
### overlays
|
||||
|
||||
|
|
|
@ -47,6 +47,7 @@ in
|
|||
|
||||
homebrew.masApps = {
|
||||
Bitwarden = 1352778147;
|
||||
"Reeder 5" = 1529448980;
|
||||
Spark = 1176895641;
|
||||
Tailscale = 1475387142;
|
||||
Xcode = 497799835;
|
||||
|
@ -98,6 +99,7 @@ in
|
|||
"fileicon"
|
||||
"fzf"
|
||||
"gifsicle"
|
||||
"netlify-cli"
|
||||
"tarsnap"
|
||||
"unison-language"
|
||||
];
|
||||
|
|
|
@ -82,8 +82,10 @@
|
|||
body = ''
|
||||
switch $$env_var
|
||||
case 1
|
||||
echo "Setting dark mode"
|
||||
set -U term_background dark
|
||||
case 0
|
||||
echo "Setting light mode"
|
||||
set -U term_background light
|
||||
end
|
||||
'';
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
programs.git.userName = config.home.primaryUser.fullName;
|
||||
|
||||
programs.git.extraConfig = {
|
||||
core.editor = "kak";
|
||||
core.editor = "hx";
|
||||
diff.colorMoved = "default";
|
||||
pull.rebase = true;
|
||||
init.defaultBranch = "main";
|
||||
|
|
|
@ -2,7 +2,9 @@
|
|||
|
||||
{
|
||||
# Programs + packages with configuration --------------------------------------------------------------- {{{
|
||||
|
||||
home.sessionVariables = {
|
||||
EDITOR = "hx";
|
||||
};
|
||||
programs = {
|
||||
# a nicer cat
|
||||
# https://rycee.gitlab.io/home-manager/options.html#opt-programs.bat.enable
|
||||
|
@ -47,10 +49,9 @@
|
|||
};
|
||||
ssh = {
|
||||
enable = true;
|
||||
matchBlocks."*".extraOptions = {
|
||||
matchBlocks."*".extraOptions = lib.optionalAttrs pkgs.stdenv.isDarwin {
|
||||
UseKeychain = "yes";
|
||||
AddKeysToAgent = "yes";
|
||||
} // lib.optionalAttrs pkgs.stdenv.isDarwin {
|
||||
IdentityAgent = "${config.home.homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -5,8 +5,9 @@
|
|||
let
|
||||
logPath = "/var/log/tarsnap";
|
||||
tarsnapBackup = pkgs.writeShellScriptBin "tarsnap-backup-helper" ''
|
||||
/opt/homebrew/bin/tarsnap -v -c \
|
||||
/opt/homebrew/bin/tarsnap -c \
|
||||
--configfile ${config.home.homeDirectory}/.tarsnaprc \
|
||||
--keyfile ${config.xdg.configHome}/tarsnap/write-only.key \
|
||||
-f $(uname -n)-$(date -u +%Y-%m-%dT%H:%M:%SZ) \
|
||||
${config.home.homeDirectory}/{dotfiles.nix,Desktop,Development,Documents,Downloads}
|
||||
'';
|
||||
|
|
|
@ -1,11 +1,5 @@
|
|||
{ lib, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkEnableOption;
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
games.enable = mkEnableOption "Enable games (managed by homebrew)";
|
||||
};
|
||||
options.games.enable = lib.mkEnableOption "Enable games (managed by homebrew)";
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue