initial commit

base/apollo/configuration.nix

@@ -0,0 +1,199 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  programs.steam.enable = true;
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  programs.virt-manager.enable = true;
+  hardware.keyboard.qmk.enable = true;
+  virtualisation = {
+    libvirtd = {
+      enable = true;
+      extraConfig = ''
+        user="maya"
+      '';
+      qemu.ovmf.enable = true;
+      qemu.package = pkgs.qemu_kvm;
+      qemu.runAsRoot = true;
+    };
+    spiceUSBRedirection.enable = true;
+  };
+   systemd.tmpfiles.rules = 
+  let
+    rocmEnv = pkgs.symlinkJoin {
+      name = "rocm-combined";
+      paths = with pkgs.rocmPackages; [
+        rocblas
+        hipblas
+        clr
+      ];
+    };
+  in [
+    "L+    /opt/rocm   -    -    -     -    ${rocmEnv}"
+  ];
+  systemd.packages = with pkgs; [lact];
+  systemd.services.lactd.wantedBy = ["multi-user.target"];
+  networking.hostName = "apollo"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Enable networking
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+    extraPackages = with pkgs; [mesa.opencl];
+  };
+  environment.variables = { 
+    ROC_ENABLE_PRE_VEGA = "1";
+  };
+  networking.networkmanager = {
+    enable = true;
+    wifi.backend = "iwd";
+  };
+
+  # Set your time zone.
+  time.timeZone = "Australia/Perth";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_AU.UTF-8";
+
+  services.udisks2.enable = true;
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_AU.UTF-8";
+    LC_IDENTIFICATION = "en_AU.UTF-8";
+    LC_MEASUREMENT = "en_AU.UTF-8";
+    LC_MONETARY = "en_AU.UTF-8";
+    LC_NAME = "en_AU.UTF-8";
+    LC_NUMERIC = "en_AU.UTF-8";
+    LC_PAPER = "en_AU.UTF-8";
+    LC_TELEPHONE = "en_AU.UTF-8";
+    LC_TIME = "en_AU.UTF-8";
+  };
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  services.greetd = {
+    enable = true;
+    restart = true;
+    settings.default_session = {
+      command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
+      user = "greeter";
+    };
+  };
+  systemd.services.greetd.serviceConfig = {
+    Type = "idle";
+    StandardInput = "tty";
+    StandardOutput = "tty";
+    StandardError = "journal";
+    TTYReset = "true";
+    TTYHangup = "true";
+    TTYVTDisallocate = "true";
+  };
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+  programs.dconf.enable = true;
+
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "";
+  };
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+ nixpkgs.overlays = [
+    (self: super: {
+      vlc = super.vlc.override {
+        libbluray = super.libbluray.override {
+          withAACS = true;
+          withBDplus = true;
+        };
+      };
+    })
+  ];
+  # Enable sound with pipewire.
+  services.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.maya = {
+    isNormalUser = true;
+    description = "Maya";
+    extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
+    packages = with pkgs; [
+    #  thunderbird
+    ];
+  };
+
+  # Install firefox.
+  programs.firefox.enable = true;
+  services.libinput.enable = true;
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #  wget
+    neovim
+    git
+    lact
+    keepassxc
+  ];
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "24.11"; # Did you read the comment?
+
+}

base/apollo/default.nix

@@ -0,0 +1,10 @@
+{config, pkgs, ...}:{
+  imports = [
+    ./configuration.nix
+    ../overrides.nix
+    ../ssh.nix
+    ../syncthing.nix
+    ../substituters.nix
+    ../fonts.nix
+  ];
+}

base/apollo/hardware-configuration.nix

@@ -0,0 +1,45 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
+  boot.kernelModules = [ "kvm-intel" "vfio_virqfd" "vhost-net" ];
+  boot.extraModulePackages = [ ];
+  boot.extraModprobeConfig = "options vfio-pci ids=10de:2184,10de:1aeb,10de:1aec,10de:1aed,1b21:1242";
+  boot.blacklistedKernelModules = ["nouveau"];
+  boot.kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" "intel_iommu=on" "iommu=pt" "pcie_acs_override=downstream,multifunction" "preempt=voluntary" "module_blacklist=nouveau" ];
+
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/3367079b-0477-4088-b57d-90a8098bdef7";
+      fsType = "xfs";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/8DE9-D26C";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/f7e4a77c-0936-445c-8ce9-0386e9e81656"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp7s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

