Merge branch 'main' of github.com:bloxx12/nichts

hosts/vali/mars/configuration.nix

@@ -23,6 +23,8 @@
   security.sudo.package = pkgs.sudo.override { withInsults = true; };
   security.polkit.enable = true;
   programs.kdeconnect.enable = true;
+  programs.neovim.defaultEditor = true;
+  programs.adb.enable = true;
   services.mpd = {
       enable = true;
       musicDirectory = "/home/vali/Nextcloud/Media/Music/";
@@ -34,12 +36,7 @@
           }       
       '';
   };
-/*   options.ui.darkTheme = {
+
-    type = lib.types.bool;
-    default = true;
-    example = false;
-    description = "If ui programs should use a dark or light theme";
-  };*/
   modules = {
       other = {
           system = {
@@ -59,11 +56,10 @@
           mpv.enable = true;
           kitty.enable = true;
           dwm.enable = true;
-          schizofox.enable = true;
+          newsboat.enable = true;
           #git = {
           #    enable = true;
-          #    userName = "vali";
+          #    userName = "vali"; userEmail = "valentin@kaas.cc";
-          #    userEmail = "valentin@kaas.cc";
           #    defaultBranch = "main";
           #};
           starship.enable = true;
@@ -84,21 +80,17 @@
           };
           gtk = {
               enable = false;
-              package = pkgs.catppuccin-gtk;
+              package = pkgs.gruvbox-gtk-theme;
-              name = "Catppuccin-Mocha-Standard-Green-Dark";
+              name = "Gruvbox-Dark-BL";
-              variant = "mocha";
-              accentColour = "green";
               iconTheme = {
-                  name = "Papirus-Dark";
+                 # name = "Papirus-Dark";
-                  package = pkgs.catppuccin-papirus-folders;
+                 # package = pkgs.catppuccin-papirus-folders;
               };
           };
           qt = {
             enable = true;
-            package = pkgs.catppuccin-kde;
+            package = pkgs.kde-gruvbox;
-            name = "Catppuccin-Mocha-Dark";
+            name = "Gruvbox";
-            variant = "mocha";
-            accentColour = "green";
           };
       };
     };

hosts/vali/mars/programs.nix

