From 1114c0cf7168a92f74c0d6caf131c2d2eb189e3d Mon Sep 17 00:00:00 2001
From: Sneexy <sneexy@disroot.org>
Date: Fri, 19 Apr 2024 09:19:19 -0500
Subject: [PATCH] chore: modify vscodium, clean up home manager

---
 nixos.nix            |  2 +-
 users/ruben/home.nix | 93 +++++++++++++++++++++++++++++++++-----------
 2 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/nixos.nix b/nixos.nix
index 5d0e217..6f17d3a 100644
--- a/nixos.nix
+++ b/nixos.nix
@@ -170,8 +170,8 @@
   fonts = {
     packages = with pkgs; [
       noto-fonts
+      lexend
       liberation_ttf
-      fira
       unifont
       (nerdfonts.override { fonts = [ "JetBrainsMono" "Iosevka" "FiraCode" "DroidSansMono" ]; })
       noto-fonts-color-emoji
diff --git a/users/ruben/home.nix b/users/ruben/home.nix
index d1c4ce4..e36626f 100644
--- a/users/ruben/home.nix
+++ b/users/ruben/home.nix
@@ -1,5 +1,12 @@
-# This is your home-manager configuration file
-# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
+# ╭──────────────────────────────────────────────────────────────────────────────────╮
+# │     __                                                                           │
+# │    / /_  ____  ____ ___  ___        ____ ___  ____ _____  ____ _____ ____  _____ │
+# │   / __ \/ __ \/ __ `__ \/ _ \______/ __ `__ \/ __ `/ __ \/ __ `/ __ `/ _ \/ ___/ │
+# │  / / / / /_/ / / / / / /  __/_____/ / / / / / /_/ / / / / /_/ / /_/ /  __/ /     │
+# │ /_/ /_/\____/_/ /_/ /_/\___/     /_/ /_/ /_/\__,_/_/ /_/\__,_/\__, /\___/_/      │
+# │                                                             /____/               │
+# │ home manager config                                                              │
+# ╰──────────────────────────────────────────────────────────────────────────────────╯
 {
   inputs,
   lib,
@@ -16,12 +23,6 @@
 
     # catppuccin home-manager flake
     flake-inputs.catppuccin.homeManagerModules.catppuccin
-
-    # If you want to use home-manager modules from other flakes (such as nix-colors):
-    # inputs.nix-colors.homeManagerModule
-
-    # You can also split up your configuration and import pieces of it here:
-    # ./nvim.nix
   ];
 
   home = {
@@ -29,9 +30,14 @@
     homeDirectory = "/home/ruben";
   };
 
-  # flatpaks
-  # TODO: unsure if i should even bother using flatpaks in a configuration/distro like this...
-  # maybe i can fully embrace flatpaks once i've figured out how to remove default packages
+  # ╭─────────────────────────────────╮
+  # │   __ _      _              _    │
+  # │  / _| |__ _| |_ _ __  __ _| |__ │
+  # │ |  _| / _` |  _| '_ \/ _` | / / │
+  # │ |_| |_\__,_|\__| .__/\__,_|_\_\ │
+  # │                |_|              │
+  # │ flatpak                         │
+  # ╰─────────────────────────────────╯
   services.flatpak.remotes = lib.mkOptionDefault [{
     name = "flathub-user";
     location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
@@ -68,6 +74,14 @@
     "io.gitlab.azymohliad.WatchMate"
   ];
 
+  # ╭──────────────────────────────────────╮
+  # │                _                     │
+  # │  _ __  __ _ __| |____ _ __ _ ___ ___ │
+  # │ | '_ \/ _` / _| / / _` / _` / -_|_-< │
+  # │ | .__/\__,_\__|_\_\__,_\__, \___/__/ │
+  # │ |_|                    |___/         │
+  # │ user packages                        │
+  # ╰──────────────────────────────────────╯
   # Add stuff for your user as you see fit:
   programs.neovim.enable = true;
   home.packages = with pkgs; [
@@ -83,15 +97,18 @@
     starship
     zoxide
 
+    cargo
     usbutils
     jq
     ffmpeg_6-full
     imagemagick
     yt-dlp
+    mpdris2
 
     mpv
     nextcloud-client
     obs-studio
+    joystickwake
     ventoy-full
   ];
 
@@ -131,7 +148,7 @@
     package = pkgs.vscodium;
 
     extensions = with pkgs.vscode-extensions; [
-      vscodevim.vim
+      esbenp.prettier-vscode
       catppuccin.catppuccin-vsc
       catppuccin.catppuccin-vsc-icons
       arrterian.nix-env-selector
@@ -139,12 +156,16 @@
     ];
 
     userSettings = {
-      "editor.fontFamily" = "\'JetBrainsMono Nerd Font\', \'Terminus (TTF)\', \'Droid Sans Mono\', \'monospace\', monospace";
+      "editor.fontFamily" = "\'JetBrainsMono Nerd Font\', \'Droid Sans Mono\', \'monospace\', monospace";
       "editor.fontSize" = 16;
+      "files.autoSave" = "onFocusChange";
+      "editor.cursorBlinking" = "expand";
+      "editor.cursorSmoothCaretAnimation" = "on";
+      "window.dialogStyle" = "custom";
+      "window.titleBarStyle" = "custom";
       "workbench.colorTheme" = "Catppuccin Mocha";
-      #"workbench.iconTheme" = "material-icon-theme";
-      "files.eol" = "\n";
-      "editor.cursorBlinking" = "phase";
+      "workbench.iconTheme" = "catppuccin-mocha";
+      "catppuccin.accentColor" = "green";
     };
   };
 
@@ -156,16 +177,34 @@
   # music!!
   services.mpd = {
     enable = true;
-    #extraConfig = ''
-    #  ''audio_output {
-    #    type "pipewire"
-    #    name "PipeWire"
-    #  }''
-    #'';
+
+    dataDir = "~/.config/mpd";
+    musicDirectory = "~/Music";
+    playlistDirectory = "~/.config/mpd/playlists";
+    dbFile = "~/.config/mpd/db";
+
+    extraConfig = ''
+      state_file_interval "120"
+      restore_paused "yes"
+
+      audio_output {
+        type "pipewire"
+        name "PipeWire"
+      }
+    '';
   };
 
   xdg.userDirs.enable = true;
 
+  # ╭───────────────────────────────────────────╮
+  # │          _                        _       │
+  # │  __ __ _| |_ _ __ _ __ _  _ __ __(_)_ _   │
+  # │ / _/ _` |  _| '_ \ '_ \ || / _/ _| | ' \  │
+  # │ \__\__,_|\__| .__/ .__/\_,_\__\__|_|_||_| │
+  # │             |_|  |_|                      │
+  # │ catppuccin                                │
+  # ╰───────────────────────────────────────────╯
+
   # catppuccin flavour
   catppuccin.flavour = "mocha";
 
@@ -190,6 +229,16 @@
     "gtk-4.0/gtk-dark.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css";
   };
 
+  # ╭───────────────────────────────────────────────╮
+  # │               _                    __ _       │
+  # │  _ __  ___ __| |_ ___ __ ___ _ _  / _(_)__ _  │
+  # │ | '_ \/ _ (_-<  _|___/ _/ _ \ ' \|  _| / _` | │
+  # │ | .__/\___/__/\__|   \__\___/_||_|_| |_\__, | │
+  # │ |_|                                    |___/  │
+  # │ post-config                                   │
+  # ╰───────────────────────────────────────────────╯
+  # post-setup things
+
   # Nicely reload system units when changing configs
   systemd.user.startServices = "sd-switch";