base/fonts.nix

@@ -0,0 +1,14 @@
+{pkgs, ...}:{
+  fonts.packages = with pkgs; [
+    font-awesome
+    jetbrains-mono
+    nerd-fonts.iosevka
+    noto-fonts
+    noto-fonts-cjk-sans
+    noto-fonts-emoji
+    source-han-sans
+    source-han-sans-japanese
+    source-han-serif-japanese
+    comfortaa
+  ];
+}

base/overrides.nix

@@ -0,0 +1,23 @@
+{pkgs, ...}:{
+   environment.systemPackages = with pkgs; [
+    
+    (lutris.override {
+       extraPkgs = pkgs: [
+         wine
+         gamescope
+       ];
+
+       extraLibraries =  pkgs: [
+         nspr
+         xorg.libXdamage
+         xorg.libXfixes
+	 openal
+	 gnutls
+	 libidn2
+	 libssh2
+	 libpsl
+	 brotli
+       ];
+    })
+  ];
+}

base/ssh.nix

@@ -0,0 +1,11 @@
+{
+  networking.firewall.allowedTCPPorts = [ 22 ];
+  services.openssh = {
+    enable = true;
+    settings = {
+      PasswordAuthentication = false;
+      KbdInteractiveAuthentication = false;
+    };
+  };
+}
+

base/substituters.nix

@@ -0,0 +1,22 @@
+{
+  inputs,
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+
+  nix.settings.substituters = [
+    "https://nix-community.cachix.org"
+    "https://hyprland.cachix.org"
+    "https://nixpkgs-wayland.cachix.org"
+    "https://cache.garnix.io"
+  ];
+
+  nix.settings.trusted-public-keys = [
+    "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+    "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
+    "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+  ];
+}

base/syncthing.nix

@@ -0,0 +1,45 @@
+{
+  networking.firewall.allowedTCPPorts = [ 22000 ];
+  networking.firewall.allowedUDPPorts = [ 22000 21027 ];
+  services.syncthing = {
+    enable = true;
+    user = "maya";
+    dataDir = "/home/maya/sync/";
+    configDir = "/home/maya/.config/syncthing";
+    overrideDevices = true;
+    overrideFolders = true;
+    settings = {
+      devices = {
+        "hypermac" = { id = "XVY5YLM-QETCA4H-KT4XBEH-IR4U47O-CJCJ5YM-DPVWQQX-VHEK4MS-GJCMIQ2"; };
+        "adventurer" = { id = "LLKP3BJ-5RBN5KR-63NXUCW-JC4FMAX-QOXTJBK-65OHI7V-OKZQPTD-5FJIIAB"; };
+        "callisto" = { id = "NPXGWEK-JP4C2NM-QZZPBYI-ISAXIZK-ORCNVGO-C4GFRHJ-SWWFQGC-F5JAMQC"; };
+        "traveler" = { id = "JVNNE3V-IMVW2YL-JKEWUJZ-N5PU4NE-3YQDEU7-77ZHIP3-ADW3LAA-NODOVA3"; };
+      };
+      folders = {
+        "General" = {
+          path = "/home/maya/sync/general";
+          devices = [ "callisto" "hypermac" "adventurer" "traveler" ];
+        };
+        "Music" = {
+          path = "/home/maya/Music";
+          devices = [ "callisto" "hypermac" "adventurer" "traveler" ];
+        };
+        "College" = {
+          path = "/home/maya/sync/college";
+          devices = [ "callisto" "hypermac" "adventurer" "traveler" ];
+          versioning = {
+            type = "staggered";
+            params = {
+              cleanInterval = "3600";
+              maxAge = "15768000";
+            };
+          };
+        };
+        "PrusaSlicer" = {
+          path = "/home/maya/.config/PrusaSlicer";
+          devices = [ "callisto" "hypermac" "adventurer" "traveler" ];
+        };
+      };
+    };
+  };
+}

flake.nix

@@ -0,0 +1,38 @@
+{
+  description = "various system flakes";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixgl.url = "github:nix-community/nixGL";
+    home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    catppuccin.url = "github:catppuccin/nix";
+    nvf.url = "github:notashelf/nvf";
+    nix-index-database.url = "github:nix-community/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = inputs@{ self, nixpkgs, home-manager, ...}:{
+    nixosConfigurations."apollo" = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        ./base/apollo
+	home-manager.nixosModules.home-manager {
+	  #imports = [ inputs.nix-index-database.hmModules.nix-index ];
+	  home-manager.extraSpecialArgs = {
+	    inherit inputs;
+	    vars = {
+	      isNixOS = true;
+	      class = "desktop";
+	    };
+	  };
+	  home-manager.useGlobalPkgs = true;
+	  home-manager.useUserPackages = true;
+	  home-manager.users.maya = ./home;
+	}
+      ];
+    };
+    #other confs go here, cant be assed rn
+
+  };
+}

home/default.nix

@@ -0,0 +1,60 @@
+{config, pkgs, lib, inputs, vars, ...}:{
+  imports = [
+    #home-manager modules
+    inputs.nix-index-database.hmModules.nix-index
+    inputs.nvf.homeManagerModules.default
+    inputs.catppuccin.homeManagerModules.catppuccin
+    #aux files to make finding specific things easier
+    ./sway.nix
+    ./theming.nix
+    ./packages.nix #general user packages not managed by home-manager but i want to install via hm anyways
+  ];
+  home = rec {
+    username = "maya";
+    homeDirectory = "/home/${username}"; #change this if you use a non-standard home dir
+    stateVersion = "23.11";
+    file = {
+      ".config/waybar/config".source = config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/config";
+      ".config/waybar/style.css".source = config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/style.css";
+    };
+  };
+  programs.home-manager.enable = (if vars.isNixOS then false else true); #value is set in flake.nix
+  programs.foot = {
+    enable = true;
+    settings.main.font = "monospace:size=10";
+    settings.colors.alpha = "0.8";
+  };
+  programs.ncmpcpp = {
+    enable = true;
+    settings = {
+      tags_separator = ";";
+    };
+  };
+  services.mpd = {
+    enable = true;
+    musicDirectory = "/home/maya/Music"; #TODO: figure out not hardcoding this
+    extraConfig = ''
+      audio_output {
+        type "pipewire"
+	name "default pipewire"
+      }
+    '';
+  };
+  services.mpd-mpris = {
+    enable = true;
+  };
+  programs.waybar = {
+    enable = true;
+  };
+  programs.git = {
+    enable = true;
+    userName = "beanigen";
+    userEmail = "beanigit@protonmail.com";
+    extraConfig = {
+      commit.gpgsign = true;
+      gpg.format = "ssh";
+      user.signingkey = "~/.ssh/id_ed25519.pub";
+      init.defaultBranch = "main";
+    };
+  }; 
+}

home/packages.nix

@@ -0,0 +1,42 @@
+{pkgs, ...}:{
+  home.packages = with pkgs; [
+    prismlauncher
+    libgpod
+    blender-hip
+    libimobiledevice
+    mpc
+    strawberry
+#    lmms
+    kanshi
+    emacs
+    comma
+    openscad
+    openutau
+    wlr-randr
+    grim
+    slurp
+    swaynotificationcenter
+    udiskie
+    gtklock
+    swaybg
+    gzdoom
+    fzf
+    openrct2
+    wl-clipboard
+    brightnessctl
+    nemo
+    xfce.ristretto
+    xfce.tumbler
+    inkscape
+    hyfetch
+    pamixer
+    pavucontrol
+    gimp
+    prusa-slicer
+    gamescope
+    vlc
+    playerctl
+    firefox
+    libreoffice
+  ];
+}

home/sway.nix

