feat(nix): extend wayland with sway setup
This commit is contained in:
parent
2da1181445
commit
6970b8c7d2
27 changed files with 867 additions and 516 deletions
|
|
@ -1,4 +1,8 @@
|
|||
{lib, ...}: {
|
||||
{lib, pkgs, ...}: {
|
||||
home.packages = [
|
||||
pkgs.gcr
|
||||
];
|
||||
|
||||
programs.gpg.enable = true;
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -14,6 +14,11 @@
|
|||
inherit pname version;
|
||||
hash = "sha256-Mukjzjumv9VL+A0maU0K/SliWrgeRjAeiEdN5a83G0I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pkgs.libxcrypt-legacy
|
||||
];
|
||||
|
||||
};
|
||||
radicale-storage-decsync = pkgs.python3Packages.buildPythonPackage rec {
|
||||
pname = "radicale_storage_decsync";
|
||||
|
|
@ -24,7 +29,17 @@
|
|||
hash = "sha256-X+0MT5o2PjsKxca5EDI+rYyQDmUtbRoELDr6e4YXKCg=";
|
||||
};
|
||||
|
||||
buildInputs = [pkgs.radicale];
|
||||
buildInputs = [
|
||||
pkgs.radicale
|
||||
pkgs.libxcrypt-legacy
|
||||
pkgs.libxcrypt
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pkgs.libxcrypt-legacy
|
||||
pkgs.libxcrypt
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [libdecsync pkgs.python3Packages.setuptools];
|
||||
};
|
||||
radicale-decsync = pkgs.radicale.overrideAttrs (old: {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
packages',
|
||||
...
|
||||
}: {
|
||||
home.packages = [
|
||||
packages'.salut
|
||||
];
|
||||
|
||||
home.file.".config/salut/config.ini" = {
|
||||
enable = true;
|
||||
text = ''
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -1,196 +1,81 @@
|
|||
{ pkgs, config, inputs, ... }:
|
||||
{ pkgs, config, repoFlake, ... }:
|
||||
|
||||
let
|
||||
rogScript = pkgs.writeShellScript "waybar-rog.sh" ''
|
||||
set -euo pipefail
|
||||
val="$(${pkgs.asusctl}/bin/asusctl profile -p)"
|
||||
if [[ "''${val}" == *"Performance"* ]]; then
|
||||
echo $'{"text": "rog prf"}';
|
||||
elif [[ "''${val}" == *"Balanced"* ]]; then
|
||||
echo $'{"text": "rog bal"}';
|
||||
elif [[ "''${val}" == *"Quiet"* ]]; then
|
||||
echo $'{"text": "rog qui"}';
|
||||
fi
|
||||
'';
|
||||
|
||||
pppScript = pkgs.writeShellScript "waybar-ppp.sh" ''
|
||||
set -euo pipefail
|
||||
val="$(${pkgs.power-profiles-daemon}/bin/powerprofilesctl get)"
|
||||
if [[ "''${val}" == "performance" ]]; then
|
||||
echo $'{"text": "ppp prf"}';
|
||||
elif [[ "''${val}" == "balanced" ]]; then
|
||||
echo $'{"text": "ppp bal"}';
|
||||
elif [[ "''${val}" == "power-saver" ]]; then
|
||||
echo $'{"text": "ppp pwr"}';
|
||||
fi
|
||||
'';
|
||||
extraModules = if config.networking.hostName != "zeph" then { } else {
|
||||
"custom/rog" = {
|
||||
exec = "${rogScript}";
|
||||
return-type = "json";
|
||||
interval = 10;
|
||||
};
|
||||
"custom/ppp" = {
|
||||
exec = "${pppScript}";
|
||||
return-type = "json";
|
||||
interval = 10;
|
||||
};
|
||||
};
|
||||
# # jobpath = "/run/user/1000/srht/jobs";
|
||||
# # jobs = {
|
||||
# # "niche" = "niche";
|
||||
# # "n-w" = "nixpkgs-wayland";
|
||||
# # "f-f-n" = "flake-firefox-nightly";
|
||||
# # };
|
||||
|
||||
# # suffix = pkgs.lib.mapAttrsToList (k: v: ''
|
||||
# # status="$("${pkgs.jq}/bin/jq" -r '[.results[] | select(.tags=="${v}" and .status!="running" and .status!="cancelled")][0] | .status' "${jobpath}/data")"
|
||||
# # echo "{\"text\":\"''${status}\", \"class\":\"srht-''${status}\"}" > "${jobpath}/${v}-json"
|
||||
# # '') jobs;
|
||||
|
||||
# # jobsScript = pkgs.writeShellScriptBin "jobs.sh" (pkgs.lib.concatStrings (
|
||||
# # [''
|
||||
# # TOKEN=$(cat ${config.sops.secrets."srht-pat".path})
|
||||
# # BUILD_HOST="https://builds.sr.ht"
|
||||
# # "${pkgs.coreutils}/bin/mkdir" -p "${jobpath}"
|
||||
# # "${pkgs.curl}/bin/curl" \
|
||||
# # -H "Authorization:token ''${TOKEN}" \
|
||||
# # -H "Content-Type: application/json" -X GET \
|
||||
# # "''${BUILD_HOST}/api/jobs" > "${jobpath}/data"
|
||||
# # ''] ++ suffix ));
|
||||
# networktoggle = pkgs.writeShellScriptBin "networktoggle.sh" ''
|
||||
# if ip link | grep wlan; then
|
||||
# sudo ${pkgs.util-linux}/bin/rfkill toggle wlan
|
||||
# sudo ${pkgs.systemd}/bin/networkctl reconfigure wlan0
|
||||
# ${pkgs.libnotify}/bin/notify-send "toggled wlan0"
|
||||
# else
|
||||
# ${pkgs.libnotify}/bin/notify-send "no wlan to toggle"
|
||||
# fi
|
||||
# '';
|
||||
in
|
||||
{
|
||||
config = {
|
||||
# sops.secrets."srht-pat" = {
|
||||
# owner = "cole";
|
||||
# group = "cole";
|
||||
# };
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = repoFlake.inputs.nixpkgs-wayland.outputs.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
|
||||
# style = pkgs.lib.readFile ./waybar.css;
|
||||
systemd.enable = true;
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
position = "bottom";
|
||||
height = 30;
|
||||
output = ["*"];
|
||||
# output = [
|
||||
# "eDP-1"
|
||||
# "DP-*"
|
||||
# ];
|
||||
|
||||
home-manager.users.cole = { pkgs, ... }: {
|
||||
# systemd.user.services."srht-jobs-status" = {
|
||||
# Unit.Description = "check srht-jobs status";
|
||||
# Service = {
|
||||
# Type = "oneshot";
|
||||
# ExecStart = "${jobsScript}/bin/jobs.sh";
|
||||
# };
|
||||
# };
|
||||
# systemd.user.timers."srht-jobs-status" = {
|
||||
# Unit.Description = "check srht jobs status";
|
||||
# Timer = { OnBootSec = "1m"; OnUnitInactiveSec = "1m"; Unit = "srht-jobs-status.service"; };
|
||||
# Install.WantedBy = [ "default.target" ];
|
||||
# # {
|
||||
# # wantedBy = [ "timers.target" ];
|
||||
# # partOf = [ "srht-${repo}.service" ];
|
||||
# # timerConfig.OnCalendar = "hourly";
|
||||
# # }
|
||||
# };
|
||||
home.packages = [ pkgs.libappindicator-gtk3 ];
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = inputs.nixpkgs-wayland.outputs.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
|
||||
style = pkgs.lib.readFile ./waybar.css;
|
||||
systemd.enable = true;
|
||||
settings = [{
|
||||
# ipc = true;
|
||||
layer = "top";
|
||||
# position = "top";
|
||||
modules-left = [
|
||||
"sway/mode"
|
||||
"sway/workspaces"
|
||||
];
|
||||
modules-center = [
|
||||
"wlr/workspaces"
|
||||
];
|
||||
modules-right = [
|
||||
# "keyboard-state"
|
||||
# "idle_inhibitor"
|
||||
"pulseaudio"
|
||||
"backlight"
|
||||
"tray"
|
||||
]
|
||||
++ (builtins.attrNames extraModules)
|
||||
++ [
|
||||
"cpu"
|
||||
"memory"
|
||||
"network"
|
||||
"temperature"
|
||||
"battery"
|
||||
"clock"
|
||||
"clock#date"
|
||||
];
|
||||
modules-left = [
|
||||
"sway/workspaces"
|
||||
"sway/mode"
|
||||
# "wlr/taskbar"
|
||||
];
|
||||
|
||||
modules = ({
|
||||
"sway/workspaces" = {
|
||||
all-outputs = true;
|
||||
disable-scroll-wraparound = true;
|
||||
#enable-bar-scroll = true;
|
||||
};
|
||||
"sway/mode" = { tooltip = false; };
|
||||
"sway/workspaces" = {
|
||||
disable-scroll = true;
|
||||
all-outputs = false;
|
||||
};
|
||||
|
||||
modules-center = [
|
||||
"sway/window"
|
||||
# "custom/hello-from-waybar"
|
||||
];
|
||||
|
||||
# # TODO:
|
||||
# keyboard-state = {
|
||||
# "numlock" = true;
|
||||
# "capslock" = true;
|
||||
# "format" = "{name} {icon}";
|
||||
# "format-icons" = {
|
||||
# "locked" = "+";
|
||||
# "unlocked" = "-";
|
||||
# };
|
||||
# };
|
||||
"wlr/taskbar" = { };
|
||||
temperature = {
|
||||
format = "tmp {temperatureC}";
|
||||
};
|
||||
idle_inhibitor = {
|
||||
format = "iil {icon}";
|
||||
format-icons = {
|
||||
activated = "[x]";
|
||||
deactivated = "[ ]";
|
||||
};
|
||||
};
|
||||
pulseaudio = {
|
||||
format = "vol {volume}";
|
||||
on-click-middle = "${pkgs.sway}/bin/swaymsg exec \"${pkgs.pavucontrol}/bin/pavucontrol\"";
|
||||
};
|
||||
network = {
|
||||
format-wifi = "net {signalStrength}";
|
||||
format-ethernet = "eth";
|
||||
};
|
||||
cpu.interval = 2;
|
||||
cpu.format = "cpu {usage}";
|
||||
memory.format = "mem {}";
|
||||
backlight = {
|
||||
format = "nit {percent}";
|
||||
on-scroll-up = "${pkgs.brightnessctl}/bin/brightnessctl set 2%+";
|
||||
on-scroll-down = "${pkgs.brightnessctl}/bin/brightnessctl set 2%-";
|
||||
};
|
||||
tray.spacing = 10;
|
||||
# battery
|
||||
clock = {
|
||||
format = "{:%d %b %Y}";
|
||||
};
|
||||
"clock#date" = {
|
||||
format = "{:%H:%M %p}";
|
||||
};
|
||||
battery = {
|
||||
format = "bat {}";
|
||||
states = {
|
||||
warning = 25;
|
||||
critical = 15;
|
||||
};
|
||||
};
|
||||
} // extraModules);
|
||||
}];
|
||||
modules-right = [
|
||||
"tray"
|
||||
|
||||
"cpu"
|
||||
"memory"
|
||||
"temperature"
|
||||
"custom/fan"
|
||||
"battery"
|
||||
"pulseaudio"
|
||||
"clock"
|
||||
"clock#date"
|
||||
];
|
||||
|
||||
tray.spacing = 10;
|
||||
|
||||
cpu.format = " {}%";
|
||||
memory.format = " {}%";
|
||||
"temperature" = {
|
||||
hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input";
|
||||
format = " {temperatureC} °C";
|
||||
};
|
||||
"custom/fan" = {
|
||||
|
||||
format = " {} rpm ";
|
||||
exec = "${pkgs.lm_sensors}/bin/sensors | ${pkgs.gawk}/bin/awk '/fan1:/ {print $2}'";
|
||||
interval = 5;
|
||||
};
|
||||
battery.format = "🔋 {}%";
|
||||
pulseaudio = {
|
||||
format = "🔉 {volume}%";
|
||||
# on-click-middle = ''${pkgs.sway}/bin/swaymsg exec "${pkgs.pavucontrol}/bin/pavucontrol"'';
|
||||
};
|
||||
"clock#date".format = "{:%d %b %Y}";
|
||||
clock.format = "{:%H:%M %p}";
|
||||
|
||||
# "custom/hello-from-waybar" = {
|
||||
# format = "hello {}";
|
||||
# max-length = 40;
|
||||
# interval = "once";
|
||||
# exec = pkgs.writeShellScript "hello-from-waybar" ''
|
||||
# echo "from within waybar"
|
||||
# '';
|
||||
# };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ in {
|
|||
# don't cd into directories when executed
|
||||
unsetopt AUTO_CD
|
||||
|
||||
export NIX_PATH="${pkgs.path}"
|
||||
export NIX_PATH="nixpkgs=${pkgs.path}"
|
||||
|
||||
# print lines without termination
|
||||
setopt PROMPT_CR
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue