Nix fmt

7 files changed, 230 insertions, 192 deletions

diff --git a/home-modules/apps/default.nix b/home-modules/apps/default.nix
index 5c920fd..ba19780 100644
--- a/home-modules/apps/default.nix
+++ b/home-modules/apps/default.nix
@@ -1,39 +1,44 @@
-{lib, pkgs, inputs, config, ...}:
+{
+  lib,
+  pkgs,
+  inputs,
+  config,
+  ...
+}:
 with lib;
 let
-cfg = config.homeapps.presets;
-in 
+  cfg = config.homeapps.presets;
+in
 {
-   imports = [
-     ./nvim
-     ./desktop 
-     ./zsh.nix
-   ];
+  imports = [
+    ./nvim
+    ./desktop
+    ./zsh.nix
+  ];
 
   options.homeapps.presets = {
-    base.enable = lib.mkOption { 
-      type = lib.types.bool; 
-      default = true; 
-        description ="Enable basics for home-config";
-    } ;
-    full.enable = lib.mkEnableOption  "Enable everything" ;
+    base.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = "Enable basics for home-config";
+    };
+    full.enable = lib.mkEnableOption "Enable everything";
     email.enable = lib.mkEnableOption "Enable email-related config";
     browser.enable = lib.mkEnableOption "Enable the browser (librewolf)";
     comms.enable = lib.mkEnableOption "Enable communication-related config";
-    utils.enable = lib.mkEnableOption "Enable utilities" ;
-    note-taking.enable = lib.mkEnableOption "Enable note taking apps"; 
-    art.enable = lib.mkEnableOption "Enable art apps config"; 
-    work.enable = lib.mkEnableOption "Enable research-related config"; 
-    dev.enable = lib.mkEnableOption "Enable development apps"; 
-    connectivity.enable = lib.mkEnableOption "Enable connectivity"; 
-    multimedia.enable = lib.mkEnableOption "Enable multimedia apps"; 
-    games.enable = lib.mkEnableOption "Enable games"; 
+    utils.enable = lib.mkEnableOption "Enable utilities";
+    note-taking.enable = lib.mkEnableOption "Enable note taking apps";
+    art.enable = lib.mkEnableOption "Enable art apps config";
+    work.enable = lib.mkEnableOption "Enable research-related config";
+    dev.enable = lib.mkEnableOption "Enable development apps";
+    connectivity.enable = lib.mkEnableOption "Enable connectivity";
+    multimedia.enable = lib.mkEnableOption "Enable multimedia apps";
+    games.enable = lib.mkEnableOption "Enable games";
   };
