foot, starship, fixed waybar

This commit is contained in:
Aria Nolan 2023-11-01 00:06:04 -04:00
parent 662b00afcd
commit ab7ac580be
9 changed files with 91 additions and 42 deletions

View file

@ -55,6 +55,7 @@
# Enable sound.
sound.enable = true;
hardware.pulseaudio.enable = true;
services.pipewire.enable = true;
xdg.portal = {

View file

@ -13,8 +13,6 @@
"$HOME/.dotnet"
];
shellAliases = {
# cat = "bat";
# please = "sudo !!";
gaa = "git add .";
gcm = "git commit -m";
gpom = "git push -u origin main";
@ -24,18 +22,20 @@
comic-mono
maple-mono
jetbrains-mono
(nerdfonts.override {fonts = ["FiraMono"]; } )
fira-code
mononoki
(nerdfonts.override {fonts = ["FiraCode"]; } )
gnupg
pandoc
jdk20
pdftk
git
# git-crypt
# (writeShellScriptBin "hs-way" ''
# home-manager --flake $HOME/nix-config/#tacocat build
# # GEN=$(home-manager generations | head -1 | awk '{print $NF}')
# "$HOME/nix-config/result/specialisation/wayland/activate"
# '')
lua
pamixer
networkmanagerapplet
htop
p7zip
gitui
];
};

View file

@ -1,9 +1,5 @@
{pkgs, ...}:
{
services.network-manager-applet.enable = true;
services.blueman-applet.enable = true;
services.nextcloud-client = {
enable = true;
startInBackground = true;
@ -24,7 +20,7 @@
};
settings = {
global = {
geometry = "1870x5-25+45";
# geometry = "1870x5-25+45";
width = 350;
separator_height = 5;
padding = 24;

View file

@ -1,6 +1,33 @@
{lib, ...}:
{
imports = [
./zsh.nix
./bash.nix
];
programs.starship = {
enable = true;
enableBashIntegration = true;
enableZshIntegration = true;
settings = {
add_newline = false;
format = lib.concatStrings [
# "$line_break"
"$shlvl"
"$directory"
"$git_branch"
"$git_commit"
"$git_state"
"$git_status"
"$package"
"$status"
"$character"
];
scan_timeout = 10;
# character = {
# success_symbol = "[%](bold green)";
# error_symbol = "[%](bold red)";
# };
};
};
}

View file

@ -19,16 +19,16 @@
};
historySubstringSearch.enable = true;
plugins = [
{
name = "powerlevel10k";
file = "powerlevel10k.zsh-theme";
src = pkgs.fetchFromGitHub {
owner = "romkatv";
repo = "powerlevel10k";
rev = "v1.19.0";
sha256 = "+hzjSbbrXr0w1rGHm6m2oZ6pfmD6UUDBfPd7uMg5l5c=";
};
}
# {
# name = "powerlevel10k";
# file = "powerlevel10k.zsh-theme";
# src = pkgs.fetchFromGitHub {
# owner = "romkatv";
# repo = "powerlevel10k";
# rev = "v1.19.0";
# sha256 = "+hzjSbbrXr0w1rGHm6m2oZ6pfmD6UUDBfPd7uMg5l5c=";
# };
# }
{
name = "z.lua";
@ -50,12 +50,12 @@
};
}
];
initExtra = ''
source $HOME/.config/zsh/.p10k.zsh
'';
localVariables = {
POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD = true;
# initExtra = ''
# source $HOME/.config/zsh/.p10k.zsh
# '';
# localVariables = {
# POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD = true;
# };
};
};
home.file.".config/zsh/.p10k.zsh".source = ./.p10k.zsh;
# home.file.".config/zsh/.p10k.zsh".source = ./.p10k.zsh;
}

View file

@ -2,6 +2,7 @@
{
imports = [
./waybar
./foot.nix
];
xdg.configFile."river" = {

View file

@ -0,0 +1,34 @@
{
programs.foot = {
enable = true;
server.enable = true;
settings = {
main = {
shell = "/usr/bin/env zsh";
font = "Mononoki:size=14,FiraCode Nerd Font:size=14";
term = "xterm-256color";
};
colors = {
background = "232136";
foreground = "e0def4";
regular0 = "393552";
regular1 = "eb6f92";
regular2 = "3e8fb0";
regular3 = "f6c177";
regular4 = "9ccfd8";
regular5 = "c4a7e7";
regular6 = "ea9a97";
regular7 = "e0def4";
bright0 = "393552";
bright1 = "eb6f92";
bright2 = "3e8fb0";
bright3 = "f6c177";
bright4 = "9ccfd8";
bright5 = "c4a7e7";
bright6 = "ea9a97";
bright7 = "e0def4";
alpha = "0.9";
};
};
};
}

View file

@ -7,7 +7,7 @@
riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND _DISPLAY XDG_CURRENT_DESKTOP=river"
riverctl map normal Super+Shift Return spawn 'kitty --single-instance'
riverctl map normal Super+Shift Return spawn 'foot'
riverctl map normal Super D spawn 'rofi -show drun'
# firefox

View file

@ -124,15 +124,6 @@
background: @mode;
}
/* Workspaces stuff */
#workspaces button {
/*font-weight: bold;*/
padding-left: 4pt;
padding-right: 4pt;
color: @white;
background: @unfocused;
}
/* Inactive (on unfocused output) */
#workspaces button.visible {
color: @white;
@ -188,7 +179,6 @@
#pulseaudio {
background: @sound;
color: @black;
font-family: FiraMono Nerd Font;
}
#network {