From 5bc832385f5540db67b4df44660107863884a251 Mon Sep 17 00:00:00 2001 From: fqbn207 Date: Wed, 8 Jan 2025 14:29:12 +0100 Subject: [PATCH] kekl --- configuration.nix | 22 +------------ modules/nix/editors/nvim/alpha.nix | 49 ---------------------------- modules/nix/editors/nvim/default.nix | 1 - modules/nix/editors/nvim/opts.nix | 6 ++-- modules/nix/mpd.nix | 30 +++++++++++++++-- modules/nix/tmux.nix | 4 +-- 6 files changed, 34 insertions(+), 78 deletions(-) delete mode 100644 modules/nix/editors/nvim/alpha.nix diff --git a/configuration.nix b/configuration.nix index df0748c..7ae25d8 100644 --- a/configuration.nix +++ b/configuration.nix @@ -27,11 +27,6 @@ in mpd.environment = { XDG_RUNTIME_DIR = "/run/user/1000"; }; - #pactl-pipe = { - # description = "Load Pactl Pipe for Audio"; - # wantedBy = [ "multi-user.target" ]; - # serviceConfig.ExecStart = "${pkgs.pulseaudio}/bin/pactl load-module module-null-sink sink_name=virtual_sink"; - #}; }; }; boot = { @@ -70,10 +65,9 @@ in }; xdg.portal = { - enable = true; + enable = false; extraPortals = [ pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-hyprland ]; }; @@ -81,15 +75,6 @@ in libinput = { enable = true; }; - xserver = { - enable = true; - displayManager.startx.enable = true; - windowManager = { - bspwm.enable = true; - dwm.enable = false; - i3.enable = true; - }; - }; pipewire = { enable = true; pulse.enable = true; @@ -116,10 +101,6 @@ in }; programs = { - hyprland = { - enable = true; - xwayland.enable = true; - }; nix-ld.enable = true; }; @@ -270,7 +251,6 @@ in proggyfonts nerdfonts ]; - #++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); }; environment.etc = { diff --git a/modules/nix/editors/nvim/alpha.nix b/modules/nix/editors/nvim/alpha.nix deleted file mode 100644 index 44f9821..0000000 --- a/modules/nix/editors/nvim/alpha.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - config, - pkgs, - nixvim, - ... -}: -{ - programs.nixvim = { - plugins = { - alpha = { - enable = true; - layout = [ - { - type = "padding"; - val = 2; - } - { - opts = { - hl = "Type"; - position = "center"; - }; - type = "text"; - val = [ - " ⣿⣿⣷⡁⢆⠈⠕⢕⢂⢕⢂⢕⢂⢔⢂⢕⢄⠂⣂⠂⠆⢂⢕⢂⢕⢂⢕⢂⢕⢂ " - " ⣿⣿⣿⡷⠊⡢⡹⣦⡑⢂⢕⢂⢕⢂⢕⢂⠕⠔⠌⠝⠛⠶⠶⢶⣦⣄⢂⢕⢂⢕ " - " ⣿⣿⠏⣠⣾⣦⡐⢌⢿⣷⣦⣅⡑⠕⠡⠐⢿⠿⣛⠟⠛⠛⠛⠛⠡⢷⡈⢂⢕⢂ " - " ⠟⣡⣾⣿⣿⣿⣿⣦⣑⠝⢿⣿⣿⣿⣿⣿⡵⢁⣤⣶⣶⣿⢿⢿⢿⡟⢻⣤⢑⢂ " - " ⣾⣿⣿⡿⢟⣛⣻⣿⣿⣿⣦⣬⣙⣻⣿⣿⣷⣿⣿⢟⢝⢕⢕⢕⢕⢽⣿⣿⣷⣔ " - " ⣿⣿⠵⠚⠉⢀⣀⣀⣈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣗⢕⢕⢕⢕⢕⢕⣽⣿⣿⣿⣿ " - " ⢷⣂⣠⣴⣾⡿⡿⡻⡻⣿⣿⣴⣿⣿⣿⣿⣿⣿⣷⣵⣵⣵⣷⣿⣿⣿⣿⣿⣿⡿ " - " ⢌⠻⣿⡿⡫⡪⡪⡪⡪⣺⣿⣿⣿⣿⣿⠿⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠃ " - " ⠣⡁⠹⡪⡪⡪⡪⣪⣾⣿⣿⣿⣿⠋⠐⢉⢍⢄⢌⠻⣿⣿⣿⣿⣿⣿⣿⣿⠏⠈ " - " ⡣⡘⢄⠙⣾⣾⣾⣿⣿⣿⣿⣿⣿⡀⢐⢕⢕⢕⢕⢕⡘⣿⣿⣿⣿⣿⣿⠏⠠⠈ " - " ⠌⢊⢂⢣⠹⣿⣿⣿⣿⣿⣿⣿⣿⣧⢐⢕⢕⢕⢕⢕⢅⣿⣿⣿⣿⡿⢋⢜⠠⠈ " - " ⠄⠁⠕⢝⡢⠈⠻⣿⣿⣿⣿⣿⣿⣿⣷⣕⣑⣑⣑⣵⣿⣿⣿⡿⢋⢔⢕⣿⠠⠈ " - " ⠨⡂⡀⢑⢕⡅⠂⠄⠉⠛⠻⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⡿⢋⢔⢕⢕⣿⣿⠠⠈ " - " ⠄⠪⣂⠁⢕⠆⠄⠂⠄⠁⡀⠂⡀⠄⢈⠉⢍⢛⢛⢛⢋⢔⢕⢕⢕⣽⣿⣿⠠⠈ " - " i hate niggas " - ]; - } - { - type = "padding"; - val = 2; - } - ]; - }; - }; - }; -} diff --git a/modules/nix/editors/nvim/default.nix b/modules/nix/editors/nvim/default.nix index 02ecd89..6eb09be 100644 --- a/modules/nix/editors/nvim/default.nix +++ b/modules/nix/editors/nvim/default.nix @@ -19,7 +19,6 @@ in ./neotree.nix ./opts.nix ./lualine.nix - ./alpha.nix ./dev.nix ./nonels.nix ./treesitter.nix diff --git a/modules/nix/editors/nvim/opts.nix b/modules/nix/editors/nvim/opts.nix index 716198c..82b46da 100644 --- a/modules/nix/editors/nvim/opts.nix +++ b/modules/nix/editors/nvim/opts.nix @@ -23,7 +23,6 @@ vim.cmd("highlight Pmenu guibg=NONE") - vim.opt.termguicolors = false vim.opt.shiftwidth = 2 vim.opt.tabstop = 2 vim.opt.softtabstop = 2 @@ -33,12 +32,13 @@ vim.opt.smartindent = true vim.opt.number = true vim.diagnostic.config({ - virtual_text = false, - virtual_lines = false, + virtual_text = true, + virtual_lines = true, }) vim.cmd [[ hi VertSplit guibg=NONE guifg=#000000 + set notermguicolors cnoreabbrev W! w! cnoreabbrev Q! q! cnoreabbrev Qall! qall! diff --git a/modules/nix/mpd.nix b/modules/nix/mpd.nix index a2b1786..65ff2b5 100644 --- a/modules/nix/mpd.nix +++ b/modules/nix/mpd.nix @@ -2,6 +2,8 @@ { home.packages = with pkgs; [ mpc + mpd-discord-rpc + mpv ]; services = { mpd = { @@ -12,6 +14,14 @@ type "pipewire" name "Pipewire Output" } + + audio_output { + type "fifo" + name "Visualizer feed" + path "/tmp/mpd.fifo" + format "44100:16:2" + } + ''; }; }; @@ -20,15 +30,31 @@ ncmpcpp = { enable = true; mpdMusicDir = "/home/fabian/.music"; + bindings = [ + ]; settings = { ncmpcpp_directory = "~/.ncmpcpp"; mpd_host = "localhost"; mpd_port = 6600; header_window_color = "cyan"; - progressbar_look = "░█"; - visualizer_type = "wave"; + progressbar_look = "━━━"; visualizer_color = "cyan"; visualizer_look = "┃│"; + now_playing_prefix = "󰮯 "; + visualizer_type = "wave"; + song_status_format = " $2%a $4⟫$3⟫ $8%t $4⟫$3⟫ $5%b "; + autocenter_mode = "yes"; + centered_cursor = "yes"; + display_bitrate = "no"; + enable_window_title = "no"; + follow_now_playing_lyrics = "yes"; + ignore_leading_the = "yes"; + empty_tag_marker = ""; + visualizer_data_source = "/tmp/mpd.fifo"; + visualizer_output_name = "my_fifo"; + header_visibility = false; + statusbar_visibility = true; + titles_visibility = true; }; }; }; diff --git a/modules/nix/tmux.nix b/modules/nix/tmux.nix index e1f2035..edf2ab2 100644 --- a/modules/nix/tmux.nix +++ b/modules/nix/tmux.nix @@ -29,8 +29,8 @@ bind -n M-Up select-pane -U bind -n M-Down select-pane -D - setw -g window-status-current-format "#T(#I:#W#F)" - setw -g window-status-format "#T(#I:#W#F)" + setw -g window-status-current-format "[ #W ]" + setw -g window-status-format "#W" set-option -s status-interval 1 set -g status-right-length 100