diff --git a/extras/dev.nix b/extras/dev.nix index a0820ac..58f1a1c 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -4,6 +4,7 @@ # freecad # gh # vulkan-loader + direnv qFlipper hyperfine jq diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 73c4a05..a299d09 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -41,6 +41,8 @@ services.fwupd.enable = true; services.fprintd.enable = true; + systemd.services."backlight@backlight:amdgpu_bl2".enable = false; + # TODO investigate tradeoffs # services.beesd.filesystems = { # root = { diff --git a/users/tao/HOME.nix b/users/tao/HOME.nix index 5603d1c..64a1912 100644 --- a/users/tao/HOME.nix +++ b/users/tao/HOME.nix @@ -38,6 +38,12 @@ in { }; }; + direnv = { + enable = true; + enableNushellIntegration = true; + nix-direnv.enable = true; + }; + jujutsu = { enable = true; settings = { diff --git a/users/tao/helix.nix b/users/tao/helix.nix index 365a430..5b21b79 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -5,7 +5,7 @@ }: { programs.helix = { settings = { - theme = "dracula"; + theme = "gruvbox_dark_hard"; editor = { # rainbow-brackets = true; line-number = "relative"; diff --git a/users/tao/starship.toml b/users/tao/starship.toml index 802f5e6..5aa7b25 100644 --- a/users/tao/starship.toml +++ b/users/tao/starship.toml @@ -1,152 +1,120 @@ -command_timeout = 1000 +"$schema" = 'https://starship.rs/config-schema.json' format = """ -[](#9A348E)\ +[](color_orange)\ $username\ -[](bg:#DA627D fg:#9A348E)\ +[](bg:color_yellow fg:color_orange)\ $directory\ -[](fg:#DA627D bg:#FCA17D)\ -$git_branch\ -$git_status\ -[](fg:#FCA17D bg:#86BBD8)\ +[](fg:color_yellow bg:color_aqua)\ +[](fg:color_aqua bg:color_blue)\ $c\ -$elixir\ -$elm\ -$golang\ -$gradle\ -$haskell\ -$java\ -$julia\ -$nodejs\ -$nim\ $rust\ -$scala\ -[](fg:#86BBD8 bg:#06969A)\ +$golang\ +$nodejs\ +$java\ +$kotlin\ +$python\ +[](fg:color_blue bg:color_bg3)\ $docker_context\ -[](fg:#06969A bg:#33658A)\ -[ ](fg:#33658A)\ -$nix_shell\ -""" +$conda\ +[](fg:color_bg3 bg:color_bg1)\ +$time\ +[ ](fg:color_bg1)\ +$line_break$character""" -# Disable the blank line at the start of the prompt -# add_newline = false +palette = 'gruvbox_dark' -# You can also replace your username with a neat symbol like  or disable this -# and use the os module below -[username] -show_always = true -style_user = "bg:#9A348E" -style_root = "bg:#9A348E" -format = '[$user ]($style)' -disabled = false +[palettes.gruvbox_dark] +color_fg0 = '#fbf1c7' +color_bg1 = '#3c3836' +color_bg3 = '#665c54' +color_blue = '#458588' +color_aqua = '#689d6a' +color_green = '#98971a' +color_orange = '#d65d0e' +color_purple = '#b16286' +color_red = '#cc241d' +color_yellow = '#d79921' -# An alternative to the username module which displays a symbol that -# represents the current operating system -[os] -style = "bg:#9A348E" -disabled = true # Disabled by default +# [username] +# show_always = true +# style_user = "bg:color_orange fg:color_fg0" +# style_root = "bg:color_orange fg:color_fg0" +# format = '[ $user ]($style)' [directory] -style = "bg:#DA627D" +style = "fg:color_fg0 bg:color_yellow" format = "[ $path ]($style)" truncation_length = 3 truncation_symbol = "…/" -# Here is how you can shorten some long paths by text replacement -# similar to mapped_locations in Oh My Posh: [directory.substitutions] -"Documents" = " " -"Downloads" = " " -"Music" = " " -"Pictures" = " " -# Keep in mind that the order matters. For example: -# "Important Documents" = "  " -# will not be replaced, because "Documents" was already substituted before. -# So either put "Important Documents" before "Documents" or use the substituted version: -# "Important  " = "  " +"documents" = "󰈙 " +"downloads" = " " +"music" = "󰝚 " +"pictures" = " " -[c] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' +# [git_branch] +# symbol = "" +# style = "bg:color_aqua" +# format = '[[ $symbol $branch ](fg:color_fg0 bg:color_aqua)]($style)' -[docker_context] -symbol = " " -style = "bg:#06969A" -format = '[ $symbol $context ]($style) $path' - -[elixir] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[elm] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[git_branch] -symbol = "" -style = "bg:#FCA17D" -format = '[ $symbol $branch ]($style)' - -[git_status] -style = "bg:#FCA17D" -format = '[$all_status$ahead_behind ]($style)' - -[golang] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[gradle] -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[haskell] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[java] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' - -[julia] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' +# [git_status] +# style = "bg:color_aqua" +# format = '[[($all_status$ahead_behind )](fg:color_fg0 bg:color_aqua)]($style)' [nodejs] symbol = "" -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' -[nim] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' +[c] +symbol = " " +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' [rust] symbol = "" -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' -[scala] -symbol = " " -style = "bg:#86BBD8" -format = '[ $symbol ($version) ]($style)' +[golang] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[java] +symbol = " " +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[kotlin] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' + +[python] +symbol = "" +style = "bg:color_blue" +format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' [time] disabled = false -time_format = "%R" # Hour:Minute Format -style = "bg:#33658A" -format = '[ ♥ $time ]($style)' +time_format = "%R" +style = "bg:color_bg1" +format = '[[  $time ](fg:color_fg0 bg:color_bg1)]($style)' -[nix_shell] +[line_break] disabled = false -impure_msg = '[impure shell](bold red)' -pure_msg = '[pure shell](bold green)' -unknown_msg = '[unknown shell](bold yellow)' -format = 'via [☃️ $state( \($name\))](bold blue)' + +[character] +disabled = false +success_symbol = '[](bold fg:color_green)' +error_symbol = '[](bold fg:color_red)' +vimcmd_symbol = '[](bold fg:color_green)' +vimcmd_replace_one_symbol = '[](bold fg:color_purple)' +vimcmd_replace_symbol = '[](bold fg:color_purple)' +vimcmd_visual_symbol = '[](bold fg:color_yellow)' + +[[battery.display]] +thershold = 42 diff --git a/users/tao/wezterm.lua b/users/tao/wezterm.lua index c05878d..a0786c0 100644 --- a/users/tao/wezterm.lua +++ b/users/tao/wezterm.lua @@ -1,7 +1,7 @@ local wezterm = require 'wezterm'; local config = { font = wezterm.font 'FiraCode Nerd Font', - color_scheme = 'Dracula', + color_scheme = 'GruvboxDarkHard', warn_about_missing_glyphs = false, check_for_updates = false, hide_tab_bar_if_only_one_tab = true,