diff options
| -rw-r--r-- | flake.lock | 8 | ||||
| -rw-r--r-- | modules/basic.nix | 16 | ||||
| -rw-r--r-- | modules/default-user.nix | 2 | ||||
| -rw-r--r-- | modules/emacs/README.org | 6 |
4 files changed, 23 insertions, 9 deletions
@@ -163,11 +163,11 @@ "nixpkgs_old": "nixpkgs_old" }, "locked": { - "lastModified": 1731509841, - "narHash": "sha256-Rq47X2KA49uT0MhrsRDd78ZTjjv/GrN+9O7b19bcT3M=", + "lastModified": 1732822990, + "narHash": "sha256-Wr8gzDD2O6jIDwa74BM2gwx8zKqbFiX05NAq71QVGyw=", "ref": "refs/heads/master", - "rev": "099621c4617a0635e965315b9e3763573f49e784", - "revCount": 67666, + "rev": "67bb2ba2a800bccc2323404aa9297b02ca836142", + "revCount": 68535, "type": "git", "url": "ssh://[email protected]/mixrank/mixrank" }, diff --git a/modules/basic.nix b/modules/basic.nix index 26d2e15..71404a8 100644 --- a/modules/basic.nix +++ b/modules/basic.nix @@ -31,7 +31,21 @@ promptInit = '' PS1="\[\033[1;95m\][\h]\[\033[0m\] \[\033[0;32m\]\w\[\033[0m\] :: " - [ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/bash" + vterm_printf() { + if [ -n "$TMUX" ] && ([ "$${TERM%%-*}" = "tmux" ] || [ "$${TERM%%-*}" = "screen" ]); then + # Tell tmux to pass the escape sequences through + printf "\ePtmux;\e\e]%s\007\e\\" "$1" + elif [ "$${TERM%%-*}" = "screen" ]; then + # GNU screen (screen, screen-256color, screen-256color-bce) + printf "\eP\e]%s\007\e\\" "$1" + else + printf "\e]%s\e\\" "$1" + fi + } + vterm_prompt_end(){ + vterm_printf "51;A$(whoami)@$(hostname):$(pwd)" + } + PS1=$PS1'\[$(vterm_prompt_end)\]' ''; }; programs.direnv = { diff --git a/modules/default-user.nix b/modules/default-user.nix index fce1f23..774f97f 100644 --- a/modules/default-user.nix +++ b/modules/default-user.nix @@ -72,7 +72,7 @@ in { file.".ssh/id_ed25519.pub".source = ../secrets/user-ssh-key.pub; file.".mozilla/firefox/leonardo/chrome/firefox-gnome-theme" = mkIf cfg.firefox.enable { source = inputs.firefox-gnome-theme; }; packages = lib.optionals cfg.desktop-environment.enable (with pkgs; [ - discord + vesktop slack whatsapp-for-linux telegram-desktop diff --git a/modules/emacs/README.org b/modules/emacs/README.org index 1cdce7d..610bdc9 100644 --- a/modules/emacs/README.org +++ b/modules/emacs/README.org @@ -21,7 +21,7 @@ You can also use it as a ~nixosModule~, in order to add additional packages like (scroll-bar-mode -1) (global-display-line-numbers-mode 1) - +(setq default-frame-alist '((fullscreen . maximized))) (setq use-short-answers t) (setq inhibit-startup-message t) @@ -36,7 +36,7 @@ You can also use it as a ~nixosModule~, in order to add additional packages like (use-package modus-themes :ensure t) ;; (use-package kanagawa-theme) -(load-theme 'leuven-dark t) +(load-theme 'modus-operandi-tinted t) (add-hook 'after-make-frame-functions (lambda (frame) @@ -223,7 +223,7 @@ Completion popup system #+end_src ** Vterm #+begin_src emacs-lisp :tangle yes -(use-package eat +(use-package vterm :ensure t) #+end_src ** Compilation |