feat: make foot default conf everywhere and waybar toggleable

This commit is contained in:
Nydragon 2024-09-03 02:01:24 +02:00
parent 16b1723afe
commit 9564130b66
Signed by: nydragon
SSH key fingerprint: SHA256:iQnIC12spf4QjWSbarmkD2No1cLMlu6TWoV7K6cYF5g
9 changed files with 27 additions and 10 deletions

View file

@ -16,6 +16,10 @@
colors = { colors = {
alpha = 0.8; alpha = 0.8;
}; };
scrollback = {
indicator-position = "none";
};
}; };
}; };
} }

View file

@ -93,7 +93,7 @@ lib.mkIf osConfig.programs.hyprland.enable {
"focusonactivate, title:${mkRegexList [ "Firefox" ]}" "focusonactivate, title:${mkRegexList [ "Firefox" ]}"
"workspace 2,initialClass:${mkRegexList [ "firefox" ]}" "workspace 2,initialClass:${mkRegexList [ "firefox" ]}"
"workspace 3,initialClass:${mkRegexList [ "obsidian" ]}" "workspace 3,initialClass:${mkRegexList [ "obsidian" ]}"
"workspace 4,initialClass:${mkRegexList [ "discord" ]}" "workspace 4,initialClass:${mkRegexList [ "steam" ]}"
"workspace 5,initialClass:${mkRegexList [ "lollypop" ]}" "workspace 5,initialClass:${mkRegexList [ "lollypop" ]}"
"fullscreen, class:gamescope" "fullscreen, class:gamescope"
@ -118,6 +118,7 @@ lib.mkIf osConfig.programs.hyprland.enable {
"borderangle, 1, 8, default" "borderangle, 1, 8, default"
"fade, 1, 7, default" "fade, 1, 7, default"
"workspaces, 1, 6, default" "workspaces, 1, 6, default"
"specialWorkspace, 1, 6, default, slidevert"
]; ];
}; };

View file

@ -13,7 +13,7 @@ lib.mkIf config.programs.rofi.enable {
package = pkgs.rofi-wayland.override { inherit plugins; }; package = pkgs.rofi-wayland.override { inherit plugins; };
plugins = [ pkgs.rofi-calc ]; plugins = [ pkgs.rofi-calc ];
theme = "${conf}/themes/rounded-gray-dark.rasi"; theme = "${conf}/themes/rounded-gray-dark.rasi";
terminal = "${pkgs.alacritty}/bin/alacritty"; terminal = "${pkgs.foot}/bin/foot";
extraConfig = { extraConfig = {
modes = [ modes = [
"combi" "combi"

View file

@ -16,7 +16,7 @@
wayland.windowManager.sway = wayland.windowManager.sway =
let let
homeDirectory = config.home.homeDirectory; homeDirectory = config.home.homeDirectory;
term = "${pkgs.alacritty}/bin/alacritty"; term = "${pkgs.foot}/bin/foot";
filemanager = "${pkgs.nautilus}/bin/nautilus"; filemanager = "${pkgs.nautilus}/bin/nautilus";
colors = { colors = {
lavender = "#babbf1"; lavender = "#babbf1";

View file

@ -1,3 +1,4 @@
{ pkgs, ... }:
{ {
position = "top"; position = "top";
layer = "bottom"; layer = "bottom";
@ -125,7 +126,7 @@
network = { network = {
format-wifi = "{essid} ({signalStrength}%) "; format-wifi = "{essid} ({signalStrength}%) ";
on-click = "alacritty -t nmtui -e nmtui"; on-click = "${pkgs.foot}/bin/foot -t nmtui -e nmtui";
}; };
privacy = { privacy = {
icon-size = 18; icon-size = 18;

View file

@ -1,16 +1,20 @@
{ pkgs, ... }: {
pkgs,
lib,
config,
...
}:
let let
toCSS = import ./tocss.nix; toCSS = import ./tocss.nix;
in in
{ lib.mkIf config.programs.waybar.enable {
programs.waybar = { programs.waybar = {
enable = true;
style = toCSS { style = toCSS {
inherit pkgs; inherit pkgs;
file = ./style.scss; file = ./style.scss;
}; };
settings = { settings = {
main = import ./config.nix; main = import ./config.nix { inherit pkgs; };
}; };
}; };
} }

View file

@ -21,6 +21,10 @@
nix-direnv.enable = true; nix-direnv.enable = true;
}; };
programs = {
waybar.enable = true;
};
services.blueman-applet.enable = true; services.blueman-applet.enable = true;
home = { home = {
@ -48,11 +52,12 @@
varia varia
signal-desktop signal-desktop
calibre calibre
alacritty
tagger tagger
soundconverter soundconverter
foliate foliate
kid3 kid3
pulseview
prismlauncher
# proprietary # proprietary
obsidian obsidian

View file

@ -166,7 +166,6 @@
htop htop
nextcloud-client nextcloud-client
kdeconnect kdeconnect
alacritty
eza eza
bat bat
glib glib

View file

@ -28,6 +28,7 @@
}; };
programs = { programs = {
waybar.enable = true;
rofi.enable = true; rofi.enable = true;
}; };
home = { home = {
@ -50,6 +51,8 @@
varia varia
signal-desktop signal-desktop
calibre calibre
pulseview
foot
# Proprietary # Proprietary
postman postman