oysteikt/nix-dotfiles
oysteikt
/
nix-dotfiles
2
1
Fork 0
Code Issues Pull Requests Activity

WIP

This commit is contained in:
Oystein Kristoffer Tveit 2024-10-05 12:10:18 +02:00
parent 17f019cbc0
commit f6d0847c39
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
home/programs/xmonad/xmonad.hs
View File

@ -86,6 +86,7 @@ myScratchpads = [ NS "ncmpcpp" spawnNC findNC layoutA
where where
spawnNC = myTerminal ++ " --title ncmpcppScratchpad -e ncmpcpp" spawnNC = myTerminal ++ " --title ncmpcppScratchpad -e ncmpcpp"
spawnTM = myTerminal ++ " --class floatingTerminal -e tmux new-session -A -s f" spawnTM = myTerminal ++ " --class floatingTerminal -e tmux new-session -A -s f"
spawnTW = myTerminal ++ " --class taskWarriorTerminal -e taskwarrior-tui"
-- spawnMX = "element" -- spawnMX = "element"
spawnFB = "thunar --class=floatingThunar" spawnFB = "thunar --class=floatingThunar"
spawnEX = "emacs --name=floatingEmacs" spawnEX = "emacs --name=floatingEmacs"
@ -94,6 +95,7 @@ myScratchpads = [ NS "ncmpcpp" spawnNC findNC layoutA
findNC = title =? "ncmpcppScratchpad" findNC = title =? "ncmpcppScratchpad"
findTM = className =? "floatingTerminal" findTM = className =? "floatingTerminal"
findTW = className =? "taskWarriorTerminal"
findSC = className =? "floatingSchedule" findSC = className =? "floatingSchedule"
-- findMX = className =? "element" -- findMX = className =? "element"
findFB = className =? "floatingThunar" findFB = className =? "floatingThunar"
@ -168,7 +170,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
, ((modm .|. shiftMask , xK_space ), spawn $ myTerminal ++ " -e tmux") , ((modm .|. shiftMask , xK_space ), spawn $ myTerminal ++ " -e tmux")
-- , ((modm , xK_v ), spawn "rofi -modi lpass:$HOME/.scripts/rofi/lpass//rofi-lpass -show lpass") -- , ((modm , xK_v ), spawn "rofi -modi lpass:$HOME/.scripts/rofi/lpass//rofi-lpass -show lpass")
, ((modm .|. shiftMask, xK_d ), viewDropboxStatus) -- , ((modm .|. shiftMask, xK_d ), viewDropboxStatus)
] ]
termIsOpen :: X Bool termIsOpen :: X Bool

47
home/services/polybar.nix
View File

@ -1,4 +1,4 @@
{ pkgs, config, machineVars, ... }: let { pkgs, lib, config, machineVars, ... }: let
colors = config.colors.defaultColorSet; colors = config.colors.defaultColorSet;
in { in {
services.polybar = { services.polybar = {
@ -11,13 +11,23 @@ in {
package = pkgs.polybar.override { package = pkgs.polybar.override {
githubSupport = true; githubSupport = true;
mpdSupport = true; mpdSupport = true;
pulseSupport = true;
}; };
settings = { settings = {
"module/tray" = {
type = "internal/tray";
# padding = 4;
tray-spacing = "8px";
tray-maxsize = "25px";
# tray-background = colors.background;
};
"bar/top" = { "bar/top" = {
bottom = false; bottom = false;
# monitor = # monitor =
tray.position = "right"; # tray.position = "right";
background = colors.background; background = colors.background;
foreground = colors.foreground; foreground = colors.foreground;
@ -41,19 +51,20 @@ in {
left = "xmonad"; left = "xmonad";
center = "date"; center = "date";
right = builtins.concatStringsSep " " [ right = builtins.concatStringsSep " " [
"filesystem " "filesystem"
(if machineVars.wlanInterface != null then "wlan " else "") (lib.optionalString (machineVars.wlanInterface != null) "wlan")
(if machineVars.battery != null then "batt " else "") (lib.optionalString (machineVars.battery != null) "batt")
"vol" "pulseaudio"
"mpd" "mpd"
"tray"
]; ];
}; };
tray = { # tray = {
padding = 4; # padding = 4;
maxsize = 25; # maxsize = 25;
background = colors.background; # background = colors.background;
}; # };
}; };
"module/xmonad" = { "module/xmonad" = {
@ -155,15 +166,15 @@ in {
}; };
}; };
"module/vol" = { "module/pulseaudio" = {
type = "internal/alsa"; type = "internal/pulseaudio";
# format-volume = "<bar-volume>}" # format-volume = "<bar-volume>}"
# format-volume = "%{A1:bash -c '~/.scripts/get-volume' &:}<bar-volume>%{A}" # format-volume = "%{A1:bash -c '~/.scripts/get-volume' &:}<bar-volume>%{A}"
# format-volume = <label-volume> <bar-volume> # format-volume = <label-volume> <bar-volume>
# format-volume-padding = 1 # format-volume-padding = 1
# format-muted-padding = 1 # format-muted-padding = 1
format-volume = "%{T3}%{T-} <label-volume> <bar-volume>"; format-volume = " <label-volume> <bar-volume>";
# label-volume =  # label-volume = 
label-volume-foreground = colors.magenta; label-volume-foreground = colors.magenta;
# format-muted-foreground = "${colors.foreground-alt}"; # format-muted-foreground = "${colors.foreground-alt}";
@ -273,9 +284,11 @@ in {
# Default: false # Default: false
fixed-values = true; fixed-values = true;
# Spacing (number of spaces, pixels, points) between entries # Margin (number of spaces, pixels, or points) to add before/after each module
# Default: 2 # Individual side values can be defined using:
spacing = 4; # module-margin-{left,right}
module-margin = "16px";
# spacing = "16px";
# Default: 90 # Default: 90
# New in version 3.6.0 # New in version 3.6.0