refactor(treewide): format with alejandra

flake.nix

@@ -2,9 +2,12 @@
   # ooknet
   description = "a nix configuration written by an orangutan";
 
-  outputs = { flake-parts, self, ... } @ inputs:
+  outputs = {
+    flake-parts,
+    self,
+    ...
+  } @ inputs:
     flake-parts.lib.mkFlake {inherit inputs;} ({withSystem, ...}: {
-
       systems = import inputs.systems;
 
       imports = [
@@ -16,11 +19,13 @@
         nixosConfigurations = import ./outputs/nixos.nix {inherit self inputs withSystem;};
       };
 
+      perSystem = {pkgs, ...}: {
+        formatter = pkgs.alejandra;
+      };
     });
 
   # External inputs we depend on
   inputs = {
-  
     # unstable because why not
     nixpkgs.url = "github:Nixos/nixpkgs/nixos-unstable";
     nixpkgs-small.url = "github:Nixos/nixpkgs/nixos-unstable-small";
@@ -93,7 +98,7 @@
     };
 
     # neovim configured with nix
-    ookvim.url = "git+ssh://git@github.com/ooks-io/ookvim";
+    ooks-vim.url = "git+ssh://git@github.com/ooks-io/ooks-vim";
 
     # packaged firefox addons
     firefox-addons = {

home/modules/appearance/cursor.nix

@@ -1,11 +1,11 @@
-{ lib, config, ... }: 
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.cursor;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     home.pointerCursor = {
       package = cfg.package;
@@ -16,4 +16,3 @@ in
     };
   };
 }
-

home/modules/appearance/fonts.nix

@@ -1,11 +1,12 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.fonts;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     fonts.fontconfig.enable = true;
     home.packages = [
@@ -18,4 +19,3 @@ in
     ];
   };
 }
-

home/modules/appearance/gtk.nix

@@ -1,12 +1,15 @@
-{ config, pkgs, inputs, lib, ... }:
+{
-
+  config,
-let
+  pkgs,
+  inputs,
+  lib,
+  ...
+}: let
   inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme;
   inherit (lib) mkIf;
   cfg = config.ooknet.gtk;
-in
+in {
-{
+  config = mkIf cfg.enable rec {
-  config = mkIf cfg.enable (rec {
     gtk = {
       enable = true;
       font = {
@@ -30,6 +33,5 @@ in
         "Net/IconThemeName" = gtk.iconTheme.name;
       };
     };
-  });
+  };
 }
-

home/modules/appearance/qt.nix

@@ -1,11 +1,12 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.qt;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     qt = {
       enable = true;

home/modules/appearance/wallpaper.nix

@@ -1,15 +1,19 @@
-{ lib, config, inputs, pkgs, osConfig, ... }:
+{
-let 
+  lib,
+  config,
+  inputs,
+  pkgs,
+  osConfig,
+  ...
+}: let
   inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) nixWallpaperFromScheme;
   inherit (lib) mkDefault mkIf;
 
   monitors = osConfig.ooknet.host.hardware.monitors;
   cfg = config.ooknet.wallpaper;
-in
+in {
-{
   config = mkIf cfg.enable {
-    ooknet.wallpaper.path =
+    ooknet.wallpaper.path = let
-      let
       largest = f: xs: builtins.head (builtins.sort (a: b: a > b) (map f xs));
       largestWidth = largest (x: x.width) monitors;
       largestHeight = largest (x: x.height) monitors;
@@ -23,4 +27,3 @@ in
         });
   };
 }
-

home/modules/base/home-manager.nix

@@ -1,11 +1,12 @@
-{ lib, config, osConfig, ... }:
+{
-
+  lib,
-let
+  config,
+  osConfig,
+  ...
+}: let
   inherit (lib) mkDefault;
   admin = osConfig.ooknet.host.admin;
