Compare commits

..

No commits in common. "373ab6ef416a4c9b5d78668aaed442d0eec19bbc" and "3f2546116fe8b5725daf848c357989a2a08c01df" have entirely different histories.

7 changed files with 341 additions and 392 deletions

View File

@ -9,13 +9,8 @@
imports = [ imports = [
../nixos/packages/packages.nix ../nixos/packages/packages.nix
../nixos/desktop/desktops.nix
]; ];
desktop.gnome.enable = true;
desktop.hyprland.enable = false;
desktop.kde.enable = false;
program.firefox.enable = true; program.firefox.enable = true;
group = { group = {

View File

@ -1,14 +1,7 @@
{lib, ...}: {...}:
{ {
imports = [ imports = [
./hyprland/hyprland.nix ./hyprland/hyprland.nix
./kde/kde.nix ./kde/kde.nix
./gnome/gnome.nix
]; ];
desktop = {
gnome.enable = lib.mkDefault false;
kde.enable = lib.mkDefault false;
hyprland.enable = lib.mkDefault true;
};
} }

View File

@ -1,24 +0,0 @@
{
lib,
config,
pkgs-stable,
...
}: {
options = {
desktop.gnome.enable =
lib.mkEnableOption "enable GNOME configuration";
};
config = lib.mkIf config.desktop.gnome.enable {
dconf = {
enable = true;
settings."org/gnome/shell" = {
disable-user-extensions = false;
enabled-extensions = with pkgs-stable.gnomeExtensions; [
blur-my-shell.extensionUuid
gsconnect.extensionUuid
];
};
};
};
}

View File

@ -1,13 +1,4 @@
{ {...}: {
lib,
config,
...
}: {
options = {
desktop.kde.enable = lib.mkEnableOption "enable KDE module";
};
config = lib.mkIf config.desktop.kde.enable {
programs.plasma = { programs.plasma = {
enable = true; enable = true;
@ -346,5 +337,4 @@
dataFile = { dataFile = {
}; };
}; };
};
} }

View File

@ -9,7 +9,6 @@
]; ];
desktop.hyprland.enable = true; desktop.hyprland.enable = true;
desktop.kde.enable = true;
group.programming.enable = true; group.programming.enable = true;
group.games.enable = true; group.games.enable = true;

View File

@ -23,6 +23,8 @@
ip = "ip -c"; ip = "ip -c";
s = "kitten ssh"; s = "kitten ssh";
diff = "diff --color"; diff = "diff --color";
cd = "z";
respawn = "clear; pfetch"; respawn = "clear; pfetch";
l = "eza -lh --icons=auto"; l = "eza -lh --icons=auto";
mkdir = "mkdir -p"; mkdir = "mkdir -p";

View File

@ -1,8 +1,5 @@
{lib, config, ...}:
{ {
lib,
config,
...
}: {
options = { options = {
program.zoxide.enable = lib.mkEnableOption "zoxide"; program.zoxide.enable = lib.mkEnableOption "zoxide";
}; };
@ -11,9 +8,6 @@
programs.zoxide = { programs.zoxide = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;
options = [
"--cmd cd"
];
}; };
}; };
} }