From 417c45b85d060dd60741f6c65a335e91edfced40 Mon Sep 17 00:00:00 2001
From: Frankie B <git@diskfloppy.me>
Date: Wed, 7 Feb 2024 01:42:54 +0000
Subject: Misc config formatting

---
 homes/floppydisk/hyprland.nix  |   2 +-
 homes/floppydisk/packages.nix  | 233 +++++++++++++++++++++--------------------
 homes/floppydisk/waybar.nix    |   1 -
 hosts/nixpad/configuration.nix |  41 ++++----
 4 files changed, 140 insertions(+), 137 deletions(-)

diff --git a/homes/floppydisk/hyprland.nix b/homes/floppydisk/hyprland.nix
index 5691a56..9531bbf 100644
--- a/homes/floppydisk/hyprland.nix
+++ b/homes/floppydisk/hyprland.nix
@@ -148,4 +148,4 @@
     "$mod, up, movefocus, u"
     "$mod, down, movefocus, d"
   ];
-}
\ No newline at end of file
+}
diff --git a/homes/floppydisk/packages.nix b/homes/floppydisk/packages.nix
index d4c2c85..0e2f87b 100644
--- a/homes/floppydisk/packages.nix
+++ b/homes/floppydisk/packages.nix
@@ -1,124 +1,129 @@
-{
- pkgs, ...}: {
-
+{pkgs, ...}: {
   home.packages = with pkgs; [
-  # utils
-  handbrake
-  thunderbird
-  picard
-  realvnc-vnc-viewer
-  rpi-imager
-  obs-studio
-  yt-dlp
-  _1password-gui
-  _1password
-  git-credential-1password
-  firefox-devedition
-  rdesktop
-  _3llo
-  gimp
-  qemu
-  virt-manager
-  exactaudiocopy
-  fsv
-  lsd
-  lsdvd
-  thefuck
-  zip
-  unzip
-  notion-app-enhanced
-  libresprite
-  qbittorrent
-  wine
-  vifm
-  cloudflared
-  ansible
-  just
-  pwgen
-  grafx2
-  libreoffice-fresh
-  wiki-tui
-  calcurse 
+    # utils
+    handbrake
+    thunderbird
+    picard
+    realvnc-vnc-viewer
+    rpi-imager
+    obs-studio
+    yt-dlp
+    _1password-gui
+    _1password
+    git-credential-1password
+    firefox-devedition
+    rdesktop
+    _3llo
+    gimp
+    qemu
+    virt-manager
+    exactaudiocopy
+    fsv
+    lsd
+    lsdvd
+    thefuck
+    zip
+    unzip
+    notion-app-enhanced
+    libresprite
+    qbittorrent
+    wine
+    vifm
+    cloudflared
+    ansible
+    just
+    pwgen
+    grafx2
+    libreoffice-fresh
+    wiki-tui
+    calcurse
+    kitty
+    rofi
+    grim
+    wlogout
+    hyprpaper
 
-  # fetch
-  neofetch
-  yafetch
-  cpufetch
-  bunnyfetch
-  nitch
-  screenfetch
-  starfetch
+    # fetch
+    neofetch
+    yafetch
+    cpufetch
+    bunnyfetch
+    nitch
+    screenfetch
+    starfetch
 
-  # devtools
-  github-desktop
-  gh
-  codeql
-  vscode
-  jetbrains.ruby-mine
-  jetbrains.rider
-  jetbrains.phpstorm
-  jetbrains.idea-ultimate
-  jetbrains.webstorm
-  lazygit
-  wakatime
-  mongodb-compass
-  mongosh
-  httpie
-  ngrok
-  mycli
-  squirrel-sql
-  figma-linux
+    # devtools
+    github-desktop
+    gh
+    codeql
+    vscode
+    jetbrains.ruby-mine
+    jetbrains.rider
+    jetbrains.phpstorm
+    jetbrains.idea-ultimate
+    jetbrains.webstorm
+    lazygit
+    wakatime
+    mongodb-compass
+    mongosh
+    httpie
+    ngrok
+    mycli
+    squirrel-sql
+    figma-linux
 
-  # langs
-  openscad
-  nodejs_18
-  nodePackages.yarn
-  nodePackages.ts-node
-  nodePackages.pnpm
-  php82
-  php82Packages.composer
-  deno
-  python310
-  python310Packages.pip
-  python310Packages.discordpy
-  dotnet-sdk
-  jdk17
-  maven
-  purescript
-  lua
-  flutter
+    # langs
+    openscad
+    nodejs_18
+    nodePackages.yarn
+    nodePackages.ts-node
+    nodePackages.pnpm
+    php82
+    php82Packages.composer
+    deno
+    python310
+    python310Packages.pip
+    python310Packages.discordpy
+    dotnet-sdk
+    jdk17
+    maven
+    purescript
+    lua
+    flutter
 
-  # comms
-  nheko
-  element-desktop
-  vesktop
-  caprine-bin
-  teamspeak5_client
+    # comms
+    nheko
+    element-desktop
+    vesktop
+    caprine-bin
+    teamspeak5_client
 
-  # gaming
-  rpcs3
-  pcsxr
-  pcsx2
-  steam
-  gzdoom
-  minecraft
-  dolphin-emu
-  prismlauncher
-  fceux
-  snes9x
-  heroic
-  openrct2
-  osu-lazer-bin
+    # gaming
+    rpcs3
+    pcsxr
+    pcsx2
+    steam
+    gzdoom
+    minecraft
+    dolphin-emu
+    prismlauncher
+    fceux
+    snes9x
+    heroic
+    openrct2
+    osu-lazer-bin
 
-  # media
-  vlc
-  libsForQt5.vvave
-  tidal-hifi
-  spotify-tui
-  youtube-tui
-  mpv
+    # media
+    vlc
+    libsForQt5.vvave
+    tidal-hifi
+    spotify-tui
+    youtube-tui
+    mpv
+    spotify
+    spicetify-cli
 
-  # zsh themes
-  zsh-powerlevel10k
+    # zsh themes
+    zsh-powerlevel10k
   ];
 }
diff --git a/homes/floppydisk/waybar.nix b/homes/floppydisk/waybar.nix
index 194109a..24a9eb2 100644
--- a/homes/floppydisk/waybar.nix
+++ b/homes/floppydisk/waybar.nix
@@ -176,4 +176,3 @@
     };
   };
 }
