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

Tweaks and fixes

main
mat ess 2022-08-31 00:48:48 -04:00
parent 0fc4814d3e
commit 3c555f5594
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
darwin/homebrew.nix
View File

@ -2,7 +2,8 @@
let let
inherit (lib) mkIf; inherit (lib) mkIf;
mkIfCaskPresent = cask: mkIf (lib.any (x: x == cask) config.homebrew.casks); caskIsPresent = cask: lib.any (x: x == cask) config.homebrew.casks;
mkIfCaskPresent = cask: mkIf (caskIsPresent cask);
brewEnabled = config.homebrew.enable; brewEnabled = config.homebrew.enable;
gamesEnabled = config.games.enable; gamesEnabled = config.games.enable;
in in
@ -25,6 +26,8 @@ in
if test -d (brew --prefix)"/share/fish/vendor_completions.d" if test -d (brew --prefix)"/share/fish/vendor_completions.d"
set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d
end end
'' + lib.optionalString (caskIsPresent "miniforge") ''
eval /opt/homebrew/Caskroom/miniforge/base/bin/conda "shell.fish" "hook" $argv | source
''; '';
homebrew.enable = pkgs.lib.homebrew-enabled; homebrew.enable = pkgs.lib.homebrew-enabled;
@ -66,7 +69,7 @@ in
"logitech-options" "logitech-options"
"lulu" "lulu"
"macsvg" "macsvg"
"miniconda" "miniforge"
# "mullvadvpn" # "mullvadvpn"
"rectangle" "rectangle"
"secretive" "secretive"

2
home/shells.nix
View File

@ -222,7 +222,7 @@
''; '';
programs.fish.interactiveShellInit = '' programs.fish.interactiveShellInit = ''
set -g fish_greeting "ヽ(´ᗜ｀)ノ welcome ヽ(´ᗜ｀)ノ" set -g fish_greeting "(づ￣ ³￣)づ hello (づ￣ ³￣)づ"
fish_vi_key_bindings fish_vi_key_bindings
set VIRTUAL_ENV_DISABLE_PROMPT true set VIRTUAL_ENV_DISABLE_PROMPT true
bind -M insert ! __history_previous_command bind -M insert ! __history_previous_command

4
pkgs/dark-mode-notify.nix
View File

@ -15,11 +15,11 @@ stdenv.mkDerivation {
name = "dark-mode-notify"; name = "dark-mode-notify";
src = dark-mode-notify-src; src = dark-mode-notify-src;
buildPhase = '' buildPhase = ''
${xcode}/bin/xcrun swiftc dark-mode-notify.swift -o dark-mode-notify ${xcode}/bin/xcrun swift build -c release --disable-sandbox
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp dark-mode-notify $out/bin cp .build/release/dark-mode-notify $out/bin
''; '';
meta.platforms = lib.platforms.darwin; meta.platforms = lib.platforms.darwin;
} }