move more stuff into modules

This commit is contained in:
Vinzenz Schroeter 2025-09-15 17:52:33 +02:00
parent f5e1b9c7ee
commit f89c75aad2
12 changed files with 116 additions and 116 deletions

View file

@ -1,8 +1,17 @@
{ pkgs, ... }:
{
config = {
home.packages = with pkgs.gnomeExtensions; [
solaar-extension
home.packages = with pkgs; [
gitg
meld
simple-scan
pinta
dconf-editor
impression # usb image writer
papers # pdf viewer
gnome-software # for flatpak apps
gnomeExtensions.solaar-extension
snapshot
];
dconf.settings = {

View file

@ -1,31 +0,0 @@
{ pkgs, ... }:
{
config = {
programs.firefox.enable = true;
environment.systemPackages = with pkgs; [
lm_sensors
# office
#libreoffice-qt
#hunspell
#hunspellDicts.de-de
#hunspellDicts.en-us-large
];
fonts = {
enableDefaultPackages = true;
fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font" ];
packages = with pkgs; [
nerd-fonts.fira-code
roboto-mono
recursive
];
};
hardware.logitech.wireless = {
enable = true;
enableGraphical = true;
};
};
}

View file

@ -1,46 +0,0 @@
{ pkgs, ... }:
{
# remove some gnome default apps
environment.gnome.excludePackages = with pkgs; [
cheese # photo booth
epiphany # web browser
evince # document viewer
geary # email client
gnome-maps
gnome-weather
gnome-tour
sysprof
orca # screen reader
gnome-weather
gnome-backgrounds
gnome-user-docs
yelp # help app
# gnome-music
# totem # video player
# snapshot # camera
# baobab # disk usage
];
# RDP connections
services.gnome.gnome-remote-desktop.enable = true;
networking.firewall.allowedTCPPorts = [ 3389 ];
home-manager.sharedModules = [
{
home.packages = with pkgs; [
gitg
meld
simple-scan
pinta
dconf-editor
gpaste
ghex
impression
papers
# graphical installer for flatpak apps
gnome-software
];
}
];
}

View file

@ -4,10 +4,10 @@
./configuration.nix
./hardware.nix
../../modules/gnome.nix
../../modules/gaming.nix
vinzenzNixosModules.gnome
vinzenzNixosModules.steam
../../modules/desktop-environment.nix
vinzenzNixosModules.wine-gaming
vinzenzNixosModules.vinzenz-desktop-settings
../../home/ronja
];

View file

@ -4,12 +4,12 @@
./configuration.nix
./hardware.nix
../../modules/gnome.nix
../../modules/gaming.nix
vinzenzNixosModules.gnome
vinzenzNixosModules.wine-gaming
vinzenzNixosModules.steam
vinzenzNixosModules.printing
vinzenzNixosModules.podman
../../modules/desktop-environment.nix
vinzenzNixosModules.vinzenz-desktop-settings
../../home/vinzenz
../../home/ronja

View file

@ -6,13 +6,12 @@
./vscode-server.nix
./hass.nix
../../modules/gnome.nix
../../modules/gaming.nix
vinzenzNixosModules.gnome
vinzenzNixosModules.wine-gaming
vinzenzNixosModules.steam
vinzenzNixosModules.printing
vinzenzNixosModules.podman
#../../modules/niri.nix
../../modules/desktop-environment.nix
vinzenzNixosModules.vinzenz-desktop-settings
../../home/vinzenz
../../home/ronja

View file

@ -1,3 +1,4 @@
{ pkgs, ... }:
{
i18n = {
defaultLocale = "en_US.UTF-8";
@ -21,4 +22,10 @@
"en-US"
"de"
];
environment.systemPackages = [
pkgs.hunspell
pkgs.hunspellDicts.de-de
pkgs.hunspellDicts.en-us
];
}

View file

@ -1,31 +1,65 @@
{ pkgs, ... }:
{
services = {
xserver = {
# Enable the GNOME Desktop Environment.
desktopManager.gnome = {
enable = true;
extraGSettingsOverridePackages = [ pkgs.mutter ];
extraGSettingsOverrides = ''
[org.gnome.mutter]
experimental-features=['scale-monitor-framebuffer']
'';
pkgs,
lib,
config,
...
}:
{
options.vinzenz = {
keep-gnome-default-apps = lib.mkEnableOption "keep gnome default apps";
};
config = lib.mkMerge [
{
services = {
xserver = {
# Enable the GNOME Desktop Environment.
desktopManager.gnome = {
enable = true;
extraGSettingsOverridePackages = [ pkgs.mutter ];
extraGSettingsOverrides = ''
[org.gnome.mutter]
experimental-features=['scale-monitor-framebuffer']
'';
};
displayManager.gdm.enable = true;
excludePackages = [ pkgs.xterm ];
};
displayManager.defaultSession = "gnome";
gnome = {
tinysparql.enable = false;
localsearch.enable = false;
sushi.enable = true;
};
};
displayManager.gdm.enable = true;
excludePackages = [ pkgs.xterm ];
};
displayManager.defaultSession = "gnome";
gnome = {
tinysparql.enable = false;
localsearch.enable = false;
sushi.enable = true;
};
};
programs = {
dconf.enable = true;
gpaste.enable = true;
};
programs = {
dconf.enable = true;
gpaste.enable = true;
};
}
(lib.mkIf (!config.vinzenz.keep-gnome-default-apps) {
environment.gnome.excludePackages = with pkgs; [
cheese # photo booth
epiphany # web browser
evince # document viewer
geary # email client
gnome-maps
gnome-weather
gnome-tour
sysprof
orca # screen reader
gnome-weather
gnome-backgrounds
gnome-user-docs
yelp # help app
gnome-music
totem # video player
snapshot # camera
baobab # disk usage
];
})
];
}

View file

@ -0,0 +1,28 @@
{ pkgs, ... }:
{
programs.firefox.enable = true;
environment.systemPackages = with pkgs; [
lm_sensors
libreoffice-qt6
];
fonts = {
enableDefaultPackages = true;
fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font" ];
packages = with pkgs; [
nerd-fonts.fira-code
roboto-mono
recursive
];
};
hardware.logitech.wireless = {
enable = true;
enableGraphical = true;
};
# RDP connections
services.gnome.gnome-remote-desktop.enable = true;
networking.firewall.allowedTCPPorts = [ 3389 ];
}