hosts/hebesu/default.nix

@@ -6,14 +6,6 @@
 
   networking.hostName = "hebesu";
   services.tzupdate.enable = true;
-  services.power-profiles-daemon.enable = false;
-  services.auto-cpufreq.enable = true;
-  services.auto-cpufreq.settings = {
-    charger = {
-      governor = "powersave";
-      turbo = "auto";
-    };
-  };
   services.xserver = {
     videoDrivers = ["modesetting"];
     deviceSection = ''
@@ -26,15 +18,4 @@
     isNormalUser = true;
     extraGroups = ["wheel" "podman"];
   };
-  networking.firewall = {
-    logReversePathDrops = true;
-    extraCommands = ''
-      ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --sport 51820 -j RETURN
-      ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN
-    '';
-    extraStopCommands = ''
-      ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --sport 51820 -j RETURN || true
-      ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN || true
-    '';
-  };
 }

user/config/bash/custom

@@ -24,7 +24,7 @@ _load history
 _load aliases
 # set xdg env vars to keep home directory clean
 _load xdg
-_load func
+_load show
 
 if _exists fzf; then
     export FZF_DEFAULT_OPTS="--bind=ctrl-u:page-up,ctrl-d:page-down"
@@ -51,9 +51,9 @@ if [[ "$TERM" != "linux" ]]; then
             printf "\e]0;%s | %s | %s\a" "$(dirs +0)" "$@" "$(date +"%H:%M:%S")"
         fi
     }
+    _exists starship && eval "$(starship init bash)"
     # set window title after running command
     trap "$(trap -p DEBUG | awk -F"'" '{print $2 ";"}')_set_win_title \"\${BASH_COMMAND}\"" DEBUG
-    _exists starship && eval "$(starship init bash)"
 else
     # [username pwd] green $ reset
     PS1="[\u \W] \[\e[32;1m\]\$\[\e[0m\] "

user/config/bash/show

@@ -40,21 +40,3 @@ function rl() {
   done
   [[ -e "$l" ]] && echo "$l" || echo "~nonexistent~"
 }
-function tmpedit() {
-  if [[ "$#" -ne 1 ]]; then
-    echo "usage: tmpedit <file>" >&2
-    return 1
-  fi
-  local real="$(realpath "$1")"
-  if [[ ! -f "$real" ]]; then
-    echo "not found"
-    return 2
-  fi
-  if [[ ! "$real" =~ /nix/store/* ]]; then
-    echo "not nix"
-    return 3
-  fi
-  cp --remove-destination "$real" "$1"
-  chmod +w "$1"
-  $EDITOR "$1"
-}

user/config/default.nix

@@ -10,7 +10,6 @@ in {
     ./kde
     ./tmux
     ./nvim
-    ./starship
   ];
 
   fonts.fontconfig.enable = false;
@@ -34,5 +33,6 @@ in {
   xdg.configFile.python.source = ./python;
   xdg.configFile.qt5ct.source = ./qt5ct;
   xdg.configFile.readline.source = ./readline;
+  xdg.configFile."starship.toml".source = ./starship.toml;
   xdg.configFile.sx.source = ln "sx";
 }

user/config/nvim/default.nix

@@ -24,7 +24,6 @@
     extraPackages = with pkgs; [
       basedpyright
       clang-tools
-      nixd
     ];
     withRuby = false;
   };

user/config/nvim/lua/u/lsp.lua

@@ -14,4 +14,3 @@ lspconfig.clangd.setup({
   capabilities=capabilities
 })
 lspconfig.basedpyright.setup{}
-lspconfig.nixd.setup{}

user/config/starship.toml

@@ -0,0 +1,46 @@
+format = """
+[ ](bg:#E34F7C)\
+$username\
+$directory\
+$git_branch\
+$git_commit\
+$git_state\
+$git_metrics\
+$git_status\
+$cmd_duration\
+$line_break\
+$jobs\
+$shlvl\
+$status\
+$nix_shell\
+$character"""
+
+[status]
+disabled = false
+symbol = "x"
+
+[character]
+success_symbol = '[\$](bold green)'
+error_symbol = '[\$](bold red)'
+
+[fill]
+symbol = " "
+
+[username]
+show_always = true
+format = "[$user ]($style inverted)[ ]($style bg:#443f59)"
+style_user = "#E34F7C"
+style_root = "#4571a2 bg:red"
+
+[directory]
+format = "[$path [$read_only]($style bg:red inverted)]($style bg:white inverted)[ ]($style)"
+style = "#443f59"
+read_only =" "
+
+[shlvl]
+disabled = false
+symbol = "#"
+
+[nix_shell]
+format = "[$symbol]($style) "
+symbol = "*"

user/config/starship/default.nix

@@ -1,62 +0,0 @@
-{config, lib, ...}: {
-  programs.starship = {
-    enable = true;
-    settings = lib.mkDefault {
-      format = lib.concatStrings [
-        "$username"
-        "$hostname"
-        "$directory"
-        "([\\[ $git_branch"
-        "$git_commit"
-        "$git_state"
-        "$git_metrics"
-        "$git_status \\]](bold) )"
-        "$cmd_duration"
-        "$line_break"
-        "$jobs"
-        "$shlvl"
-        "$status"
-        "$nix_shell"
-        "$character"
-      ];
-      palettes = {
-        default = {
-          c1 = "#e34f7c"; # red
-          c2 = "#4571a2"; # blue
-          c3 = "#443f59"; # purple
-        };
-      };
-      palette = "default";
-      status = {
-        disabled = false;
-        symbol = "x";
-      };
-      character = {
-        success_symbol = "[\\$](bold green)";
-        error_symbol = "[\\$](bold red)";
-      };
-      username = {
-        show_always = true;
-        format = "[ $user ](c1 inverted)";
-      };
-      directory = {
-        format = "[ $path[$read_only](red bg:c3) ](white bg:c3) ";
-        read_only = " [ro]";
-      };
-      shlvl = {
-        disabled = false;
-        symbol = "#";
-      };
-      nix_shell = {
-        format = "[$symbol]($style) ";
-        symbol = "*";
-      };
-      git_branch.format = "[$branch(:$remote_branch)]($style) ";
-      git_status.format = "(| [$all_status$ahead_behind]($style))";
-      git_metrics.format = "(| [$added]($added_style)([ $deleted]($deleted_style)) )";
-      git_metrics.disabled = false;
-      cmd_duration.format = "[\\[$duration\\]]($style) ";
-      hostname.format = "[ @$hostname ](bg:c2)";
-    };
-  };
-}