trude/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS fixes; tmux no longer opens automatically

Browse Source
This commit is contained in:
TrudeEH
2024-10-28 23:16:40 +00:00
parent 89270c12f3
commit c06a2aaa08
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nix/home.nix
View File

@@ -5,7 +5,7 @@ let
inherit (lib) mkIf optionals; inherit (lib) mkIf optionals;
inherit (pkgs.stdenv) isLinux isDarwin; #GNOME on Linux inherit (pkgs.stdenv) isLinux isDarwin; #GNOME on Linux
userName = "trude"; userName = "trude";
isDesktop = false; # Disable for servers and WSL isDesktop = true; # Disable for servers and WSL
in in
{ {
# ======================================================================= # =======================================================================
@@ -72,11 +72,11 @@ in
'') '')
] ]
# Desktop-only apps # Desktop-only apps
++ optionals isDesktop [google-chrome prismlauncher] ++ optionals isDesktop [google-chrome]
# Linux-only apps # Linux-only apps
++ optionals (isDesktop && isLinux) [newsflash eyedropper gnome-terminal epiphany gnome-podcasts impression gnome-boxes adw-gtk3 gnomeExtensions.vitals gnomeExtensions.appindicator gnomeExtensions.caffeine gnomeExtensions.search-light] ++ optionals (isDesktop && isLinux) [newsflash eyedropper gnome-terminal epiphany gnome-podcasts impression gnome-boxes adw-gtk3 gnomeExtensions.vitals gnomeExtensions.appindicator gnomeExtensions.caffeine gnomeExtensions.search-light]
# macOS-only apps # macOS-only apps
++ optionals (isDesktop && isDarwin) [net-news-wire stats raycast iina]; ++ optionals (isDesktop && isDarwin) [net-news-wire raycast iina discord];
home.file = { home.file = {
".config/nixpkgs/config.nix".text = "{ allowUnfree = true; }"; ".config/nixpkgs/config.nix".text = "{ allowUnfree = true; }";
@@ -674,13 +674,6 @@ in
set -o vi set -o vi
export EDITOR="nvim"; export EDITOR="nvim";
if [[ -z $TMUX ]]; then
tmux attach
if [[ $? == 1 ]]; then
tmux new -s main
fi
fi
''; '';
}; };
@@ -702,7 +695,6 @@ in
ritwickdey.liveserver ritwickdey.liveserver
github.vscode-pull-request-github github.vscode-pull-request-github
arrterian.nix-env-selector arrterian.nix-env-selector
piousdeer.adwaita-theme
llvm-vs-code-extensions.vscode-clangd llvm-vs-code-extensions.vscode-clangd
formulahendry.code-runner formulahendry.code-runner
]); ]);
@@ -731,15 +723,11 @@ in
"git.autofetch" = true; "git.autofetch" = true;
# Styling # Styling
"window.autoDetectColorScheme" = true; "window.autoDetectColorScheme" = true;
"workbench.colorTheme" = "Adwaita Dark";
"workbench.preferredDarkColorTheme" = "Adwaita Dark";
"workbench.preferredLightColorTheme" = "Adwaita Light";
"workbench.iconTheme" = "material-icon-theme"; "workbench.iconTheme" = "material-icon-theme";
"material-icon-theme.activeIconPack" = "none"; "material-icon-theme.activeIconPack" = "none";
"material-icon-theme.folders.theme" = "classic"; "material-icon-theme.folders.theme" = "classic";
"editor.fontLigatures" = true; "editor.fontLigatures" = true;
"window.commandCenter" = true; "window.commandCenter" = true;
"workbench.productIconTheme" = "adwaita";
"editor.renderLineHighlight" = "none"; "editor.renderLineHighlight" = "none";
# Other # Other
"telemetry.telemetryLevel" = "off"; "telemetry.telemetryLevel" = "off";

6
nix/macOS/flake.nix
View File

@@ -59,12 +59,6 @@
SortDirection = 0; SortDirection = 0;
}; };
CustomUserPreferences = {
"com.apple.Safari" = {
"com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled" = true;
};
};
NSGlobalDomain = { NSGlobalDomain = {
AppleICUForce24HourTime = false; AppleICUForce24HourTime = false;
AppleInterfaceStyle = "Dark"; AppleInterfaceStyle = "Dark";