@@ -0,0 +1,96 @@
+{lib, osConfig, pkgs, inputs, ...}:{
+  wayland.windowManager.sway = {
+    package = pkgs.swayfx;
+    enable = true;
+    checkConfig = false; #gles2 renderer error
+    extraConfig = import ./swayfx;
+    config = {
+      modifier = "Mod4";
+      terminal = "foot";
+      #output = {
+        #eDP-1.pos = "0 1362";
+       # "Hewlett Packard HP W2371d 6CM2220CSQ".pos = "1366 1050";
+       # "Samsung Electric Company SyncMaster HMDQ202016".pos = "1517 0";
+     # };
+      gaps = {
+        inner = 5;
+        outer = 7;
+      };
+      input = {
+        "type:touchpad" = {
+          accel_profile = "flat";
+          dwt = "disabled";
+          scroll_factor = "0.3";
+        };
+        "1739:0:Synaptics_TM3075-002" = {
+          natural_scroll = "enabled";
+          click_method = "clickfinger";
+        };
+        "2:10:TPPS/2_IBM_TrackPoint" = {
+          scroll_factor = "0.3";
+        };
+        "type:pointer" = {
+          accel_profile = "flat";
+        };
+	"4152:6202:SteelSeries_SteelSeries_Aerox_3_Wireless" = {
+	  pointer_accel = "0.1";
+	};
+      };
+      bars = [];
+      defaultWorkspace = "workspace number 1";
+      startup = [
+        { command = "waybar"; }
+        { command = "udiskie --appindicator -t"; }
+        { command = "kanshi"; }
+        { command = "swaync"; }
+        { command = "swaybg -m fill -i ~/.config/nixos/assets/twilight.png"; }
+        { command = "kde-indicator"; }
+        { command = "blueman-applet"; }
+      ];
+      workspaceLayout = "default";
+      keybindings = lib.mkOptionDefault {
+        "Print" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/screenshot-`date +%F-%T`.png";
+        "Mod4+d" = "exec foot --title launch --app-id fzf-launcher bash -c 'compgen -c | sort -u | fzf | xargs swaymsg exec --'";
+	"Mod4+t" = "exec foot --title music --app-id mpd-control ncmpcpp";
+        "XF86AudioRaiseVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -l 1.0";
+        "XF86AudioLowerVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
+        "XF86AudioMute" = "exec wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
+        "XF86AudioPlay" = "exec playerctl play-pause";
+        "XF86AudioNext" = "exec playerctl next";
+        "XF86AudioPrev" = "exec playerctl previous";
+        "XF86AudioStop" = "exec playerctl stop";
+        "XF86AudioMicMute" = "exec wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle";
+        "XF86MonBrightnessDown" = "exec brightnessctl s 10%-";
+        "XF86MonBrightnessUp" = "exec brightnessctl s +10%";
+        "XF86AudioMedia" = "exec vlc";
+        "XF86Launch1" = "exec nmcli device wifi rescan";
+        "Shift_L+Control_L+B" = "exec playerctl position 10-";
+        "Shift_L+Control_L+F" = "exec playerctl position 10+";
+      };
+      floating.criteria = [
+        { app_id = "^fzf-launcher$";}
+	{ app_id = "^mpd-control$";}
+	{ con_mark = "DELTARUNE Chapter 1&2";}
+      ];
+#  colors = {
+#    focused = import ./swaycolors.nix;
+#    focused = {
+#      border = "#cba6f7";
+#    };
+#    focusedInactive = import ./swaycolors.nix; 
+#    focusedInactive = {
+#      background = "#440c88"; 
+#      indicator = "#440c88";
+#    };
+#    unfocused = import ./swaycolors.nix; 
+#    unfocused = {
+#      background = "#440c88";
+#      indicator = "#440c88";
+#    };
+#  };
+      window = {
+        titlebar = false;
+      };
+    };
+  };
+}

home/swayfx

