terminal + gnome configs

anna328p · Jan 10, 2025 · ab0a4a8 · ab0a4a8
1 parent fb8a3b4
commit ab0a4a8
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 1,179 deletions.
diff --git a/common/workstation/gui.nix b/common/workstation/gui.nix
@@ -47,6 +47,7 @@
         e.appindicator
         e.transmission-daemon-indicator-ng
         e.blur-my-shell
+        e.battery-time-2
     ];
 
     environment.variables = {
@@ -95,7 +96,7 @@
                     in overrideList [
                         "firefox-developer-edition" "discord"
                         "org.telegram.desktop"
-                        "org.gnome.Nautilus" "ghostty"
+                        "org.gnome.Nautilus" "com.mitchellh.ghostty"
                         "logseq"
                     ];
                 };
@@ -139,8 +140,6 @@
 
         # Email client
         geary.enable = true;
-
-        gnome-terminal.enable = true;
     };
 
     # Allow using extensions.gnome.org in firefox
@@ -150,6 +149,6 @@
 
     xdg.terminal-exec = {
         enable = true;
-        settings.default = [ "Alacritty.desktop" ];
+        settings.default = [ "com.mitchellh.ghostty.desktop" ];
     };
 }
diff --git a/common/workstation/sound.nix b/common/workstation/sound.nix
@@ -17,9 +17,9 @@
     nixpkgs.config.pulseaudio = true;
 
     # ...but disable PulseAudio...
-    hardware.pulseaudio.enable = false;
+    services.pulseaudio.enable = false;
 
-    # ...and use PipeWire instead!
+    # ...and use PipeWire instead
     services.pipewire = {
         enable = true;
 

diff --git a/home/base/files/zsh/p10k.zsh b/home/base/files/zsh/p10k.zsh
diff --git a/home/base/shell.nix b/home/base/shell.nix
@@ -2,7 +2,8 @@
 
 {
     home.shellAliases = {
-        ls = "eza";
+        ls = "eza --hyperlink -F";
+        ll = "ls -l --smart-group";
 
         ":w" = "sync";
         ":q" = "exit";
@@ -47,29 +48,37 @@
             autoload zargs
             
             setopt GLOB_DOTS
+            unsetopt INTERACTIVE_COMMENTS
+
             for i in util escesc autopushd; do
                 source ${files/zsh/snippets}/$i.zsh
             done
+
+            export ZLE_RPROMPT_INDENT=0
+
+            source ~/.config/zsh/.p10k.zsh
+
+            unalias ll
         '';
 
         prezto = {
             enable = true;
 
             pmodules = [
                 "environment"
+                "helper"
+                "utility"
                 "editor"
                 "history"
                 "directory"
                 "spectrum"
-                "helper"
-                "utility"
                 "completion"
                 "history-substring-search"
             ];
 
             editor.dotExpansion = true;
-
             utility.safeOps = false;
+            terminal.autoTitle = true;
         };
     };
 

diff --git a/home/base/tmux.nix b/home/base/tmux.nix
@@ -23,7 +23,7 @@
             bind-key -n C-j detach
 
             set-option -ga terminal-features \
-                ",ghostty:clipboard:cstyle:extkeys:focus:hyperlinks:margins:osc7:overline:RGB:strikethrough:sync:usstyle:"
+                ",*ghostty:clipboard:cstyle:extkeys:focus:hyperlinks:margins:osc7:overline:RGB:strikethrough:sync:usstyle:"
 
             set-option -ga terminal-features ",xterm-256color:hyperlinks:RGB:"
 

diff --git a/home/workstation/dconf/default.nix b/home/workstation/dconf/default.nix
@@ -23,6 +23,7 @@
                 "[email protected]"
                 "blur-my-shell@aunetx"
                 "[email protected]"
+                "[email protected]"
             ];
         };
 

diff --git a/home/workstation/shell.nix b/home/workstation/shell.nix
@@ -1,6 +1,9 @@
-{ ... }:
+{ pkgs, config, lib, L, ... }:
 
-{
+let
+    scheme = config.colorScheme;
+    colorsPrefixed = lib.mapAttrs (_: v: "#${v}") scheme.palette;
+in {
     home.shellAliases = let
         t = " --show-trace";
         k = " --keep-going";
@@ -37,6 +40,16 @@
             en = "/etc/nixos";
         };
 
+        initExtraFirst = let
+            base16Config = let
+                fn = name: value: "zstyle :base16:colors ${name} '${value}'";
+            in
+                L.concatLines (L.mapSetEntries fn colorsPrefixed);
+        in ''
+            ${base16Config}
+            zstyle :base16 available true
+        '';
+
         prezto = {
             pmodules = [
                 "tmux"