modules/base/default.nix

@@ -1,15 +1,9 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.base;
-in
+in {
-{
   options.modules.base = {
     enable = mkEnableOption "base";
   };
@@ -21,6 +15,7 @@ in
       wget
       curl
       dig
+      nix-tree
       procps
     ];
 

modules/boot/clean-tmp.nix

@@ -1,18 +1,14 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.clean-tmp;
-in
+in {
-{
   options.modules.clean-tmp = {
     enable = mkEnableOption "clean-tmp";
   };
 
-  config = mkIf cfg.enable { boot.tmp.cleanOnBoot = true; };
+  config = mkIf cfg.enable {
+    boot.tmp.cleanOnBoot = true;
+  };
 }

modules/boot/silent-boot.nix

@@ -1,15 +1,9 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.silent-boot;
-in
+in {
-{
   options.modules.silent-boot = {
     enable = mkEnableOption "silent-boot";
   };

modules/boot/systemd-boot.nix

@@ -1,15 +1,9 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.systemd-boot;
-in
+in {
-{
   options.modules.systemd-boot = {
     enable = mkEnableOption "systemd-boot";
   };

modules/brightnessctl/default.nix

@@ -1,18 +1,16 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.brightnessctl;
-in
+in {
-{
   options.modules.brightnessctl = {
     enable = mkEnableOption "brightnessctl";
   };
 
-  config = mkIf cfg.enable { environment.systemPackages = [ pkgs.brightnessctl ]; };
+  config = mkIf cfg.enable {
+    environment.systemPackages = [
+        pkgs.brightnessctl
+    ];
+  };
 }

modules/default.nix

@@ -1,12 +1,6 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
-with lib;
+with lib; {
-{
   imports = [
     # Import modules
     ./base/default.nix

modules/fontconfig/default.nix

@@ -1,15 +1,9 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.fontconfig;
-in
+in {
-{
   options.modules.fontconfig = {
     enable = mkEnableOption "fontconfig";
   };

modules/graphics/default.nix

@@ -1,9 +1,4 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 {
   config = {

modules/greeter/greetd/default.nix

@@ -1,15 +1,9 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.greetd;
-in
+in {
-{
   options.modules.greetd = {
     enable = mkEnableOption "greetd";
     command = mkOption {

modules/greeter/greetd/tuigreet.nix

@@ -1,15 +1,9 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.tuigreet;
-in
+in {
-{
   options.modules.tuigreet = { 
     enable = mkEnableOption "tuigreet"; 
     greeting = mkOption {

modules/locale/default.nix

@@ -1,9 +1,4 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 {
   config = {

modules/neovim/default.nix

@@ -1,15 +1,9 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.neovim;
-in
+in {
-{
   options.modules.neovim = {
     enable = mkEnableOption "neovim";
   };

modules/sound/pipewire.nix

@@ -1,15 +1,9 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.pipewire;
-in
+in {
-{
   options.modules.pipewire = {
     enable = mkEnableOption "pipewire";
   };

modules/unfree/default.nix

@@ -1,15 +1,9 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let 
   cfg = config.modules.unfree;
-in
+in {
-{
   options.modules.unfree = {
     enable = mkEnableOption "unfree";
     allowedPackages = mkOption {

modules/users/default.nix

@@ -1,24 +1,19 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   # Nixvim
-  nixvim = import (builtins.fetchGit { url = "https://github.com/nix-community/nixvim"; });
+  nixvim = import (builtins.fetchGit {
+    url = "https://github.com/nix-community/nixvim";
+  });
 
   # Stylix
-  stylix = import (
+  stylix = import (pkgs.fetchFromGitHub {
-    pkgs.fetchFromGitHub {
     owner = "danth";
     repo = "stylix";
     rev = "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116";
     sha256 = "0dz8h1ga8lnfvvmvsf6iqvnbvxrvx3qxi0y8s8b72066mqgvy8y5";
-    }
+  });
-  );
 
   # User configuration
   userModule = types.submodule {
@@ -41,8 +36,7 @@ let
       };
     };
   };
-in
+in {
-{
   imports = [
     # Import home manager
     <home-manager/nixos>

modules/users/modules/default.nix

@@ -1,9 +1,4 @@
-{
+{ input, pkgs, config, ... }:
-  input,
-  pkgs,
-  config,
-  ...
-}:
 
 { 
   imports = [
@@ -14,8 +9,6 @@
     ./firefox/default.nix
     ./fontconfig/default.nix
     ./foot/default.nix
-    ./language/nix.nix
-    ./language/rust.nix
     ./mako/default.nix
     ./neovim/default.nix
     ./obsidian/default.nix

modules/users/modules/desktop/bar/waybar.nix

@@ -1,17 +1,11 @@
-{
+{ lib, config, pkgs, ... }: 
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.waybar;
   theme = config.theming;
   colors = theme.colors;
-in
+in {
-{
   options.modules.waybar = {
     enable = mkEnableOption "waybar";
   };
@@ -28,7 +22,9 @@ in
         mainBar = {
           layer = "top";
           spacing = 16;
-          modules-left = [ "river/tags" ];
+          modules-left = [
+            "river/tags"
+          ];
           modules-center = [
             #"river/window"
             "mpris"
@@ -65,30 +61,14 @@ in
               #default = [ "" "" ];
               headphone = "";
               headphone-muted = "";
-              default = [
+              default = [ "" "" "" ];
-                ""
-                ""
-                ""
-              ];
             };
           };
           battery = {
             format = "{icon} {capacity}%"; # Spacing achieved using "Thin Space"
             format-charging = " {capacity}%"; # Spacing achieved using "Thin Space"
             #format-icons = [ "󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
-            format-icons = [
+            format-icons = [ "" "" "" "" "" "" "" "" "" "" "" ];
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-            ];
             interval = 1;
           };
           clock = {

modules/users/modules/desktop/default.nix

@@ -1,15 +1,9 @@
-{
+{ lib, pkgs, config, ... }:
-  lib,
-  pkgs,
-  config,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.desktop;
-in
+in {
-{
   imports = [
     # Import desktop environment modules
     ./bar/waybar.nix
@@ -27,23 +21,18 @@ in
   };
 
   config = {
-    home.packages = optionals cfg.wayland (
+    home.packages = optionals cfg.wayland (with pkgs; [
-      with pkgs;
-      [
       pkgs.wl-clipboard
       pkgs.wtype
-      ]
+    ]);
-    );
 
     home.file.".initrc" = {
       enable = true;
       executable = true;
-      text =
+      text = ''
-        ''
         #!${pkgs.bash}/bin/bash
 
-        ''
+      '' + cfg.initScript;
-        + cfg.initScript;
     };
   };
 }

modules/users/modules/desktop/lock-screen/waylock.nix

@@ -1,20 +1,16 @@
-{
+{ lib, pkgs, config, ... }:
-  lib,
-  pkgs,
-  config,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.waylock;
-in
+in {
-{
   options.modules.waylock = {
     enable = mkEnableOption "waylock";
   };
 
   config = {
-    home.packages = mkIf cfg.enable (with pkgs; [ waylock ]);
+    home.packages = mkIf cfg.enable (with pkgs; [
+      waylock
+    ]);
   };
 }

modules/users/modules/desktop/window-manager/river.nix

@@ -1,14 +1,8 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 let
   cfg = config.modules.river;
-in
+in {
-{
   options.modules.river.enable = lib.mkEnableOption "river";
 
   # osConfig = lib.mkIf cfg.enable {
@@ -19,9 +13,6 @@ in
     # Set desktop type to wayland
     modules.desktop.wayland = true;
 
-    # TODO: Move elsewhere and make keybindings more configurable
-    modules.rofi.enable = true;
-
     # Change desktop to execute river
     modules.desktop.initScript = ''
       river
@@ -46,31 +37,20 @@ in
       enable = true;
       systemd.enable = false;
       xwayland.enable = true;
-      settings =
+      settings = let
-        let
         layout = "rivertile";
         layoutOptions = "-outer-padding ${toString config.theming.layout.windowPadding} -view-padding ${toString config.theming.layout.windowPadding}";
-          modes = [
+        modes = ["normal" "locked"];
-            "normal"
+        tags = [1 2 3 4 5 6 7 8 9];
-            "locked"
-          ];
-          tags = [
-            1
-            2
-            3
-            4
-            5
-            6
-            7
-            8
-            9
-          ];
         waylockOptions = "-init-color 0x${colors.bg} -input-color 0x${colors.focused} -fail-color 0x${colors.bg}";
 
         colors = config.theming.colors;
 
         # Quick pow function
-          pow2 = power: if power != 0 then 2 * (pow2 (power - 1)) else 1;
+        pow2 = power:
+          if power != 0
+          then 2 * (pow2 (power - 1))
+          else 1;
 
         # Modifiers
         main = "Super";
@@ -80,8 +60,7 @@ in
         scm = "Super+Control";
         scam = "Super+Control+Alt";
         ssc = "Super+Shift+Control";
-        in
+      in {
-        {
         default-layout = "${layout}";
         set-repeat = "50 300";
         xcursor-theme = "BreezeX-RosePine-Linux 24";
@@ -97,11 +76,8 @@ in
           "\"${layout} ${layoutOptions}\""
           "waybar"
         ];
-          map = (
+        map = (lib.attrsets.recursiveUpdate ({
-            lib.attrsets.recursiveUpdate
+          normal = {
-              ({
-                normal =
-                  {
             "${main} Q" = "close";
             "${ssm} E" = "exit";
 
@@ -159,33 +135,13 @@ in
             # Toggle modes
             "${main} Space" = "toggle-float";
             "${main} F" = "toggle-fullscreen";
-                  }
+          } // builtins.listToAttrs (builtins.concatLists (map (tag: [
-                  // builtins.listToAttrs (
+            { name = "${main} ${toString tag}"; value = "set-focused-tags ${toString (pow2 (tag - 1))}"; }
-                    builtins.concatLists (
+            { name = "${ssm} ${toString tag}"; value = "set-view-tags ${toString (pow2 (tag - 1))}"; }
-                      map (tag: [
+            { name = "${scm} ${toString tag}"; value = "toggle-focused-tags ${toString (pow2 (tag - 1))}"; }
-                        {
+            { name = "${ssc} ${toString tag}"; value = "toggle-view-tags ${toString (pow2 (tag - 1))}"; }
-                          name = "${main} ${toString tag}";
+          ]) tags)); 
-                          value = "set-focused-tags ${toString (pow2 (tag - 1))}";
+        }) (builtins.listToAttrs (map (mode: {
-                        }
-                        {
-                          name = "${ssm} ${toString tag}";
-                          value = "set-view-tags ${toString (pow2 (tag - 1))}";
-                        }
-                        {
-                          name = "${scm} ${toString tag}";
-                          value = "toggle-focused-tags ${toString (pow2 (tag - 1))}";
-                        }
-                        {
-                          name = "${ssc} ${toString tag}";
-                          value = "toggle-view-tags ${toString (pow2 (tag - 1))}";
-                        }
-                      ]) tags
-                    )
-                  );
-              })
-              (
-                builtins.listToAttrs (
-                  map (mode: {
           name = "${mode}";
           value = {
             # Control volume
@@ -202,10 +158,7 @@ in
             "None XF86Go" = "spawn \"playerctl play-pause\"";
             "None Cancel" = "spawn \"playerctl next\"";
           };
-                  }) modes
+        }) modes)));
-                )
-              )
-          );
         map-pointer = {
           normal = {
             "${main} BTN_LEFT" = "move-view";

modules/users/modules/discord/default.nix

@@ -1,15 +1,9 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.discord;
-in
+in {
-{
   options.modules.discord = {
     enable = mkEnableOption "discord";
   };
@@ -17,6 +11,8 @@ in
   config = mkIf cfg.enable {
     modules.unfree.allowedPackages = [ "discord" ];
 
-    home.packages = with pkgs; [ discord ];
+    home.packages = with pkgs; [
+      discord
+    ];
   };
 }

modules/users/modules/feishin/default.nix

@@ -1,16 +1,14 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.feishin;
-in
+in {
-{
   options.modules.feishin.enable = mkEnableOption "feishin";
 
-  config = mkIf cfg.enable { home.packages = with pkgs; [ feishin ]; };
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      feishin
+    ];
+  };
 }

modules/users/modules/firefox/default.nix

@@ -1,14 +1,8 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 let
   cfg = config.modules.firefox;
-in
+in {
-{
   options.modules.firefox.enable = lib.mkEnableOption "firefox";
 
   config = lib.mkIf cfg.enable {
@@ -38,9 +32,7 @@ in
         DisableTelemetry = true;
         DisplayBookmarksToolbar = "never";
         DisplayMenuBar = "never";
-        DNSOverHTTPS = {
+        DNSOverHTTPS = { Enabled = false; };
-          Enabled = false;
-        };
         DontCheckDefaultBrowser = true;
         PasswordManagerEnabled = false;
         TranslateEnabled = true;
@@ -50,7 +42,9 @@ in
       profiles.nixos = {
         search.default = "DuckDuckGo";
 
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [ ublock-origin ];
+        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+          ublock-origin
+        ];
 
         settings = {
           "browser.tabs.inTitlebar" = 0;

modules/users/modules/fontconfig/default.nix

@@ -1,9 +1,4 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
@@ -20,11 +15,8 @@ let
     </alias>
   '';
 
-  configContent = concatStrings (
+  configContent = concatStrings (map (font: aliasConfig config.theming.fonts.pkgs.${font}) config.theming.fonts.installed);
-    map (font: aliasConfig config.theming.fonts.pkgs.${font}) config.theming.fonts.installed
+in {
-  );
-in
-{
   options.modules.fontconfig = {
     enable = mkEnableOption "fontconfig";
   };
@@ -34,10 +26,18 @@ in
       enable = true;
 
       defaultFonts = {
-        serif = [ config.theming.fonts.serif.name ];
+        serif = [
-        sansSerif = [ config.theming.fonts.sansSerif.name ];
+          config.theming.fonts.serif.name
-        monospace = [ config.theming.fonts.monospace.name ];
+        ];
-        emoji = [ config.theming.fonts.emoji.name ];
+        sansSerif = [
+          config.theming.fonts.sansSerif.name
+        ];
+        monospace = [
+          config.theming.fonts.monospace.name
+        ];
+        emoji = [
+          config.theming.fonts.emoji.name
+        ];
       };
     };
 

modules/users/modules/foot/default.nix

@@ -1,27 +1,19 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.foot;
-in
+in {
-{
   options.modules.foot.enable = mkEnableOption "foot";
 
   config = mkIf cfg.enable {
     programs.foot = {
       enable = true;
       settings = {
-        main =
+        main = let
-          let
           font = config.theming.fonts.monospace.name;
           size = toString config.theming.fonts.monospace.recommendedSize;
-          in
+        in {
-          {
           font = mkForce "${font}:style=Regular:size=${size}";
           font-bold = "${font}:style=Bold:size=${size}";
           font-italic = "${font}:style=Italic:size=${size}";

modules/users/modules/language/nix.nix

@@ -1,50 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.nix;
-in
-{
-  options.modules.nix = {
-    enable = mkEnableOption "nix";
-  };
-
-  config = mkIf cfg.enable {
-    # Development packages
-    home.packages = with pkgs; [
-      nix-tree
-      nixfmt-rfc-style
-      nixd
-    ];
-
-    # VSCode configuration
-    programs.vscode = {
-      extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide ];
-
-      userSettings = {
-        "[nix]" = {
-          "editor.tabSize" = 2;
-        };
-        "nix.enableLanguageServer" = true;
-        "nix.serverPath" = "nixd";
-        "nix.serverSettings" = {
-          nixd = {
-            formatting = {
-              command = [ "nixfmt" ];
-            };
-          };
-        };
-      };
-    };
-
-    # Neovim configuration
-    programs.nixvim = {
-
-    };
-  };
-}

modules/users/modules/language/rust.nix

@@ -1,42 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.rust;
-in
-{
-  options.modules.rust = {
-    enable = mkEnableOption "rust";
-  };
-
-  config = mkIf cfg.enable {
-    # Development packages
-    home.packages = with pkgs; [
-      rustc
-      cargo
-      rust-analyzer
-      rustfmt
-    ];
-
-    # VSCode configuration
-    programs.vscode = {
-      extensions = with pkgs.vscode-extensions; [ rust-lang.rust-analyzer ];
-
-      userSettings = {
-        "[rust]" = { };
-      };
-    };
-
-    # Neovim configuration
-    programs.nixvim = {
-      plugins.rust-tools = {
-        enable = true;
-      };
-    };
-  };
-}

modules/users/modules/mako/default.nix

@@ -1,17 +1,11 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.mako;
   theme = config.theming;
   colors = theme.colors;
-in
+in {
-{
   options.modules.mako.enable = mkEnableOption "mako";
 
   config = mkIf cfg.enable {

modules/users/modules/neovim/default.nix

@@ -1,17 +1,11 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.neovim;
   theme = config.theming;
   colors = theme.colors;
-in
+in {
-{
   options.modules.neovim = {
     enable = mkEnableOption "neovim";
   };
@@ -23,7 +17,8 @@ in
       viAlias = true;
       vimAlias = true;
 
-      extraPackages = with pkgs; [ ];
+      extraPackages = with pkgs; [
+      ];
 
       opts = {
         number = true;
@@ -174,6 +169,10 @@ in
       #  enable = true;
       #};
 
+      plugins.rust-tools = {
+        enable = true;
+      };
+
       plugins.vimtex = {
         enable = true;
         texlivePackage = null;

modules/users/modules/obsidian/default.nix

@@ -1,18 +1,16 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.obsidian;
-in
+in {
-{
   options.modules.obsidian = {
     enable = mkEnableOption "obsidian";
   };
 
-  config = mkIf cfg.enable { home.packages = with pkgs; [ obsidian ]; };
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      obsidian
+    ];
+  };
 }

modules/users/modules/qutebrowser/default.nix

@@ -1,16 +1,10 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.qutebrowser;
   theme = config.theming;
-in
+in {
-{
   options.modules.qutebrowser.enable = mkEnableOption "qutebrowser";
 
   config = mkIf cfg.enable {

modules/users/modules/rofi/default.nix

@@ -1,17 +1,11 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.rofi;
   theme = config.theming;
   colors = theme.colors;
-in
+in {
-{
   options.modules.rofi.enable = mkEnableOption "rofi";
 
   config = mkIf cfg.enable {
@@ -19,11 +13,9 @@ in
       enable = true;
       package = pkgs.rofi-wayland;
       font = "${theme.fonts.monospace.name} ${toString theme.fonts.monospace.recommendedSize}";
-      theme =
+      theme = let
-        let
         inherit (config.lib.formats.rasi) mkLiteral;
-        in
+      in {
-        {
         "*" = {
           background-color = mkLiteral "rgba(0, 0, 0, 0%)";
           border-color = mkLiteral "#${colors.fg}";

modules/users/modules/rofi/rofi-rbw.nix

@@ -1,21 +1,17 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.rofi-rbw;
-in
+in {
-{
   options.modules.rofi-rbw.enable = mkEnableOption "rofi-rbw";
 
   config = mkIf cfg.enable {
     modules.rofi.enable = true;
 
-    home.packages = [ pkgs.rofi-rbw ];
+    home.packages = [
+      pkgs.rofi-rbw
+    ];
 
     # TODO: Move to separate module and make configurable
     programs.rbw = {

modules/users/modules/shell/bash.nix

@@ -1,15 +1,9 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let 
   cfg = config.modules.bash;
-in
+in {
-{
   options.modules.bash = {
     enable = mkEnableOption "bash";
   };

modules/users/modules/shell/fish.nix

@@ -1,15 +1,9 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let 
   cfg = config.modules.fish;
-in
+in {
-{
   options.modules.fish = {
     enable = mkEnableOption "fish";
 
@@ -37,18 +31,9 @@ in
       enable = true;
 
       plugins = [
-        (mkIf cfg.plugins.done {
+        (mkIf cfg.plugins.done { name = "done"; src = pkgs.fishPlugins.done.src; })
-          name = "done";
+        (mkIf cfg.plugins.fzf { name = "fzf"; src = pkgs.fishPlugins.fzf-fish.src; })
-          src = pkgs.fishPlugins.done.src;
+        (mkIf cfg.plugins.grc { name = "grc"; src = pkgs.fishPlugins.grc.src; })
-        })
-        (mkIf cfg.plugins.fzf {
-          name = "fzf";
-          src = pkgs.fishPlugins.fzf-fish.src;
-        })
-        (mkIf cfg.plugins.grc {
-          name = "grc";
-          src = pkgs.fishPlugins.grc.src;
-        })
       ];
     };
 

modules/users/modules/steam/default.nix

@@ -1,12 +1,6 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
-with lib;
+with lib; {
-{
   options.modules.steam = {
     enable = mkEnableOption "steam";
   };

modules/users/modules/systemwide/river.nix

@@ -1,14 +1,10 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   enabled = any (user: user.modules.river.enable) (attrValues config.home-manager.users);
-in
+in {
-{
+  config = mkIf enabled {
-  config = mkIf enabled { programs.river.enable = true; };
+    programs.river.enable = true;
+  };
 }

modules/users/modules/systemwide/steam.nix

@@ -1,14 +1,10 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   enabled = any (user: user.modules.steam.enable) (attrValues config.home-manager.users);
-in
+in {
-{
+  config = mkIf enabled {
-  config = mkIf enabled { programs.steam.enable = true; };
+    programs.steam.enable = true;
+  };
 }

modules/users/modules/systemwide/waylock.nix

@@ -1,14 +1,10 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   enabled = any (user: user.modules.waylock.enable) (attrValues config.home-manager.users);
-in
+in {
-{
+  config = mkIf enabled {
-  config = mkIf enabled { security.pam.services.waylock = { }; };
+    security.pam.services.waylock = {};
+  };
 }

modules/users/modules/theming/default.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, lib, config, ... }:
-  pkgs,
-  lib,
-  config,
-  ...
-}:
 
 with lib;
 let
@@ -68,35 +63,25 @@ let
   ] ++ map (font: font.name) cfg.fonts.extraFonts;
 
   # Flatten dependencies of fonts
-  fontPackages =
+  fontPackages = converge (fonts:
-    converge
+    listToAttrs (map (font: {
-      (
-        fonts:
-        listToAttrs (
-          map
-            (font: {
       name = font;
       value = true;
-            })
+    }) (
-            (
+      flatten (map (font: 
-              flatten (map (font: [ font.name ] ++ cfg.fonts.pkgs.${font.name}.fallbackFonts) (attrsToList fonts))
+        [ font.name ]
-            )
+        ++ cfg.fonts.pkgs.${font.name}.fallbackFonts
-        )
+      ) (attrsToList fonts))
-      )
+    ))
-      (
+  ) (listToAttrs (map (font: {
-        listToAttrs (
-          map (font: {
     name = font;
     value = true;
-          }) enabledFonts
+  }) enabledFonts));
-        )
-      );
 
   # Convert set of fonts to list of packages
   fontNameList = map (font: font.name) (attrsToList fontPackages);
   fontPackageList = map (font: cfg.fonts.pkgs.${font}.package) fontNameList;
-in
+in {
-{
   imports = [
     # Import all themes
     ./themes/gruvbox.nix
@@ -105,11 +90,7 @@ in
 
   options.modules.theming.enable = mkEnableOption "theming";
 
-  options.theming =
+  options.theming = let colors = config.theming.schemeColors; in {
-    let
-      colors = config.theming.schemeColors;
-    in
-    {
     darkMode = mkOption {
       type = types.bool;
       default = false;
@@ -185,12 +166,10 @@ in
     fonts = {
       pkgs = mkOption {
         type = types.attrsOf fontModule;
-          default = builtins.listToAttrs (
+        default = builtins.listToAttrs (map (module: {
-            map (module: {
           name = module.name;
           value = module;
-            }) (map (module: (import module) { inherit lib config pkgs; }) fontModules)
+        }) (map (module: (import module) { inherit lib config pkgs; }) fontModules));
-          );
         description = "All available font modules.";
       };
 
@@ -250,8 +229,7 @@ in
     };
 
     # Configure gtk theme
-    gtk =
+    gtk = let
-      let
       disableCSD = ''
         headerbar.default-decoration {
           margin-bottom: 50px;
@@ -263,8 +241,7 @@ in
           box-shadow: none;
         }
       '';
-      in
+    in {
-      {
       enable = true;
 
       theme = {
@@ -312,22 +289,10 @@ in
       polarity = if cfg.darkMode then "dark" else "light";
 
       fonts = {
-        serif = getAttrs [
+        serif = getAttrs [ "name" "package" ] cfg.fonts.serif;
-          "name"
+        sansSerif = getAttrs [ "name" "package" ] cfg.fonts.sansSerif;
-          "package"
+        monospace = getAttrs [ "name" "package" ] cfg.fonts.monospace;
-        ] cfg.fonts.serif;
+        emoji = getAttrs [ "name" "package" ] cfg.fonts.emoji;
-        sansSerif = getAttrs [
-          "name"
-          "package"
-        ] cfg.fonts.sansSerif;
-        monospace = getAttrs [
-          "name"
-          "package"
-        ] cfg.fonts.monospace;
-        emoji = getAttrs [
-          "name"
-          "package"
-        ] cfg.fonts.emoji;
 
         sizes = {
           applications = mkDefault cfg.fonts.serif.recommendedSize;

modules/users/modules/theming/fonts/cozette-vector.nix

@@ -4,5 +4,6 @@
   name = "Cozette Vector";
   package = pkgs.cozette;
   recommendedSize = 9;
-  fallbackFonts = [ ];
+  fallbackFonts = [
+  ];
 }

modules/users/modules/theming/fonts/cozette.nix

@@ -4,5 +4,7 @@
   name = "Cozette";
   package = pkgs.cozette;
   recommendedSize = 9;
-  fallbackFonts = [ "Cozette Vector" ];
+  fallbackFonts = [
+    "Cozette Vector"
+  ];
 }

modules/users/modules/theming/fonts/fira-code.nix

@@ -4,5 +4,7 @@
   name = "Fira Code";
   package = pkgs.fira-code;
   recommendedSize = 12;
-  fallbackFonts = [ "Symbols Nerd Font Mono" ];
+  fallbackFonts = [
+    "Symbols Nerd Font Mono"
+  ];
 }

modules/users/modules/theming/themes/catppuccin.nix

@@ -1,25 +1,14 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.theming.themes.catppuccin;
-in
+in {
-{
   options = {
     theming.themes.catppuccin = {
       enable = mkEnableOption "catppuccin";
       flavor = mkOption {
-        type = types.enum [
+        type = types.enum [ "latte" "frappe" "macchiato" "mocha" ];
-          "latte"
-          "frappe"
-          "macchiato"
-          "mocha"
-        ];
         default = "mocha";
         description = "The flavor of catppuccin theme.";
       };

modules/users/modules/theming/themes/gruvbox.nix

@@ -1,26 +1,16 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.theming.themes.gruvbox;
   mode = if cfg.darkMode then "dark" else "light";
-in
+in {
-{
   options = {
     theming.themes.gruvbox = {
       enable = mkEnableOption "gruvbox-hard";
       darkMode = mkEnableOption "dark mode";
       contrast = mkOption {
-        type = types.enum [
+        type = types.enum [ "hard" "medium" "soft" ];
-          "hard"
-          "medium"
-          "soft"
-        ];
         default = "hard";
         description = "The contrast level of the theme.";
       };

modules/users/modules/vscode/default.nix

@@ -1,16 +1,10 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.vscode;
   theme = config.theming;
-in
+in {
-{
   options.modules.vscode = {
     enable = mkEnableOption "vscode";
     codeFont = mkOption {
@@ -26,13 +20,21 @@ in
   config = mkIf cfg.enable {
     modules.unfree.allowedPackages = [ "vscode" ];
     
-    theming.fonts.extraFonts = [ cfg.codeFont ];
+    theming.fonts.extraFonts = [
+      cfg.codeFont
+    ];
 
     programs.vscode = {
       enable = true;
 
-      mutableExtensionsDir = false;
+      extensions = with pkgs.vscode-extensions; [
-      extensions = with pkgs.vscode-extensions; [ eamodio.gitlens ];
+        eamodio.gitlens
+
+        # Language support
+        # TODO: Move to separate language modules
+        bbenoist.nix
+        rust-lang.rust-analyzer
+      ];
 
       userSettings = {
         # Font setup
@@ -43,9 +45,8 @@ in
         "terminal.integrated.fontFamily" = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
         "terminal.integrated.fontSize" = mkForce (cfg.codeFont.recommendedSize); # Convert pt to px
         
-        # Formatting
+        # Autoformatting
         "editor.formatOnSave" = true;
-        "editor.tabSize" = 4;
 
         # Layout
         "window.menuBarVisibility" = "hidden";

modules/users/modules/winbox/default.nix

@@ -1,15 +1,9 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.winbox;
-in
+in {
-{
   options.modules.winbox = {
     enable = mkEnableOption "winbox";
   };
@@ -17,6 +11,8 @@ in
   config = mkIf cfg.enable {
     modules.unfree.allowedPackages = [ "winbox" ];
 
-    home.packages = with pkgs; [ winbox ];
+    home.packages = with pkgs; [
+      winbox
+    ];
   };
 }

modules/users/modules/zathura/default.nix

@@ -1,14 +1,8 @@
-{
+{config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 let
   cfg = config.modules.zathura;
-in
+in {
-{
   options.modules.zathura.enable = lib.mkEnableOption "zathura";
 
   config = lib.mkIf cfg.enable {

modules/vpn/tailscale.nix

@@ -1,15 +1,9 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.tailscale;
-in
+in {
-{
   options.modules.tailscale = {
     enable = mkEnableOption "tailscale";
   };

modules/wifi/wpa_supplicant.nix

@@ -1,15 +1,9 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 let
   cfg = config.modules.wpa_supplicant;
-in
+in {
-{
   options.modules.wpa_supplicant = {
     enable = mkEnableOption "wpa_supplicant";
   };

pkgs/default.nix

@@ -1,9 +1,4 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 with lib;
 # let

pkgs/fonts/wqy-bitmapsong.nix

@@ -1,9 +1,4 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 pkgs.stdenv.mkDerivation rec {
   pname = "wqy-bitmapsong-pcf";

pkgs/fonts/wqy-microhei.nix

@@ -1,9 +1,4 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 pkgs.stdenv.mkDerivation rec {
   pname = "wqy-microhei";

pkgs/fonts/wqy-zenhei.nix

@@ -1,9 +1,4 @@
-{
+{ lib, config, pkgs, ... }:
-  lib,
-  config,
-  pkgs,
-  ...
-}:
 
 pkgs.stdenv.mkDerivation rec {
   pname = "wqy-zenhei";

users/jan.nix

@@ -29,21 +29,14 @@
       discord.enable = true;
       qutebrowser.enable = true;
       neovim.enable = true;
-
+      rofi.enable = true; # TODO: Remove this, should be enabled by other modules that require rofi.
-      # Programming languages
-      nix.enable = true;
-      rust.enable = true;
 
       # Enable unfree
       unfree.enable = true;
     };
 
     # Theme configuration
-    theming =
+    theming = let fontpkgs = config.theming.fonts.pkgs; in {
-      let
-        fontpkgs = config.theming.fonts.pkgs;
-      in
-      {
       # Fonts
       fonts.serif = fontpkgs."DejaVu Serif";
       fonts.sansSerif = fontpkgs."DejaVu Sans";