@@ -0,0 +1,11 @@
+"
+blur enable
+corner_radius 10
+# shadows enable - not using this because of flicker
+default_dim_inactive 0.3
+client.focused 000000 cba6f7 000000 cba6f7
+for_window [title=\"Picture-in-Picture\"] dim_inactive 0.0
+for_window [title=\"Picture-in-Picture\"] sticky enable
+client.focused_inactive 000000 440C88 000000 440C88
+client.unfocused 000000 440C88 000000 440C88
+"

home/theming.nix

@@ -0,0 +1,35 @@
+{pkgs, ...}:{
+  home.pointerCursor = {
+    gtk.enable = true;
+    x11.enable = true;
+    package = pkgs.catppuccin-cursors.mochaMauve;
+    name = "catppuccin-mocha-mauve-cursors";
+    size = 24;
+  };
+  catppuccin = {
+    enable = true;
+    gtk.enable = false;
+    kvantum.enable = true;
+    waybar.enable = false;
+  };
+  gtk = {
+    #catppuccin.enable = false;
+    enable = true;
+    theme = {
+      name = "catppuccin-mocha-mauve-standard";
+      package = pkgs.catppuccin-gtk.override {
+        accents = ["mauve"];
+	size = "standard";
+	variant = "mocha";
+      };
+    };
+    iconTheme.package = pkgs.adwaita-icon-theme;
+    iconTheme.name = "Adwaita";
+  };
+  qt = {
+    enable = true;
+    style.name = "kvantum";
+    #style.catppuccin.enable = true;
+    platformTheme.name = "kvantum";
+  };
+}

home/waybar.nix

@@ -0,0 +1,12 @@
+{
+  mainBar = {
+    layer = "top";
+    position = "top";
+    height = 20;
+  
+
+
+
+
+  };
+}

home/waybar/\

@@ -0,0 +1,64 @@
+@import "/nix/store/f9wv2p1q7wvqygsic1pkdgrxlid2cmw3-waybar-ee8ed32/mocha.css";
+* {
+	font-family: Iosevka NF;
+}
+window#waybar {
+	background-color: @surface0;
+/*	padding: 0px 5px;
+	margin: 5px 10px 5px; */
+	border-radius: 10px;
+}
+#clock,
+#wireplumber,
+#mpd {
+	padding: 5px; 
+	border-radius: 10px;
+	border: 0.2em solid #cba6f7;
+	background: @surface2;
+	min-height: 0;
+	margin: 0.2em;
+}
+#dtray {
+	margin: 0px 10px 0px;
+	padding: 0px 10px 0px;
+}
+#wireplumber.muted {
+	border: 0;
+	color: #888888;
+}
+#mpd.stopped {
+	background-color: @surface0;
+	border: 0;
+}
+#mpd.playing {
+	background: @mauve;
+}
+.mpdcontrol {
+	background-color: @mauve; 
+	border-radius: 10px;
+	font-size: 1.2em;
+}
+#custom-playpause {
+	background-color: #e5a6f7; 
+	margin-right: -15px;
+	padding-right: 15px;
+/*	border-right: 0.2em solid #e5a6f7; */
+	border-top-right-radius: 10px;
+	border-bottom-right-radius: 10px; 
+}
+#custom-prev {
+	background-color: #F7A6E8;
+	margin-right: -15px;
+	padding-right: 15px;
+	border-top-right-radius: 10px;
+	border-top-left-radius: 10px;
+}
+#custom-next {
+	background-color: #FAA5B7;
+	margin-right: -15px;
+	padding-right: 15px;
+}
+#mpdg:hover {
+	border-radius: 10px;
+	background: @mauve	
+}

home/waybar/cat

@@ -0,0 +1 @@
+/nix/store/f9wv2p1q7wvqygsic1pkdgrxlid2cmw3-waybar-ee8ed32/mocha.css

home/waybar/config

