diff --git a/hosts/common/environment.nix b/hosts/common/environment.nix index 406a5cd..f48095d 100644 --- a/hosts/common/environment.nix +++ b/hosts/common/environment.nix @@ -1,7 +1,8 @@ -{ ... }: +{ pkgs, ... }: { environment.shellAliases = { + ls = "${pkgs.eza}/bin/eza --icons --group-directories-first"; neofetch = "fastfetch"; syscleanup = "sudo nix-collect-garbage -d; sudo /run/current-system/bin/switch-to-configuration boot"; }; diff --git a/hosts/desktops/io/hardware-configuration.nix b/hosts/desktops/io/hardware-configuration.nix index 046956b..76c4b79 100644 --- a/hosts/desktops/io/hardware-configuration.nix +++ b/hosts/desktops/io/hardware-configuration.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, modulesPath, ... }: @@ -21,7 +20,6 @@ luks.devices."enc".device = "/dev/disk/by-uuid/8018720e-42dd-453c-b374-adaa02eb48c9"; }; kernelModules = [ "kvm-intel" ]; - extraModulePackages = [ ]; }; fileSystems = { diff --git a/users/desktops/common/default.nix b/users/desktops/common/default.nix index 0e1fc3a..56b1e4e 100644 --- a/users/desktops/common/default.nix +++ b/users/desktops/common/default.nix @@ -3,6 +3,7 @@ { imports = [ ./programs.nix - ./programs + ./hyprland.nix + ./wezterm.nix ]; } diff --git a/users/desktops/common/programs/default.nix b/users/desktops/common/programs/default.nix deleted file mode 100644 index 91ccd89..0000000 --- a/users/desktops/common/programs/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - imports = [ - ./wezterm.nix - ]; -} diff --git a/users/desktops/common/programs/wezterm.nix b/users/desktops/common/wezterm.nix similarity index 100% rename from users/desktops/common/programs/wezterm.nix rename to users/desktops/common/wezterm.nix