Update Zed configuration for nix LSP and formatter.

flake.nix

@@ -51,20 +51,17 @@
     nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest";
   };
 
-  outputs =
+  outputs = {
-    {
     nixpkgs,
     nix-flatpak,
     auto-cpufreq,
     ...
-    }@inputs:
+  } @ inputs: let
-    let
     hostDirs = builtins.attrNames (builtins.readDir ./hosts);
 
-      mkHost =
+    mkHost = hostName: let
-        hostName:
+      inherit
-        let
+        (import ./hosts/${hostName}/variables.nix)
-          inherit (import ./hosts/${hostName}/variables.nix)
         host
         username
         profile
@@ -86,8 +83,7 @@
           auto-cpufreq.nixosModules.default
         ];
       };
-    in
+  in {
-    {
     nixosConfigurations = nixpkgs.lib.genAttrs hostDirs mkHost;
   };
 }

hosts/Garand-Desktop/default.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   imports = [
     ./hardware.nix
     ./host-packages.nix

hosts/Garand-Desktop/hardware.nix

@@ -6,8 +6,7 @@
   lib,
   modulesPath,
   ...
-}:
+}: {
-{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
@@ -22,7 +21,7 @@
         "usb_storage"
         "sd_mod"
       ];
-      kernelModules = [ "dm-snapshot" ];
+      kernelModules = ["dm-snapshot"];
       luks.devices = {
         cryptroot = {
           device = "/dev/disk/by-uuid/7c018698-d35c-4ee6-92a8-5e4edf914065";
@@ -30,8 +29,8 @@
         };
       };
     };
-    kernelModules = [ "kvm-amd" ];
+    kernelModules = ["kvm-amd"];
-    extraModulePackages = [ ];
+    extraModulePackages = [];
   };
 
   fileSystems = {

hosts/Garand-Desktop/host-packages.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   environment.systemPackages = with pkgs; [
     # audacity
   ];

hosts/Garand-Laptop/default.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   imports = [
     ./hardware.nix
     ./host-packages.nix

hosts/Garand-Laptop/hardware.nix

@@ -6,9 +6,7 @@
   lib,
   modulesPath,
   ...
-}:
+}: {
-
-{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
@@ -21,14 +19,14 @@
         "usb_storage"
         "sd_mod"
       ];
-      kernelModules = [ "dm-snapshot" ];
+      kernelModules = ["dm-snapshot"];
       luks.devices.cryptroot = {
         device = "/dev/disk/by-uuid/6abc2228-823e-42b0-94c7-48fda757732c";
         preLVM = true;
       };
     };