@@ -0,0 +1,64 @@
+[
+  {
+    "layer": "top",
+    "margin-top": 10,
+    "margin-left": 12,
+    "margin-right": 12,
+    "height": 35,
+    "spacing": 5,
+    "position": "top",
+    "modules-center": ["group/mpdg"],
+    "modules-left": ["group/dtray"],
+    "modules-right": ["clock", "wireplumber"],
+
+
+    "group/dtray": {
+    	"orientation": "inherit",
+    	"drawer": {
+		"transition-duration": 500,
+		"transition-left-to-right": true
+	},
+    	"modules": ["custom/arrow", "tray"]
+    },
+    "group/mpdg": {
+      "orientation": "inherit",
+      "drawer": {
+        "transition-duration": 500,
+	"children-class": "mpdcontrol",
+	"transition-left-to-right": true
+      },
+      "modules": ["mpd", "custom/playpause", "custom/prev", "custom/next"]
+    },
+    "custom/playpause": {
+      "format": "󰐎",
+      "on-click": "mpc toggle"
+    },
+    "custom/prev": {
+      "format": "󰒮",
+      "on-click": "mpc prev"
+    },
+    "custom/next": {
+      "format": "󰒭",
+      "on-click": "mpc next"
+    },
+    "custom/arrow": {
+    	"format": "  ",
+	"tooltip": false
+    },
+    "tray": {
+      "spacing": 5
+    },
+    "clock": {
+      "format": "{:%I:%M %p}",
+    },
+    "wireplumber": {
+      "on-click": "pavucontrol",
+    },
+    "mpd": {
+      "on-click": "mpc toggle",
+      "format-disconnected": "MPD seems to be down",
+      "format": "{title} - {album} - {artist}",
+      "format-paused": "{title} - {album} - {artist}",
+    },
+  }
+]

home/waybar/mocha.css

@@ -0,0 +1,26 @@
+@define-color rosewater #f5e0dc;
+@define-color flamingo #f2cdcd;
+@define-color pink #f5c2e7;
+@define-color mauve #cba6f7;
+@define-color red #f38ba8;
+@define-color maroon #eba0ac;
+@define-color peach #fab387;
+@define-color yellow #f9e2af;
+@define-color green #a6e3a1;
+@define-color teal #94e2d5;
+@define-color sky #89dceb;
+@define-color sapphire #74c7ec;
+@define-color blue #89b4fa;
+@define-color lavender #b4befe;
+@define-color text #cdd6f4;
+@define-color subtext1 #bac2de;
+@define-color subtext0 #a6adc8;
+@define-color overlay2 #9399b2;
+@define-color overlay1 #7f849c;
+@define-color overlay0 #6c7086;
+@define-color surface2 #585b70;
+@define-color surface1 #45475a;
+@define-color surface0 #313244;
+@define-color base #1e1e2e;
+@define-color mantle #181825;
+@define-color crust #11111b;

home/waybar/result-jack

@@ -0,0 +1 @@
+/nix/store/j9lnxjn1ccl2v6gpnfdrvc9agd5w643h-pipewire-1.2.7-jack

home/waybar/style.css

@@ -0,0 +1,63 @@
+@import "/nix/store/f9wv2p1q7wvqygsic1pkdgrxlid2cmw3-waybar-ee8ed32/mocha.css";
+* {
+	font-family: Iosevka NF;
+}
+window#waybar {
+	background-color: @surface0;
+/*	padding: 0px 5px;
+	margin: 5px 10px 5px; */
+	border-radius: 10px;
+}
+#clock,
+#wireplumber,
+#mpd {
+	padding: 5px; 
+	border-radius: 10px;
+	border: 0.2em solid #cba6f7;
+	background: @surface2;
+	min-height: 0;
+	margin: 0.2em;
+}
+#dtray {
+	margin: 0px 10px 0px;
+	padding: 0px 10px 0px;
+}
+#wireplumber.muted {
+	border: 0;
+	color: #888888;
+}
+#mpd.stopped {
+	background-color: @surface0;
+	border: 0;
+}
+#mpd.playing {
+	background: @mauve;
+}
+.mpdcontrol {
+	background-color: @surface0; 
+/*	border-radius: 10px; */
+	font-size: 1.2em;
+}
+
+#custom-playpause {
+	background-color: #e5a6f7; 
+	padding-right: 10px; 
+	padding-left: 5px;
+}
+#custom-prev {
+	background-color: #F7A6E8;
+	padding-right: 7px;
+	padding-left: 6px;
+}
+#custom-next {
+	background-color: #FAA5B7;
+	padding-right: 8px;
+	padding-left: 6px;
+	border-top-right-radius: 10px;
+	border-bottom-right-radius: 10px;
+}
+#mpdg:hover {
+	border-bottom-left-radius: 10px;
+	border-top-left-radius: 10px;
+	background: #e5a6f7; 	
+}