17 files changed, 219 insertions, 6 deletions
diff --git a/users/fcuny/cli/zsh.nix b/users/fcuny/cli/zsh.nix
index 6b56d35..be827b4 100644
--- a/users/fcuny/cli/zsh.nix
+++ b/users/fcuny/cli/zsh.nix
@@ -2,7 +2,7 @@
 
 {
 
-  xdg.configFile."zsh/personal".source = config.lib.file.mkOutOfStoreSymlink ../../configs/zsh;
+  xdg.configFile."zsh/personal".source = config.lib.file.mkOutOfStoreSymlink ../configs/zsh;
 
   programs.zsh = {
     enable = true;
diff --git a/users/fcuny/configs/mpd/mpd.conf b/users/fcuny/configs/mpd/mpd.conf
new file mode 100644
index 0000000..c7e9b3b
--- /dev/null
+++ b/users/fcuny/configs/mpd/mpd.conf
@@ -0,0 +1,24 @@
+playlist_directory  "~/.config/mpd/playlists"
+db_file	            "~/.config/mpd/database"
+sticker_file        "~/.config/mpd/sticker.sql"
+music_directory     "~/media/music"
+
+auto_update "yes"
+
+filesystem_charset "UTF-8"
+
+input {
+  plugin "curl"
+}
+
+audio_output {
+  type "pipewire"
+  name "PipeWire Sound Server"
+}
+
+audio_output {
+  type   "fifo"
+  name   "visualizer"
+  path   "/tmp/mpd.fifo"
+  format "44100:16:2"
+}
diff --git a/users/fcuny/configs/ncmpcpp/config b/users/fcuny/configs/ncmpcpp/config
new file mode 100644
index 0000000..45814c4
--- /dev/null
+++ b/users/fcuny/configs/ncmpcpp/config
@@ -0,0 +1,19 @@
+mpd_music_dir = /home/fcuny/media/music
+mpd_connection_timeout = 5
+
+media_library_primary_tag = "album_artist"
+
+allow_for_physical_item_deletion = no
+ask_before_clearing_playlists = yes
+default_place_to_search_in = database
+user_interface = classic
+search_engine_display_mode = classic
+
+browser_display_mode = columns
+browser_sort_mode = name
+cyclic_scrolling = no
+display_volume_level = no
+header_text_scrolling = no
+header_visibility = no
+statusbar_visibility = no
+titles_visibility = no
diff --git a/users/fcuny/configs/polybar/aptos.ini b/users/fcuny/configs/polybar/aptos.ini
new file mode 100644
index 0000000..04c35fe
--- /dev/null
+++ b/users/fcuny/configs/polybar/aptos.ini
@@ -0,0 +1,37 @@
+include-file = ~/.config/polybar/modules/battery.ini
+include-file = ~/.config/polybar/modules/bluetooth.ini
+include-file = ~/.config/polybar/modules/colors.ini
+include-file = ~/.config/polybar/modules/date.ini
+include-file = ~/.config/polybar/modules/i3.ini
+include-file = ~/.config/polybar/modules/mpd.ini
+include-file = ~/.config/polybar/modules/pulseaudio.ini
+include-file = ~/.config/polybar/modules/wireless.ini
+
+[settings]
+screenchange-reload = false
+
+[bar/common]
+enable-ipc = true
+width = 100%
+monitor = ${env:MONITOR:}
+monitor-strict = true
+dpi = ${env:DPI:}
+border-size = 0
+tray-position = none
+fixed-center = true
+module-margin = 1
+padding-right = 1
+line-size = 3
+
+background = ${colors.background}
+foreground = ${colors.foreground}
+
+font-0 = Source Code Pro:style=Regular:size=10;2
+
+modules-left = i3
+
+modules-center = mpd
+
+[bar/alone]
+inherit = bar/common
+modules-right = network bluetooth pulseaudio battery date
diff --git a/users/fcuny/configs/polybar/carmel.ini b/users/fcuny/configs/polybar/carmel.ini
new file mode 100644
index 0000000..d09f796
--- /dev/null
+++ b/users/fcuny/configs/polybar/carmel.ini
@@ -0,0 +1,36 @@
+include-file = ~/.config/polybar/modules/colors.ini
+include-file = ~/.config/polybar/modules/date.ini
+include-file = ~/.config/polybar/modules/i3.ini
+include-file = ~/.config/polybar/modules/mpd.ini
+include-file = ~/.config/polybar/modules/pulseaudio.ini
+include-file = ~/.config/polybar/modules/wired.ini
+
+[settings]
+screenchange-reload = false
+
+[bar/common]
+enable-ipc = true
+width = 100%
+monitor = ${env:MONITOR:}
+monitor-strict = true
+dpi = ${env:DPI:}
+border-size = 0
+tray-position = none
+fixed-center = true
+module-margin = 1
+padding-right = 1
+
+background = ${colors.background}
+foreground = ${colors.foreground}
+
+font-0 = Source Code Pro:style=Regular:size=8;2
+font-1 = Font Awesome 5 Free:style=Solid:pixelsize=8;3
+font-2 = Material\-Design\-Iconic\-Font:size=8;2
+
+modules-left = i3
+
+modules-center = mpd
+
+[bar/alone]
+inherit = bar/common
+modules-right = wired-network pulseaudio date
diff --git a/users/fcuny/configs/polybar/modules/battery.ini b/users/fcuny/configs/polybar/modules/battery.ini
new file mode 100644
index 0000000..8c7e84a
--- /dev/null
+++ b/users/fcuny/configs/polybar/modules/battery.ini
@@ -0,0 +1,4 @@
+[module/battery]
+type = custom/script
+exec = /home/fcuny/workspace/go/bin/polybar-bat
+interval = 10
diff --git a/users/fcuny/configs/polybar/modules/bluetooth.ini b/users/fcuny/configs/polybar/modules/bluetooth.ini
new file mode 100644
index 0000000..9a82955
--- /dev/null
+++ b/users/fcuny/configs/polybar/modules/bluetooth.ini
@@ -0,0 +1,5 @@
+[module/bluetooth]
+type = custom/script
+exec = ~/.config/rofi/scripts/bluetooth --status
+interval = 1
+click-left = ~/.config/rofi/scripts/bluetooth &
diff --git a/users/fcuny/configs/polybar/modules/colors.ini b/users/fcuny/configs/polybar/modules/colors.ini
new file mode 100644
index 0000000..2b15171
--- /dev/null
+++ b/users/fcuny/configs/polybar/modules/colors.ini
@@ -0,0 +1,7 @@
+[colors]
+background = #000000
+foreground = #FFFFF8
+highlight = #4c7899
+warning = #ff3121
+focused = #4c7899
+disabled = #90a1ad
diff --git a/users/fcuny/configs/polybar/modules/date.ini b/users/fcuny/configs/polybar/modules/date.ini
new file mode 100644
index 0000000..c5b28da
--- /dev/null
+++ b/users/fcuny/configs/polybar/modules/date.ini
@@ -0,0 +1,6 @@
+[module/date]
+type = internal/date
+interval = 2
+time = %H:%M
+date = %a %b %d
+label = %date% %time%
diff --git a/users/fcuny/configs/polybar/modules/i3.ini b/users/fcuny/configs/polybar/modules/i3.ini
new file mode 100644
index 0000000..7e24a4a
--- /dev/null
+++ b/users/fcuny/configs/polybar/modules/i3.ini
@@ -0,0 +1,20 @@
+[module/i3]
+type = internal/i3
+format = <label-state> <label-mode>
+index-sort = true
+wrapping-scroll = false
+pin-workspaces = true
+
+label-mode-background = ${colors.highlight}
+label-mode-padding = 1
+label-focused = %name%
+label-focused-background = ${colors.focused}
+label-focused-padding = 1
+label-unfocused = %name%
+label-unfocused-padding = 1
+label-visible = %name%
+label-visible-background = ${colors.highlight}
+label-visible-padding = 1
+label-urgent = %name%
+label-urgent-background = #a00000
+label-urgent-padding = 1
diff --git a/users/fcuny/configs/polybar/modules/mpd.ini b/users/fcuny/configs/polybar/modules/mpd.ini
new file mode 100644
index 0000000..05f066d
--- /dev/null
+++ b/users/fcuny/configs/polybar/modules/mpd.ini
@@ -0,0 +1,6 @@
+[module/mpd]
+type = internal/mpd
+socket = /var/run/user/1000/mpd/socket
+interval = 2
+label-song = %artist% / %title%
+format-online = <label-song>
diff --git a/users/fcuny/configs/polybar/modules/pulseaudio.ini b/users/fcuny/configs/polybar/modules/pulseaudio.ini
new file mode 100644
index 0000000..41d02b6
--- /dev/null
+++ b/users/fcuny/configs/polybar/modules/pulseaudio.ini
@@ -0,0 +1,8 @@
+[module/pulseaudio]
+type = internal/pulseaudio
+use-ui-max = false
+format-volume = <label-volume>
+label-volume = "vol/%percentage%%"
+label-muted = "vol/%percentage%%"
+label-muted-foreground = ${colors.disabled}
+click-right = pavucontrol
diff --git a/users/fcuny/configs/polybar/modules/wired.ini b/users/fcuny/configs/polybar/modules/wired.ini
new file mode 100644
index 0000000..f9f1db0
--- /dev/null
+++ b/users/fcuny/configs/polybar/modules/wired.ini
@@ -0,0 +1,10 @@
+[module/wired-network]
+type = internal/network
+interface = enp9s0
+
+format-connected =<label-connected>
+label-connected = "%local_ip%"
+format-disconnected = <label-disconnected>
+label-disconnected = "%ifname%"
+format-disconnected-foreground = #121212
+format-disconnected-background = #ff6961
diff --git a/users/fcuny/configs/polybar/modules/wireless.ini b/users/fcuny/configs/polybar/modules/wireless.ini
new file mode 100644
index 0000000..95b0f09
--- /dev/null
+++ b/users/fcuny/configs/polybar/modules/wireless.ini
@@ -0,0 +1,4 @@
+[module/network]
+type = custom/script
+exec = /home/fcuny/workspace/go/bin/polybar-wifi
+interval = 10
diff --git a/users/fcuny/configs/zsh/init.zsh b/users/fcuny/configs/zsh/init.zsh
new file mode 100644
index 0000000..1dba48e
--- /dev/null
+++ b/users/fcuny/configs/zsh/init.zsh
@@ -0,0 +1,27 @@
+# Print timing statistics for everything which takes longer than 5 seconds of
+# user + system time ('sleep 6' does not work because of 0% user/system time!).
+REPORTTIME=5
+
+autoload -U colors && colors
+
+autoload -Uz vcs_info add-zsh-hook
+setopt prompt_subst
+
+add-zsh-hook precmd vcs_info
+# Enable checking for (un)staged changes, enabling use of %u and %c
+zstyle ':vcs_info:*' check-for-changes true
+# Set custom strings for an unstaged vcs repo changes (*) and staged changes (+)
+zstyle ':vcs_info:*' unstagedstr "%F{yellow}●%f"
+zstyle ':vcs_info:*' stagedstr   "%F{green}●%f"
+# Set the format of the Git information for vcs_info
+zstyle ':vcs_info:git:*' formats       " (%b%c%u)"
+zstyle ':vcs_info:git:*' actionformats " (%b|%a%u%c)"
+
+PROMPT='%K{cyan}%F{black}%m%k%f %~%F{red}${vcs_info_msg_0_}%f %# '
+
+# For tramp (emacs).
+if [ "$TERM" = "dumb" ]; then
+  unset PROMPT
+  PS1='$ '
+  unsetopt zle
+fi
diff --git a/users/fcuny/desktop/i3.nix b/users/fcuny/desktop/i3.nix
index dd01348..332b7af 100644
--- a/users/fcuny/desktop/i3.nix
+++ b/users/fcuny/desktop/i3.nix
@@ -33,9 +33,9 @@ in
     };
   };
 
