nix: Remove logic from modules/default.nix

For simplicity, the first-level default.nix should be used to import all
the other modules.
This commit is contained in:
Donovan Glover 2023-06-08 17:23:09 -04:00
parent d137d3342c
commit 47b5ac0d7d
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
2 changed files with 121 additions and 126 deletions

View File

@ -30,130 +30,4 @@ in {
./waybar
./xdg-user-dirs
];
virtualisation.vmware.host = {
enable = true;
extraConfig = ''
# Enable 3D acceleration on the host
mks.gl.allowUnsupportedDrivers = "TRUE"
mks.vk.allowUnsupportedDevices = "TRUE"
'';
};
environment.systemPackages = with pkgs; [
audacity
gimp
anki
logseq
mullvad-browser
spek
keepassxc
libreoffice
wget
jq
exa
fd
fzf
gdu
fdupes
mediainfo
ponysay
lolcat
cmatrix
sox
httpie
p7zip
ripgrep
rsync
unar
genact
ffmpeg
killall
trashy
whois
dwt1-shell-color-scripts
dig
yt-dlp
neofetch
pywal
brightnessctl
zellij
librespeed-cli
wiki-tui
hexyl
nb
jpegoptim
playerctl
recode
rmlint
sd
shards
smartmontools
sqlitebrowser
visidata
scc
hwinfo
stress
choose
gum
hdparm
imagemagick
onefetch
restic
wails
watchexec
memento
mpvpaper
timg
kanjidraw
ventoy
wf-recorder
mdcat
mdbook
zola
file
tessen
wtype
mtr
grim
slurp
wl-clipboard
lnch
wev
swww
kickoff
greetd.tuigreet
(pkgs.callPackage ../packages/hyprland-autoname-workspaces {})
];
home-manager.sharedModules = [
{
programs.bat.enable = true;
}
];
programs.htop = {
enable = true;
package = pkgs."htop-vim";
settings = {tree_view = 1;};
};
services.greetd = {
enable = true;
restart = false;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
user = "greeter";
};
initial_session = {
command = "${pkgs.hyprland}/bin/Hyprland";
user = VARIABLES.username;
};
};
};
zramSwap.enable = true;
}

View File

@ -95,6 +95,93 @@ in {
cargo
rust-analyzer
bacon
# other
audacity
gimp
anki
logseq
mullvad-browser
spek
keepassxc
libreoffice
wget
jq
exa
fd
fzf
gdu
fdupes
mediainfo
ponysay
lolcat
cmatrix
sox
httpie
p7zip
ripgrep
rsync
unar
genact
ffmpeg
killall
trashy
whois
dwt1-shell-color-scripts
dig
yt-dlp
neofetch
pywal
brightnessctl
zellij
librespeed-cli
wiki-tui
hexyl
nb
jpegoptim
playerctl
recode
rmlint
sd
shards
smartmontools
sqlitebrowser
visidata
scc
hwinfo
stress
choose
gum
hdparm
imagemagick
onefetch
restic
wails
watchexec
memento
mpvpaper
timg
kanjidraw
ventoy
wf-recorder
mdcat
mdbook
zola
file
tessen
wtype
mtr
grim
slurp
wl-clipboard
lnch
wev
swww
kickoff
greetd.tuigreet
(pkgs.callPackage ../packages/hyprland-autoname-workspaces {})
];
nixpkgs.config.allowUnfreePredicate = pkg:
@ -159,6 +246,8 @@ in {
};
};
};
programs.bat.enable = true;
}
];
};
@ -251,4 +340,36 @@ in {
];
};
};
virtualisation.vmware.host = {
enable = true;
extraConfig = ''
# Enable 3D acceleration on the host
mks.gl.allowUnsupportedDrivers = "TRUE"
mks.vk.allowUnsupportedDevices = "TRUE"
'';
};
programs.htop = {
enable = true;
package = pkgs."htop-vim";
settings = {tree_view = 1;};
};
services.greetd = {
enable = true;
restart = false;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
user = "greeter";
};
initial_session = {
command = "${pkgs.hyprland}/bin/Hyprland";
user = VARIABLES.username;
};
};
};
zramSwap.enable = true;
}