kdb424/nixFlake
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix: Cleanup

Browse source
This commit is contained in:
Kyle Brown 2023-12-02 14:57:20 -08:00
parent a8c9073d29
commit e52fbce169
5 changed files with 168 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1 +1,2 @@
result result
.direnv

2
common/style/stylix.nix
View file

@ -37,7 +37,7 @@
}; };
emoji = { emoji = {
package = pkgs.noto-fonts-emoji; package = pkgs.noto-fonts-color-emoji;
name = "Noto Color Emoji"; name = "Noto Color Emoji";
}; };
}; };

10
flake.nix
View file

@ -122,10 +122,12 @@
homeConfigurations = { homeConfigurations = {
"kdb424@cubert" = mkHome [./home-manager/machines/cubert.nix] nixpkgs.legacyPackages.aarch64-darwin; "kdb424@cubert" = mkHome [./home-manager/machines/cubert.nix] nixpkgs.legacyPackages.aarch64-darwin;
"kdb424@farnsworth" = mkHome [./home-manager/machines/headless.nix] nixpkgs.legacyPackages.aarch64-linux; "kdb424@farnsworth" = mkHome [./home-manager/machines/headless.nix] nixpkgs.legacyPackages.aarch64-linux;
"kdb424@zapp" = mkHome [ "kdb424@zapp" =
stylix.homeManagerModules.stylix mkHome [
./home-manager/machines/headless.nix stylix.homeManagerModules.stylix
] nixpkgs.legacyPackages.x86_64-linux; ./home-manager/machines/headless.nix
]
nixpkgs.legacyPackages.x86_64-linux;
}; };
}; };

2
home-manager/modules/hyprland.nix
View file

