refactor: standardize config structure and consolidate modules
- Standardized apps/ directory by renaming all entry points (e.g., home.nix) to default.nix and updating imports to use directory paths. - Consolidated system/ logic into modules/system/, eliminating the top-level system/ directory and redundant wrappers. - Merged subsidiary utility scripts (e.g., hakase-popup.nix, switch-wallpaper.nix) into their parent default.nix files for better cohesion. - Cleaned up unused files and updated all module references to reflect the new structure.
This commit is contained in:
+11
-34
@@ -1,38 +1,15 @@
|
||||
{
|
||||
myConfig,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||
withUWSM = true;
|
||||
};
|
||||
imports = [
|
||||
./hypr/binds.nix
|
||||
./hypr/general.nix
|
||||
./hypr/exec.nix
|
||||
./hypr/rules.nix
|
||||
./hypr/animation.nix
|
||||
./hypr/misc.nix
|
||||
./hypr/input.nix
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.hyprpicker
|
||||
pkgs.hyprlock
|
||||
pkgs.hypridle
|
||||
pkgs.hyprpaper
|
||||
pkgs.hyprsunset
|
||||
pkgs.hyprpolkitagent
|
||||
./scripts/movement.nix
|
||||
];
|
||||
|
||||
xdg.terminal-exec = {
|
||||
enable = true;
|
||||
settings = {
|
||||
default = ["${myConfig.terminal.default}"];
|
||||
};
|
||||
};
|
||||
|
||||
# systemd.user.services.hyprpolkitagent = {
|
||||
# description = "Hyprland Polkit Agent";
|
||||
# wantedBy = ["graphical-session.target"];
|
||||
# serviceConfig = {
|
||||
# ExecStart = "${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent";
|
||||
# Restart = "on-failure";
|
||||
# };
|
||||
# };
|
||||
wayland.windowManager.hyprland.enable = true;
|
||||
wayland.windowManager.hyprland.systemd.enable = false; # for UWSM support...
|
||||
}
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
{
|
||||
imports = [
|
||||
./hypr/binds.nix
|
||||
./hypr/general.nix
|
||||
./hypr/exec.nix
|
||||
./hypr/rules.nix
|
||||
./hypr/animation.nix
|
||||
./hypr/misc.nix
|
||||
./hypr/input.nix
|
||||
|
||||
./scripts/movement.nix
|
||||
];
|
||||
wayland.windowManager.hyprland.enable = true;
|
||||
wayland.windowManager.hyprland.systemd.enable = false; # for UWSM support...
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
{pkgs, ...}: let
|
||||
hakase-terminal-launch =
|
||||
pkgs.writeShellScriptBin "hakase-terminal-launch" ''
|
||||
'';
|
||||
in {
|
||||
home.packages = [
|
||||
hakase-terminal-launch
|
||||
];
|
||||
}
|
||||
Reference in New Issue
Block a user