From deb36b44e1b39c55f563668f6bc8d11a779bbe67 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Thu, 18 Jul 2024 21:05:35 -0400 Subject: [PATCH] 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 --- .github/workflows/nix-drybuild.yml | 59 ------------------- .gitlab-ci.yml | 1 - baseModules/default.nix | 15 +---- homeManagerModules/apps/alacritty/default.nix | 3 +- homeManagerModules/apps/backblaze/default.nix | 4 +- homeManagerModules/apps/bash/default.nix | 4 +- homeManagerModules/apps/chromium/default.nix | 3 +- homeManagerModules/apps/default.nix | 5 -- homeManagerModules/apps/emacs/default.nix | 4 +- homeManagerModules/apps/fastfetch/default.nix | 4 +- homeManagerModules/apps/firefox/default.nix | 4 +- homeManagerModules/apps/fuzzel/default.nix | 3 +- homeManagerModules/apps/keepassxc/default.nix | 4 +- homeManagerModules/apps/librewolf/default.nix | 3 +- homeManagerModules/apps/mako/default.nix | 3 +- homeManagerModules/apps/nemo/default.nix | 9 ++- homeManagerModules/apps/swaylock/default.nix | 4 +- homeManagerModules/apps/thunar/default.nix | 4 +- homeManagerModules/apps/tmux/default.nix | 4 +- homeManagerModules/apps/vsCodium/default.nix | 4 +- homeManagerModules/apps/waybar/default.nix | 4 +- homeManagerModules/apps/wlogout/default.nix | 4 +- homeManagerModules/apps/zed/default.nix | 1 + homeManagerModules/default.nix | 5 -- homeManagerModules/defaultApps.nix | 1 - .../desktop/cinnamon/default.nix | 1 - homeManagerModules/desktop/default.nix | 1 - homeManagerModules/desktop/gnome/default.nix | 1 - .../desktop/hyprland/default.nix | 1 - homeManagerModules/desktop/sway/default.nix | 18 +----- .../desktop/sway/randomWallpaper.nix | 6 +- homeManagerModules/desktop/sway/redShift.nix | 4 +- homeManagerModules/desktop/waylandComp.nix | 6 +- homeManagerModules/services/default.nix | 10 ++-- .../services/easyeffects/default.nix | 1 - homeManagerModules/services/mpd/default.nix | 1 - homes/aly/firefox/default.nix | 1 - homes/dustin/default.nix | 1 - hosts/common/samba.nix | 2 +- hosts/fallarbor/default.nix | 2 - hosts/fallarbor/home.nix | 5 -- hosts/lavaridge/default.nix | 2 - hosts/lavaridge/home.nix | 5 -- hosts/mauville/home.nix | 1 - hosts/petalburg/default.nix | 2 - hosts/petalburg/home.nix | 1 - hosts/rustboro/default.nix | 2 - hosts/rustboro/home.nix | 7 +-- nixosModules/apps/default.nix | 14 ++--- nixosModules/apps/firefox/default.nix | 1 - nixosModules/apps/nicotine-plus/default.nix | 4 +- nixosModules/apps/podman/default.nix | 1 - nixosModules/apps/virt-manager/default.nix | 1 - nixosModules/default.nix | 5 -- nixosModules/desktop/cinnamon/default.nix | 4 +- nixosModules/desktop/default.nix | 1 - nixosModules/desktop/gnome/default.nix | 18 +++--- nixosModules/desktop/greetd/default.nix | 37 ++++++------ nixosModules/desktop/hyprland/default.nix | 1 - nixosModules/desktop/sway/default.nix | 1 - nixosModules/desktop/waylandComp.nix | 1 - nixosModules/options.nix | 1 - nixosModules/services/default.nix | 5 -- nixosModules/services/flatpak/default.nix | 4 +- userModules/aly/default.nix | 2 - userModules/aly/syncthing.nix | 1 - userModules/default.nix | 5 -- userModules/dustin/default.nix | 2 - userModules/options.nix | 1 - 69 files changed, 94 insertions(+), 256 deletions(-) delete mode 100644 .github/workflows/nix-drybuild.yml diff --git a/.github/workflows/nix-drybuild.yml b/.github/workflows/nix-drybuild.yml deleted file mode 100644 index c9bee92c..00000000 --- a/.github/workflows/nix-drybuild.yml +++ /dev/null @@ -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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 237dd418..86e3ce77 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,6 @@ variables: GIT_STRATEGY: clone GIT_DEPTH: 1 - stages: - "Update" - "Checks" diff --git a/baseModules/default.nix b/baseModules/default.nix index 065d35f4..8a0dec86 100644 --- 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; }; diff --git a/homeManagerModules/apps/alacritty/default.nix b/homeManagerModules/apps/alacritty/default.nix index 290b0609..2f1f83d2 100644 --- 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 { diff --git a/homeManagerModules/apps/backblaze/default.nix b/homeManagerModules/apps/backblaze/default.nix index 0a5d7b59..04415eba 100644 --- 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; diff --git a/homeManagerModules/apps/bash/default.nix b/homeManagerModules/apps/bash/default.nix index d0f2d580..32bc73f1 100644 --- 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 { diff --git a/homeManagerModules/apps/chromium/default.nix b/homeManagerModules/apps/chromium/default.nix index 24d9a0c0..8e491cbc 100644 --- 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 { diff --git a/homeManagerModules/apps/default.nix b/homeManagerModules/apps/default.nix index 168284a8..c0744373 100644 --- a/homeManagerModules/apps/default.nix +++ b/homeManagerModules/apps/default.nix @@ -1,9 +1,4 @@ { - config, - lib, - pkgs, - ... -}: { imports = [ ./alacritty ./backblaze diff --git a/homeManagerModules/apps/emacs/default.nix b/homeManagerModules/apps/emacs/default.nix index 0da771e8..cb446dab 100644 --- 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 { diff --git a/homeManagerModules/apps/fastfetch/default.nix b/homeManagerModules/apps/fastfetch/default.nix index 705bb220..b38a5cf8 100644 --- 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 { diff --git a/homeManagerModules/apps/firefox/default.nix b/homeManagerModules/apps/firefox/default.nix index d5b5d782..2a7ee4d2 100644 --- 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 { diff --git a/homeManagerModules/apps/fuzzel/default.nix b/homeManagerModules/apps/fuzzel/default.nix index fe96bbe2..36898b3d 100644 --- 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 { diff --git a/homeManagerModules/apps/keepassxc/default.nix b/homeManagerModules/apps/keepassxc/default.nix index ecb41627..21520e43 100644 --- 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 { diff --git a/homeManagerModules/apps/librewolf/default.nix b/homeManagerModules/apps/librewolf/default.nix index 14928198..6c4d413b 100644 --- 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 { diff --git a/homeManagerModules/apps/mako/default.nix b/homeManagerModules/apps/mako/default.nix index 04dd5d4d..bc4d0113 100644 --- 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 { diff --git a/homeManagerModules/apps/nemo/default.nix b/homeManagerModules/apps/nemo/default.nix index 88fad944..0688d782 100644 --- 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"; diff --git a/homeManagerModules/apps/swaylock/default.nix b/homeManagerModules/apps/swaylock/default.nix index f40ca731..857cfb9b 100644 --- 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 { diff --git a/homeManagerModules/apps/thunar/default.nix b/homeManagerModules/apps/thunar/default.nix index 6c75229f..2ef89521 100644 --- 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 { diff --git a/homeManagerModules/apps/tmux/default.nix b/homeManagerModules/apps/tmux/default.nix index 07c6ca93..83ea38e0 100644 --- 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 { diff --git a/homeManagerModules/apps/vsCodium/default.nix b/homeManagerModules/apps/vsCodium/default.nix index 71231748..2a88203f 100644 --- 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 { diff --git a/homeManagerModules/apps/waybar/default.nix b/homeManagerModules/apps/waybar/default.nix index efe1ff29..371b1df2 100644 --- 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 { diff --git a/homeManagerModules/apps/wlogout/default.nix b/homeManagerModules/apps/wlogout/default.nix index 392e52c2..d8018b3e 100644 --- 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 { diff --git a/homeManagerModules/apps/zed/default.nix b/homeManagerModules/apps/zed/default.nix index 0539f5e5..22ef18ba 100644 --- 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; diff --git a/homeManagerModules/default.nix b/homeManagerModules/default.nix index bdb12527..fb6f1ee4 100644 --- a/homeManagerModules/default.nix +++ b/homeManagerModules/default.nix @@ -1,9 +1,4 @@ self: { - config, - pkgs, - lib, - ... -}: { imports = [ ./apps ./defaultApps.nix diff --git a/homeManagerModules/defaultApps.nix b/homeManagerModules/defaultApps.nix index 05ef8a37..37bc9c56 100644 --- a/homeManagerModules/defaultApps.nix +++ b/homeManagerModules/defaultApps.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: let cfg = config.ar.home.defaultApps; diff --git a/homeManagerModules/desktop/cinnamon/default.nix b/homeManagerModules/desktop/cinnamon/default.nix index 8d6b1ba0..9725468e 100644 --- a/homeManagerModules/desktop/cinnamon/default.nix +++ b/homeManagerModules/desktop/cinnamon/default.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/homeManagerModules/desktop/default.nix b/homeManagerModules/desktop/default.nix index 5c8bdfb3..93afe3c9 100644 --- a/homeManagerModules/desktop/default.nix +++ b/homeManagerModules/desktop/default.nix @@ -2,7 +2,6 @@ config, lib, osConfig, - pkgs, ... }: { imports = [ diff --git a/homeManagerModules/desktop/gnome/default.nix b/homeManagerModules/desktop/gnome/default.nix index 63a027e8..90075b22 100644 --- a/homeManagerModules/desktop/gnome/default.nix +++ b/homeManagerModules/desktop/gnome/default.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/homeManagerModules/desktop/hyprland/default.nix b/homeManagerModules/desktop/hyprland/default.nix index 3e99f69a..6a025381 100644 --- 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; diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix index 7be248c2..f7372b82 100644 --- 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) diff --git a/homeManagerModules/desktop/sway/randomWallpaper.nix b/homeManagerModules/desktop/sway/randomWallpaper.nix index 4ce6d15d..8b2523a2 100644 --- 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}";} diff --git a/homeManagerModules/desktop/sway/redShift.nix b/homeManagerModules/desktop/sway/redShift.nix index 27fe265b..29c0a1cd 100644 --- 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 { diff --git a/homeManagerModules/desktop/waylandComp.nix b/homeManagerModules/desktop/waylandComp.nix index b3b324f8..ea16ef70 100644 --- 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; }; }; diff --git a/homeManagerModules/services/default.nix b/homeManagerModules/services/default.nix index ceb7c965..8ab0c7dc 100644 --- a/homeManagerModules/services/default.nix +++ b/homeManagerModules/services/default.nix @@ -1,8 +1,6 @@ { - config, - lib, - pkgs, - ... -}: { - imports = [./easyeffects ./mpd]; + imports = [ + ./easyeffects + ./mpd + ]; } diff --git a/homeManagerModules/services/easyeffects/default.nix b/homeManagerModules/services/easyeffects/default.nix index a47e84a4..14ddaa7a 100644 --- a/homeManagerModules/services/easyeffects/default.nix +++ b/homeManagerModules/services/easyeffects/default.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/homeManagerModules/services/mpd/default.nix b/homeManagerModules/services/mpd/default.nix index a01d24d9..6c7f227e 100644 --- a/homeManagerModules/services/mpd/default.nix +++ b/homeManagerModules/services/mpd/default.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/homes/aly/firefox/default.nix b/homes/aly/firefox/default.nix index 4adac807..692ed1cf 100644 --- a/homes/aly/firefox/default.nix +++ b/homes/aly/firefox/default.nix @@ -1,6 +1,5 @@ { config, - lib, pkgs, ... }: { diff --git a/homes/dustin/default.nix b/homes/dustin/default.nix index 95bb9a6e..de899c9e 100644 --- a/homes/dustin/default.nix +++ b/homes/dustin/default.nix @@ -1,6 +1,5 @@ self: { config, - lib, pkgs, ... }: { diff --git a/hosts/common/samba.nix b/hosts/common/samba.nix index 283907e2..ea0f3941 100644 --- 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" ]; diff --git a/hosts/fallarbor/default.nix b/hosts/fallarbor/default.nix index 9f3b0ed9..2f30de15 100644 --- 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, ... }: { diff --git a/hosts/fallarbor/home.nix b/hosts/fallarbor/home.nix index 54945ef7..780a258f 100644 --- 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"]; diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix index 830f425e..c3a98b1d 100644 --- 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, ... }: { diff --git a/hosts/lavaridge/home.nix b/hosts/lavaridge/home.nix index 9564aab7..2a0fa9b0 100644 --- a/hosts/lavaridge/home.nix +++ b/hosts/lavaridge/home.nix @@ -1,9 +1,4 @@ { - config, - lib, - pkgs, - ... -}: { home-manager.sharedModules = [ { ar.home = { diff --git a/hosts/mauville/home.nix b/hosts/mauville/home.nix index 9679e3f9..43d15d92 100644 --- a/hosts/mauville/home.nix +++ b/hosts/mauville/home.nix @@ -1,5 +1,4 @@ { - config, lib, pkgs, self, diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix index 8948d5ec..4e03417a 100644 --- 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, ... }: { diff --git a/hosts/petalburg/home.nix b/hosts/petalburg/home.nix index 76e7ee57..075901be 100644 --- a/hosts/petalburg/home.nix +++ b/hosts/petalburg/home.nix @@ -1,5 +1,4 @@ { - config, lib, pkgs, self, diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix index 29b0a594..4423278e 100644 --- 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, ... }: { diff --git a/hosts/rustboro/home.nix b/hosts/rustboro/home.nix index 14234b69..a8c1b64a 100644 --- 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; diff --git a/nixosModules/apps/default.nix b/nixosModules/apps/default.nix index 0f91f74c..e0267d5c 100644 --- 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 + ]; } diff --git a/nixosModules/apps/firefox/default.nix b/nixosModules/apps/firefox/default.nix index 96788e10..14aeb6c2 100644 --- 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 { diff --git a/nixosModules/apps/nicotine-plus/default.nix b/nixosModules/apps/nicotine-plus/default.nix index e04394ea..88434f26 100644 --- 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 { diff --git a/nixosModules/apps/podman/default.nix b/nixosModules/apps/podman/default.nix index 933668fc..4528ccba 100644 --- a/nixosModules/apps/podman/default.nix +++ b/nixosModules/apps/podman/default.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/nixosModules/apps/virt-manager/default.nix b/nixosModules/apps/virt-manager/default.nix index 8fe60ed0..d908e138 100644 --- 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 { diff --git a/nixosModules/default.nix b/nixosModules/default.nix index e56392dc..837331f1 100644 --- a/nixosModules/default.nix +++ b/nixosModules/default.nix @@ -1,9 +1,4 @@ self: { - config, - pkgs, - lib, - ... -}: { imports = [ ./apps ./desktop diff --git a/nixosModules/desktop/cinnamon/default.nix b/nixosModules/desktop/cinnamon/default.nix index 40ee402d..b039038f 100644 --- 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 { diff --git a/nixosModules/desktop/default.nix b/nixosModules/desktop/default.nix index 62c0e9ac..64a0369d 100644 --- a/nixosModules/desktop/default.nix +++ b/nixosModules/desktop/default.nix @@ -1,6 +1,5 @@ { config, - inputs, lib, pkgs, ... diff --git a/nixosModules/desktop/gnome/default.nix b/nixosModules/desktop/gnome/default.nix index 28173dbd..6ac2bb2b 100644 --- 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]; diff --git a/nixosModules/desktop/greetd/default.nix b/nixosModules/desktop/greetd/default.nix index 8f220ce1..4d0a456c 100644 --- 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}"; + }; + }; }; }; } diff --git a/nixosModules/desktop/hyprland/default.nix b/nixosModules/desktop/hyprland/default.nix index 3fe150d3..11a22efe 100644 --- a/nixosModules/desktop/hyprland/default.nix +++ b/nixosModules/desktop/hyprland/default.nix @@ -1,6 +1,5 @@ { config, - inputs, lib, pkgs, ... diff --git a/nixosModules/desktop/sway/default.nix b/nixosModules/desktop/sway/default.nix index 39ecc7e1..d3793404 100644 --- a/nixosModules/desktop/sway/default.nix +++ b/nixosModules/desktop/sway/default.nix @@ -1,5 +1,4 @@ { - inputs, pkgs, lib, config, diff --git a/nixosModules/desktop/waylandComp.nix b/nixosModules/desktop/waylandComp.nix index 5845d32b..29d45c9a 100644 --- a/nixosModules/desktop/waylandComp.nix +++ b/nixosModules/desktop/waylandComp.nix @@ -1,5 +1,4 @@ { - inputs, pkgs, lib, config, diff --git a/nixosModules/options.nix b/nixosModules/options.nix index 974532b3..37f6a1df 100644 --- a/nixosModules/options.nix +++ b/nixosModules/options.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: { options.ar = { diff --git a/nixosModules/services/default.nix b/nixosModules/services/default.nix index 2c7f609f..6f52f3b0 100644 --- a/nixosModules/services/default.nix +++ b/nixosModules/services/default.nix @@ -1,9 +1,4 @@ { - pkgs, - lib, - config, - ... -}: { imports = [ ./flatpak ]; diff --git a/nixosModules/services/flatpak/default.nix b/nixosModules/services/flatpak/default.nix index 10e44518..f46e517e 100644 --- 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 { diff --git a/userModules/aly/default.nix b/userModules/aly/default.nix index 769053c1..29655805 100644 --- a/userModules/aly/default.nix +++ b/userModules/aly/default.nix @@ -1,8 +1,6 @@ { config, - inputs, lib, - pkgs, self, ... }: { diff --git a/userModules/aly/syncthing.nix b/userModules/aly/syncthing.nix index 42a1650e..8bb03aea 100644 --- a/userModules/aly/syncthing.nix +++ b/userModules/aly/syncthing.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: let cfg = config.ar.users.aly.syncthing; diff --git a/userModules/default.nix b/userModules/default.nix index ace9fce2..7cdef176 100644 --- a/userModules/default.nix +++ b/userModules/default.nix @@ -1,9 +1,4 @@ self: { - config, - pkgs, - lib, - ... -}: { imports = [ ./aly ./dustin diff --git a/userModules/dustin/default.nix b/userModules/dustin/default.nix index 6bae4a33..2d1f98a4 100644 --- a/userModules/dustin/default.nix +++ b/userModules/dustin/default.nix @@ -1,8 +1,6 @@ { config, - inputs, lib, - pkgs, self, ... }: { diff --git a/userModules/options.nix b/userModules/options.nix index 82c5164b..9fd2c4b7 100644 --- a/userModules/options.nix +++ b/userModules/options.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: { options.ar.users = let