Use milou theme

nvim: use milou theme

starship: update to milou scheme

fish: update to milou scheme

kitty: update to milou theme

starship: increase contrast in git modules

fzf: update to milou theme

nvim/lazy: update milou theme

fish/fzf.fish: use patdiff

.config/nvim/init.lua

@@ -7,4 +7,4 @@ require("_lazy")
 require("lsp.haskell")
 require("lsp.rust")
 
-vim.cmd.colorscheme("curry")
+vim.cmd.colorscheme("milou")

.config/nvim/lazy-lock.json

@@ -7,7 +7,6 @@
   "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
   "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "curry.nvim": { "branch": "mistress", "commit": "2c20e5dd43af134a6e18e21ba53f1c0830abe4fc" },
   "fidget.nvim": { "branch": "main", "commit": "3f5475949679953af6d78654db29b944fa826e6a" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" },
@@ -16,6 +15,7 @@
   "lazy.nvim": { "branch": "main", "commit": "59334064f8604ca073791c25dcc5c9698865406e" },
   "lazydev.nvim": { "branch": "main", "commit": "258d2a5ef4a3e3d6d9ba9da72c9725c53e9afcbd" },
   "leap.nvim": { "branch": "main", "commit": "07304103f6bd923004fdef9262d9a4d7925fb70a" },
+  "milou": { "branch": "haddock", "commit": "4b3ab4976ff53b029f73d039fea016520af813d6" },
   "no-neck-pain.nvim": { "branch": "main", "commit": "ecc584150f5c8a2a82f2e1d43201df0f65c63d0e" },
   "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },

.config/nvim/lua/_lazy.lua

@@ -78,7 +78,8 @@ local plugins = {
     -- Highlight comments
     { "folke/todo-comments.nvim", dependencies = "nvim-lua/plenary.nvim" },
 
-    "leana8959/curry.nvim",
+    -- "leana8959/curry.nvim",
+    "https://git.confusedcompiler.org/leana8959/milou",
 
     --
     -- LSP / DAP

nix/homeModules/common/firefox.nix

@@ -19,7 +19,7 @@ in {
       ];
 
       SearchEngines = {
-        Remove = ["Bing" "DuckDuckGo" "Qwant" "eBay"];
+        Remove = ["Bing" "DuckDuckGo" "Qwant" "eBay" "Perplexity"];
       };
       NoDefaultBookmarks = true;
       DisplayMenuBar = "never";

nix/homeModules/common/fish/default.nix

@@ -10,7 +10,7 @@
   #
   # Script dependencies
   #
-  home.packages = [pkgs.vivid];
+  home.packages = [pkgs.vivid pkgs.patdiff];
   programs = {
     fd.enable = true;
     fzf.enable = true;

nix/homeModules/common/fish/shellInit.fish

@@ -18,34 +18,33 @@ set fish_cursor_visual block
                                 ###############
 # Learn more: https://fishshell.com/docs/current/interactive.html
 begin # scope this in a block to not leak variables everywhere
-    set -l black  \#000000
+    set -l black   "#073642" # .hs-identifier
-    set -l grey   \#a0a1a7
+    set -l grey    "#a0a1a7"
-    set -l cyan   \#0184bc
+    set -l cyan    "#2aa198" # .hs-pragma
-    set -l blue   \#4078f2
+    set -l blue    "#268bd2" # .hs-number
-    set -l purple \#a626a4
+    set -l magenta "#d33682" # .hs-operator
-    set -l green  \#50a14f
+    set -l green   "#859900" # .hs-cpp
-    set -l orange \#e45649
+    set -l orange  "#cb4b16" # .hs-char
-    set -l red    \#ca1243
+    set -l red     "#af005f" # .hs-special
-    set -l brown  \#986801
+    set -l purple  "#5f5faf" # .hs-type
-    set -l gold   \#c18401
+    set -l visual  "#dbcba3"
-    set -l accent \#645199
+    set -l cursor  "#f0e5c9"
-    set -l visual \#d0d0d0
 
     # General
     set fish_color_normal $black                     # default color
-    set fish_color_command $blue                     # commands like echo
+    set fish_color_command                           # commands like echo
-    set fish_color_keyword $purple                   # keywords like if - this falls back on the command color if unset
+    set fish_color_keyword $red                      # keywords like if - this falls back on the command color if unset
-    set fish_color_quote $green                      # quoted text like "abc"
+    set fish_color_quote $orange                     # quoted text like "abc"
-    set fish_color_redirection $gold                 # IO redirections like >/dev/null
+    set fish_color_redirection $magenta              # IO redirections like >/dev/null
-    set fish_color_end $black --bold                 # process separators like ; and &
+    set fish_color_end $magenta --bold               # process separators like ; and &
-    set fish_color_error $black                      # syntax errors
+    set fish_color_error $grey                       # syntax errors
-    set fish_color_param $red                        # ordinary command parameters
+    set fish_color_param $black                      # ordinary command parameters
     set fish_color_valid_path --italics              # parameters that are filenames (if the file exists)
-    set fish_color_option $cyan                      # options starting with “-”, up to the first “--” parameter
+    set fish_color_option                            # options starting with “-”, up to the first “--” parameter
     set fish_color_comment $grey                     # comments like ‘# important’
     set fish_color_selection --background=$visual    # selected text in vi visual mode
-    set fish_color_operator $orange                  # parameter expansion operators like * and ~
+    set fish_color_operator $magenta                 # parameter expansion operators like * and ~
-    set fish_color_escape $purple                    # character escapes like \n and \x70
+    set fish_color_escape $orange                    # character escapes like \n and \x70
     set fish_color_autosuggestion $grey              # autosuggestions (the proposed rest of a command)
     set fish_color_cwd $black                        # The current working directory in the default prompt
     set fish_color_cwd_root $red                     # The current working directory in the default prompt for the root user
@@ -53,19 +52,19 @@ begin # scope this in a block to not leak variables everywhere
     set fish_color_host $black                       # The hostname in the default prompt
     set fish_color_host_remote $red                  # the hostname in the default prompt for remote sessions (like ssh)
     set fish_color_status $red                       # the last command’s nonzero exit code in the default prompt
-    set fish_color_cancel $accent --reverse          # the ‘^C’ indicator on a canceled command
+    set fish_color_cancel $cyan --reverse            # the ‘^C’ indicator on a canceled command
-    set fish_color_search_match --background $visual # history search matches and selected pager items (background only)
+    set fish_color_search_match --background=$cursor # history search matches and selected pager items (background only)
 
     # Pager
-    set fish_pager_color_progress --reverse $cyan   # the progress bar at the bottom left corner
+    set fish_pager_color_progress --reverse                        # the progress bar at the bottom left corner
-    set fish_pager_color_background $black          # the background color of a line
+    set fish_pager_color_background                                # the background color of a line
-    set fish_pager_color_prefix $black              # the prefix string, i.e. the string that is to be completed
+    set fish_pager_color_prefix $black                             # the prefix string, i.e. the string that is to be completed
-    set fish_pager_color_completion $grey           # the completion itself, i.e. the proposed rest of the string
+    set fish_pager_color_completion $grey                          # the completion itself, i.e. the proposed rest of the string
-    set fish_pager_color_description $grey          # the completion description
+    set fish_pager_color_description $grey                         # the completion description
-    set fish_pager_color_selected_background $black # background of the selected completion
+    set fish_pager_color_selected_background --background=$cursor  # background of the selected completion
-    set fish_pager_color_selected_prefix            # prefix of the selected completion
+    set fish_pager_color_selected_prefix $black                    # prefix of the selected completion
-    set fish_pager_color_selected_completion $red   # suffix of the selected completion
+    set fish_pager_color_selected_completion $black                # suffix of the selected completion
-    set fish_pager_color_selected_description $gold # description of the selected completion
+    set fish_pager_color_selected_description $black               # description of the selected completion
 
     # # Alternating colors
     # set fish_pager_color_secondary_background --background=$tinted_bg # background of every second unselected completion
@@ -81,8 +80,9 @@ end
 set -x fzf_preview_file_cmd 'cat -n'
 # fzf-fish search hidden files
 set -x fzf_fd_opts --hidden --exclude=.git
+set -x fzf_diff_highlighter patdiff
 
 # fd uses LS_COLORS
-set -x LS_COLORS (vivid -m 24-bit generate one-light)
+set -x LS_COLORS (vivid -m 24-bit generate solarized-light) # similar to milou
 
 set -g sponge_purge_only_on_exit true

nix/homeModules/common/fzf.nix

@@ -3,10 +3,11 @@
     "--cycle"
     "--border=none"
     "--preview-window=wrap"
-    "--color=fg:#000000,bg:#eeeeee,hl:#ca1243"
+    # TODO: This makes the unmatched harder to read
-    "--color=fg+:#000000,bg+:#d0d0d0,hl+:#ca1243"
+    "--color=fg:#a0a1a7,bg:#fdf6e3,hl:#073642"
-    "--color=info:#0184bc,prompt:#645199,pointer:#645199"
+    "--color=fg+:#a0a1a7,bg+:#f0e5c9,hl+:#073642"
-    "--color=marker:#0184bc,spinner:#645199,header:#645199"
+    "--color=info:#268bd2,prompt:#5f5faf,pointer:#073642"
-    "--color=gutter:#eeeeee"
+    "--color=marker:#268bd2,spinner:#5f5faf,header:#073642"
+    "--color=gutter:#eeeadd"
   ];
 }

nix/homeModules/common/kitty.nix

@@ -14,7 +14,7 @@ in {
     programs.kitty = lib.mkIf cfg.enable {
       font.name = "family=\"Iosevka NFM\"";
 
-      settings = {
+      settings = rec {
         # Make text thicker
         text_composition_strategy = lib.mkIf pkgs.stdenv.isLinux "2.8 0";
 
@@ -32,28 +32,28 @@ in {
         cursor_stop_blinking_after = 15; # always blink
 
         # theme
-        background = "#ffffff";
+        background = "#fdf6e3";
-        foreground = "#000000";
+        foreground = "#073642";
         cursor = "#000000";
         cursor_text_color = "#ffffff";
-        selection_background = "#bbbbbb";
+        selection_foreground = foreground;
-        color0 = "#000000";
+        selection_background = "#dbcba3";
+        color0 = "#073642";
         color8 = "#4d4d4d";
-        color1 = "#ca1243";
+        color1 = "#af005f";
-        color9 = "#e61955";
+        color9 = "#d33682";
-        color2 = "#50a14f";
+        color2 = "#859900";
-        color10 = "#67c761";
+        color10 = "#29a350";
-        color3 = "#e5bf6d";
+        color3 = "#ba9b23";
-        color11 = "#ffdf84";
+        color11 = "#d6b429";
-        color4 = "#4078f2";
+        color4 = "#268bd2";
-        color12 = "#6296ff";
+        color12 = "#469edd";
-        color5 = "#950095";
+        color5 = "#5f5faf";
-        color13 = "#b000b0";
+        color13 = "#6060d1";
-        color6 = "#0184bc";
+        color6 = "#2aa198";
-        color14 = "#00a6e6";
+        color14 = "#4bccc1"; # a platupus? perry the platupus?
-        color7 = "#bbbbbb";
+        color7 = "#a0a1a7";
-        color15 = "#ffffff";
+        color15 = "#eeeadd";
-        selection_foreground = "#f8f8f8";
       };
     };
   };

nix/homeModules/common/starship/starship.toml

@@ -14,32 +14,29 @@ $git_state$git_branch$git_commit$git_status
 
 
 #################### Theme ####################
-palette = 'curry'
+palette = 'milou'
 
-[palettes.curry]
+[palettes.milou]
-accent = '#645199'       # Haskell purple
+black = "#073642" # .hs-identifier
-accent_trans = '#efebfc'
-black = '#24292f'
 grey = '#a0a1a7'
-cyan = '#1b7c83'
+cyan = "#2aa198" # .hs-pragma
-blue = '#0969da'
+blue = "#268bd2" # .hs-number
-purple = '#8250df'
+magenta = "#d33682" # .hs-operator
-green = '#116329'
+green = "#859900" # .hs-cpp
-orange = '#e45649'
+orange = "#cb4b16" # .hs-char
-red = '#ca1243'
+red = "#af005f" # .hs-special
-brown = '#986801'
+purple = "#5f5faf" # .hs-type
-gold = '#c18401'
+cursor = "#f0e5c9"
-tinted_bg = '#eeeeee'
 #################### Theme ####################
 
 
 [hostname]
 ssh_only = true
-style = 'bold orange'
+style = 'bold'
 format = '[$hostname]($style):'
 
 [username]
-style_root = 'bold orange'
+style_root = 'bold'
 style_user = 'grey'
 format = '( [\($user\)]($style))'
 
@@ -54,7 +51,7 @@ vimcmd_visual_symbol = '[V](grey)'      # Visual
 [directory]
 truncation_length = 4
 truncate_to_repo = false
-style = 'fg:black bg:accent_trans'
+style = 'fg:black bg:cursor'
 format = '[$path]($style)( [$read_only]($read_only_style))'
 read_only = ''
 read_only_style = 'red'
@@ -107,13 +104,13 @@ style = "bold #5e5086"
 [time]
 disabled = false
 format = '[$time]($style) '
-style = "brown"
+style = "blue"
 
 #################### Right hand side ####################
 [cmd_duration]
 min_time = 60_000
 show_milliseconds = true
-style = 'brown'
+style = 'blue'
 format = '([$duration]($style) )'
 
 [git_state]
@@ -122,17 +119,17 @@ format = '\([$state( $progress_current/$progress_total)]($style)\) '
 
 [git_branch]
 symbol = ''
-style = 'grey'
+style = 'black'
 format = '[$symbol$branch(:$remote_branch)]($style)'
 
 [git_commit]
-style = 'accent'
+style = 'cyan'
-format = '[\(](grey)[$hash$tag]($style)[\)](grey)'
+format = '[\(](black)[$hash$tag]($style)[\)](black)'
 
 [git_status]
 ahead = '⇡$count'
 behind = '⇣$count'
 diverged = '⇕⇡$ahead_count⇣$behind_count'
-style = 'bold accent'
+style = 'bold cyan'
-format = '([\[](grey)[$all_status$ahead_behind]($style)[\]](grey))'
+format = '([\[](black)[$all_status$ahead_behind]($style)[\]](black))'
 #################### Right hand side ####################

nix/nixosModules/common/sudo-conf.nix

@@ -1,5 +1,8 @@
-{
+{pkgs, ...}: {
-  security.sudo.extraConfig = ''
+  security.doas.enable = true;
-    Defaults        lecture = always
+  security.sudo.enable = false;
-  '';
+
+  environment.systemPackages = [
+    pkgs.doas-sudo-shim
+  ];
 }

nix/packages/by-name/ruler/package.nix

@@ -12,8 +12,8 @@
       domain = "git.confusedcompiler.org";
       owner = "leana8959";
       repo = "ruler";
-      rev = "adf8f711b014cba4b73da0132c2be944ba20ba0b";
+      rev = "4c374125ec9f566638e64671f468e598b33730e6";
-      hash = "sha256-sHJEgwEAMERhOCPY16Lsirj1bSUfEUpwNnPmHfg+/8Q=";
+      hash = "sha256-n5xNC31t5S+h5WoT6iaJV2JxomxKLqz6gGF0KrM8YjQ=";
     })
     {};