-  xdg.configFile."polybar/aptos.ini".source = ../../configs/polybar/aptos.ini;
-  xdg.configFile."polybar/carmel.ini".source = ../../configs/polybar/carmel.ini;
-  xdg.configFile."polybar/modules".source = ../../configs/polybar/modules;
+  xdg.configFile."polybar/aptos.ini".source = ../configs/polybar/aptos.ini;
+  xdg.configFile."polybar/carmel.ini".source = ../configs/polybar/carmel.ini;
+  xdg.configFile."polybar/modules".source = ../configs/polybar/modules;
 
   services.polybar = {
     enable = true;
diff --git a/users/fcuny/desktop/media.nix b/users/fcuny/desktop/media.nix
index 57d0dd2..a75dce4 100644
--- a/users/fcuny/desktop/media.nix
+++ b/users/fcuny/desktop/media.nix
@@ -6,8 +6,8 @@
     pkgs.ncmpcpp
   ];
 
-  xdg.configFile."mpd/mpd.conf".source = ../../configs/mpd/mpd.conf;
-  xdg.configFile."ncmpcpp/config".source = ../../configs/ncmpcpp/config;
+  xdg.configFile."mpd/mpd.conf".source = ../configs/mpd/mpd.conf;
+  xdg.configFile."ncmpcpp/config".source = ../configs/ncmpcpp/config;
 
   services.mpd = {
     enable = true;