@@ -7,7 +7,6 @@ in {
             alacritty
             alsa-utils
             asciinema
-#            betterbird
             bibata-cursors
             blanket
             dig
@@ -47,7 +46,7 @@ in {
             neovim
             networkmanagerapplet
             nextcloud-client
-            nheko
+            nicotine-plus
             pamixer
             pavucontrol
             pcmanfm
@@ -56,6 +55,7 @@ in {
             playerctl
             polkit
             python3
+            python311Packages.pygame
             qbittorrent
             ripgrep
             rustdesk
@@ -65,7 +65,6 @@ in {
             signal-desktop-beta
             smartmontools
             spotube
-            steam
             strawberry
             telegram-desktop
             texliveFull
@@ -74,11 +73,12 @@ in {
             trash-cli
             tree
             unzip
+            util-linux
             ventoy-full
-            vesktop
             vlc
             weechat
             wget
+            wireguard-tools 
             xclip
             xfce.thunar
             xorg.libX11.dev

hosts/vali/mars/temp

@@ -1,78 +0,0 @@
-{ config, inputs, pkgs, ... }:
-let
-  username = config.myOptions.other.system.username;
-in {
-    home-manager.users.${username} = {
-        home.packages = let
-          fenix = inputs.fenix.packages.${pkgs.system};
-
-        in with pkgs; [
-            alacritty
-            alsa-utils
-            asciinema
-            betterbird
-            bibata-cursors
-            dig
-            easyeffects
-            element-desktop
-            eza
-            fastfetch
-            (fenix.complete.withComponents [
-              "cargo"
-              "clippy"
-              "rust-src"
-              "rustc"
-              "rustfmt"
-            ])
-            ffmpeg_6-full
-            flameshot
-            foot
-            gcc
-            gdb
-            grimblast
-            git
-            httpie
-            imagemagick
-            keepassxc
-            krita
-            lazygit
-            libreoffice-fresh
-            neofetch
-            neovim
-            networkmanagerapplet
-            nextcloud-client
-            pamixer
-            pavucontrol
-            pcmanfm
-            pfetch
-            playerctl
-            polkit
-            python3
-            qbittorrent
-            ripgrep
-            rustdesk
-            rofi
-            scc
-            sherlock
-            signal-desktop-beta
-            smartmontools
-            st
-            steam
-            strawberry.strawberry-wrapped
-            telegram-desktop
-            texliveFull
-            thunderbird
-            tor-browser-bundle-bin
-            trash-cli
-            tree
-            unzip
-            ventoy-full
-            vesktop
-            vlc
-            xclip
-            yt-dlp
-            zathura
-            zip
-        ];
-    };
-}

modules/gui/vesktop.nix

@@ -33,8 +33,8 @@ in {
                 autoUpdate = false;
                 autoUpdateNotification = false;
                 useQuickCss = true;
-                themeLinks = [];
+                themeLinks = ["https://github.com/Costeer/Gruvbox-Material-Themes/blob/main/Discord%20Theme/gruvboxmaterial.theme.css"];
-                enabledThemes = ["Catppuccin.theme.css"];
+                enabledThemes = ["gruvboxmaterial.theme.css"];
                 enableReactDevtools = true;
                 frameless = false;
                 transparent = false;

modules/other/system.nix

@@ -27,7 +27,7 @@ in {
 
         users.users.${cfg.username} = {
             isNormalUser = true;
-            extraGroups = [ "wheel" ];
+            extraGroups = [ "wheel" "adbusers" ];
         };
     };
 }

modules/tui/ncmpcpp.nix

@@ -10,9 +10,72 @@ in  {
             xdg.configFile."ncmpcpp/config".source = ./config;
             programs.ncmpcpp = {
                 enable = true;
+                package = (pkgs.ncmpcpp.override {visualizerSupport = true;});
                 mpdMusicDir = "/home/vali/Nextcloud/Media/Music";
+                    settings = {
+                    mpd_host = "127.0.0.1";
+                    mpd_port = "6600";
+                    alternative_header_first_line_format = "$5{$b%t$/b}$9";
+                    alternative_header_second_line_format = "$3by $7{$b%a$/b}$9 $3from $7{$b%b$/b}$9 $5{(%y)}";
+                    song_list_format = "♫   $2%n$(end) $9 $3%a$(end) $(245)-$9 $(246)%t$9 $R{ $5%y$9}$(end)     $(246)%lq$(end)";
+                    song_columns_list_format ="(3f)[red]{n} (3f)[246]{} (35)[white]{t} (18)[blue]{a} (30)[green]{b} (5f)[yellow]{d} (5f)[red]{y} (7f)[magenta]{l}";
+                    song_status_format = "$b $8%A $8•$3• $3%t $3•$5• $5%b $5•$2• $2%y $2•$8• %g";
+                    playlist_display_mode = "columns";
+                    browser_display_mode = "columns";
+                    search_engine_display_mode = "columns";
+                    now_playing_prefix = "$b";
+                    now_playing_suffix = "$/b";
+                    browser_playlist_prefix = "$2 ♥ $5 ";
+                    playlist_disable_highlight_delay = "1";
+                    message_delay_time = "1";
+                    progressbar_look = "━━━";
+                    colors_enabled = "yes";
+                    empty_tag_color = "red";
+                    statusbar_color = "blue";
+                    state_line_color = "black";
+                    state_flags_color = "default";
+                    main_window_color = "blue"; 
+                    header_window_color = "white";
+                    alternative_ui_separator_color = "black";
+                    window_border_color = "green";
+                    active_window_border = "red";
+                    volume_color = "default";
+                    progressbar_color = "black";
+                    progressbar_elapsed_color = "blue";
+                    statusbar_time_color = "blue";
+                    player_state_color = "default";
+                    display_bitrate = "yes";
+                    autocenter_mode = "yes";
+                    centered_cursor = "yes";
+                    titles_visibility = "no";
+                    enable_window_title = "yes";
+                    statusbar_visibility = "yes";
+                    empty_tag_marker="";
+                    mouse_support = "yes";
+                    header_visibility = "no";
+                    display_remaining_time = "no";
+                    ask_before_clearing_playlists = "yes";
+                    discard_colors_if_item_is_selected = "yes";
+                    user_interface = "alternative";
+                    default_find_mode = "wrapped";
+                    lyrics_directory = "~/.lyrics";
+                    follow_now_playing_lyrics = "yes";
+                    store_lyrics_in_song_dir = "no";
+                    ignore_leading_the = "yes";
+                    lines_scrolled = "1";
+                    mouse_list_scroll_whole_page = "no";
+                    show_hidden_files_in_local_browser = "no";
+                    startup_screen = "playlist";
+                    execute_on_song_change="/home/dobbie/.bin/np";
+                    connected_message_on_startup = "no";
+                    playlist_separate_albums = "no";
+                    allow_for_physical_item_deletion = "no";
+                    visualizer_in_stereo = "yes";
+                    visualizer_data_source = "/tmp/mpd.fifo";
+                    visualizer_type = "wave_filled";
+                    visualizer_look = "▉▋";
+                  };
             };
         };
     };
-
 } 

modules/tui/newsboat.nix

@@ -25,6 +25,7 @@ in {
                     bind-key d pagedown
                     bind-key u pageup
                     bind-key a toggle-article-read
+                    macro x set browser "setsid -f mpv --really-quiet --no-terminal" ; open-in-browser ; set browser librewolf
 
                     color listnormal         color15 default
                     color listnormal_unread  color2  default
@@ -50,6 +51,14 @@ in {
                         title = "NixOS Weekly";
                         url = "https://weekly.nixos.org/feeds/all.rss.xml";
                     }
+                    {
+                        title = "Veronica Explains";
+                        url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCMiyV_Ib77XLpzHPQH_q0qQ";
+                    }
+                    {
+                        title = "Mental Outlaw";
+                        url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC7YOGHUfC1Tb6E4pudI9STA";
+                    }
                     {
                         title = "Hacker News";
                         url = "https://hnrss.org/newest";