diff --git a/config/hosts/samhain/torrenting.nix b/config/hosts/samhain/torrenting.nix index c3faedb6..56bd81ca 100644 --- a/config/hosts/samhain/torrenting.nix +++ b/config/hosts/samhain/torrenting.nix @@ -23,6 +23,8 @@ rpc-bind-address = "0.0.0.0"; rpc-whitelist = "127.0.0.1,192.168.1.*,192.168.122.*"; script-torrent-done-enabled = true; + dht-enabled = true; + pex-enabled = true; script-torrent-done-filename = "${transmission-done-script}/bin/script"; umask = 0; }; diff --git a/config/profiles/gui/home/music.nix b/config/profiles/gui/home/music.nix index a9860feb..acf0141a 100644 --- a/config/profiles/gui/home/music.nix +++ b/config/profiles/gui/home/music.nix @@ -5,6 +5,36 @@ programs.ncmpcpp = { enable = true; mpdMusicDir = "/home/kat/music"; + settings = { + visualizer_data_source = "/tmp/mpd.fifo"; + visualizer_output_name = "my_fifo"; + visualizer_in_stereo = "yes"; + visualizer_type = "spectrum"; + visualizer_look = "+|"; + user_interface = "alternative"; + colors_enabled = "yes"; + discard_colors_if_item_is_selected = "no"; + header_window_color = "250"; + volume_color = "250"; + state_line_color = "cyan"; + state_flags_color = "cyan"; + statusbar_color = "yellow"; + progressbar_color = "black"; + progressbar_elapsed_color = "blue"; + playlist_display_mode = "classic"; + song_columns_list_format = + "(3f)[cyan]{n} (40)[default]{t|f} (25)[red]{a} (30)[blue]{b} (4f)[cyan]{l}"; + now_playing_prefix = "$b"; + song_list_format = + "$1$9%l$1$9 $8¦$9 $6%a$9 $8¦$9 $5%b$9 $R$1$9%t$1$9 $8¦$9 $7%n$9"; + song_library_format = "{%n > }{%t}|{%f}"; + song_status_format = "{%a - }{%t - }{%b}"; + titles_visibility = "no"; + header_visibility = "no"; + statusbar_visibility = "no"; + now_playing_suffix = "$8$/b"; + progressbar_look = "▄▄ "; + }; }; programs.beets = { enable = true; @@ -26,9 +56,16 @@ musicDirectory = "/home/kat/music"; extraConfig = '' audio_output { - type "pulse" - name "speaker" + type "fifo" + name "my_fifo" + path "/tmp/mpd.fifo" + format "44100:16:2" } + + audio_output { + type "pulse" + name "speaker" + } ''; }; }; diff --git a/config/profiles/gui/home/packages.nix b/config/profiles/gui/home/packages.nix index 4ed2c843..c5b492ad 100644 --- a/config/profiles/gui/home/packages.nix +++ b/config/profiles/gui/home/packages.nix @@ -22,6 +22,7 @@ v4l-utils transmission-gtk lm_sensors + p7zip baresip psmisc discord @@ -40,7 +41,7 @@ gimp-with-plugins vscode cryptsetup - pcmanfm + vifm neofetch htop ]; diff --git a/config/profiles/kat/home/neovim/default.nix b/config/profiles/kat/home/neovim/default.nix index 9513f9ff..23e1c1ce 100644 --- a/config/profiles/kat/home/neovim/default.nix +++ b/config/profiles/kat/home/neovim/default.nix @@ -22,7 +22,7 @@ } ]; extraPackages = with pkgs; - [ (python3.withPackages (ps: with ps; [ black flake8])) ]; + [ (python3.withPackages (ps: with ps; [ black flake8 ])) ]; extraPython3Packages = (ps: with ps; [ jedi pylint ]); extraConfig = import ./vimrc.nix { inherit pkgs; }; }; diff --git a/nix/sources.json b/nix/sources.json index 88d69ece..5f112b82 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "https://nur.nix-community.org/", "owner": "nix-community", "repo": "NUR", - "rev": "94e3d90e9d8c642e2a2eb484aa4e595406ec181d", - "sha256": "1nricxq1z81k9zff1npapw68z5a68h8flj925b86djkx0d4faki2", + "rev": "50e9a5746919d75b4346e1d8c69b0da19400dce2", + "sha256": "1ahxkw93d6gpbimd16vjmiaxsflz9lk4m1a4vmy3zlr2b4mhl30l", "type": "tarball", - "url": "https://github.com/nix-community/NUR/archive/94e3d90e9d8c642e2a2eb484aa4e595406ec181d.tar.gz", + "url": "https://github.com/nix-community/NUR/archive/50e9a5746919d75b4346e1d8c69b0da19400dce2.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "arc-nixexprs": { @@ -17,10 +17,10 @@ "homepage": null, "owner": "arcnmx", "repo": "nixexprs", - "rev": "692466a7f316e69715a0298643ddf75d2157d8d9", - "sha256": "0jm71p6cnn8f0fdmmi46gmgr0fm5i050zlwz4xggwj8bhf13crpw", + "rev": "dd8ada6ce98285f41eb7c85812aafa1f2656362b", + "sha256": "1rwxh9vfnpj75h0lfpd6lpbygpbm5110wamm04fsx8fh7hmc4yq0", "type": "tarball", - "url": "https://github.com/arcnmx/nixexprs/archive/692466a7f316e69715a0298643ddf75d2157d8d9.tar.gz", + "url": "https://github.com/arcnmx/nixexprs/archive/dd8ada6ce98285f41eb7c85812aafa1f2656362b.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "home-manager": { @@ -74,10 +74,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "1ac507ba981970c8e864624542e31eb1f4049751", - "sha256": "1r05lrkvmjhygpmxj4h0rmvz53c7zmy5lff5az09bi1nwqm1xr42", + "rev": "f26c6ddc472d63418ea9117832d40912407f4abf", + "sha256": "01hv2hyaq4n41d2bfp0cdrfk80ykniszj5563w8ryv887d829d5g", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/1ac507ba981970c8e864624542e31eb1f4049751.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/f26c6ddc472d63418ea9117832d40912407f4abf.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-mozilla": { @@ -98,10 +98,10 @@ "homepage": "", "owner": "nixos", "repo": "nixpkgs", - "rev": "8edfe0a2e8bfc750f7ac2818b2a4f364124806b6", - "sha256": "0ya2j4wg4v8j99rf98yfzsswqf3ydl49cdsm779z778cak4g7d7f", + "rev": "1005b14672de04c6f46ca8a9a9c423fa358b7142", + "sha256": "1815gsqh6md3k5416g1hpk4x2718py2wg5qagkd8avpm8y149k5l", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/8edfe0a2e8bfc750f7ac2818b2a4f364124806b6.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/1005b14672de04c6f46ca8a9a9c423fa358b7142.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "pbb-nixfiles": { diff --git a/pkgs/default.nix b/pkgs/default.nix index 46eb18a2..2c3a8525 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -10,6 +10,11 @@ let discord = unstable.discord.override { nss = self.nss_latest; }; + ncmpcpp = unstable.ncmpcpp.override { + visualizerSupport = true; + clockSupport = true; + }; + arc = import sources.arc-nixexprs { pkgs = super; }; unstable = import sources.nixpkgs-unstable { inherit (self) config; }; nur = import sources.NUR {