diff --git a/.Xresources b/.Xresources index 28cb066..4001907 100644 --- a/.Xresources +++ b/.Xresources @@ -76,18 +76,18 @@ URxvt*scrollTtyKeypress: true !! SCRIPTS -! URxvt.perl-lib: /usr/lib/urxvt/perl/ -! URxvt.perl-ext-common: default,matcher,clipboard,url-select,keyboard-select +URxvt.perl-lib: /usr/lib/urxvt/perl/ +URxvt.perl-ext-common: default,matcher,clipboard,url-select,keyboard-select ! clipboard -! URxvt.keysym.M-c: perl:clipboard:copy -! URxvt.keysym.M-v: perl:clipboard:paste -! URxvt.keysym.M-C-v: perl:clipboard:paste_escaped +URxvt.keysym.M-c: perl:clipboard:copy +URxvt.keysym.M-v: perl:clipboard:paste +URxvt.keysym.M-C-v: perl:clipboard:paste_escaped ! keyboard select text -! URxvt.keysym.M-a: perl:keyboard-select:activate -! URxvt.keysym.M-s: perl:keyboard-select:search +URxvt.keysym.M-a: perl:keyboard-select:activate +URxvt.keysym.M-s: perl:keyboard-select:search ! url matcher -! URxvt.url-launcher: /usr/bin/chromium -! URxvt.matcher.button: 1 +URxvt.url-launcher: /usr/bin/chromium +URxvt.matcher.button: 1 diff --git a/bspwmrc b/bspwmrc index 8b2705f..9b602a7 100755 --- a/bspwmrc +++ b/bspwmrc @@ -7,8 +7,6 @@ xsetroot -cursor_name left_ptr # Start lemonbar sh ~/.config/bspwm/lemonbar.sh & -# Daemons -mpd # Set up desktops on monitors bspc monitor DVI-I-0 -d 1 2 diff --git a/configuration.nix b/configuration.nix index f822125..8300a74 100644 --- a/configuration.nix +++ b/configuration.nix @@ -12,8 +12,15 @@ boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sdd"; + # SSD + boot.tmpOnTmpfs = true; # save some writes fileSystems."/".options = "discard,noatime"; + # Mount Data disk + fileSystems."/mnt/Dati" = { + device = "/dev/sdd3"; + }; + time.timeZone = "Italy/Rome"; networking.hostName = "Fazo-PC"; # Define your hostname. @@ -29,24 +36,30 @@ nixpkgs.config = { allowUnfree = true; - rxvt_unicode = { - perlSupport = true; + packageOverrides = pkgs: { + ncmpcpp = pkgs.ncmpcpp.override { + outputsSupport = true; + visualizerSupport = true; + clockSupport = true; + }; }; }; environment.systemPackages = with pkgs; [ # Development atom git nodejs - # Desktop and appliations - sxhkd tmux htop vim ranger w3m rxvt_unicode chromium dmenu gnupg irssi bar bc i3lock + # Desktop and shell environment + sxhkd tmux htop rxvt_unicode dmenu bar i3lock + # Libs + xsel urxvt_perls xclip # Games minecraft + # Productivity and applications + vim ranger chromium irssi bc w3m gnupg libreoffice # Media - mpv beets mpd mpc_cli popcorntime + beets mpd mpc_cli ncmpcpp popcorntime mpv # System utilities, drivers... ntfs3g - # Services - syncthing transmission # Other stuff screenfetch scrot iotop iftop ]; @@ -79,6 +92,41 @@ desktopManager.default = "none"; windowManager.default = "bspwm"; }; + + mpd = { + enable = true; + user = "fazo"; + group = "users"; + dataDir = "/home/fazo/.config/mpd"; + musicDirectory = "/home/fazo/Music"; + extraConfig = '' + audio_output { + type "fifo" + name "FIFO" + path "/tmp/mpd.fifo" + format "44100:16:1" + } + audio_output { + type "alsa" + name "Fazo-PC" + mixer_type "software" + } + ''; + }; + + transmission = { + enable = true; + settings = { + download-dir = "/mnt/Dati/Downloads/"; + }; + }; + + # Syncthing + #syncthing = { + # enable = true; + # user = "fazo"; + # dataDir = "~/.config/syncthing"; + #}; }; # User environment @@ -90,7 +138,7 @@ users.extraUsers.fazo = { isNormalUser = true; - extraGroups = [ "wheel" ]; + extraGroups = [ "wheel" "transmission" ]; uid = 1000; shell = "/run/current-system/sw/bin/zsh"; openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIqHaL0uH1ko/jLI3JeetD4bITUF34IE9HTEvF2Go8JYbhk3YSsG0/EoNu8dhA35S45Y7TXUk/K0axcqmFUePVwY271b7L+9I7/ehUg1wHOaNLCf/ueAyRfo5ZUHuH1YnTg9TinwVi0dynjVMaaVDR1YWVgzuw0KTEDW5em5m+jRbDvFrrq72D2GD/fYqkc2Z/cmnRijMi26PCF1xTq4g6BlIUYloCN+ZlDRvkSWiqCcFD3a/QOZXsUBVg80K4QrHVwj4+Bu2M1KDLhmW+8fzMkbwzKumUFt9SwcQh5Tq/MQfzSWOO2wtn1sys0BDKGazJwn9gMFNkcFbRsD5Uqcgh fazo@mac.lan" ]; diff --git a/install b/install index 40847c8..697d1ef 100755 --- a/install +++ b/install @@ -38,8 +38,12 @@ cp .gitconfig ~/ # MPD -mkdir -p ~/.config/mpd/playlists/ +mkdir -p ~/.config/mpd mkdir -p ~/Music/ -cp mpd.conf ~/.config/mpd/ + +# ncmpcpp + +mkdir -p ~/.config/ncmpcpp +cp ncmpcpp_config ~/.config/ncmpcpp/ echo "Run install-prezto with ZSH to install prezto" diff --git a/lemonbar.sh b/lemonbar.sh index 06d26e1..5f669c4 100755 --- a/lemonbar.sh +++ b/lemonbar.sh @@ -17,10 +17,14 @@ getNET(){ echo -n "$(curl -s http://canihazip.com/s)" } +getDISK(){ + echo -n "$(du -hs ~ | cut -d$'\t' -f1)" +} + buildBar () { while true do - echo "$(getVolume) $(getMPD) %{c}$(buildClock)%{r}$(getNET)" + echo "$(getVolume) $(getMPD) %{c}$(buildClock)%{r}$(getDISK) | $(getNET)" sleep 0.5 done } diff --git a/mpd.conf b/mpd.conf deleted file mode 100644 index 01bf4c2..0000000 --- a/mpd.conf +++ /dev/null @@ -1,15 +0,0 @@ -music_directory "/home/fazo/Music" -playlist_directory "/home/fazo/.config/mpd/playlists/" -db_file "/home/fazo/.config/mpd/db" -log_file "/home/fazo/.config/mpd/mpd.log" -pid_file "/home/fazo/.config/mpd/mpd.pid" -state_file "/home/fazo/.config/mpd/state" - -bind_to_address "127.0.0.1" -port "6600" - -audio_output { - type "alsa" - name "Fazo-PC" - mixer_type "software" -} diff --git a/ncmpcpp_config b/ncmpcpp_config new file mode 100644 index 0000000..fa43d7c --- /dev/null +++ b/ncmpcpp_config @@ -0,0 +1,28 @@ +ncmpcpp_directory = ~/.config/ncmpcpp + +visualizer_type = "spectrum" +progressbar_look = "─╼─" +visualizer_color = "blue" +visualizer_look = "◆▒" + +color2 = "yellow" +color1 = "black" +user_interface = "alternative" +progressbar_color = "black" +active_column_color = "green" +window_border_color = "black" +active_window_border = "white" +main_window_highlight_color = "red" +main_window_color = "white" + +playlist_display_mode = "columns" +browser_display_mode = "columns" +search_engine_display_mode = "columns" + +song_columns_list_format = "(35)[white]{t} (32)[cyan]{a} (25)[green]{b} (5)[red]{l} " +media_library_primary_tag = "artist" + +header_visibility = "no" +statusbar_visibility = "no" +ignore_leading_the = "yes" +colors_enabled = "yes"