-  
 
   config = lib.mkMerge [
     (lib.mkIf cfg.full.enable {
-      homeapps.presets = { 
+      homeapps.presets = {
         base.enable = true;
         email.enable = true;
         browser.enable = true;
@@ -50,11 +55,11 @@ in
     })
     (lib.mkIf cfg.base.enable {
       home.packages = with pkgs; [
-        lm_sensors 
+        lm_sensors
         nix-output-monitor
       ];
-      homeapps.zsh.enable = true; 
-      homeapps.nvim.enable = true; 
+      homeapps.zsh.enable = true;
+      homeapps.nvim.enable = true;
     })
     (lib.mkIf cfg.email.enable {
       home.packages = with pkgs; [
@@ -68,11 +73,11 @@ in
     (lib.mkIf cfg.utils.enable {
       home.packages = with pkgs; [
         htop
-        btop 
-        nmap 
+        btop
+        nmap
         dig
-        ripgrep 
-        unzip 
+        ripgrep
+        unzip
         unrar
         sshfs
         xdg-user-dirs
@@ -82,17 +87,18 @@ in
       ];
     })
     (lib.mkIf cfg.note-taking.enable {
-      home.packages = with pkgs; [ ];
-      # Todo force synthing to be on here 
+      home.packages = [ ];
+      # Todo force synthing to be on here
     })
     (lib.mkIf cfg.work.enable {
       home.packages = with pkgs; [
+        inputs.tatuin.packages.${pkgs.system}.default
       ];
     })
     (lib.mkIf cfg.dev.enable {
       home.packages = with pkgs; [
-        cmake 
-        ( hiPrio gcc)
+        cmake
+        (hiPrio gcc)
         gnumake
         clang
         rustup
@@ -103,11 +109,11 @@ in
     })
     (lib.mkIf cfg.connectivity.enable {
       home.packages = with pkgs; [
-        eduvpn-client 
+        eduvpn-client
       ];
       # services.syncthing = {
-      #   enable = true; 
-      # }; 
+      #   enable = true;
+      # };
     })
     (lib.mkIf cfg.multimedia.enable {
       home.packages = with pkgs; [
@@ -115,23 +121,23 @@ in
         playerctl
       ];
 
-      services.playerctld.enable = true; 
+      services.playerctld.enable = true;
       services.spotifyd = {
-        enable = true; 
+        enable = true;
         settings = {
           global = {
-            use-mpris = true; 
-            device_name = "Apocalypse Nix"; 
-          }; 
+            use-mpris = true;
+            device_name = "Apocalypse Nix";
+          };
           discovery = {
-            zeroconf_port = 5352; 
+            zeroconf_port = 5352;
           };
           audio = {
-            backend="pulse";
+            backend = "pulse";
           };
-          ## Fixes spotifyd for some reason 
+          ## Fixes spotifyd for some reason
           # FIXME: Add a hook for notifications
-        }; 
+        };
       };
     })
     (lib.mkIf cfg.games.enable {
diff --git a/home-modules/apps/desktop/default.nix b/home-modules/apps/desktop/default.nix
index 5eb14f3..c326607 100644
--- a/home-modules/apps/desktop/default.nix
+++ b/home-modules/apps/desktop/default.nix
@@ -1,100 +1,108 @@
-{lib, pkgs, config ,hostconfig, ...}: 
-let 
-  cfg = config.homeapps.presets; 
-in 
 {
-  imports = [ 
+  lib,
+  pkgs,
+  config,
+  hostconfig,
+  ...
+}:
+let
+  cfg = config.homeapps.presets;
+in
+{
+  imports = [
     ./floorp.nix
   ];
-  
-  config = lib.mkIf hostconfig.addons.desktop.enable or false (lib.mkMerge [
-    (lib.mkIf cfg.base.enable {
-      home.packages = with pkgs; [
-        # Base 
-        evince
-        kitty
-        mpv
-        #Theme  
-        qt6Packages.qt6ct
-        kdePackages.qtstyleplugin-kvantum
-        (catppuccin-kvantum.override {
-           accent = "pink";
-           variant = "mocha";
-        })
-      ];
-    })
-    (lib.mkIf cfg.email.enable {
-      home.packages = with pkgs; [
-        thunderbird
-      ];
-    })
-    (lib.mkIf cfg.comms.enable {
-      home.packages = with pkgs; [
-        element-desktop
-        vesktop
-      ];
-    })
-    (lib.mkIf cfg.utils.enable {
-      home.packages = with pkgs; [
-        kdePackages.filelight
-        qalculate-qt
-        gparted
-      ];
-    })
-    (lib.mkIf cfg.note-taking.enable {
-      home.packages = with pkgs; [ obsidian ];
-      # Todo force synthing to be on here 
-    })
-    (lib.mkIf cfg.art.enable {
-      home.packages = with pkgs; [
-        krita 
-        inkscape
-      ];
-    })
-    (lib.mkIf cfg.browser.enable {
-      home.packages = with pkgs; [
-        librewolf
-      ];
-    })
-    (lib.mkIf cfg.work.enable {
-      home.packages = with pkgs; [
-        libreoffice-qt6-fresh
-        zotero
-      ];
-    })
-    (lib.mkIf cfg.dev.enable {
-      home.packages = with pkgs; [
-        hugo
-        wireshark-qt
-      ];
-    })
-    (lib.mkIf cfg.connectivity.enable {
-      home.packages = with pkgs; [
-        kdePackages.kdeconnect-kde
-        eduvpn-client 
-      ];
-      services.syncthing = { 
-        tray = {
-          enable = true; 
-          command = "syncthingtray --wait"; 
-        }; 
-      };
-    })
-    (lib.mkIf cfg.multimedia.enable {
-      home.packages = with pkgs; [
-        ani-cli
-        vlc
-        # Spotify (The proprietary frontend)
-        riff 
-      ];
-    })
-    (lib.mkIf cfg.games.enable {
-      home.packages = with pkgs; [
-        # Games 
-        prismlauncher
-        openttd
-        anki-bin
-      ];
-    })
-  ]);
+
+  config = lib.mkIf hostconfig.addons.desktop.enable or false (
+    lib.mkMerge [
+      (lib.mkIf cfg.base.enable {
+        home.packages = with pkgs; [
+          # Base
+          evince
+          kitty
+          mpv
+          #Theme
+          qt6Packages.qt6ct
+          kdePackages.qtstyleplugin-kvantum
+          (catppuccin-kvantum.override {
+            accent = "pink";
+            variant = "mocha";
+          })
+        ];
+      })
+      (lib.mkIf cfg.email.enable {
+        home.packages = with pkgs; [
+          thunderbird
+        ];
+      })
+      (lib.mkIf cfg.comms.enable {
+        home.packages = with pkgs; [
+          element-desktop
+          vesktop
+        ];
+      })
+      (lib.mkIf cfg.utils.enable {
+        home.packages = with pkgs; [
+          kdePackages.filelight
+          qalculate-qt
+          gparted
+        ];
+      })
+      (lib.mkIf cfg.note-taking.enable {
+        home.packages = with pkgs; [ obsidian ];
+        # Todo force synthing to be on here
+      })
+      (lib.mkIf cfg.art.enable {
+        home.packages = with pkgs; [
+          krita
+          inkscape
+        ];
+      })
+      (lib.mkIf cfg.browser.enable {
+        home.packages = with pkgs; [
+          librewolf
+        ];
+      })
+      (lib.mkIf cfg.work.enable {
+        home.packages = with pkgs; [
+          libreoffice-qt6-fresh
+          zotero
+        ];
+      })
+      (lib.mkIf cfg.dev.enable {
+        home.packages = with pkgs; [
+          hugo
+          wireshark-qt
+        ];
+      })
+      (lib.mkIf cfg.connectivity.enable {
+        home.packages = with pkgs; [
+          kdePackages.kdeconnect-kde
+          eduvpn-client
+        ];
+        services.syncthing = {
+          tray = {
+            enable = true;
+            command = "syncthingtray --wait";
+          };
+        };
+      })
+      (lib.mkIf cfg.multimedia.enable {
+        home.packages = with pkgs; [
+          ani-cli
+          vlc
+          # Spotify (The proprietary frontend)
+          riff
+        ];
+      })
+      (lib.mkIf cfg.games.enable {
+        home.packages = with pkgs; [
+          # Games
+          prismlauncher
+          openttd
+          anki-bin
+        ];
+      })
+    ]
+  );
 }
diff --git a/home-modules/apps/desktop/floorp.nix b/home-modules/apps/desktop/floorp.nix
index 2d8cadb..b5b2cec 100644
--- a/home-modules/apps/desktop/floorp.nix
+++ b/home-modules/apps/desktop/floorp.nix
@@ -1,2 +1,3 @@
-{pkgs, config, ...}: {
+{ pkgs, config, ... }:
+{
 }
diff --git a/home-modules/apps/desktop/ghidra.nix b/home-modules/apps/desktop/ghidra.nix
index 7bbcd0a..6e5b8c3 100644
--- a/home-modules/apps/desktop/ghidra.nix
+++ b/home-modules/apps/desktop/ghidra.nix
@@ -1,3 +1,3 @@
-{pkgs, ...}: 
+{ pkgs, ... }:
 {
-} 
+}
diff --git a/home-modules/apps/desktop/wine.nix b/home-modules/apps/desktop/wine.nix
index 4aa00b6..a23f44a 100644
--- a/home-modules/apps/desktop/wine.nix
+++ b/home-modules/apps/desktop/wine.nix
@@ -1,7 +1,12 @@
-{pkgs, config, lib, ...}: 
 {
-  home.packages = with pkgs; [ 
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+{
+  home.packages = with pkgs; [
     wineWowPackages.waylandFull
     winetricks
-  ]; 
+  ];
 }
diff --git a/home-modules/apps/nvim/default.nix b/home-modules/apps/nvim/default.nix
index 58a7dda..f45095f 100644
--- a/home-modules/apps/nvim/default.nix
+++ b/home-modules/apps/nvim/default.nix
@@ -1,26 +1,32 @@
-{ pkgs, config, lib,...}:
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
 let
-ts_ls=pkgs.typescript-language-server;
-vue_ls=pkgs.vue-language-server;
-in {
+  ts_ls = pkgs.typescript-language-server;
+  vue_ls = pkgs.vue-language-server;
+in
+{
   options.homeapps.nvim = {
-    enable = lib.mkEnableOption "Enables neovim configuration"; 
+    enable = lib.mkEnableOption "Enables neovim configuration";
   };
 
-  config = lib.mkIf config.homeapps.nvim.enable { 
+  config = lib.mkIf config.homeapps.nvim.enable {
     programs.neovim = {
-      enable = true; 
-       defaultEditor = true;
-       viAlias = true; 
-       vimAlias = true; 
-       vimdiffAlias = true;
-       withPython3 = true; 
-       withNodeJs = true; 
-       withRuby = true; 
-    
-       coc.enable = false; 
-       plugins = [
-       ];
+      enable = true;
+      defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
+      vimdiffAlias = true;
+      withPython3 = true;
+      withNodeJs = true;
+      withRuby = true;
+
+      coc.enable = false;
+      plugins = [
+      ];
     };
 
     home.file."./.config/nvim/lua/wilkuu/init.lua".text = ''
@@ -36,28 +42,34 @@ in {
 
     home.sessionPath = [
       "/home/wilkuu/.npm/bin/"
-    ]; 
+    ];
 
-    home.packages = with pkgs; [
-      lua
-      lua-language-server
-      gopls 
-      go
-      typescript
-      nodejs_22 
-      rustup
-      nil
-      statix
-      nixfmt-rfc-style 
-      # phpactor
-      pyright
-      nodePackages.intelephense
-      texlive.combined.scheme-medium
-      texlab
-      mermaid-cli
-      ltex-ls
-      deno
-    ] ++ [ ts_ls  vue_ls];
+    home.packages =
+      with pkgs;
+      [
+        lua
+        lua-language-server
+        gopls
+        go
+        typescript
+        nodejs_22
+        rustup
+        nil
+        statix
+        nixfmt-rfc-style
+        # phpactor
+        pyright
+        nodePackages.intelephense
+        texlive.combined.scheme-medium
+        texlab
+        mermaid-cli
+        ltex-ls
+        deno
+      ]
+      ++ [
+        ts_ls
+        vue_ls
+      ];
 
   };
 }
diff --git a/home-modules/apps/zsh.nix b/home-modules/apps/zsh.nix
index b979a83..9a7c84d 100644
--- a/home-modules/apps/zsh.nix
+++ b/home-modules/apps/zsh.nix
@@ -1,4 +1,10 @@
-{config ,pkgs, lib, ...}: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
   options.homeapps.zsh = {
     enable = lib.mkEnableOption "Enable ZSH shell";
   };
@@ -6,10 +12,10 @@
   config = lib.mkIf config.homeapps.zsh.enable {
 
     programs.zsh = {
-      enable = true; 
+      enable = true;
       enableCompletion = true;
       oh-my-zsh = {
-        enable = true; 
+        enable = true;
         theme = "clean";
       };
       plugins = [
@@ -24,6 +30,6 @@
           };
         }
       ];
-    }; 
+    };
   };
 }