Added gnome environment back in, fixed es-de

This commit is contained in:
Jan-Bulthuis 2025-04-16 13:02:27 +02:00
parent 885940fd69
commit 9c9fe6b18a
2 changed files with 113 additions and 113 deletions

View File

@ -26,22 +26,22 @@ in
# TODO: Remove exception once no longer required by es-de # TODO: Remove exception once no longer required by es-de
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"freeimage-unstable-2021-11-01" "freeimage-3.18.0-unstable-2024-04-18"
]; ];
# TODO: Remove once emulationstation-de fixes the issue # TODO: Remove once emulationstation-de fixes the issue
# TODO: If not fixed, at least pin the specific commit properly # TODO: If not fixed, at least pin the specific commit properly
nixpkgs.overlays = # nixpkgs.overlays =
let # let
pkgs-stable = import (fetchTarball { # pkgs-stable = import (fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/nixos-24.11.tar.gz"; # url = "https://github.com/NixOS/nixpkgs/archive/nixos-24.11.tar.gz";
sha256 = "1wr1xzkw7v8biqqjcr867gbpqf3kibkgly36lcnhw0glvkr1i986"; # sha256 = "1wr1xzkw7v8biqqjcr867gbpqf3kibkgly36lcnhw0glvkr1i986";
}) { inherit system; }; # }) { inherit system; };
in # in
[ # [
(final: prev: { # (final: prev: {
libgit2 = pkgs-stable.libgit2; # libgit2 = pkgs-stable.libgit2;
}) # })
]; # ];
}; };
} }

View File

@ -186,112 +186,112 @@
# ]; # ];
# }; # };
# }; # };
# gnome = { gnome = {
# name = "Gnome"; name = "Gnome";
# type = "custom"; type = "custom";
# config = { }; config = { };
# extraConfig = { extraConfig = {
# programs = { programs = {
# gnome-shell.enable = true; gnome-shell.enable = true;
# }; };
# desktop = { desktop = {
# initScript = '' initScript = ''
# ${pkgs.gnome-session}/bin/gnome-session ${pkgs.gnome-session}/bin/gnome-session
# ''; '';
# session = { session = {
# type = "wayland"; type = "wayland";
# desktop = "GNOME"; desktop = "GNOME";
# }; };
# }; };
# # TODO: Remove everything below, it is here out of convenience and should be elsewhere # TODO: Remove everything below, it is here out of convenience and should be elsewhere
# xdg.portal = { xdg.portal = {
# enable = true; enable = true;
# config.common.default = [ config.common.default = [
# "gnome" "gnome"
# "gtk" "gtk"
# ]; ];
# extraPortals = with pkgs; [ extraPortals = with pkgs; [
# xdg-desktop-portal-gnome xdg-desktop-portal-gnome
# xdg-desktop-portal-gtk xdg-desktop-portal-gtk
# ]; ];
# }; };
# home.packages = [ home.packages = [
# # Core utilities # Core utilities
# pkgs.baobab pkgs.baobab
# pkgs.epiphany pkgs.epiphany
# pkgs.gnome-text-editor pkgs.gnome-text-editor
# pkgs.gnome-calculator pkgs.gnome-calculator
# pkgs.gnome-calendar pkgs.gnome-calendar
# pkgs.gnome-characters pkgs.gnome-characters
# pkgs.gnome-clocks pkgs.gnome-clocks
# pkgs.gnome-console pkgs.gnome-console
# pkgs.gnome-contacts pkgs.gnome-contacts
# pkgs.gnome-font-viewer pkgs.gnome-font-viewer
# pkgs.gnome-logs pkgs.gnome-logs
# pkgs.gnome-maps pkgs.gnome-maps
# pkgs.gnome-music pkgs.gnome-music
# pkgs.gnome-system-monitor pkgs.gnome-system-monitor
# pkgs.gnome-weather pkgs.gnome-weather
# pkgs.loupe pkgs.loupe
# pkgs.nautilus pkgs.nautilus
# pkgs.gnome-connections pkgs.gnome-connections
# pkgs.simple-scan pkgs.simple-scan
# pkgs.snapshot pkgs.snapshot
# pkgs.totem pkgs.totem
# pkgs.yelp pkgs.yelp
# # Optional packages # Optional packages
# pkgs.adwaita-icon-theme pkgs.adwaita-icon-theme
# pkgs.gnome-backgrounds pkgs.gnome-backgrounds
# pkgs.gnome-bluetooth pkgs.gnome-bluetooth
# pkgs.gnome-color-manager pkgs.gnome-color-manager
# pkgs.gnome-control-center pkgs.gnome-control-center
# pkgs.gnome-shell-extensions pkgs.gnome-shell-extensions
# pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
# pkgs.gnome-user-docs pkgs.gnome-user-docs
# pkgs.glib # for gsettings program pkgs.glib # for gsettings program
# pkgs.gnome-menus pkgs.gnome-menus
# pkgs.gtk3.out # for gtk-launch program pkgs.gtk3.out # for gtk-launch program
# pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
# pkgs.xdg-user-dirs-gtk # Used to create the default bookmarks pkgs.xdg-user-dirs-gtk # Used to create the default bookmarks
# # Games # Games
# pkgs.aisleriot pkgs.aisleriot
# pkgs.atomix pkgs.atomix
# pkgs.five-or-more pkgs.five-or-more
# pkgs.four-in-a-row pkgs.four-in-a-row
# pkgs.gnome-2048 pkgs.gnome-2048
# pkgs.gnome-chess pkgs.gnome-chess
# pkgs.gnome-klotski pkgs.gnome-klotski
# pkgs.gnome-mahjongg pkgs.gnome-mahjongg
# pkgs.gnome-mines pkgs.gnome-mines
# pkgs.gnome-nibbles pkgs.gnome-nibbles
# pkgs.gnome-robots pkgs.gnome-robots
# pkgs.gnome-sudoku pkgs.gnome-sudoku
# pkgs.gnome-taquin pkgs.gnome-taquin
# pkgs.gnome-tetravex pkgs.gnome-tetravex
# pkgs.hitori pkgs.hitori
# pkgs.iagno pkgs.iagno
# pkgs.lightsoff pkgs.lightsoff
# pkgs.quadrapassel pkgs.quadrapassel
# pkgs.swell-foop pkgs.swell-foop
# pkgs.tali pkgs.tali
# # Fonts # Fonts
# pkgs.cantarell-fonts pkgs.cantarell-fonts
# pkgs.dejavu_fonts pkgs.dejavu_fonts
# pkgs.source-code-pro # Default monospace font in 3.32 pkgs.source-code-pro # Default monospace font in 3.32
# pkgs.source-sans pkgs.source-sans
# # Other stuff # Other stuff
# pkgs.gnome-session pkgs.gnome-session
# # pkgs.gnome-session.sessions # pkgs.gnome-session.sessions
# ]; ];
# }; };
# }; };
}; };
# Enabled modules # Enabled modules
@ -313,7 +313,7 @@
# Gaming # Gaming
steam.enable = true; steam.enable = true;
modrinth.enable = true; modrinth.enable = true;
es-de.enable = true; # es-de.enable = true; # TODO: Fix, again
retroarch.enable = true; retroarch.enable = true;
ryujinx.enable = true; ryujinx.enable = true;