From 354afc1754f0616cd086b1a6f607022155a1f9e3 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 16 May 2023 20:09:27 -0700 Subject: profiles/workstation: stop using dark mode + prezto --- home/profiles/gtk.nix | 21 -------------- home/profiles/home.nix | 2 +- home/profiles/sway.nix | 2 +- home/profiles/tmux.nix | 20 ------------- home/profiles/workstation.nix | 17 ++++++++++-- home/profiles/zsh.nix | 51 ++++++++++++++++++++++++++++++++++ home/profiles/zsh/completion-style.zsh | 42 ---------------------------- home/profiles/zsh/default.nix | 51 ---------------------------------- home/profiles/zsh/new-go-project.zsh | 19 ------------- home/profiles/zsh/options.zsh | 27 ------------------ home/profiles/zsh/prompt.zsh | 17 ------------ home/profiles/zsh/tmux.zsh | 9 ------ 12 files changed, 68 insertions(+), 210 deletions(-) delete mode 100644 home/profiles/tmux.nix create mode 100644 home/profiles/zsh.nix delete mode 100644 home/profiles/zsh/completion-style.zsh delete mode 100644 home/profiles/zsh/default.nix delete mode 100644 home/profiles/zsh/new-go-project.zsh delete mode 100644 home/profiles/zsh/options.zsh delete mode 100644 home/profiles/zsh/prompt.zsh delete mode 100644 home/profiles/zsh/tmux.zsh (limited to 'home/profiles') diff --git a/home/profiles/gtk.nix b/home/profiles/gtk.nix index e1615b8..0be2475 100644 --- a/home/profiles/gtk.nix +++ b/home/profiles/gtk.nix @@ -2,30 +2,9 @@ { gtk = { enable = true; - - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme; - }; - - theme = { - name = "palenight"; - package = pkgs.palenight-theme; - }; - cursorTheme = { name = "Numix-Cursor"; package = pkgs.numix-cursor-theme; }; - - gtk3.extraConfig = { - gtk-application-prefer-dark-theme = true; - }; - - gtk4.extraConfig = { - gtk-application-prefer-dark-theme = true; - }; }; - - home.sessionVariables.GTK_THEME = "palenight"; } diff --git a/home/profiles/home.nix b/home/profiles/home.nix index 1aa90cf..42517b9 100644 --- a/home/profiles/home.nix +++ b/home/profiles/home.nix @@ -3,7 +3,7 @@ imports = [ ./git.nix ./ssh.nix - ./zsh + ./zsh.nix ]; home.packages = with pkgs; [ diff --git a/home/profiles/sway.nix b/home/profiles/sway.nix index 0665556..dc3999c 100644 --- a/home/profiles/sway.nix +++ b/home/profiles/sway.nix @@ -60,7 +60,7 @@ in systemdIntegration = true; config = { # FIXME: this should be a variable - terminal = "alacritty"; + terminal = "kitty"; modifier = modifier; menu = ''${pkgs.wofi}/bin/wofi -S drun -p "app:" -L 10''; bars = [ ]; diff --git a/home/profiles/tmux.nix b/home/profiles/tmux.nix deleted file mode 100644 index 22f8683..0000000 --- a/home/profiles/tmux.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ ... }: -{ - programs.tmux = { - enable = true; - - terminal = "xterm-256color"; - escapeTime = 0; - aggressiveResize = true; - baseIndex = 1; - shortcut = "z"; - clock24 = true; - historyLimit = 50000; # Bigger buffer - - extraConfig = '' - setw -g mouse on - - set-option -g renumber-windows on - ''; - }; -} diff --git a/home/profiles/workstation.nix b/home/profiles/workstation.nix index 60ba6ad..8bca5b1 100644 --- a/home/profiles/workstation.nix +++ b/home/profiles/workstation.nix @@ -30,11 +30,9 @@ let in { imports = [ - ./alacritty.nix ./dev.nix ./emacs.nix ./firefox.nix - ./tmux.nix ./yubikey.nix ./ytdlp.nix ]; @@ -70,6 +68,21 @@ in # masked-emails ]; + programs.kitty = { + enable = true; + font = { + name = "Source Code Pro"; + size = 13; + }; + theme = "Modus Operandi"; + settings = { + tab_bar_edge = "bottom"; + tab_bar_background = "none"; + tab_bar_style = "powerline"; + active_tab_font_style = "bold-italic"; + }; + }; + programs.feh.enable = true; programs.mpv = { enable = true; diff --git a/home/profiles/zsh.nix b/home/profiles/zsh.nix new file mode 100644 index 0000000..3da6baa --- /dev/null +++ b/home/profiles/zsh.nix @@ -0,0 +1,51 @@ +{ config, pkgs, lib, ... }: +{ + home.packages = with pkgs; [ zsh-completions ]; + + programs.zsh = { + enable = true; + dotDir = ".config/zsh"; + + defaultKeymap = "emacs"; + enableCompletion = true; + enableAutosuggestions = true; + + history = { + size = 500000; + save = 500000; + extended = true; + ignoreSpace = true; + ignoreDups = true; + share = true; + # see + # https://github.com/nix-community/home-manager/blob/32a7da69dc53c9eb5ad0675eb7fdc58f7fe35272/modules/programs/zsh.nix#L537 + path = "${config.xdg.dataHome}/zsh/zsh_history"; + }; + + localVariables = { + # Print timing statistics for everything which takes longer than 5 seconds of + # user + system time. + REPORTTIME = 5; + }; + + shellAliases = { + ll = "ls -l --color=auto"; + lt = "ls -ltrh --color=auto"; + la = "ls -ltrha --color=auto"; + pkgsearch = "nix search nixpkgs"; + hms = "home-manager switch --flake ."; + nr = "sudo nixos-rebuild switch --flake ."; + flup = "nix flake update --commit-lock-file"; + dhcp-leasese = "xdg-open http://192.168.6.1:8067/"; + }; + + prezto = { + enable = true; + prompt = { theme = "pure"; }; + pmodules = [ + "prompt" + "git" + ]; + }; + }; +} diff --git a/home/profiles/zsh/completion-style.zsh b/home/profiles/zsh/completion-style.zsh deleted file mode 100644 index 79a4e68..0000000 --- a/home/profiles/zsh/completion-style.zsh +++ /dev/null @@ -1,42 +0,0 @@ -# 'ctrl-x r' will complete the 12 last modified (mtime) files/directories -zle -C newest-files menu-complete _generic -# Use "*newest-files" so that it matches both "newest-files" and -# "load-completion-and-newest-files". -zstyle ':completion:*newest-files:*' completer _files -zstyle ':completion:*newest-files:*' file-patterns '*(omN[1,12])' -zstyle ':completion:*newest-files:*' menu select yes -zstyle ':completion:*newest-files:*' sort false -zstyle ':completion:*newest-files:*' matcher-list 'b:=*' # important - -# colors for zsh file name completion -zmodload zsh/complist -zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} - -# Show a prompt on selection -zstyle ':completion:*' select-prompt '%SScrolling active: current selection at %p%s' - -# Use arrow keys in completion list -zstyle ':completion:*' menu select - -# Group results by category -zstyle ':completion:*' group-name '' - -# Keep directories and files separated -zstyle ':completion:*' list-dirs-first true - -# match uppercase from lowercase -zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' - -# Filename suffixes to ignore during completion (except after rm command) -zstyle ':completion:*:*:(^rm):*:*files' ignored-patterns '*?.old' - -# command for process lists, the local web server details and host completion -# on processes completion complete all user processes -zstyle ':completion:*:processes' command 'ps -au$USER' - -# Completion formatting and messages -zstyle ':completion:*' verbose yes -zstyle ':completion:*:descriptions' format '%B%d%b' -zstyle ':completion:*:messages' format '%d' -zstyle ':completion:*:warnings' format 'No matches for: %d' -zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b' diff --git a/home/profiles/zsh/default.nix b/home/profiles/zsh/default.nix deleted file mode 100644 index 38450ab..0000000 --- a/home/profiles/zsh/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - home.packages = with pkgs; [ zsh-completions ]; - - programs.zsh = { - enable = true; - dotDir = ".config/zsh"; - - enableCompletion = true; - enableAutosuggestions = true; - - history = { - size = 500000; - save = 500000; - extended = false; - ignoreSpace = true; - ignoreDups = true; - share = false; - # see - # https://github.com/nix-community/home-manager/blob/32a7da69dc53c9eb5ad0675eb7fdc58f7fe35272/modules/programs/zsh.nix#L537 - path = "${config.xdg.dataHome}/zsh/zsh_history"; - }; - - localVariables = { - # Print timing statistics for everything which takes longer than 5 seconds of - # user + system time. - REPORTTIME = 5; - }; - - shellAliases = { - ll = "ls -l --color=auto"; - lt = "ls -ltrh --color=auto"; - la = "ls -ltrha --color=auto"; - pkgsearch = "nix search nixpkgs"; - hms = "home-manager switch --flake ."; - nr = "sudo nixos-rebuild switch --flake ."; - flup = "nix flake update --commit-lock-file"; - dhcp-leasese = "xdg-open http://192.168.6.1:8067/"; - }; - - defaultKeymap = "emacs"; - - initExtra = lib.concatMapStrings builtins.readFile [ - ./completion-style.zsh - ./options.zsh - ./prompt.zsh - ./tmux.zsh - ./new-go-project.zsh - ]; - }; -} diff --git a/home/profiles/zsh/new-go-project.zsh b/home/profiles/zsh/new-go-project.zsh deleted file mode 100644 index 0b96a34..0000000 --- a/home/profiles/zsh/new-go-project.zsh +++ /dev/null @@ -1,19 +0,0 @@ -new-go-project() { - local project_name=$1 - - echo "> creating ${project_name}" - cd ~/workspace/ - mkdir $project_name - cd $project_name - - echo "> initializing the git repository" - git init . - - echo "> setting the default template for go projects" - nix flake init -t ~/workspace/world/templates#go - direnv allow - - echo "> creating initial commit, touch your yubikey" - git add . - git commit -m 'initial commit' -} diff --git a/home/profiles/zsh/options.zsh b/home/profiles/zsh/options.zsh deleted file mode 100644 index 6d39bc1..0000000 --- a/home/profiles/zsh/options.zsh +++ /dev/null @@ -1,27 +0,0 @@ -# Show an error when a globbing expansion doesn't find any match -setopt nomatch - -# List on ambiguous completion and Insert first match immediately -setopt autolist menucomplete - -# Use pushd when cd-ing around -setopt autopushd pushdminus pushdsilent - -# Use single quotes in string without the weird escape tricks -setopt rcquotes - -# Single word commands can resume an existing job -setopt autoresume - -# Append commands to history as they are exectuted -setopt inc_append_history_time - -# Remove useless whitespace from commands -setopt hist_reduce_blanks - -# Those options aren't wanted -unsetopt beep extendedglob notify - -# word select works like in bash -autoload -U select-word-style -select-word-style bash diff --git a/home/profiles/zsh/prompt.zsh b/home/profiles/zsh/prompt.zsh deleted file mode 100644 index 8a3efa9..0000000 --- a/home/profiles/zsh/prompt.zsh +++ /dev/null @@ -1,17 +0,0 @@ -setopt prompt_subst - -autoload -Uz vcs_info - -# display the name of the branch -zstyle ':vcs_info:git*' formats " [%b]" -zstyle ':vcs_info:*' enable git - -precmd () { vcs_info } -PROMPT='%m%f:%F{green}%~%f%F{yellow}$vcs_info_msg_0_ %F{reset}' - -# For tramp (emacs). -if [ "$TERM" = "dumb" ]; then - unset PROMPT - PS1='$ ' - unsetopt zle -fi diff --git a/home/profiles/zsh/tmux.zsh b/home/profiles/zsh/tmux.zsh deleted file mode 100644 index 97944f5..0000000 --- a/home/profiles/zsh/tmux.zsh +++ /dev/null @@ -1,9 +0,0 @@ -# If we're not in an ssh connection, and tmux is installed, and we're -# not already in a tmux session, attach to the session named -# 'default', and if the session does not exist, start one named -# 'default' -if [ -z "$SSH_CONNECTION" ]; then - if command -v tmux &> /dev/null && [ -z "$TMUX" ]; then - tmux attach -t default || tmux new -s default - fi -fi -- cgit 1.4.1