-
diff --git a/hosts/nixpad/configuration.nix b/hosts/nixpad/configuration.nix
index b2781ab..092ffde 100644
--- a/hosts/nixpad/configuration.nix
+++ b/hosts/nixpad/configuration.nix
@@ -72,23 +72,24 @@
   };
 
   environment.systemPackages = with pkgs; [
-  gcc  
-  git
-  grim
-  lxqt.lxqt-policykit
-  pavucontrol
-  pciutils
-  pulseaudio
-  screen
-  slurp
-  usbutils
-  wget
-  wl-clipboard
-  xdg-utils
-  swaynotificationcenter
-  swayidle
-  wofi
-  swaylock
+    gcc
+    git
+    grim
+    lxqt.lxqt-policykit
+    pavucontrol
+    pciutils
+    pulseaudio
+    screen
+    slurp
+    usbutils
+    wget
+    wl-clipboard
+    xdg-utils
+    swaynotificationcenter
+    swayidle
+    wofi
+    swaylock
+    gnome.gnome-keyring
   ];
 
   services.printing.enable = true;
@@ -107,7 +108,6 @@
   boot.loader.efi.canTouchEfiVariables = true;
   boot.initrd.systemd.enable = true;
   boot.kernelPackages = pkgs.linuxPackages_latest;
-  
 
   # Set a time zone, idiot
   time.timeZone = "Europe/London";
@@ -148,9 +148,8 @@
   # Feel free to remove if you don't need it.
 
   services.openssh.enable = true;
-  
+
   networking.firewall.enable = false;
-  
+
   system.stateVersion = "24.05";
-  
 }
-- 
cgit v1.2.3-54-g00ecf