-in
+in {
-
-{
   programs.home-manager.enable = true;
   systemd.user.startServices = "sd-switch";
 

home/modules/base/mime-apps.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   home.packages = [pkgs.xdg-utils];
   xdg.mimeApps = {
     enable = true;

home/modules/base/user-dirs.nix

@@ -1,6 +1,4 @@
-{ config, ... }:
+{config, ...}: {
-
-{
   xdg = {
     enable = true;
     configHome = "${config.home.homeDirectory}/.config";

home/modules/console/editor/helix/default.nix

@@ -1,13 +1,15 @@
-{ inputs, config, pkgs, lib, ... }:
+{
-
+  inputs,
-let
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
   inherit (config) colorscheme;
   inherit (lib) mkIf;
   cfg = config.ooknet.editor.helix;
   console = config.ooknet.console;
-in
+in {
-
-{
   imports = [
     ./languages.nix
   ];

home/modules/console/editor/helix/languages.nix

@@ -1,12 +1,13 @@
-{ pkgs, lib, config, ... }: 
+{
-
+  pkgs,
-let
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf getExe;
   cfg = config.ooknet.editor.helix;
   console = config.ooknet.console;
-in
+in {
-
-{
   config = mkIf (cfg.enable || console.editor == "helix") {
     programs.helix.languages = {
       language = let

home/modules/console/editor/helix/theme.nix

@@ -1,9 +1,11 @@
-
 {colorscheme}: {
   "${colorscheme.slug}" = {
     palette = builtins.mapAttrs (_name: value: "#${value}") colorscheme.colors; # Add leading '#'
     "attributes" = "base09";
-    "comment" = { fg = "base03"; modifiers = [ "italic" ]; };
+    "comment" = {
+      fg = "base03";
+      modifiers = ["italic"];
+    };
     "constant" = "base09";
     "constant.character.escape" = "base0C";
     "constant.numeric" = "base09";
@@ -23,11 +25,20 @@
     "info" = "base0D";
     "keyword" = "base0E";
     "label" = "base0E";
-    "markup.bold" = { fg = "base0A"; modifiers = [ "bold" ]; };
+    "markup.bold" = {
+      fg = "base0A";
+      modifiers = ["bold"];
+    };
     "markup.heading" = "base0D";
-    "markup.italic" = { fg = "base0E"; modifiers = [ "italic" ]; };
+    "markup.italic" = {
+      fg = "base0E";
+      modifiers = ["italic"];
+    };
     "markup.link.text" = "base08";
-    "markup.link.url" = { fg = "base09"; modifiers = [ "underlined" ]; };
+    "markup.link.url" = {
+      fg = "base09";
+      modifiers = ["underlined"];
+    };
     "markup.list" = "base08";
     "markup.quote" = "base0C";
     "markup.raw" = "base0B";
@@ -38,28 +49,84 @@
     "string" = "base0B";
     "type" = "base0A";
     "ui.background" = {bg = "base00";};
-    "ui.bufferline" = { fg = "base04"; bg = "base00"; };
+    "ui.bufferline" = {
-    "ui.bufferline.active" = { fg = "base00"; bg = "base03"; modifiers = [ "bold" ]; };
+      fg = "base04";
-    "ui.cursor" = { fg = "base04"; modifiers = [ "reversed" ]; };
+      bg = "base00";
-    "ui.cursor.insert" = { fg = "base0A"; modifiers = [ "underlined" ]; };
+    };
-    "ui.cursor.match" = { fg = "base0A"; modifiers = [ "underlined" ]; };
+    "ui.bufferline.active" = {
-    "ui.cursor.select" = { fg = "base0A"; modifiers = [ "underlined" ]; };
+      fg = "base00";
-    "ui.cursorline.primary" = { fg = "base05"; bg = "base01"; };
+      bg = "base03";
+      modifiers = ["bold"];
+    };
+    "ui.cursor" = {
+      fg = "base04";
+      modifiers = ["reversed"];
+    };
+    "ui.cursor.insert" = {
+      fg = "base0A";
+      modifiers = ["underlined"];
+    };
+    "ui.cursor.match" = {
+      fg = "base0A";
+      modifiers = ["underlined"];
+    };
+    "ui.cursor.select" = {
+      fg = "base0A";
+      modifiers = ["underlined"];
+    };
+    "ui.cursorline.primary" = {
+      fg = "base05";
+      bg = "base01";
+    };
     "ui.gutter" = {bg = "base00";};
-    "ui.help" = { fg = "base06"; bg = "base01"; };
+    "ui.help" = {
-    "ui.linenr" = { fg = "base03"; bg = "base00"; };
+      fg = "base06";
-    "ui.linenr.selected" = { fg = "base04"; bg = "base01"; modifiers = [ "bold" ]; };
+      bg = "base01";
-    "ui.menu" = { fg = "base05"; bg = "base01"; };
+    };
-    "ui.menu.scroll" = { fg = "base03"; bg = "base01"; };
+    "ui.linenr" = {
-    "ui.menu.selected" = { fg = "base01"; bg = "base04"; };
+      fg = "base03";
+      bg = "base00";
+    };
+    "ui.linenr.selected" = {
+      fg = "base04";
+      bg = "base01";
+      modifiers = ["bold"];
+    };
+    "ui.menu" = {
+      fg = "base05";
+      bg = "base01";
+    };
+    "ui.menu.scroll" = {
+      fg = "base03";
+      bg = "base01";
+    };
+    "ui.menu.selected" = {
+      fg = "base01";
+      bg = "base04";
+    };
     "ui.popup" = {bg = "base01";};
     "ui.selection" = {bg = "base02";};
     "ui.selection.primary" = {bg = "base02";};
-    "ui.statusline" = { fg = "base0B"; bg = "base02"; };
+    "ui.statusline" = {
-    "ui.statusline.inactive" = { bg = "base01"; fg = "base02"; };
+      fg = "base0B";
-    "ui.statusline.insert" = { fg = "base00"; bg = "base0B"; };
+      bg = "base02";
-    "ui.statusline.normal" = { fg = "base00"; bg = "base04"; };
+    };
-    "ui.statusline.select" = { fg = "base00"; bg = "base0E"; };
+    "ui.statusline.inactive" = {
+      bg = "base01";
+      fg = "base02";
+    };
+    "ui.statusline.insert" = {
+      fg = "base00";
+      bg = "base0B";
+    };
+    "ui.statusline.normal" = {
+      fg = "base00";
+      bg = "base04";
+    };
+    "ui.statusline.select" = {
+      fg = "base00";
+      bg = "base0E";
+    };
     "ui.text" = "base05";
     "ui.text.focus" = "base05";
     "ui.virtual.indent-guide" = {fg = "base03";};

home/modules/console/editor/nvim/default.nix

@@ -1,16 +1,19 @@
-{ config, lib, inputs, pkgs, ... }:
-
-let
-  inherit (lib) mkIf;
-  cfg = config.ooknet.editor.nvim;
-  console = config.ooknet.console;
-
-  ookvim = inputs.ookvim.packages.${pkgs.system}.default;
-in
-  
 {
+  config,
+  lib,
+  inputs,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf;
+  inherit (config.ooknet) console;
 
+  cfg = config.ooknet.editor.nvim;
+
+  ookvim = inputs.ooks-vim.packages.${pkgs.system}.ooks-vim;
+in {
   config = mkIf (cfg.enable || console.editor == "nvim") {
     home.packages = [ookvim];
+    home.sessionVariables.EDITOR = mkIf (console.editor == "nvim") "nvim";
   };
 }

home/modules/console/multiplexer/tmux/default.nix

@@ -1,13 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (config.colorscheme) palette;
   inherit (lib) mkIf;
   cfg = config.ooknet.multiplexer.tmux;
   console = config.ooknet.console;
-in
+in {
-
-{
   config = mkIf (cfg.enable || console.multiplexer == "tmux") {
     programs.tmux = {
       enable = true;
@@ -22,7 +23,11 @@ in
           plugin = tmuxPlugins.mode-indicator;
         }
       ];
-      extraConfig = /* sh */ ''
+      extraConfig =
+        /*
+        sh
+        */
+        ''
           # General Settings
           set -g set-clipboard on
           #Appearance

home/modules/console/multiplexer/zellij/default.nix

@@ -1,13 +1,16 @@
-{ osConfig, lib, config, pkgs, ... }:
+{
-let
+  osConfig,
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   inherit (config.colorscheme) palette;
   inherit (lib) mkIf;
+  inherit (config.ooknet) console;
+  inherit (osConfig.ooknet.host) admin;
   cfg = config.ooknet.multiplexer.zellij;
-  console = config.ooknet.console;
+in {
-  admin = osConfig.ooknet.host.admin;
-in
-
-{
   config = mkIf (cfg.enable || console.multiplexer == "zellij") {
     programs.zellij = {
       enable = true;
@@ -16,6 +19,7 @@ in
         default_shell = "${admin.shell}";
         default_layout = "default";
         pane_frames = false;
+        scrollback_editor = "${console.editor}";
         themes = {
           "${config.colorscheme.slug}" = {
             fg = "#${palette.base05}";
@@ -35,16 +39,18 @@ in
     };
 
     # Layouts
+    xdg.configFile = {
       # Default layout
-    xdg.configFile."zellij/layouts/default.kdl" = import ./layouts/defaultLayout.nix { inherit pkgs config; };
+      "zellij/layouts/default.kdl" = import ./layouts/defaultLayout.nix {inherit pkgs config;};
       # Layout for bash scripts
-    xdg.configFile."zellij/layouts/script.kdl" = import ./layouts/scriptLayout.nix { inherit pkgs config; };
+      "zellij/layouts/script.kdl" = import ./layouts/scriptLayout.nix {inherit pkgs config;};
       # Layout for configuring my flake
-    xdg.configFile."zellij/layouts/flake.kdl" = import ./layouts/flakeLayout.nix { inherit pkgs config; };
+      "zellij/layouts/flake.kdl" = import ./layouts/flakeLayout.nix {inherit pkgs config;};
-
       # Additional keybinds
-    xdg.configFile."zellij/config.kdl".text = /* kdl */ ''
+      "zellij/config.kdl".text =
-      keybinds {
+        # kdl
+        ''
+          keybinds clear-defaults=true {
               shared_except "locked" {
                   bind "Alt 1" { GoToTab 1; }
                   bind "Alt 2" { GoToTab 2; }
@@ -55,9 +61,138 @@ in
                   bind "Alt 7" { GoToTab 7; }
                   bind "Alt 8" { GoToTab 8; }
                   bind "Alt 9" { GoToTab 9; }
+                  bind "Alt -" { Resize "Decrease" ; }
+                  bind "Alt =" { Resize "Increase" ; }
+              }
+
+              locked {
+                  bind "Alt g" { SwitchToMode "Normal" ; }
+              }
+
+              resize {
+                  bind "Alt r" { SwitchToMode "Normal" ; }
+                  bind "h" "Left" { Resize "Increase Left" ; }
+                  bind "j" "Down"  { Resize "Increase Down" ; }
+                  bind "k" "Up"    { Resize "Increase Up" ; }
+                  bind "l" "Right" { Resize "Increase Right" ; }
+              }
+
+              pane {
+                  bind "Alt p"     { SwitchToMode "Normal" ; }
+                  bind "c"         { Clear ; }
+                  bind "e"         { TogglePaneEmbedOrFloating ; SwitchToMode "Normal" ; }
+                  bind "f"         { ToggleFocusFullscreen ; SwitchToMode "Normal" ; }
+                  bind "j" "Down"  { NewPane "Down" ; SwitchToMode "Normal" ; }
+                  bind "l" "Right" { NewPane "Right" ; SwitchToMode "Normal" ; }
+                  bind "n"         { NewPane ; SwitchToMode "Normal" ; }
+                  bind "p"         { SwitchFocus ; SwitchToMode "Normal" ; }
+                  bind "r"         { SwitchToMode "RenamePane" ; PaneNameInput 0 ; }
+                  bind "w"         { ToggleFloatingPanes ; SwitchToMode "Normal" ; }
+                  bind "x"         { CloseFocus ; SwitchToMode "Normal" ; }
+                  bind "z"         { TogglePaneFrames ; SwitchToMode "Normal" ; }
+              }
+              move {
+                  bind "Alt m"     { SwitchToMode "Normal"; }
+                  bind "h" "Left"  { MovePane "Left" ; }
+                  bind "j" "Down"  { MovePane "Down" ; }
+                  bind "k" "Up"    { MovePane "Up" ; }
+                  bind "l" "Right" { MovePane "Right" ; }
+              }
+              tab {
+                bind "Alt t" { SwitchToMode "Normal" ; }
+                bind "b"     { BreakPane; SwitchToMode "Normal" ; }
+                bind "h"     { MoveTab "Left" ; }
+                bind "l"     { MoveTab "Right" ; }
+                bind "n"     { NewTab ; SwitchToMode "Normal" ; }
+                bind "r"     { SwitchToMode "RenameTab" ; TabNameInput 0 ; }
+                bind "x"     { CloseTab ; SwitchToMode "Normal" ; }
+                bind "1"     { GoToTab 1 ; SwitchToMode "Normal" ; }
+                bind "2"     { GoToTab 2 ; SwitchToMode "Normal" ; }
+                bind "3"     { GoToTab 3 ; SwitchToMode "Normal" ; }
+                bind "4"     { GoToTab 4 ; SwitchToMode "Normal" ; }
+                bind "5"     { GoToTab 5 ; SwitchToMode "Normal" ; }
+                bind "6"     { GoToTab 6 ; SwitchToMode "Normal" ; }
+                bind "7"     { GoToTab 7 ; SwitchToMode "Normal" ; }
+                bind "8"     { GoToTab 8 ; SwitchToMode "Normal" ; }
+                bind "9"     { GoToTab 9 ; SwitchToMode "Normal" ; }
+            }
+            scroll {
+                bind "Alt s"    { SwitchToMode "Normal" ; }
+                bind "e"        { EditScrollback; SwitchToMode "Normal" ; }
+                bind "d"        { HalfPageScrollDown ; }
+                bind "u"        { HalfPageScrollUp ; }
+                bind "j" "Down" { ScrollDown ; }
+                bind "k" "Up"   { ScrollUp ; }
+                bind "Home"     { ScrollToTop ; SwitchToMode "Normal" ; }
+                bind "End"      { ScrollToBottom ; SwitchToMode "Normal" ; }
+                bind "PageDown" { PageScrollDown ; }
+                bind "PageUp"   { PageScrollUp ; }
+                bind "s"        { SwitchToMode "EnterSearch" ; SearchInput 0 ; }
+            }
+            search {
+                bind "Alt s" { SwitchToMode "Normal" ; }
+                bind "n"     { Search "down" ; }
+                bind "p"     { Search "up" ; }
+                bind "c"     { SearchToggleOption "CaseSensitivity" ; }
+                bind "w"     { SearchToggleOption "Wrap" ; }
+                bind "o"     { SearchToggleOption "WholeWord" ; }
+            }
+            entersearch {
+                bind "Alt c" "Esc" { SwitchToMode "Scroll" ; }
+                bind "Enter"       { SwitchToMode "Search" ; }
+            }
+            renametab {
+                bind "Alt c" { SwitchToMode "Normal" ; }
+                bind "Esc"   { UndoRenameTab ; SwitchToMode "Tab" ; }
+            }
+            renamepane {
+                bind "Alt c" { SwitchToMode "Normal"; }
+                bind "Esc" { UndoRenamePane; SwitchToMode "Pane"; }
+            }
+            session {
+                bind "Alt o" { SwitchToMode "Normal" ; }
+                bind "d"     { Detach ; }
+                bind "w"     {
+                    LaunchOrFocusPlugin "session-manager" {
+                        floating true
+                        move_to_focused_tab true
+                    };
+                    SwitchToMode "Normal"
+                }
+            }
+            shared_except "locked" {
+                bind "Alt g"             { SwitchToMode "Locked" ; }
+                bind "Alt q"             { Quit ; }
+                bind "Alt h" "Alt Left"  { MoveFocusOrTab "Left" ; }
+                bind "Alt l" "Alt Right" { MoveFocusOrTab "Right" ; }
+                bind "Alt j" "Alt Down"  { MoveFocus "Down" ; }
+                bind "Alt k" "Alt Up"    { MoveFocus "Up" ; }
+                bind "Alt ["             { PreviousSwapLayout ; }
+                bind "Alt ]"             { NextSwapLayout ; }
+            }
+            shared_except "normal" "locked" {
+                bind "Enter" "Esc" { SwitchToMode "Normal" ; }
+            }
+            shared_except "pane" "locked" {
+                bind "Alt p" { SwitchToMode "Pane" ; }
+            }
+            shared_except "resize" "locked" {
+                bind "Alt r" { SwitchToMode "Resize" ; }
+            }
+            shared_except "scroll" "locked" {
+                bind "Alt s" { SwitchToMode "Scroll" ; }
+            }
+            shared_except "session" "locked" {
+                bind "Alt o" { SwitchToMode "Session" ; }
+            }
+            shared_except "tab" "locked" {
+                bind "Alt t" { SwitchToMode "Tab" ; }
+            }
+            shared_except "move" "locked" {
+                bind "Alt m" { SwitchToMode "Move" ; }
             }
           }
         '';
     };
+  };
 }
-

home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix

@@ -1,11 +1,15 @@
-{ pkgs, config, ... }:
-
-let
-  inherit (config.colorscheme) palette;
-in
-
 {
-  text = /* kdl */ ''
+  pkgs,
+  config,
+  ...
+}: let
+  inherit (config.colorscheme) palette;
+in {
+  text =
+    /*
+    kdl
+    */
+    ''
       layout {
         default_tab_template {
           pane size=2 borderless=true {

home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix

@@ -1,11 +1,15 @@
-{ pkgs, config, ... }:
-
-let
-  inherit (config.colorscheme) palette;
-in
-
 {
-  text = /* kdl */ ''
+  pkgs,
+  config,
+  ...
+}: let
+  inherit (config.colorscheme) palette;
+in {
+  text =
+    /*
+    kdl
+    */
+    ''
       layout {
         default_tab_template {
           pane size=2 borderless=true {

home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix

@@ -1,11 +1,15 @@
-{ pkgs, config, ... }:
-
-let
-  inherit (config.colorscheme) palette;
-in
-
 {
-text = /* kdl */ ''
+  pkgs,
+  config,
+  ...
+}: let
+  inherit (config.colorscheme) palette;
+in {
+  text =
+    /*
+    kdl
+    */
+    ''
       layout {
         default_tab_template {
           pane size=2 borderless=true {

home/modules/console/shell/bash/default.nix

@@ -1,12 +1,13 @@
-{ config, lib, osConfig, ... }:
+{
-
+  config,
-let
+  lib,
+  osConfig,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.shell.bash;
   admin = osConfig.ooknet.host.admin;
-in
+in {
-
-{
   config = mkIf (cfg.enable || admin.shell == "bash") {
     programs.bash.enable = true;
   };

home/modules/console/shell/fish/aliases.nix

@@ -1,14 +1,16 @@
-{ lib, config, osConfig, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  osConfig,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf getExe;
   inherit (pkgs) bat eza dust nh;
 
   cfg = config.ooknet.shell.fish;
   admin = osConfig.ooknet.host.admin;
-in
+in {
-
-{
   config = mkIf (cfg.enable || admin.shell == "fish") {
     programs.fish = {
       shellAliases = {

home/modules/console/shell/fish/binds.nix

@@ -1,16 +1,18 @@
-{ lib, config, osConfig, ... }:
-
-let
-  inherit (lib) mkIf;
-  cfg = config.ooknet.shell.fish;
-  admin = osConfig.ooknet.host.admin;
-in
-
 {
+  lib,
+  config,
+  osConfig,
+  ...
+}: let
+  inherit (lib) mkIf;
+  inherit (osConfig.ooknet.host) admin;
+
+  cfg = config.ooknet.shell.fish;
+in {
   config = mkIf (cfg.enable || admin.shell == "fish") {
     programs.fish.functions = {
       fish_user_key_bindings = ''
-        bind --preset -M insert \cf fe
+        bind --preset -M insert \cf $EDITOR $FLAKE
         bind --preset -M insert \ec fzf_cd_widget
       '';
     };

home/modules/console/shell/fish/default.nix

@@ -1,12 +1,14 @@
-{ lib, config, osConfig, ... }:
-
-let
-  inherit (lib) mkIf;
-  cfg = config.ooknet.shell.fish;
-  admin = osConfig.ooknet.host.admin;
-in
-
 {
+  lib,
+  config,
+  osConfig,
+  ...
+}: let
+  inherit (lib) mkIf;
+  inherit (osConfig.ooknet.host) admin;
+
+  cfg = config.ooknet.shell.fish;
+in {
   imports = [
     ./plugins.nix
     ./binds.nix
@@ -27,7 +29,8 @@ in
           set fish_cursor_insert      line       blink
           set fish_cursor_replace_one underscore blink
           set fish_cursor_visual      block
-        '' +
+        ''
+        +
         # Use terminal colors
         ''
           set -U fish_color_autosuggestion      brblack
@@ -60,4 +63,3 @@ in
     };
   };
 }
- 

home/modules/console/shell/fish/plugins.nix

@@ -1,12 +1,14 @@
-{ lib, config, pkgs, osConfig, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  osConfig,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.shell.fish;
   admin = osConfig.ooknet.host.admin;
-in
+in {
-
-{
   config = mkIf (cfg.enable || admin.shell == "fish") {
     programs.fish = {
       plugins = [
@@ -26,4 +28,3 @@ in
     };
   };
 }
-

home/modules/console/shell/zsh/default.nix

@@ -1,12 +1,13 @@
-{ lib, config, osConfig, ... }:
+{
-
+  lib,
-let
+  config,
+  osConfig,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.shell.zsh;
   admin = osConfig.ooknet.host.admin;
-in
+in {
-
-{
   imports = [
     ./plugins.nix
   ];

home/modules/console/shell/zsh/plugins.nix

@@ -1,12 +1,14 @@
-{ lib, pkgs, config, osConfig, ... }:
+{
-
+  lib,
-let
+  pkgs,
+  config,
+  osConfig,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.shell.zsh;
   admin = osConfig.ooknet.host.admin;
-in
+in {
-
-{
   config = mkIf (cfg.enable || admin.shell == "zsh") {
     programs.zsh.plugins = [
       {

home/modules/console/tools/bat.nix

@@ -1,11 +1,12 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.tools.bat;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     programs.bat = {
       enable = true;

home/modules/console/tools/btop.nix

@@ -1,11 +1,11 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.tools.btop;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     programs.btop = {
       enable = true;

home/modules/console/tools/direnv.nix

@@ -1,11 +1,11 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.tools.direnv;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     programs.direnv = {
       enable = true;

home/modules/console/tools/eza.nix

@@ -1,11 +1,11 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.tools.eza;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     programs.eza = {
       enable = true;

home/modules/console/tools/ffmpeg.nix

@@ -1,11 +1,12 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.tools.ffmpeg;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     home.packages = [pkgs.ffmpeg];
   };

home/modules/console/tools/fzf.nix

@@ -1,12 +1,13 @@
-{ lib, config, osConfig, ... }:
+{
-
+  lib,
-let
+  config,
+  osConfig,
+  ...
+}: let
   inherit (lib) mkIf;
   admin = osConfig.ooknet.host.admin;
   cfg = config.ooknet.tools.fzf;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     programs.fzf = {
       enable = true;

home/modules/console/tools/git.nix

@@ -1,12 +1,14 @@
-{ pkgs, config, lib, osConfig, ... }:
+{
-
+  pkgs,
-  let 
+  config,
+  lib,
+  osConfig,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.tools.git;
   admin = osConfig.ooknet.host.admin;
-  in
+in {
-  
-{ 
   config = mkIf cfg.enable {
     programs.git = {
       enable = true;
@@ -23,4 +25,3 @@
     ];
   };
 }
-

home/modules/console/tools/nixIndex.nix

@@ -1,11 +1,12 @@
-{ lib, config, inputs, ... }:
+{
-
+  lib,
-let
+  config,
+  inputs,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.tools.nixIndex;
-in
+in {
-
-{
   imports = [inputs.nix-index-db.hmModules.nix-index];
   config = mkIf cfg.enable {
     programs = {

home/modules/console/tools/sourcegraph.nix

@@ -1,11 +1,12 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.tools.sourcegraph;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     home.packages = [pkgs.src-cli];
   };

home/modules/console/tools/ssh.nix

@@ -1,11 +1,12 @@
-{ lib, config, osConfig, ... }:
+{
-
+  lib,
-let
+  config,
+  osConfig,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.tools.ssh;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     programs.ssh = {
       enable = true;

home/modules/console/tools/starship.nix

@@ -1,11 +1,11 @@
-{ config, lib, ... }:
+{
-
+  config,
-let
+  lib,
+  ...
+}: let
   cfg = config.ooknet.tools.starship;
   inherit (lib) concatStrings mkIf;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     programs.starship = {
       enable = true;
@@ -73,4 +73,3 @@ in
     };
   };
 }
-

home/modules/console/tools/utils.nix

@@ -1,10 +1,11 @@
-{ pkgs, lib, config, ... }:
-
-let
-  cfg = config.ooknet.tools.utils;
-in
-
 {
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.ooknet.tools.utils;
+in {
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
       bc # Calculator

home/modules/desktop/browser/firefox/default.nix

@@ -1,6 +1,11 @@
-{ pkgs, lib, inputs, config, osConfig, ... }:
+{
-
+  pkgs,
-let
+  lib,
+  inputs,
+  config,
+  osConfig,
+  ...
+}: let
   inherit (lib) mkIf mkMerge;
 
   addons = inputs.firefox-addons.packages.${pkgs.system};
@@ -22,10 +27,7 @@ let
     "application/x-extension-xht" = ["firefox.desktop"];
     "application/json" = ["firefox.desktop"];
   };
-in
+in {
-
-{
-
   imports = [./tridactyl.nix];
   config = mkMerge [
     (mkIf (cfg.enable || browser == "firefox") {
@@ -54,6 +56,5 @@ in
         defaultApplications = firefoxMime;
       };
     })
-
   ];
 }

home/modules/desktop/browser/firefox/settings/narsilUserjs.nix

@@ -1044,5 +1044,4 @@
   # Disable skipping DoH when parental controls are enabled [FF70+]
   "network.dns.skipTRR-when-parental-control-enabled" = false;
   #
-
 }

home/modules/desktop/browser/firefox/theme/penguinFox.nix

@@ -1,4 +1,6 @@
- /* css */ 
+/*
+css
+*/
 ''
   /* config */
 
@@ -177,4 +179,3 @@
   /*  Removes the annoying rainbow thing from the hamburger  */
   #appMenu-fxa-separator{border-image:none !important;}
 ''
-

home/modules/desktop/browser/firefox/theme/penguinFoxContent.nix

@@ -1,4 +1,7 @@
-/* css */ '' 
+/*
+css
+*/
+''
   @-moz-document url-prefix(about:){
 
   /*  Removes the scrollbar on some places  */

home/modules/desktop/browser/firefox/tridactyl.nix

@@ -1,16 +1,15 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   inherit (config.colorscheme) palette;
 
   cfg = config.ooknet.browser.firefox;
   browser = config.ooknet.desktop.browser;
   fonts = config.ooknet.fonts;
-  
+in {
-in
-
-{
   config = mkIf (browser == "firefox" || cfg.enable) {
     xdg.configFile = {
       "tridactyl/tridactylrc".text = ''
@@ -37,7 +36,11 @@ in
 
       # based off base16 themes
       # source: <https://github.com/bezmi/base16-tridactyl>
-      "tridactyl/themes/ooknet.css".text = /* css */ ''
+      "tridactyl/themes/ooknet.css".text =
+        /*
+        css
+        */
+        ''
           :root {
             --font: ${fonts.monospace.family};
             --bg: #${palette.base00};

home/modules/desktop/communication/discord/vesktop.nix

@@ -1,6 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (config.colorscheme) palette;
   inherit (lib) mkIf mkMerge;
 
@@ -10,9 +13,7 @@ let
   vesktopMime = {
     "x-scheme-handler/discord" = ["vesktop.desktop"];
   };
-in
+in {
-
-{
   config = mkMerge [
     (mkIf (cfg.enable || discord == "vesktop") {
       # <https://github.com/AlephNought0/Faery/blob/main/Home/Programs/Vesktop/patchedvesktop.patch>
@@ -22,7 +23,11 @@ in
         }))
       ];
 
-      xdg.configFile."vesktop/themes/nix.css".text = /* css */ ''
+      xdg.configFile."vesktop/themes/nix.css".text =
+        /*
+        css
+        */
+        ''
           /**
             * @name nix-colors-minimal
             * @author aoku

home/modules/desktop/creative/audacity.nix

@@ -1,11 +1,12 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.creative.audacity;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     home.packages = [pkgs.audacity];
   };

home/modules/desktop/creative/inkscape.nix

@@ -1,13 +1,13 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.creative.inkscape;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     home.packages = [pkgs.inkscape-with-extensions];
   };
 }
-

home/modules/desktop/file-manager/nemo.nix

@@ -1,15 +1,16 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkMerge;
   cfg = config.ooknet.fileManager.nemo;
   fileManager = config.ooknet.desktop.fileManager;
   nemoMime = {
     "inode/directory" = ["nemo.desktop"];
   };
-in
+in {
-
-{
   config = mkMerge [
     (mkIf (cfg.enable || fileManager == "nemo") {
       home.packages = [pkgs.cinnamon.nemo-with-extensions];

home/modules/desktop/gaming/bottles.nix

@@ -1,15 +1,15 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.gaming.bottles;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       bottles
     ];
   };
-  
 }

home/modules/desktop/gaming/factorio.nix

@@ -1,10 +1,11 @@
-{ lib, config, pkgs, ... }:
-
-let
-  cfg = config.ooknet.gaming.factorio;
-in
-
 {
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  cfg = config.ooknet.gaming.factorio;
+in {
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [factorio];
   };

home/modules/desktop/gaming/lutris.nix

@@ -1,11 +1,12 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.gaming.lutris;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       (lutris.override {

home/modules/desktop/gaming/wine.nix

@@ -1,11 +1,12 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.gaming.wine;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       winetricks

home/modules/desktop/media/image/imv.nix

@@ -1,14 +1,14 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.media.image.imv;
   imvMime = {
     "image/*" = ["imv.desktop"];
   };
-in
+in {
-
-{
   config = mkIf cfg.enable {
     programs = {
       imv = {

home/modules/desktop/media/music/tui.nix

@@ -1,6 +1,10 @@
-{ osConfig, pkgs, config, lib, ... }:
+{
-
+  osConfig,
-let
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
   inherit (config.colorscheme) palette;
   inherit (lib) mkIf getExe;
 
@@ -8,10 +12,7 @@ let
   zellij = config.ooknet.multiplexer.zellij;
   multiplexer = config.ooknet.console.multiplexer;
   hostName = osConfig.networking.hostName;
-
+in {
-in
-
-{
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       termusic
@@ -43,7 +44,11 @@ in
       };
     };
 
-    xdg.configFile."spotify-player/app.toml".text =  /* toml */ ''
+    xdg.configFile."spotify-player/app.toml".text =
+      /*
+      toml
+      */
+      ''
         theme = "default"
         client_id = "fc4c3656d7cc4a7ea70c6080965f8b1a"
         client_port = 8080
@@ -76,7 +81,12 @@ in
         normalization = false
       '';
 
-    xdg.configFile."zellij/layouts/music.kdl".text = mkIf (zellij.enable || multiplexer == "zellij") /* kdl */ ''
+    xdg.configFile."zellij/layouts/music.kdl".text =
+      mkIf (zellij.enable || multiplexer == "zellij")
+      /*
+      kdl
+      */
+      ''
         layout {
         default_tab_template {
             pane size=2 borderless=true {
@@ -127,5 +137,4 @@ in
       zjm = "zellij --layout music";
     };
   };
-  
 }

home/modules/desktop/media/video/jellyfin-player.nix

@@ -1,11 +1,12 @@
-{ pkgs, lib, config, ... }:
+{
-
+  pkgs,
-let
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.media.video.jellyfinPlayer;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     home.packages = [pkgs.jellyfin-media-player];
   };

home/modules/desktop/media/video/mpv.nix

@@ -1,15 +1,15 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.media.video.mpv;
   mpvMime = {
     "audio/*" = ["mpv.desktop"];
     "video/*" = ["mpv.desktop"];
   };
-in
+in {
-
-{
   config = mkIf cfg.enable {
     programs.mpv = {
       enable = true;

home/modules/desktop/media/video/youtube.nix

@@ -1,11 +1,12 @@
-{ lib, config, pkgs, ...}:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.media.video.youtube;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     home.packages = [pkgs.youtube-tui];
     programs.yt-dlp = {

home/modules/desktop/productivity/default.nix

@@ -1,6 +1,4 @@
-{ ... }:
+{...}: {
-
-{
   imports = [
     ./office
     ./notes

home/modules/desktop/productivity/notes/obsidian.nix

@@ -1,6 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkMerge hm;
   cfg = config.ooknet.productivity.notes.obsidian;
   notes = config.ooknet.desktop.notes;
@@ -8,13 +11,16 @@ let
   # TODO: use admin.githubUsername
   notesRepo = "git@github.com:ooks-io/notes.git";
   notesPath = "${config.xdg.userDirs.documents}/notes";
-in
+in {
-
-{
   config = mkMerge [
     (mkIf (cfg.enable || notes == "obsidian") {
       home.packages = [pkgs.obsidian];
-      home.activation.cloneObsidianVault = hm.dag.entryAfter ["installPackages"] /* shell */ ''
+      home.activation.cloneObsidianVault =
+        hm.dag.entryAfter ["installPackages"]
+        /*
+        shell
+        */
+        ''
           if ! [ -d "${notesPath}" ]; then
             $DRY_RUN_CMD git clone ${notesRepo} ${notesPath}
           fi

home/modules/desktop/productivity/office/libreoffice.nix

@@ -1,11 +1,12 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
   cfg = config.ooknet.desktop.productivity.office;
-in
+in {
-
-{
   options.ooknet.desktop.productivity.office.enable = mkEnableOption "enable office home module";
   config = mkIf cfg.enable {
     home.packages = [pkgs.libreoffice];

home/modules/desktop/productivity/pdf/zathura.nix

@@ -1,6 +1,8 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (config.colorscheme) palette;
   inherit (lib) mkIf;
 
@@ -8,9 +10,7 @@ let
   cfg = config.ooknet.productivity.pdf.zathura;
   pdf = config.ooknet.desktop.pdf;
   fonts = config.ooknet.fonts;
-in
+in {
-
-{
   config = mkIf (cfg.enable || pdf == "zathura") {
     programs.zathura = {
       enable = true;

home/modules/desktop/security/polkit.nix

@@ -1,11 +1,12 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   polkit = config.ooknet.security.polkit;
-in
+in {
-
-{
   config = {
     systemd.user.services = {
       polkit-pantheon-authentication-agent-1 = mkIf (polkit == "pantheon") {

home/modules/desktop/terminal/foot.nix

@@ -1,14 +1,14 @@
-{ config, lib, ... }:
+{
-
+  config,
-let
+  lib,
+  ...
+}: let
   inherit (config.colorscheme) palette;
   inherit (lib) mkMerge mkIf;
   fonts = config.ooknet.fonts;
   cfg = config.ooknet.terminal.foot;
   desktop = config.ooknet.desktop;
-in
+in {
-
-{
   config = mkMerge [
     (mkIf (cfg.enable || desktop.terminal == "foot") {
       programs.foot = {

home/modules/desktop/terminal/kitty.nix

@@ -1,17 +1,17 @@
-{ config, lib, osConfig, ... }:
+{
-
+  config,
-let
+  lib,
+  osConfig,
+  ...
+}: let
   inherit (lib) mkIf;
   inherit (config.colorscheme) palette;
   fonts = config.ooknet.fonts;
   cfg = config.ooknet.terminal.kitty;
   terminal = config.ooknet.desktop.terminal;
   shell = osConfig.ooknet.host.admin.shell;
-in
+in {
-
-{
   config = mkIf (cfg.enable || terminal == "kitty") {
-
     home.sessionVariables = mkIf (terminal == "kitty") {
       TERMINAL = "kitty -1";
       TERM = "kitty -1";

home/modules/desktop/tools/1password.nix

@@ -1,11 +1,11 @@
-{ osConfig, lib, ... }:
+{
-
+  osConfig,
-let
+  lib,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = osConfig.ooknet.programs._1password;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     ooknet.binds.password = "1password";
   };

home/modules/desktop/tools/kdeconnect.nix

@@ -1,11 +1,11 @@
-{ lib, osConfig, ... }:
+{
-
+  lib,
-let
+  osConfig,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = osConfig.ooknet.programs.kdeconnect;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     services.kdeconnect = {
       enable = true;

home/modules/desktop/tools/ookbrightness.nix

@@ -1,13 +1,20 @@
-{ lib, osConfig, pkgs, ... }:
+{
-
+  lib,
-let
+  osConfig,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   inherit (builtins) elem;
   features = osConfig.ooknet.host.hardware.features;
   ookbrightness = pkgs.writeShellApplication {
     name = "ookbrightness";
     runtimeInputs = with pkgs; [brillo libnotify];
-    text = /* bash */ ''
+    text =
+      /*
+      bash
+      */
+      ''
         BRIGHTNESS=$(brillo -G | awk -F'.' '{print$1}')
         notify() {
           notify-send --app-name="system-notify" -h string:x-canonical-private-synchronous:sys-notify "󰃠  $BRIGHTNESS%"
@@ -32,9 +39,7 @@ let
         main "$@"
       '';
   };
-in
+in {
-
-{
   config = mkIf (elem "backlight" features) {
     home.packages = [ookbrightness];
     ooknet.binds.brightness = {

home/modules/desktop/tools/ookpower.nix

@@ -1,12 +1,13 @@
-{ lib, config, inputs, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  inputs,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   launcher = config.ooknet.wayland.launcher;
-in
+in {
-
-
-{
   config = mkIf (launcher == "rofi") {
     home.packages = [inputs.ooks-scripts.packages.${pkgs.system}.powermenu];
     ooknet.binds.powerMenu = "powermenu -c dmenu";

home/modules/desktop/tools/ookvolume.nix

@@ -1,6 +1,9 @@
-{ lib, pkgs, osConfig, ... }:
+{
-
+  lib,
-let
+  pkgs,
+  osConfig,
+  ...
+}: let
   inherit (lib) mkIf;
   inherit (builtins) elem;
   features = osConfig.ooknet.host.hardware.features;
@@ -33,9 +36,7 @@ let
       main "$@"
     '';
   };
-in
+in {
-
-{
   config = mkIf (elem "audio" features) {
     home.packages = [ookvolume];
     ooknet.binds.volume = {

home/modules/desktop/tools/zellijMenu.nix

@@ -1,6 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   multiplexer = config.ooknet.console.multiplexer;
   launcher = config.ooknet.wayland.launcher;
@@ -8,7 +11,11 @@ let
   zellijmenu = pkgs.writeShellApplication {
     name = "zellijmenu";
     runtimeInputs = with pkgs; [coreutils rofi-wayland];
-    text = /* bash */ ''
+    text =
+      /*
+      bash
+      */
+      ''
         set -e
 
         type=""
@@ -224,9 +231,7 @@ let
         main
       '';
   };
-in
+in {
-
-{
   config = mkIf (multiplexer == "zellij" && launcher == "rofi") {
     home.packages = [zellijmenu];
     ooknet.binds.zellijMenu = "zellijmenu -n";

home/modules/desktop/wayland/bar/default.nix

@@ -1,5 +1,4 @@
-{ lib, ... }:
+{lib, ...}: {
-{
   imports = [
     #./eww
     # ./ags
@@ -17,5 +16,4 @@
       enable = lib.mkEnableOption "Enable waybar bar";
     };
   };
-
 }

home/modules/desktop/wayland/bar/waybar/default.nix

@@ -1,15 +1,17 @@
-{ config, lib, pkgs, osConfig, ... }:
+{
-
+  config,
-let
+  lib,
+  pkgs,
+  osConfig,
+  ...
+}: let
   inherit (config.colorscheme) palette;
   inherit (lib) mkIf head;
   fonts = config.ooknet.fonts;
   wayland = config.ooknet.wayland;
   monitors = osConfig.ooknet.host.hardware.monitors;
   monitorWidth = (head monitors).width - 20;
-in
+in {
-
-{
   config = mkIf (wayland.bar == "waybar") {
     programs.waybar = {
       enable = true;
@@ -79,7 +81,11 @@ in
           signal = 12;
         };
       };
-      style = /* css */ ''
+      style =
+        /*
+        css
+        */
+        ''
           * {
             font-family: "${fonts.monospace.family}";
             font-size: 19px;

home/modules/desktop/wayland/compositor/hyprland/default.nix

@@ -1,9 +1,13 @@
-{ inputs, lib, config, pkgs, ... }: 
+{
-let
+  inputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   wayland = config.ooknet.wayland;
   inherit (lib) mkIf;
-in
+in {
-{
   imports = [
     inputs.hyprland.homeManagerModules.default
     ./settings

home/modules/desktop/wayland/compositor/hyprland/extras/hyprcapture.nix

@@ -1,13 +1,14 @@
-{ lib, config, pkgs, inputs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  inputs,
+  ...
+}: let
   inherit (lib) mkIf;
   wayland = config.ooknet.wayland;
-in
+in {
-
-{
   config = mkIf (wayland.compositor == "hyprland") {
-
     home.packages = with inputs; [
       # Screenshot tool
       hyprland-contrib.packages.${pkgs.system}.grimblast

home/modules/desktop/wayland/compositor/hyprland/extras/hyprshade.nix

@@ -1,11 +1,12 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   wayland = config.ooknet.wayland;
-in
+in {
-
-{
   config = mkIf (wayland.compositor == "hyprland") {
     home.packages = [pkgs.hyprshade];
     # TODO: implement hyprshade configuration

home/modules/desktop/wayland/compositor/hyprland/settings/appearance.nix

@@ -1,13 +1,13 @@
-{ config, lib, ... }:
+{
-
+  config,
-let
+  lib,
+  ...
+}: let
   wayland = config.ooknet.wayland;
   pointer = config.home.pointerCursor;
   inherit (config.colorscheme) palette;
   inherit (lib) mkIf;
-in
+in {
-
-{
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland = {
       settings = {
@@ -27,7 +27,6 @@ in
         ];
 
         decoration = {
-
           active_opacity = 1.0;
           inactive_opacity = 1.0;
           fullscreen_opacity = 1.0;

home/modules/desktop/wayland/compositor/hyprland/settings/binds.nix

@@ -1,12 +1,12 @@
-{ lib, config, ... }: 
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   wayland = config.ooknet.wayland;
   binds = config.ooknet.binds;
-in
+in {
-
-{
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings = {
       bind = [

home/modules/desktop/wayland/compositor/hyprland/settings/env.nix

@@ -1,17 +1,15 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   wayland = config.ooknet.wayland;
-in
+in {
-
-{
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings.env = [
       "XDG_SESSION_DESKTOP,hyprland"
       "XDG_CURRENT_DESKTOP,hyprland"
     ];
   };
-
-  
 }

home/modules/desktop/wayland/compositor/hyprland/settings/exec.nix

@@ -1,11 +1,12 @@
-{ config, lib, pkgs, ... }:
+{
-
+  config,
-let
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   wayland = config.ooknet.wayland;
-in
+in {
-
-{
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings = {
       exec = [

home/modules/desktop/wayland/compositor/hyprland/settings/gestures.nix

@@ -1,11 +1,11 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   wayland = config.ooknet.wayland;
-in
+in {
-
-{
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings.gestures = {
       workspace_swipe = true;

home/modules/desktop/wayland/compositor/hyprland/settings/hyprpaper.nix

@@ -1,12 +1,12 @@
-{ lib, config,  ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   wayland = config.ooknet.wayland;
   wallpaperPath = config.ooknet.wallpaper.path;
-in
+in {
-
-{
   config = mkIf (wayland.compositor == "hyprland") {
     services.hyprpaper = {
       enable = true;

home/modules/desktop/wayland/compositor/hyprland/settings/inputs.nix

@@ -1,11 +1,11 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   wayland = config.ooknet.wayland;
-in
+in {
-
-{
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings.input = {
       kb_layout = "us";
@@ -14,5 +14,4 @@ in
       mouse_refocus = false;
     };
   };
-  
 }

home/modules/desktop/wayland/compositor/hyprland/settings/misc.nix

@@ -1,11 +1,11 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   wayland = config.ooknet.wayland;
-in
+in {
-
-{
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings.misc = {
       mouse_move_enables_dpms = true;

home/modules/desktop/wayland/compositor/hyprland/settings/monitor.nix

@@ -1,22 +1,34 @@
-{ lib, config, osConfig, ... }:
+{
-
+  lib,
-let
+  config,
+  osConfig,
+  ...
+}: let
   inherit (lib) mkIf concatMap;
   wayland = config.ooknet.wayland;
   monitors = osConfig.ooknet.host.hardware.monitors;
-in
+in {
-
-{
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings = {
-      monitor = concatMap (m: let
+      monitor =
+        concatMap (
+          m: let
             resolution = "${toString m.width}x${toString m.height}@${toString m.refreshRate}";
             position = "${toString m.x}x${toString m.y}";
-        basicConfig = "${m.name},${if m.enabled then "${resolution},${position},1" else "disable"}";
+            basicConfig = "${m.name},${
+              if m.enabled
+              then "${resolution},${position},1"
+              else "disable"
+            }";
           in
-        [ basicConfig ] ++ (if m.transform != 0 then ["${m.name},transform,${toString m.transform}"] else [])
+            [basicConfig]
-      ) (monitors);
+            ++ (
+              if m.transform != 0
+              then ["${m.name},transform,${toString m.transform}"]
+              else []
+            )
+        )
+        monitors;
     };
   };
 }
-

home/modules/desktop/wayland/compositor/hyprland/settings/rules.nix

@@ -1,11 +1,11 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   wayland = config.ooknet.wayland;
-in
+in {
-
-{
   config = mkIf (wayland.compositor == "hyprland") {
     wayland.windowManager.hyprland.settings = {
       windowrulev2 = [

home/modules/desktop/wayland/launcher/rofi.nix

@@ -1,12 +1,13 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   fonts = config.ooknet.fonts;
   wayland = config.ooknet.wayland;
-in
+in {
-
-{
   config = mkIf (wayland.launcher == "rofi") {
     programs.rofi = {
       enable = true;

home/modules/desktop/wayland/launcher/tofi.nix

@@ -1,16 +1,21 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (config.colorscheme) palette;
   inherit (lib) mkIf;
   wayland = config.ooknet.wayland;
   fonts = config.ooknet.fonts;
-in
+in {
-
-{
   config = mkIf (wayland.launcher == "tofi") {
     home.packages = [pkgs.tofi];
-    xdg.configFile."tofi/config".text = /* config */ ''
+    xdg.configFile."tofi/config".text =
+      /*
+      config
+      */
+      ''
         history = false
         clip-to-padding = false
         horizontal = true
@@ -38,4 +43,3 @@ in
       '';
   };
 }
-

home/modules/desktop/wayland/lockscreen/default.nix

@@ -4,4 +4,3 @@
     ./hyprlock.nix
   ];
 }
-

home/modules/desktop/wayland/lockscreen/hyprlock.nix

@@ -1,13 +1,13 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (config.colorscheme) palette;
   inherit (lib) mkIf;
   wayland = config.ooknet.wayland;
   fonts = config.ooknet.fonts;
-in
+in {
-
-{
   config = mkIf (wayland.locker == "hyprlock") {
     ooknet.binds.lock = "hyprlock";
     programs.hyprlock = {

home/modules/desktop/wayland/lockscreen/swaylock.nix

@@ -1,13 +1,14 @@
-{ config, lib, ... }:
+{
-
+  config,
-let
+  lib,
+  ...
+}: let
   inherit (config.colorscheme) palette;
   inherit (lib) mkIf;
   fonts = config.ooknet.fonts;
   wallpaperPath = config.ooknet.wallpaper.path;
   wayland = config.ooknet.wayland;
-in
+in {
-{
   config = mkIf (wayland.locker == "swaylock") {
     ooknet.binds.lock = "swaylock";
     programs.swaylock = {

home/modules/desktop/wayland/notification/mako.nix

@@ -1,21 +1,20 @@
-{ config, lib, ... }:
+{
- 
+  config,
-let
+  lib,
+  ...
+}: let
   inherit (config.colorscheme) palette variant;
   inherit (lib) mkIf;
   fonts = config.ooknet.fonts;
   wayland = config.ooknet.wayland;
-in 
+in {
-
-{
   config = mkIf (wayland.notification == "mako") {
     services.mako = {
       enable = true;
       iconPath =
-        if variant == "dark" then
+        if variant == "dark"
-          "${config.gtk.iconTheme.package}/share/icons/Papirus-Dark"
+        then "${config.gtk.iconTheme.package}/share/icons/Papirus-Dark"
-        else
+        else "${config.gtk.iconTheme.package}/share/icons/Papirus-Light";
-          "${config.gtk.iconTheme.package}/share/icons/Papirus-Light";
       font = "${fonts.regular.family} 12";
       padding = "10,10";
       anchor = "top-right";
@@ -41,4 +40,3 @@ in
     };
   };
 }
-

home/modules/desktop/wayland/utility/gammastep.nix

@@ -1,11 +1,11 @@
-{ lib, config, ... }:
+{
-
+  lib,
-let
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.wayland;
-in
+in {
-
-{
   config = mkIf cfg.enable {
     services.gammastep = {
       enable = true;

home/modules/desktop/wayland/utility/tools.nix

@@ -1,11 +1,12 @@
-{ lib, config, pkgs, ... }:
+{
-
+  lib,
-let
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.wayland;
-in
+in {
-
-{
   config = lib.mkIf cfg.enable {
     home = {
       packages = with pkgs; [

home/modules/desktop/wayland/variables.nix

@@ -1,14 +1,16 @@
-{ lib, config, osConfig, ... }:
+{
-
+  lib,
-let
+  config,
+  osConfig,
+  ...
+}: let
   inherit (lib) mkIf;
   cfg = config.ooknet.wayland;
   gpu = osConfig.ooknet.host.hardware.gpu;
-in
+in {
-
-{
   config = mkIf cfg.enable {
-    home.sessionVariables = {
+    home.sessionVariables =
+      {
         CLUTTER_BACKEND = "wayland";
         NIXOS_OZONE_WL = "1";
         GDK_BACKEND = "wayland";
@@ -20,7 +22,8 @@ in
         MOZ_DBUS_REMOTE = "1";
         XDG_SESSION_TYPE = "wayland";
         SDL_VIDEODRIVER = "wayland";
-    } // mkIf (gpu == "nvidia") {
+      }
+      // mkIf (gpu == "nvidia") {
         LIBVA_DRIVER_NAME = "nvidia";
         GBM_BACKEND = "nvidia-drm";
         __GLX_VENDOR_LIBRARY_NAME = "nvidia";

home/options/appearance/cursor.nix

@@ -1,10 +1,6 @@
-{ lib, ... }:
+{lib, ...}: let
-
-let
   inherit (lib) mkEnableOption mkOption types;
-in
+in {
-  
-{
   options.ooknet.cursor = {
     enable = mkEnableOption "Enable cursor module";
     package = mkOption {

home/options/appearance/fonts.nix

@@ -1,6 +1,4 @@
-{ lib, ... }:
+{lib, ...}: let
-
-let
   mkFontOption = kind: {
     family = lib.mkOption {
       type = lib.types.str;
@@ -15,8 +13,7 @@ let
       example = "pkgs.fira-code";
     };
   };
-in
+in {
-{
   options.ooknet.fonts = {
     enable = lib.mkEnableOption "Whether to enable font profiles";
     monospace = mkFontOption "monospace";

home/options/appearance/gtk.nix

@@ -1,9 +1,5 @@
-{ lib, ... }:
+{lib, ...}: let
-
-let
   inherit (lib) mkEnableOption;
-in
+in {
-
-{
   options.ooknet.gtk.enable = mkEnableOption "";
 }

home/options/appearance/qt.nix

@@ -1,9 +1,5 @@
-{ lib, ... }:
+{lib, ...}: let
-
-let
   inherit (lib) mkEnableOption;
-in
+in {
-
-{
   options.ooknet.qt.enable = mkEnableOption "";
 }

home/options/appearance/theme.nix

@@ -1,11 +1,7 @@
-{ lib, ... }:
+{lib, ...}: let
-
-let
   inherit (lib) mkOption;
   inherit (lib.types) nullOr enum;
-in
+in {
-
-{
   options.ooknet.theme = mkOption {
     type = nullOr (enum ["minimal" "phone"]);
     default = null;

home/options/appearance/wallpaper.nix

@@ -1,10 +1,6 @@
-{ lib, ... }:
+{lib, ...}: let
-
-let
   inherit (lib) types mkEnableOption mkOption;
-in
+in {
-
-{
   options.ooknet.wallpaper = {
     enable = mkEnableOption "";
     path = mkOption {

home/options/console/editor.nix

@@ -1,10 +1,6 @@
-{ lib, ... }:
+{lib, ...}: let
-
-let
   inherit (lib) mkEnableOption;
-in
+in {
-
-{
   options.ooknet.editor = {
     helix.enable = mkEnableOption "";
     nvim.enable = mkEnableOption "";