code cleanup (#47)

* remove unused variables and nesting issues * more code cleanups and build fixes * cleanup sway * base/plymouth: removed unnecessary font override * hosts/common: remove unnecessary host checks
2024-12-21 06:05:56 -05:00 · 2024-07-18 21:05:35 -04:00 · 2024-07-18 21:05:35 -04:00 · deb36b44e1
parent fa2d6a7d72
commit deb36b44e1
69 changed files with 94 additions and 256 deletions
--- a/.github/workflows/nix-drybuild.yml
+++ b/.github/workflows/nix-drybuild.yml
@ -1,59 +0,0 @@
-name: "nix-drybuild"
-on:
-  push:
-    paths-ignore:
-      - '*.md'
-      - '.github/**'
-      - '_img/**'
-  workflow_dispatch:
-jobs:
-  fallarbor-drybuild:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-        with:
-          fetch-depth: 1
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-      - name: Drybuild fallarbor
-        run: nix build --dry-run .#nixosConfigurations.fallarbor.config.system.build.toplevel
-  lavaridge-drybuild:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-        with:
-          fetch-depth: 1
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-      - name: Drybuild lavaridge
-        run: nix build --dry-run .#nixosConfigurations.lavaridge.config.system.build.toplevel
-  mauville-drybuild:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-        with:
-          fetch-depth: 1
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-      - name: Drybuild mauville
-        run: nix build --dry-run .#nixosConfigurations.mauville.config.system.build.toplevel
-  petalburg-drybuild:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-        with:
-          fetch-depth: 1
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-      - name: Drybuild petalburg
-        run: nix build --dry-run .#nixosConfigurations.petalburg.config.system.build.toplevel
-  rustboro-drybuild:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-        with:
-          fetch-depth: 1
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-      - name: Drybuild rustboro
-        run: nix build --dry-run .#nixosConfigurations.rustboro.config.system.build.toplevel
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -5,7 +5,6 @@ variables:
  GIT_STRATEGY: clone
  GIT_DEPTH: 1

-
 stages:
  - "Update"
  - "Checks"
--- a/baseModules/default.nix
+++ b/baseModules/default.nix
@ -1,17 +1,8 @@
-self: {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
+self: {lib, ...}: {
  boot = {
    consoleLogLevel = 0;
    initrd.verbose = false;
-
-    plymouth = {
-      enable = true;
-      font = "${pkgs.nerdfonts.override {fonts = ["Noto"];}}/share/fonts/truetype/NerdFonts/NotoSansNerdFont-Regular.ttf";
-    };
+    plymouth.enable = true;
  };

  console.useXkbConfig = true;
@ -59,6 +50,7 @@ self: {
      enable = true;
      nssmdns4 = true;
      openFirewall = true;
+
      publish = {
        enable = true;
        addresses = true;
@ -80,7 +72,6 @@ self: {
    };

    printing.enable = true;
-
    system-config-printer.enable = true;
  };

--- a/homeManagerModules/apps/alacritty/default.nix
+++ b/homeManagerModules/apps/alacritty/default.nix
@ -1,7 +1,6 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.alacritty.enable {
--- a/homeManagerModules/apps/backblaze/default.nix
+++ b/homeManagerModules/apps/backblaze/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: let
  cfg = config.ar.home.apps.backblaze;
--- a/homeManagerModules/apps/bash/default.nix
+++ b/homeManagerModules/apps/bash/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.bash.enable {
--- a/homeManagerModules/apps/chromium/default.nix
+++ b/homeManagerModules/apps/chromium/default.nix
@ -1,7 +1,6 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.chromium.enable {
--- a/homeManagerModules/apps/default.nix
+++ b/homeManagerModules/apps/default.nix
@ -1,9 +1,4 @@
 {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
  imports = [
    ./alacritty
    ./backblaze
--- a/homeManagerModules/apps/emacs/default.nix
+++ b/homeManagerModules/apps/emacs/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.emacs.enable {
--- a/homeManagerModules/apps/fastfetch/default.nix
+++ b/homeManagerModules/apps/fastfetch/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.fastfetch.enable {
--- a/homeManagerModules/apps/firefox/default.nix
+++ b/homeManagerModules/apps/firefox/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.firefox.enable {
--- a/homeManagerModules/apps/fuzzel/default.nix
+++ b/homeManagerModules/apps/fuzzel/default.nix
@ -1,7 +1,6 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.fuzzel.enable {
--- a/homeManagerModules/apps/keepassxc/default.nix
+++ b/homeManagerModules/apps/keepassxc/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.keepassxc.enable {
--- a/homeManagerModules/apps/librewolf/default.nix
+++ b/homeManagerModules/apps/librewolf/default.nix
@ -1,7 +1,6 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.librewolf.enable {
--- a/homeManagerModules/apps/mako/default.nix
+++ b/homeManagerModules/apps/mako/default.nix
@ -1,7 +1,6 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.mako.enable {
--- a/homeManagerModules/apps/nemo/default.nix
+++ b/homeManagerModules/apps/nemo/default.nix
@ -1,16 +1,15 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.nemo.enable {
-    home.packages = with pkgs; [
-      cinnamon.nemo
-    ];
+    home.packages = [pkgs.cinnamon.nemo];

    dconf = {
      enable = true;
+
      settings = {
        "org/nemo/preferences" = {
          show-image-thumbnails = "always";
--- a/homeManagerModules/apps/swaylock/default.nix
+++ b/homeManagerModules/apps/swaylock/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.swaylock.enable {
--- a/homeManagerModules/apps/thunar/default.nix
+++ b/homeManagerModules/apps/thunar/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.thunar.enable {
--- a/homeManagerModules/apps/tmux/default.nix
+++ b/homeManagerModules/apps/tmux/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.tmux.enable {
--- a/homeManagerModules/apps/vsCodium/default.nix
+++ b/homeManagerModules/apps/vsCodium/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.vsCodium.enable {
--- a/homeManagerModules/apps/waybar/default.nix
+++ b/homeManagerModules/apps/waybar/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.waybar.enable {
--- a/homeManagerModules/apps/wlogout/default.nix
+++ b/homeManagerModules/apps/wlogout/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.home.apps.wlogout.enable {
--- a/homeManagerModules/apps/zed/default.nix
+++ b/homeManagerModules/apps/zed/default.nix
@ -95,6 +95,7 @@
          ui_font_size = 16;
          vim_mode = false;
        };
+
        settings = defaults // config.ar.home.apps.zed.settings;
      in
        lib.generators.toJSON {} settings;
--- a/homeManagerModules/default.nix
+++ b/homeManagerModules/default.nix
@ -1,9 +1,4 @@
 self: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
  imports = [
    ./apps
    ./defaultApps.nix
--- a/homeManagerModules/defaultApps.nix
+++ b/homeManagerModules/defaultApps.nix
@ -1,7 +1,6 @@
 {
  config,
  lib,
-  pkgs,
  ...
 }: let
  cfg = config.ar.home.defaultApps;
--- a/homeManagerModules/desktop/cinnamon/default.nix
+++ b/homeManagerModules/desktop/cinnamon/default.nix
@ -1,5 +1,4 @@
 {
-  pkgs,
  lib,
  config,
  ...
--- a/homeManagerModules/desktop/default.nix
+++ b/homeManagerModules/desktop/default.nix
@ -2,7 +2,6 @@
  config,
  lib,
  osConfig,
-  pkgs,
  ...
 }: {
  imports = [
--- a/homeManagerModules/desktop/gnome/default.nix
+++ b/homeManagerModules/desktop/gnome/default.nix
@ -1,5 +1,4 @@
 {
-  pkgs,
  lib,
  config,
  ...
--- a/homeManagerModules/desktop/hyprland/default.nix
+++ b/homeManagerModules/desktop/hyprland/default.nix
@ -2,7 +2,6 @@
  config,
  lib,
  pkgs,
-  self,
  ...
 }: let
  cfg = config.ar.home;
--- a/homeManagerModules/desktop/sway/default.nix
+++ b/homeManagerModules/desktop/sway/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  imports = [./randomWallpaper.nix ./redShift.nix];
@ -26,18 +26,7 @@
        editor = lib.getExe config.ar.home.defaultApps.editor;
        terminal = lib.getExe config.ar.home.defaultApps.terminal;

-        brightness = lib.getExe' pkgs.swayosd "swayosd-client";
-        brightness_up = "${brightness} --brightness=raise";
-        brightness_down = "${brightness} --brightness=lower";
-        volume = brightness;
-        volume_up = "${volume} --output-volume=raise";
-        volume_down = "${volume} --output-volume=lower";
-        volume_mute = "${volume} --output-volume=mute-toggle";
-        mic_mute = "${volume} --input-volume=mute-toggle";
        media = lib.getExe pkgs.playerctl;
-        media_play = "${media} play-pause";
-        media_next = "${media} next";
-        media_prev = "${media} previous";

        # Sway desktop utilities
        bar = lib.getExe pkgs.waybar;
@ -66,9 +55,6 @@
        screenshot_screen = "${screenshot} --capture output";
        screenshot_region = "${screenshot} --capture region";

-        qt_platform_theme = "qt6ct";
-        gdk_scale = "1.5";
-
        cycleSwayDisplayModes = pkgs.writeShellScriptBin "cycleSwayDisplayModes" ''
          # TODO: remove petalburg hardcodes
          current_mode=$(${lib.getExe' config.wayland.windowManager.sway.package "swaymsg"} -t get_outputs -p | grep "Current mode" | grep -Eo '[0-9]+x[0-9]+ @ [0-9.]+ Hz' | tr -d " " | grep 2880)
--- a/homeManagerModules/desktop/sway/randomWallpaper.nix
+++ b/homeManagerModules/desktop/sway/randomWallpaper.nix
@ -2,7 +2,6 @@
  config,
  lib,
  pkgs,
-  self,
  ...
 }: let
  sway-randomWallpaper = pkgs.writeShellScriptBin "sway-randomWallpaper" ''
@ -38,7 +37,10 @@
  '';
 in {
  config = lib.mkIf config.ar.home.desktop.sway.randomWallpaper {
-    home.packages = with pkgs; [swaybg sway-randomWallpaper];
+    home.packages = [
+      pkgs.swaybg
+      sway-randomWallpaper
+    ];

    wayland.windowManager.sway.config.startup = [
      {command = "${lib.getExe sway-randomWallpaper}";}
--- a/homeManagerModules/desktop/sway/redShift.nix
+++ b/homeManagerModules/desktop/sway/redShift.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.home.desktop.sway.redShift {
--- a/homeManagerModules/desktop/waylandComp.nix
+++ b/homeManagerModules/desktop/waylandComp.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf (config.ar.home.desktop.hyprland.enable || config.ar.home.desktop.sway.enable) {
@ -16,7 +16,7 @@
    dconf = {
      enable = true;
      settings = {
-        "org/gnome/desktop/wm/preferences" = {button-layout = "";};
+        "org/gnome/desktop/wm/preferences".button-layout = "";
        "org/gnome/nm-applet".disable-connected-notifications = true;
      };
    };
--- a/homeManagerModules/services/default.nix
+++ b/homeManagerModules/services/default.nix
@ -1,8 +1,6 @@
 {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
-  imports = [./easyeffects ./mpd];
+  imports = [
+    ./easyeffects
+    ./mpd
+  ];
 }
--- a/homeManagerModules/services/easyeffects/default.nix
+++ b/homeManagerModules/services/easyeffects/default.nix
@ -1,5 +1,4 @@
 {
-  pkgs,
  lib,
  config,
  ...
--- a/homeManagerModules/services/mpd/default.nix
+++ b/homeManagerModules/services/mpd/default.nix
@ -1,5 +1,4 @@
 {
-  pkgs,
  lib,
  config,
  ...
--- a/homes/aly/firefox/default.nix
+++ b/homes/aly/firefox/default.nix
@ -1,6 +1,5 @@
 {
  config,
-  lib,
  pkgs,
  ...
 }: {
--- a/homes/dustin/default.nix
+++ b/homes/dustin/default.nix
@ -1,6 +1,5 @@
 self: {
  config,
-  lib,
  pkgs,
  ...
 }: {
--- a/hosts/common/samba.nix
+++ b/hosts/common/samba.nix
@ -32,7 +32,7 @@

  home-manager.sharedModules = [
    {
-      gtk.gtk3.bookmarks = lib.optionals (config.networking.hostName != "mauville") [
+      gtk.gtk3.bookmarks = [
        "file:///mnt/Media"
        "file:///mnt/Archive"
      ];
--- a/hosts/fallarbor/default.nix
+++ b/hosts/fallarbor/default.nix
@ -1,8 +1,6 @@
 # Framework 13 with 11th gen Intel Core i5, 16GB RAM, 512GB SSD.
 {
  config,
-  lib,
-  pkgs,
  self,
  ...
 }: {
--- a/hosts/fallarbor/home.nix
+++ b/hosts/fallarbor/home.nix
@ -1,9 +1,4 @@
 {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
  home-manager.sharedModules = [
    {
      ar.home.desktop.hyprland.laptopMonitors = ["desc:BOE 0x095F,preferred,auto,1.566667"];
--- a/hosts/lavaridge/default.nix
+++ b/hosts/lavaridge/default.nix
@ -1,8 +1,6 @@
 # Framework Laptop 13 with AMD Ryzen 7640U, 32GB RAM, 1TB SSD.
 {
  config,
-  lib,
-  pkgs,
  self,
  ...
 }: {
--- a/hosts/lavaridge/home.nix
+++ b/hosts/lavaridge/home.nix
@ -1,9 +1,4 @@
 {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
  home-manager.sharedModules = [
    {
      ar.home = {
--- a/hosts/mauville/home.nix
+++ b/hosts/mauville/home.nix
@ -1,5 +1,4 @@
 {
-  config,
  lib,
  pkgs,
  self,
--- a/hosts/petalburg/default.nix
+++ b/hosts/petalburg/default.nix
@ -1,8 +1,6 @@
 # Lenovo Yoga 9i Convertible with Intel Core i7-1360P, 16GB RAM, 512GB SSD.
 {
  config,
-  lib,
-  pkgs,
  self,
  ...
 }: {
--- a/hosts/petalburg/home.nix
+++ b/hosts/petalburg/home.nix
@ -1,5 +1,4 @@
 {
-  config,
  lib,
  pkgs,
  self,
--- a/hosts/rustboro/default.nix
+++ b/hosts/rustboro/default.nix
@ -1,8 +1,6 @@
 # Lenovo Thinkpad T440p with a Core i5 4210M, 16GB RAM, 512GB SSD.
 {
  config,
-  lib,
-  pkgs,
  self,
  ...
 }: {
--- a/hosts/rustboro/home.nix
+++ b/hosts/rustboro/home.nix
@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
+{lib, ...}: {
  home-manager.sharedModules = [
    {
      gtk.font.size = lib.mkForce 14;
--- a/nixosModules/apps/default.nix
+++ b/nixosModules/apps/default.nix
@ -1,9 +1,9 @@
 {
-  pkgs,
-  inputs,
-  lib,
-  config,
-  ...
-}: {
-  imports = [./firefox ./nicotine-plus ./steam ./podman ./virt-manager];
+  imports = [
+    ./firefox
+    ./nicotine-plus
+    ./steam
+    ./podman
+    ./virt-manager
+  ];
 }
--- a/nixosModules/apps/firefox/default.nix
+++ b/nixosModules/apps/firefox/default.nix
@ -1,7 +1,6 @@
 {
  config,
  lib,
-  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.apps.firefox.enable {
--- a/nixosModules/apps/nicotine-plus/default.nix
+++ b/nixosModules/apps/nicotine-plus/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.apps.nicotine-plus.enable {
--- a/nixosModules/apps/podman/default.nix
+++ b/nixosModules/apps/podman/default.nix
@ -1,5 +1,4 @@
 {
-  pkgs,
  lib,
  config,
  ...
--- a/nixosModules/apps/virt-manager/default.nix
+++ b/nixosModules/apps/virt-manager/default.nix
@ -1,7 +1,6 @@
 {
  config,
  lib,
-  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.apps.virt-manager.enable {
--- a/nixosModules/default.nix
+++ b/nixosModules/default.nix
@ -1,9 +1,4 @@
 self: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
  imports = [
    ./apps
    ./desktop
--- a/nixosModules/desktop/cinnamon/default.nix
+++ b/nixosModules/desktop/cinnamon/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.desktop.cinnamon.enable {
--- a/nixosModules/desktop/default.nix
+++ b/nixosModules/desktop/default.nix
@ -1,6 +1,5 @@
 {
  config,
-  inputs,
  lib,
  pkgs,
  ...
--- a/nixosModules/desktop/gnome/default.nix
+++ b/nixosModules/desktop/gnome/default.nix
@ -20,16 +20,16 @@
  '';
 in {
  config = lib.mkIf config.ar.desktop.gnome.enable {
-    environment.systemPackages = with pkgs;
+    environment.systemPackages =
      [
-        gnomeExtensions.appindicator
-        gnomeExtensions.blur-my-shell
-        gnomeExtensions.gsconnect
-        gnomeExtensions.light-shell
-        gnomeExtensions.night-theme-switcher
-        gnomeExtensions.noannoyance-fork
-        gnomeExtensions.tailscale-status
-        gnomeExtensions.tiling-assistant
+        pkgs.gnomeExtensions.appindicator
+        pkgs.gnomeExtensions.blur-my-shell
+        pkgs.gnomeExtensions.gsconnect
+        pkgs.gnomeExtensions.light-shell
+        pkgs.gnomeExtensions.night-theme-switcher
+        pkgs.gnomeExtensions.noannoyance-fork
+        pkgs.gnomeExtensions.tailscale-status
+        pkgs.gnomeExtensions.tiling-assistant
      ]
      ++ [gnomeCsAdjuster];

--- a/nixosModules/desktop/greetd/default.nix
+++ b/nixosModules/desktop/greetd/default.nix
@ -11,26 +11,25 @@
      kwallet.enable = true;
    };

-    services = {
-      greetd = {
-        enable = true;
-        settings =
-          if config.ar.desktop.greetd.autologin != null
-          then {
-            default_session = {
-              command = lib.mkDefault "${lib.getExe pkgs.greetd.tuigreet} --asterisks --user-menu -g 'Welcome to NixOS ${config.system.nixos.release}' --time --remember --cmd ${config.ar.desktop.greetd.session}";
-            };
-            initial_session = {
-              command = config.ar.desktop.greetd.session;
-              user = config.ar.desktop.greetd.autologin;
-            };
-          }
-          else {
-            default_session = {
-              command = lib.mkDefault "${lib.getExe pkgs.greetd.tuigreet} --asterisks --user-menu -g 'Welcome to NixOS ${config.system.nixos.release}' --time --remember --cmd ${config.ar.desktop.greetd.session}";
-            };
+    services.greetd = {
+      enable = true;
+
+      settings =
+        if config.ar.desktop.greetd.autologin != null
+        then {
+          default_session = {
+            command = lib.mkDefault "${lib.getExe pkgs.greetd.tuigreet} --asterisks --user-menu -g 'Welcome to NixOS ${config.system.nixos.release}' --time --remember --cmd ${config.ar.desktop.greetd.session}";
          };
-      };
+          initial_session = {
+            command = config.ar.desktop.greetd.session;
+            user = config.ar.desktop.greetd.autologin;
+          };
+        }
+        else {
+          default_session = {
+            command = lib.mkDefault "${lib.getExe pkgs.greetd.tuigreet} --asterisks --user-menu -g 'Welcome to NixOS ${config.system.nixos.release}' --time --remember --cmd ${config.ar.desktop.greetd.session}";
+          };
+        };
    };
  };
 }
--- a/nixosModules/desktop/hyprland/default.nix
+++ b/nixosModules/desktop/hyprland/default.nix
@ -1,6 +1,5 @@
 {
  config,
-  inputs,
  lib,
  pkgs,
  ...
--- a/nixosModules/desktop/sway/default.nix
+++ b/nixosModules/desktop/sway/default.nix
@ -1,5 +1,4 @@
 {
-  inputs,
  pkgs,
  lib,
  config,
--- a/nixosModules/desktop/waylandComp.nix
+++ b/nixosModules/desktop/waylandComp.nix
@ -1,5 +1,4 @@
 {
-  inputs,
  pkgs,
  lib,
  config,
--- a/nixosModules/options.nix
+++ b/nixosModules/options.nix
@ -1,7 +1,6 @@
 {
  config,
  lib,
-  pkgs,
  ...
 }: {
  options.ar = {
--- a/nixosModules/services/default.nix
+++ b/nixosModules/services/default.nix
@ -1,9 +1,4 @@
 {
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
  imports = [
    ./flatpak
  ];
--- a/nixosModules/services/flatpak/default.nix
+++ b/nixosModules/services/flatpak/default.nix
@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }: {
  config = lib.mkIf config.ar.services.flatpak.enable {
--- a/userModules/aly/default.nix
+++ b/userModules/aly/default.nix
@ -1,8 +1,6 @@
 {
  config,
-  inputs,
  lib,
-  pkgs,
  self,
  ...
 }: {
--- a/userModules/aly/syncthing.nix
+++ b/userModules/aly/syncthing.nix
@ -1,7 +1,6 @@
 {
  config,
  lib,
-  pkgs,
  ...
 }: let
  cfg = config.ar.users.aly.syncthing;
--- a/userModules/default.nix
+++ b/userModules/default.nix
@ -1,9 +1,4 @@
 self: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
  imports = [
    ./aly
    ./dustin
--- a/userModules/dustin/default.nix
+++ b/userModules/dustin/default.nix
@ -1,8 +1,6 @@
 {
  config,
-  inputs,
  lib,
-  pkgs,
  self,
  ...
 }: {
--- a/userModules/options.nix
+++ b/userModules/options.nix
@ -1,7 +1,6 @@
 {
  config,
  lib,
-  pkgs,
  ...
 }: {
  options.ar.users = let