-    kernelModules = [ "kvm-amd" ];
+    kernelModules = ["kvm-amd"];
-    extraModulePackages = [ ];
+    extraModulePackages = [];
   };
 
   fileSystems = {
@@ -51,7 +49,7 @@
   };
 
   swapDevices = [
-    { device = "/dev/disk/by-uuid/5da7c845-7dd3-4882-93af-2d679cdb5e7a"; }
+    {device = "/dev/disk/by-uuid/5da7c845-7dd3-4882-93af-2d679cdb5e7a";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/Garand-Laptop/host-packages.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   environment.systemPackages = with pkgs; [
     # audacity
   ];

hosts/default/default.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   imports = [
     ./hardware.nix
     ./host-packages.nix

hosts/default/hardware.nix

@@ -7,9 +7,7 @@
   pkgs,
   modulesPath,
   ...
-}:
+}: {
-
-{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
@@ -20,17 +18,16 @@
     "nvme"
     "usbhid"
   ];
-  boot.initrd.kernelModules = [ ];
+  boot.initrd.kernelModules = [];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/dd005850-6230-40c4-9d70-8c8cf443658d";
     fsType = "ext4";
   };
 
-  boot.initrd.luks.devices."luks-b7565781-148e-4c94-9c76-36c84dd93dc8".device =
+  boot.initrd.luks.devices."luks-b7565781-148e-4c94-9c76-36c84dd93dc8".device = "/dev/disk/by-uuid/b7565781-148e-4c94-9c76-36c84dd93dc8";
-    "/dev/disk/by-uuid/b7565781-148e-4c94-9c76-36c84dd93dc8";
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/C2A6-DF56";

hosts/default/host-packages.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   environment.systemPackages = with pkgs; [
     # audacity
   ];

modules/core/auto-cpufreq.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   programs.auto-cpufreq = {
     enable = true;
     settings = {

modules/core/boot.nix

@@ -3,13 +3,11 @@
   config,
   lib,
   ...
-}:
+}: {
-
-{
   boot = {
     kernelPackages = pkgs.linuxPackages_zen;
-    kernelModules = [ "v4l2loopback" ];
+    kernelModules = ["v4l2loopback"];
-    extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
+    extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
     kernel.sysctl = {
       "vm.max_map_count" = 2147483642;
     };

modules/core/default.nix

@@ -1,8 +1,4 @@
-{
+{inputs, ...}: {
-  inputs,
-  ...
-}:
-{
   imports = [
     ./packages
     ./auto-cpufreq.nix

modules/core/fonts.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   fonts = {
     packages = with pkgs; [
       dejavu_fonts

modules/core/greetd.nix

@@ -2,8 +2,7 @@
   pkgs,
   username,
   ...
-}:
+}: {
-{
   services.greetd = {
     enable = true;
     #vt = 3;

modules/core/hardware.nix

@@ -1,10 +1,9 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   hardware = {
     sane = {
       enable = true;
-      extraBackends = [ pkgs.sane-airscan ];
+      extraBackends = [pkgs.sane-airscan];
-      disabledDefaultBackends = [ "escl" ];
+      disabledDefaultBackends = ["escl"];
     };
     logitech.wireless = {
       enable = false;

modules/core/network.nix

@@ -2,11 +2,9 @@
   host,
   options,
   ...
-}:
+}: let
-let
   inherit (import ../../hosts/${host}/variables.nix) hostId;
-in
+in {
-{
   # Defensive assertion for hostname validity (clearer message at eval time)
   assertions = [
     {
@@ -19,7 +17,7 @@ in
     hostName = "${host}";
     hostId = hostId;
     networkmanager.enable = true;
-    timeServers = options.networking.timeServers.default ++ [ "pool.ntp.org" ];
+    timeServers = options.networking.timeServers.default ++ ["pool.ntp.org"];
     firewall = {
       enable = true;
       allowedTCPPorts = [

modules/core/nfs.nix

@@ -1,8 +1,6 @@
-{ host, ... }:
+{host, ...}: let
-let
   inherit (import ../../hosts/${host}/variables.nix) enableNFS;
-in
+in {
-{
   services = {
     rpcbind.enable = enableNFS;
     nfs.server.enable = enableNFS;

modules/core/nh.nix

@@ -1,8 +1,4 @@
-{
+{username, ...}: {
-  username,
-  ...
-}:
-{
   programs.nh = {
     enable = true;
     clean = {

modules/core/packages/clients.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   environment.systemPackages = with pkgs; [
     # Communication
     slack

modules/core/packages/default.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   nixpkgs.config.allowUnfree = true;
   imports = [
     ./programs.nix

modules/core/packages/development.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   environment.systemPackages = with pkgs; [
     # Learning & practice
     exercism

modules/core/packages/gaming.nix

@@ -3,8 +3,7 @@
   # inputs,
   # system,
   ...
-}:
+}: {
-{
   environment.systemPackages = with pkgs; [
     # inputs.prismlauncher-cracked.packages.${system}.default
     space-cadet-pinball

modules/core/packages/multimedia.nix

@@ -3,8 +3,7 @@
   # inputs,
   # system,
   ...
-}:
+}: {
-{
   environment.systemPackages = with pkgs; [
     # Video & image processing
     ffmpeg

modules/core/packages/programs.nix

@@ -1,8 +1,8 @@
-{
+# {
-  # pkgs
+#   pkgs
-  ...
+#   ...
-}:
+# }
-{
+_: {
   programs = {
     nano.enable = true;
     hyprland = {

modules/core/packages/terminal.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   environment.systemPackages = with pkgs; [
     cmatrix
     cowsay

modules/core/packages/tools.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   environment.systemPackages = with pkgs; [
     # File management
     trash-cli

modules/core/packages/virtualization.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   environment.systemPackages = with pkgs; [
     virt-viewer
     # lazydocker

modules/core/printing.nix

@@ -1,8 +1,6 @@
-{ host, ... }:
+{host, ...}: let
-let
   inherit (import ../../hosts/${host}/variables.nix) printEnable;
-in
+in {
-{
   services = {
     printing = {
       enable = printEnable;

modules/core/services.nix

@@ -1,5 +1,4 @@
-{ profile, ... }:
+{profile, ...}: {
-{
   # Services to start
   services = {
     libinput.enable = true; # Input Handling
@@ -12,14 +11,17 @@
         PasswordAuthentication = true; # Users can SSH using kb and password
         KbdInteractiveAuthentication = true;
       };
-      ports = [ 22 ];
+      ports = [22];
     };
     blueman.enable = true; # Bluetooth Support
     tumbler.enable = true; # Image/video preview
     gnome.gnome-keyring.enable = true;
 
     smartd = {
-      enable = if profile == "vm" then false else true;
+      enable =
+        if profile == "vm"
+        then false
+        else true;
       autodetect = true;
     };
     pipewire = {

modules/core/steam.nix

@@ -1,12 +1,11 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs = {
     steam = {
       enable = true;
       remotePlay.openFirewall = true;
       dedicatedServer.openFirewall = true;
       gamescopeSession.enable = true;
-      extraCompatPackages = [ pkgs.proton-ge-bin ];
+      extraCompatPackages = [pkgs.proton-ge-bin];
     };
     # gamescope = {
     #   enable = true;

modules/core/stylix.nix

@@ -2,11 +2,9 @@
   pkgs,
   host,
   ...
-}:
+}: let
-let
   inherit (import ../../hosts/${host}/variables.nix) stylixImage;
-in
+in {
-{
   # Styling Options
   stylix = {
     enable = true;

modules/core/syncthing.nix

@@ -1,5 +1,4 @@
-{ username, ... }:
+{username, ...}: {
-{
   services.syncthing = {
     enable = false;
     user = "${username}";

modules/core/system.nix

@@ -1,9 +1,12 @@
-{ host, ... }:
-let
-  inherit (import ../../hosts/${host}/variables.nix) consoleKeyMap;
-in
 {
+  host,
+  inputs,
+  ...
+}: let
+  inherit (import ../../hosts/${host}/variables.nix) consoleKeyMap;
+in {
   nix = {
+    nixPath = ["nixpkgs=${inputs.nixpkgs}"];
     settings = {
       download-buffer-size = 200000000;
       auto-optimise-store = true;
@@ -11,13 +14,14 @@ in
         "nix-command"
         "flakes"
       ];
-      substituters = [ "https://hyprland.cachix.org" ];
+      substituters = ["https://hyprland.cachix.org"];
-      trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
+      trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
     };
   };
   time.timeZone = "Europe/Warsaw";
-  i18n.defaultLocale = "pl_PL.UTF-8";
+  i18n = {
-  i18n.extraLocaleSettings = {
+    defaultLocale = "pl_PL.UTF-8";
+    extraLocaleSettings = {
       LC_ADDRESS = "pl_PL.UTF-8";
       LC_IDENTIFICATION = "pl_PL.UTF-8";
       LC_MEASUREMENT = "pl_PL.UTF-8";
@@ -28,6 +32,7 @@ in
       LC_TELEPHONE = "pl_PL.UTF-8";
       LC_TIME = "pl_PL.UTF-8";
     };
+  };
   environment.variables = {
     NIXOS_OZONE_WL = "1";
     GARANDOS_VERSION = "1.0";

modules/core/thunar.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}:
-{
   programs = {
     thunar = {
       enable = true;

modules/core/user.nix

@@ -6,12 +6,10 @@
   profile,
   system,
   ...
-}:
+}: let
-let
   inherit (import ../../hosts/${host}/variables.nix) gitUsername;
-in
+in {
-{
+  imports = [inputs.home-manager.nixosModules.home-manager];
-  imports = [ inputs.home-manager.nixosModules.home-manager ];
   home-manager = {
     useUserPackages = true;
     useGlobalPkgs = false;
@@ -26,7 +24,7 @@ in
         ;
     };
     users.${username} = {
-      imports = [ ./../home ];
+      imports = [./../home];
       home = {
         username = "${username}";
         homeDirectory = "/home/${username}";
@@ -52,5 +50,5 @@ in
     shell = pkgs.bash;
     ignoreShellProgramCheck = true;
   };
-  nix.settings.allowed-users = [ "${username}" ];
+  nix.settings.allowed-users = ["${username}"];
 }

modules/core/virtualisation.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   # Only enable either docker or podman -- Not both
   virtualisation = {
     docker.enable = true;

modules/core/xdg.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   xdg.portal = {
     enable = true;
     wlr.enable = true;
@@ -7,6 +6,6 @@
       xdg-desktop-portal-hyprland
       xdg-desktop-portal-gtk
     ];
-    configPackages = [ pkgs.hyprland ];
+    configPackages = [pkgs.hyprland];
   };
 }

modules/core/xserver.nix

@@ -1,8 +1,6 @@
-{ host, ... }:
+{host, ...}: let
-let
   inherit (import ../../hosts/${host}/variables.nix) keyboardLayout;
-in
+in {
-{
   services.xserver = {
     enable = true;
     xkb = {

modules/drivers/amd-drivers.nix

@@ -4,18 +4,16 @@
   config,
   ...
 }:
-with lib;
+with lib; let
-let
   cfg = config.drivers.amdgpu;
-in
+in {
-{
   options.drivers.amdgpu = {
     enable = mkEnableOption "Enable AMD Drivers";
   };
 
   config = mkIf cfg.enable {
-    systemd.tmpfiles.rules = [ "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}" ];
+    systemd.tmpfiles.rules = ["L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"];
-    services.xserver.videoDrivers = [ "amdgpu" ];
+    services.xserver.videoDrivers = ["amdgpu"];
-    environment.systemPackages = with pkgs; [ rocmPackages.rocm-smi ];
+    environment.systemPackages = with pkgs; [rocmPackages.rocm-smi];
   };
 }

modules/drivers/default.nix

@@ -1,7 +1,4 @@
-{
+{...}: {
-  ...
-}:
-{
   imports = [
     ./amd-drivers.nix
     ./intel-drivers.nix

modules/drivers/intel-drivers.nix

@@ -4,11 +4,9 @@
   config,
   ...
 }:
-with lib;
+with lib; let
-let
   cfg = config.drivers.intel;
-in
+in {
-{
   options.drivers.intel = {
     enable = mkEnableOption "Enable Intel Graphics Drivers";
   };

modules/drivers/local-hardware-clock.nix

@@ -4,14 +4,12 @@
   config,
   ...
 }:
-with lib;
+with lib; let
-let
   cfg = config.local.hardware-clock;
-in
+in {
-{
   options.local.hardware-clock = {
     enable = mkEnableOption "Change Hardware Clock To Local Time";
   };
 
-  config = mkIf cfg.enable { time.hardwareClockInLocalTime = true; };
+  config = mkIf cfg.enable {time.hardwareClockInLocalTime = true;};
 }

modules/drivers/nvidia-drivers.nix

@@ -4,18 +4,16 @@
   pkgs,
   ...
 }:
-with lib;
+with lib; let
-let
   cfg = config.drivers.nvidia;
-in
+in {
-{
   options.drivers.nvidia = {
     enable = mkEnableOption "Enable Nvidia Drivers";
   };
 
   config = mkIf cfg.enable {
-    services.xserver.videoDrivers = [ "nvidia" ];
+    services.xserver.videoDrivers = ["nvidia"];
-    environment.systemPackages = with pkgs; [ nvidia-docker ];
+    environment.systemPackages = with pkgs; [nvidia-docker];
     hardware = {
       nvidia-container-toolkit.enable = true;
       nvidia = {
@@ -43,7 +41,6 @@ in
     };
   };
 }
-
 # Making nvidia docker toolkit work:
 #
 # sudo nvidia-ctk cdi generate --output=/etc/cdi/nvidia.yaml
@@ -59,3 +56,4 @@ in
 # EOF
 #
 # docker run --device nvidia.com/gpu=all
+

modules/drivers/nvidia-prime-drivers.nix

@@ -4,11 +4,9 @@
   config,
   ...
 }:
-with lib;
+with lib; let
-let
   cfg = config.drivers.nvidia-prime;
-in
+in {
-{
   options.drivers.nvidia-prime = {
     enable = mkEnableOption "Enable Nvidia Prime Hybrid GPU Offload";
     intelBusID = mkOption {

modules/drivers/vm-guest-services.nix

@@ -4,11 +4,9 @@
   config,
   ...
 }:
-with lib;
+with lib; let
-let
   cfg = config.vm.guest-services;
-in
+in {
-{
   options.vm.guest-services = {
     enable = mkEnableOption "Enable Virtual Machine Guest Services";
   };

modules/home/anki.nix

@@ -1,5 +1,8 @@
-{ pkgs, username, ... }:
 {
+  pkgs,
+  username,
+  ...
+}: {
   programs.anki = {
     enable = true;
     package = pkgs.anki;

modules/home/bash-aliases.nix

@@ -1,5 +1,8 @@
-{ host, username, ... }:
 {
+  host,
+  username,
+  ...
+}: {
   programs.bash = {
     shellAliases = {
       # GarandOS aliases

modules/home/bat.nix

@@ -2,8 +2,7 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-{
   programs.bat = {
     enable = true;
     config = {

modules/home/btop.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.btop = {
     enable = true;
     package = pkgs.btop.override {

modules/home/chromium.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.chromium = {
     enable = true;
     package = pkgs.ungoogled-chromium;

modules/home/default.nix

@@ -1,8 +1,6 @@
-{ host, ... }:
+{host, ...}: let
-let
   inherit (import ../../hosts/${host}/variables.nix) waybarChoice;
-in
+in {
-{
   imports = [
     ./fastfetch
     ./hyprland

modules/home/emoji.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   home.file.".config/.emoji".text = ''
     😀 grinning face face smile happy joy :D grin
     😃 grinning face with big eyes face happy joy haha :D :) smile funny

modules/home/fzf.nix

@@ -3,13 +3,11 @@
   config,
   lib,
   ...
-}:
+}: let
-let
   accent = "#" + config.lib.stylix.colors.base0D;
   foreground = "#" + config.lib.stylix.colors.base05;
   muted = "#" + config.lib.stylix.colors.base03;
-in
+in {
-{
   programs.fzf = {
     enable = true;
     enableBashIntegration = true;

modules/home/git.nix

@@ -1,8 +1,6 @@
-{ host, ... }:
+{host, ...}: let
-let
   inherit (import ../../hosts/${host}/variables.nix) gitUsername gitEmail;
-in
+in {
-{
   programs.git = {
     enable = true;
     settings = {

modules/home/gtk.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   gtk = {
     iconTheme = {
       name = "Papirus-Dark";

modules/home/hyprland/animations-def.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   wayland.windowManager.hyprland.settings = {
     animations = {
       enabled = true;

modules/home/hyprland/animations-dynamic.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   wayland.windowManager.hyprland.settings = {
     # name "Dynamic"
     # credit https://github.com/mylinuxforwork/dotfiles

modules/home/hyprland/animations-end4.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   wayland.windowManager.hyprland.settings = {
     # Name: END-4
     # Credit: END-4 project https://github.com/end-4/dots-hyprland

modules/home/hyprland/animations-moving.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   wayland.windowManager.hyprland.settings = {
     # name "moving"
     # credit https://github.com/mylinuxforwork/dotfiles

modules/home/hyprland/binds.nix

@@ -1,9 +1,11 @@
-{ host, username, ... }:
+{
-let
+  host,
+  username,
+  ...
+}: let
   inherit (import ../../../hosts/${host}/variables.nix) browser terminal;
   desktopEntriesPath = "/home/${username}/.local/state/home-manager/gcroots/current-home/home-path/share/applications/";
-in
+in {
-{
   wayland.windowManager.hyprland.settings = {
     bind = [
       # =============================================================================

modules/home/hyprland/default.nix

@@ -1,8 +1,6 @@
-{ host, ... }:
+{host, ...}: let
-let
   inherit (import ../../../hosts/${host}/variables.nix) animChoice;
-in
+in {
-{
   imports = [
     animChoice
     ./binds.nix

modules/home/hyprland/env.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   wayland.windowManager.hyprland = {
     settings = {
       env = [

modules/home/hyprland/exec-once.nix

@@ -1,10 +1,9 @@
-{ host, ... }:
+{host, ...}: let
-let
+  inherit
-  inherit (import ../../../hosts/${host}/variables.nix)
+    (import ../../../hosts/${host}/variables.nix)
     stylixImage
     ;
-in
+in {
-{
   wayland.windowManager.hyprland.settings = {
     exec-once = [
       "wl-paste --type text --watch cliphist store" # Saves text

modules/home/hyprland/hypridle.nix

@@ -1,6 +1,4 @@
-{ ... }:
+_: {
-
-{
   services = {
     hypridle = {
       enable = true;

modules/home/hyprland/hyprland.nix

@@ -3,11 +3,9 @@
   config,
   pkgs,
   ...
-}:
+}: let
-let
   inherit (import ../../../hosts/${host}/variables.nix) extraMonitorSettings keyboardLayout;
-in
+in {
-{
   systemd.user.targets.hyprland-session.Unit.Wants = [
     "xdg-desktop-autostart.target"
   ];
@@ -26,7 +24,7 @@ in
     systemd = {
       enable = true;
       enableXdgAutostart = true;
-      variables = [ "--all" ];
+      variables = ["--all"];
     };
     xwayland = {
       enable = true;
@@ -68,8 +66,7 @@ in
         gaps_out = 8;
         border_size = 2;
         resize_on_border = true;
-        "col.active_border" =
+        "col.active_border" = "rgb(${config.lib.stylix.colors.base08}) rgb(${config.lib.stylix.colors.base0C}) 45deg";
-          "rgb(${config.lib.stylix.colors.base08}) rgb(${config.lib.stylix.colors.base0C}) 45deg";
         "col.inactive_border" = "rgb(${config.lib.stylix.colors.base01})";
       };
 
@@ -154,9 +151,7 @@ in
     extraConfig = "
       monitor=,preferred,auto,auto
       monitor=Virtual-1,1920x1080@60,auto,1
-      ${
+      ${extraMonitorSettings}
-            extraMonitorSettings
-          }
       # To enable blur on waybar uncomment the line below
       # Thanks to SchotjeChrisman
       #layerrule = blur,waybar

modules/home/hyprland/hyprlock.nix

@@ -1,5 +1,4 @@
-{ username, ... }:
+{username, ...}: {
-{
   programs.hyprlock = {
     enable = true;
     settings = {

modules/home/hyprland/pyprland.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   home.file.".config/hypr/pyprland.toml".text = ''
     [pyprland]
     plugins = [

modules/home/kdeConnect.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   services.kdeconnect = {
     enable = true;
     indicator = true;

modules/home/kitty.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.kitty = {
     enable = true;
     package = pkgs.kitty;

modules/home/librewolf.nix

@@ -5,8 +5,7 @@
   system,
   host,
   ...
-}:
+}: {
-{
   programs = {
     librewolf = {
       enable = true;
@@ -61,12 +60,12 @@
             force = true;
             engines = {
               "garand's-search" = {
-                definedAliases = [ "@g" ];
+                definedAliases = ["@g"];
-                urls = [ { template = "https://search.garandplg.com/search?q={searchTerms}"; } ];
+                urls = [{template = "https://search.garandplg.com/search?q={searchTerms}";}];
                 suggestUrl = "https://search.garandplg.com/autocompleter?q={searchTerms}";
               };
               "youtube" = {
-                definedAliases = [ "@yt" ];
+                definedAliases = ["@yt"];
                 urls = [
                   {
                     template = "https://www.youtube.com/results";
@@ -80,7 +79,7 @@
                 ];
               };
               "wikipedia-pl" = {
-                definedAliases = [ "@w" ];
+                definedAliases = ["@w"];
                 urls = [
                   {
                     template = "https://pl.wikipedia.org/w/index.php";
@@ -94,7 +93,7 @@
                 ];
               };
               "stackoverflow" = {
-                definedAliases = [ "@so" ];
+                definedAliases = ["@so"];
                 urls = [
                   {
                     template = "https://stackoverflow.com/search";
@@ -108,7 +107,7 @@
                 ];
               };
               "nix-packages" = {
-                definedAliases = [ "@np" ];
+                definedAliases = ["@np"];
                 icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
                 urls = [
                   {
@@ -123,7 +122,7 @@
                 ];
               };
               "nix-options" = {
-                definedAliases = [ "@no" ];
+                definedAliases = ["@no"];
                 icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
                 urls = [
                   {
@@ -138,7 +137,7 @@
                 ];
               };
               "nix-wiki" = {
-                definedAliases = [ "@nw" ];
+                definedAliases = ["@nw"];
                 icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
                 urls = [
                   {
@@ -153,7 +152,7 @@
                 ];
               };
               "home-manager-option" = {
-                definedAliases = [ "@hmo" ];
+                definedAliases = ["@hmo"];
                 icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
                 urls = [
                   {
@@ -162,7 +161,7 @@
                 ];
               };
               "eneba" = {
-                definedAliases = [ "@en" ];
+                definedAliases = ["@en"];
                 icon = "https://static.eneba.games/branding/v2/logoFull.svg";
                 urls = [
                   {
@@ -177,7 +176,7 @@
                 ];
               };
               "kinguin" = {
-                definedAliases = [ "@ki" ];
+                definedAliases = ["@ki"];
                 icon = "https://static.kinguin.net/media/images/other/kinguin-mobile-logo.svg";
                 urls = [
                   {
@@ -192,7 +191,7 @@
                 ];
               };
               "instant-gaming" = {
-                definedAliases = [ "@ig" ];
+                definedAliases = ["@ig"];
                 icon = "https://asset.brandfetch.io/idCbLj4uOg/idGS61T0FV.jpeg";
                 urls = [
                   {
@@ -207,7 +206,7 @@
                 ];
               };
               "morele" = {
-                definedAliases = [ "@mo" ];
+                definedAliases = ["@mo"];
                 icon = "https://www.morele.net/static/img/shop/logo/image-logo-morele.svg";
                 urls = [
                   {
@@ -222,7 +221,7 @@
                 ];
               };
               "x-kom" = {
-                definedAliases = [ "@xk" ];
+                definedAliases = ["@xk"];
                 icon = "https://assets.x-kom.pl/public-spa/xkom/75062cb4b48a8510.svg";
                 urls = [
                   {
@@ -237,7 +236,7 @@
                 ];
               };
               "komputronik" = {
-                definedAliases = [ "@kp" ];
+                definedAliases = ["@kp"];
                 icon = "https://front.komputronik.pl/front-static/komputronik.Ceqagame-a.svg";
                 urls = [
                   {
@@ -252,7 +251,7 @@
                 ];
               };
               "allegro" = {
-                definedAliases = [ "@al" ];
+                definedAliases = ["@al"];
                 icon = "";
                 urls = [
                   {

modules/home/lutris.nix

@@ -1,10 +1,13 @@
-{ pkgs, osConfig, ... }:
 {
+  pkgs,
+  osConfig,
+  ...
+}: {
   programs.lutris = {
     enable = false;
     package = pkgs.lutris;
-    protonPackages = [ pkgs.proton-ge-bin ];
+    protonPackages = [pkgs.proton-ge-bin];
-    winePackages = [ pkgs.wineWowPackages.waylandFull ];
+    winePackages = [pkgs.wineWowPackages.waylandFull];
     defaultWinePackage = pkgs.wineWowPackages.waylandFull;
     steamPackage = osConfig.programs.steam.package;
   };

modules/home/nextcloud.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   services.nextcloud-client = {
     enable = true;
     startInBackground = true;

modules/home/obs-studio.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.obs-studio = {
     enable = false;
     plugins = with pkgs.obs-studio-plugins; [

modules/home/onlyoffice.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   programs.onlyoffice = {
     enable = true;
     package = pkgs.onlyoffice-desktopeditors;

modules/home/qt.nix

@@ -1,5 +1,4 @@
-{ lib, ... }:
+{lib, ...}: {
-{
   qt = {
     enable = true;
     platformTheme.name = lib.mkForce "qtct";

modules/home/rofi/config-long.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   home.file.".config/rofi/config-long.rasi".text = ''
     @import "~/.config/rofi/config.rasi"
     * {

modules/home/rofi/default.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   imports = [
     ./config-long.nix
     ./rofi.nix

modules/home/rofi/rofi.nix

@@ -2,8 +2,7 @@
   pkgs,
   config,
   ...
-}:
+}: {
-{
   programs = {
     rofi = {
       enable = true;
@@ -18,11 +17,9 @@
         display-run = " Run";
         display-filebrowser = " File";
       };
-      theme =
+      theme = let
-        let
         inherit (config.lib.formats.rasi) mkLiteral;
-        in
+      in {
-        {
         "*" = {
           bg = mkLiteral "#${config.stylix.base16Scheme.base00}";
           bg-alt = mkLiteral "#${config.stylix.base16Scheme.base09}";

modules/home/scripts/default.nix

@@ -2,8 +2,7 @@
   pkgs,
   username,
   ...
-}:
+}: {
-{
   home.packages = with pkgs; [
     # hyprland
     swww
@@ -17,19 +16,19 @@
     # pyprland
     pyprland
 
-    (import ./emopicker9000.nix { inherit pkgs; })
+    (import ./emopicker9000.nix {inherit pkgs;})
-    (import ./hm-find.nix { inherit pkgs; })
+    (import ./hm-find.nix {inherit pkgs;})
-    (import ./keybinds.nix { inherit pkgs username; })
+    (import ./keybinds.nix {inherit pkgs username;})
-    (import ./note.nix { inherit pkgs; })
+    (import ./note.nix {inherit pkgs;})
-    (import ./note-from-clipboard.nix { inherit pkgs; })
+    (import ./note-from-clipboard.nix {inherit pkgs;})
-    (import ./nvidia-offload.nix { inherit pkgs; })
+    (import ./nvidia-offload.nix {inherit pkgs;})
-    (import ./rofi-launcher.nix { inherit pkgs; })
+    (import ./rofi-launcher.nix {inherit pkgs;})
-    (import ./screenshootin.nix { inherit pkgs; })
+    (import ./screenshootin.nix {inherit pkgs;})
-    (import ./task-waybar.nix { inherit pkgs; })
+    (import ./task-waybar.nix {inherit pkgs;})
     (import ./wallsetter.nix {
       inherit pkgs;
       inherit username;
     })
-    (import ./web-search.nix { inherit pkgs; })
+    (import ./web-search.nix {inherit pkgs;})
   ];
 }

modules/home/scripts/emopicker9000.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{pkgs}:
 pkgs.writeShellScriptBin "emopicker9000" ''
   # check if rofi is already running
   if pidof rofi > /dev/null; then

modules/home/scripts/hm-find.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{pkgs}:
 pkgs.writeShellScriptBin "hm-find" ''
   #!/usr/bin/env bash
 

modules/home/scripts/keybinds.nix

@@ -1,8 +1,11 @@
-{ pkgs, username, ... }:
+{
-let
+  pkgs,
+  username,
+  ...
+}: let
   desktopEntriesPath = "/home/${username}/.local/state/home-manager/gcroots/current-home/home-path/share/applications/";
 in
-pkgs.writeShellScriptBin "list-keybinds" ''
+  pkgs.writeShellScriptBin "list-keybinds" ''
     # check if rofi is already running
     if pidof rofi > /dev/null; then
       pkill rofi
@@ -26,4 +29,4 @@ pkgs.writeShellScriptBin "list-keybinds" ''
     # use rofi to display the keybinds with the modified content
     echo "$display_keybinds" | rofi -dmenu -i -config ~/.config/rofi/config-long.rasi -mesg "$msg"
 
-''
+  ''

modules/home/scripts/note-from-clipboard.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}:
 pkgs.writeShellScriptBin "note-from-clipboard" ''
   #!/usr/bin/env bash
 

modules/home/scripts/note.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}:
 pkgs.writeShellScriptBin "note" ''
 
   # Colors for nice output

modules/home/scripts/nvidia-offload.nix

@@ -1,5 +1,4 @@
-{ pkgs }:
+{pkgs}:
-
 pkgs.writeShellScriptBin "nvidia-offload" ''
   export __NV_PRIME_RENDER_OFFLOAD=1
   export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0

modules/home/scripts/rofi-launcher.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{pkgs}:
 pkgs.writeShellScriptBin "rofi-launcher" ''
   # check if rofi is already running
   if pidof rofi > /dev/null; then

modules/home/scripts/screenshootin.nix

@@ -1,5 +1,4 @@
-{ pkgs }:
+{pkgs}:
-
 pkgs.writeShellScriptBin "screenshootin" ''
   grim -g "$(slurp)" - | swappy -f -
 ''

modules/home/scripts/task-waybar.nix

@@ -1,5 +1,4 @@
-{ pkgs }:
+{pkgs}:
-
 pkgs.writeShellScriptBin "task-waybar" ''
   sleep 0.1
   ${pkgs.swaynotificationcenter}/bin/swaync-client -t &

modules/home/scripts/wallsetter.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}:
-
 pkgs.writeShellScriptBin "wallsetter" ''
 
   TIMEOUT=720

modules/home/scripts/web-search.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{pkgs}:
 pkgs.writeShellScriptBin "web-search" ''
   # check if rofi is already running
   if pidof rofi > /dev/null; then

modules/home/starship.nix

@@ -2,11 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-let
   accent = "#${config.lib.stylix.colors.base0D}";
-in
+in {
-{
   programs.starship = {
     enable = true;
     settings = {
@@ -107,7 +105,7 @@ in
           "docker-compose.yaml"
           "Dockerfile"
         ];
-        detect_extensions = [ "Dockerfile" ];
+        detect_extensions = ["Dockerfile"];
       };
 
       cmd_duration = {

modules/home/stylix.nix

@@ -1,7 +1,6 @@
-{ host, ... }:
+{host, ...}: {
-{
   stylix.targets = {
-    librewolf.profileNames = [ "${host}" ];
+    librewolf.profileNames = ["${host}"];
     waybar.enable = false;
     rofi.enable = false;
     hyprland.enable = false;

modules/home/swappy.nix

@@ -1,5 +1,4 @@
-{ username, ... }:
+{username, ...}: {
-{
   home.file = {
     ".config/swappy/config".text = ''
       [Default]

modules/home/swaync.nix

@@ -1,5 +1,4 @@
-{ config, ... }:
+{config, ...}: {
-{
   services.swaync = {
     enable = true;
     settings = {

modules/home/tealdeer.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   programs.tealdeer = {
     enable = true;
     settings = {

modules/home/virtmanager.nix

@@ -1,10 +1,8 @@
-{ ... }:
+_: {
-
-{
   dconf.settings = {
     "org/virt-manager/virt-manager/connections" = {
-      autoconnect = [ "qemu:///system" ];
+      autoconnect = ["qemu:///system"];
-      uris = [ "qemu:///system" ];
+      uris = ["qemu:///system"];
     };
   };
 }

modules/home/vscode.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   nixpkgs.config.allowUnfree = true;
 
   programs.vscode = {
@@ -7,8 +6,7 @@
     package = pkgs.vscodium;
     profiles = {
       default = {
-        extensions =
+        extensions = with pkgs.vscode-extensions;
-          with pkgs.vscode-extensions;
           [
             batisteo.vscode-django
             bradlc.vscode-tailwindcss
@@ -409,26 +407,22 @@
           {
             "key" = "tab";
             "command" = "-editor.emmet.action.expandAbbreviation";
-            "when" =
+            "when" = "config.emmet.triggerExpansionOnTab && editorTextFocus && !editorReadonly && !editorTabMovesFocus";
-              "config.emmet.triggerExpansionOnTab && editorTextFocus && !editorReadonly && !editorTabMovesFocus";
           }
           {
             "key" = "tab";
             "command" = "-editor.action.inlineSuggest.jump";
-            "when" =
+            "when" = "inlineEditIsVisible && tabShouldJumpToInlineEdit && !editorHoverFocused && !editorTabMovesFocus && !suggestWidgetVisible";
-              "inlineEditIsVisible && tabShouldJumpToInlineEdit && !editorHoverFocused && !editorTabMovesFocus && !suggestWidgetVisible";
           }
           {
             "key" = "tab";
             "command" = "-Alignment Preserving Indent";
-            "when" =
+            "when" = "editorTextFocus && !editorReadOnly && !editorTabMovesFocus && !inSnippetMode && !suggestWidgetVisible && config.editor.tabCompletion != 'on'";
-              "editorTextFocus && !editorReadOnly && !editorTabMovesFocus && !inSnippetMode && !suggestWidgetVisible && config.editor.tabCompletion != 'on'";
           }
           {
             "key" = "tab";
             "command" = "-Alignment Preserving Indent";
-            "when" =
+            "when" = "editorTextFocus && !editorReadOnly && !editorTabMovesFocus && !hasOtherSuggestions && !inSnippetMode && !suggestWidgetVisible && config.editor.tabCompletion == 'on'";
-              "editorTextFocus && !editorReadOnly && !editorTabMovesFocus && !hasOtherSuggestions && !inSnippetMode && !suggestWidgetVisible && config.editor.tabCompletion == 'on'";
           }
         ];
       };

modules/home/waybar/waybar-curved.nix

@@ -4,13 +4,11 @@
   host,
   config,
   ...
-}:
+}: let
-let
   betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)";
   inherit (import ../../../hosts/${host}/variables.nix) clock24h;
 in
-with lib;
+  with lib; {
-{
     # Configure & Theme Waybar
     programs.waybar = {
       enable = true;
@@ -19,7 +17,7 @@ with lib;
         {
           layer = "top";
           position = "top";
-        modules-center = [ "hyprland/workspaces" ];
+          modules-center = ["hyprland/workspaces"];
           modules-left = [
             "custom/startmenu"
             "hyprland/window"
@@ -48,7 +46,10 @@ with lib;
             on-scroll-down = "hyprctl dispatch workspace e-1";
           };
           "clock" = {
-          format = if clock24h == true then '' {:L%H:%M}'' else '' {:L%I:%M %p}'';
+            format =
+              if clock24h == true
+              then '' {:L%H:%M}''
+              else '' {:L%I:%M %p}'';
             tooltip = true;
             tooltip-format = "<big>{:%A, %d.%B %Y }</big>\n<tt><small>{calendar}</small></tt>";
           };
@@ -273,4 +274,4 @@ with lib;
         ''
       ];
     };
-}
+  }

modules/home/waybar/waybar-ddubs-2.nix

@@ -2,8 +2,7 @@
   pkgs,
   lib,
   ...
-}:
+}: let
-let
   terminal = "kitty";
   base00 = "0F1419";
   base01 = "131721";
@@ -20,8 +19,7 @@ let
   base0E = "D2A6FF";
   base0F = "E6B673";
 in
-with lib;
+  with lib; {
-{
     # Configure & Theme Waybar
     programs.waybar = {
       enable = true;
@@ -36,7 +34,7 @@ with lib;
             "tray"
             "hyprland/window"
           ];
-        modules-center = [ "hyprland/workspaces" ];
+          modules-center = ["hyprland/workspaces"];
           modules-right = [
             "idle_inhibitor"
             "custom/notification"
@@ -384,4 +382,4 @@ with lib;
         ''
       ];
     };
-}
+  }