@ -39,7 +39,7 @@
general = { general = {
gaps_in = 5; gaps_in = 5;
gaps_out = 16; gaps_out = 8;
resize_on_border = true; resize_on_border = true;
hover_icon_on_border = false; hover_icon_on_border = false;
layout = "master"; layout = "master";

256
home-manager/modules/waybar.nix
View file

@ -17,116 +17,178 @@
else if osConfig.networking.hostName == "amy" else if osConfig.networking.hostName == "amy"
then "/sys/class/hwmon/hwmon4/temp1_input" then "/sys/class/hwmon/hwmon4/temp1_input"
else ""; else "";
colors = config.lib.stylix.colors.withHashtag;
primaryColor = colors.base04;
altColor = colors.base0C;
in { in {
programs.waybar.enable = true; programs.waybar = {
enable = true;
programs.waybar.settings = { settings = {
mainBar = { mainBar = {
layer = "top"; layer = "top";
position = "top"; position = "top";
height = 24; height = 24;
modules-left = ["hyprland/workspaces" "wlr/taskbar"]; spacing = 8;
modules-center = ["hyprland/window" "gamemode"]; margin = "2px 2px 0px 2px";
modules-right = ["network" "pulseaudio" "disk" "cpu" "temperature" "memory" "battery" "tray" "clock"]; modules-left = ["hyprland/workspaces"];
modules-center = ["hyprland/window" "gamemode"];
modules-right = ["network" "cpu" "temperature" "memory" "disk" "pulseaudio" "battery" "tray" "clock" "privacy"];
"hyprland/workspaces" = { "hyprland/window" = {
sort-by-number = true; format = "<span color='${primaryColor}'>{}</span>";
on-click = "activate";
format = "{icon}";
persistent-workspaces = {
"1" = "[]";
"2" = "[]";
"3" = "[]";
"4" = "[]";
}; };
format-icons = {
"urgent" = ""; "hyprland/workspaces" = {
"active" = ""; sort-by-number = true;
"default" = ""; on-click = "activate";
format = "{icon}";
persistent-workspaces = {
"1" = "[]";
"2" = "[]";
"3" = "[]";
"4" = "[]";
};
format-icons = {
"urgent" = "<span color='${colors.base08}'></span>";
"active" = "<span color='${colors.base0C}'></span>";
"default" = "<span color='${primaryColor}'></span>";
};
}; };
};
"tray"."spacing" = 2; "tray"."spacing" = 2;
"clock" = { "clock" = {
format = " {:%a %b %d %R}"; format = "<span color='${primaryColor}'> {:%R} </span>";
}; "format-alt" = "<span color='${primaryColor}'> {:%a, %b %d, %Y %R} </span>";
"tooltip-format" = "<tt><small>{calendar}</small></tt>";
"cpu" = { "calendar" = {
"interval" = 2; "mode" = "year";
"format" = "{usage}% {avg_frequency}GHz"; "mode-mon-col" = 3;
"on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.bottom}/bin/btm"; "weeks-pos" = "right";
}; "on-scroll" = 1;
"on-click-right" = "mode";
"battery" = { "format" = {
"bat" = "BAT0"; "months" = "<span color='${colors.base0D}'><b>{}</b></span>";
"states" = { "days" = "<span color='${colors.base05}'><b>{}</b></span>";
"good" = 95; "weeks" = "<span color='${colors.base03}'><b>W{}</b></span>";
"warning" = 30; "weekdays" = "<span color='${colors.base05}'><b>{}</b></span>";
"critical" = 15; "today" = "<span color='${primaryColor}'><b><u>{}</u></b></span>";
};
};
"actions" = {
"on-click-right" = "mode";
"on-scroll-up" = "shift_up";
"on-scroll-down" = "shift_down";
};
}; };
"format" = "{capacity}% {icon} ";
"format-full" = "";
"format-icons" = ["" "" "" "" ""];
};
"memory" = { "cpu" = {
"format" = "{used:0.1f}G/{total:0.1f}G "; "interval" = 2;
"on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.bottom}/bin/btm"; "format" = "<span color='${altColor}'>{usage}% {avg_frequency}GHz</span>";
}; "on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.bottom}/bin/btm";
"disk" = {
"format" = "{used}/{total} ";
"path" = "/";
};
"network" = {
"interface" = "${networkInterface.eth}";
"interval" = 2;
"format-ethernet" = "Up: {bandwidthUpBits} Down: {bandwidthDownBits} ";
"tooltip-format-ethernet" = "{ifname} ";
"format-wifi" = "Up: {bandwidthUpBits} Down: {bandwidthDownBits} {essid} ({signalStrength}%) ";
"tooltip-format-wifi" = "{ifname} {essid} ({signalStrength}%) ";
"format-disconnected" = "Disconnected ⚠";
"on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.networkmanager}/bin/nmtui";
};
"pulseaudio" = {
"format" = "{volume}% {icon} ";
"format-bluetooth" = "{volume}% {icon} ";
"format-muted" = "";
"format-icons" = {
"headphones" = "";
"handsfree" = "";
"headset" = "";
"phone" = "";
"portable" = "";
"car" = "";
"default" = ["" ""];
}; };
"on-click" = "${pkgs.pavucontrol}/bin/pavucontrol";
};
"temperature" = { "battery" = {
"hwmon-path" = "${hwmon}"; "bat" = "BAT0";
"format" = "{}°C"; "states" = {
"critical-threshold" = 80; "good" = 95;
"on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.bottom}/bin/btm"; "warning" = 30;
}; "critical" = 15;
};
"format" = "<span color='${primaryColor}'>{capacity}% </span>{icon}";
"format-full" = "";
"format-icons" = [
"<span color='${colors.base08}'></span>"
"<span color='${colors.base09}'></span>"
"<span color='${colors.base09}'></span>"
"<span color='${primaryColor}'></span>"
"<span color='${primaryColor}'></span>"
];
};
"gamemode" = { "memory" = {
"format" = "{glyph}"; "format" = "<span color='${altColor}'>{used:0.1f}G/{total:0.1f}G </span>";
"format-alt" = "{glyph} {count}"; "on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.bottom}/bin/btm";
"glyph" = ""; };
"hide-not-running" = true;
"use-icon" = true; "disk" = {
"icon-name" = "input-gaming-symbolic"; "format" = "<span color='${primaryColor}'>{used}/{total} </span>";
"icon-spacing" = 4; "path" = "/";
"icon-size" = 20; };
"tooltip" = true;
"tooltip-format" = "Games running: {count}"; "network" = {
"interface" = "${networkInterface.eth}";
"interval" = 2;
"format-ethernet" = "<span color='${primaryColor}'>Up: {bandwidthUpBits} Down: {bandwidthDownBits} </span>";
"tooltip-format-ethernet" = "<span color='${primaryColor}'>{ifname} </span>";
"format-wifi" = "<span color='${primaryColor}'>Up: {bandwidthUpBits} Down: {bandwidthDownBits} {essid} ({signalStrength}%) </span>";
"tooltip-format-wifi" = "<span color='${primaryColor}'>{ifname} {essid} ({signalStrength}%) </span>";
"format-disconnected" = "<span color='${primaryColor}'>Disconnected ⚠</span>";
"on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.networkmanager}/bin/nmtui";
};
"pulseaudio" = {
"format" = "<span color='${altColor}'>{volume}% {icon}</span>";
"format-bluetooth" = "<span color='${altColor}'>{volume}% {icon}</span>";
"format-muted" = "<span color='${altColor}'></span>";
"format-icons" = {
"headphones" = "<span color='${altColor}'></span>";
"handsfree" = "<span color='${altColor}'></span>";
"headset" = "<span color='${altColor}'></span>";
"phone" = "<span color='${altColor}'></span>";
"portable" = "<span color='${altColor}'></span>";
"car" = "<span color='${altColor}'></span>";
"default" = [
"<span color='${altColor}'></span>"
"<span color='${altColor}'></span>"
];
};
"on-click" = "${pkgs.pavucontrol}/bin/pavucontrol";
};
"temperature" = {
"hwmon-path" = "${hwmon}";
"format" = "<span color='${primaryColor}'>{}°C</span>";
"critical-threshold" = 80;
"on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.bottom}/bin/btm";
};
"gamemode" = {
"format" = "<span color='${primaryColor}'>{glyph}</span>";
"format-alt" = "<span color='${primaryColor}'>{glyph} {count}</span>";
"glyph" = "<span color='${primaryColor}'></span>";
"hide-not-running" = true;
"use-icon" = true;
"icon-name" = "input-gaming-symbolic";
"icon-spacing" = 4;
"icon-size" = 20;
"tooltip" = true;
"tooltip-format" = "<span color='${primaryColor}'>Games running: {count}</span>";
};
"privacy" = {
"icon-size" = 20;
"icon-spacing" = 4;
"transition-duration" = 250;
"modules" = [
{
"type" = "screenshare";
"tooltip" = true;
"tooltip-icon-size" = 24;
}
{
"type" = "audio-in";
"tooltip" = true;
"tooltip-icon-size" = 24;
}
];
};
}; };
}; };
style = ''
window#waybar {
border-radius: 5px;
}
'';
}; };
} }