From 031e4226b98b8511d8ae9473d79c83922a0e4eba Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sat, 31 Dec 2022 13:57:20 +0100 Subject: split out kde and gnome nixos --- kusanagi/nixos/configuration.nix | 35 ++++++----------------------------- kusanagi/nixos/gnome.nix | 32 ++++++++++++++++++++++++++++++++ kusanagi/nixos/kde.nix | 9 +++++++++ 3 files changed, 47 insertions(+), 29 deletions(-) create mode 100644 kusanagi/nixos/gnome.nix create mode 100644 kusanagi/nixos/kde.nix diff --git a/kusanagi/nixos/configuration.nix b/kusanagi/nixos/configuration.nix index ac4e162..dde620b 100644 --- a/kusanagi/nixos/configuration.nix +++ b/kusanagi/nixos/configuration.nix @@ -8,6 +8,8 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ./kde.nix + #./gnome.nix ]; boot.loader.systemd-boot.enable = true; @@ -45,28 +47,6 @@ # Enable the X11 windowing system. services.xserver.enable = true; - # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - environment.gnome.excludePackages = [ - pkgs.gnome.cheese - pkgs.gnome-photos - pkgs.gnome.gnome-music - #pkgs.gnome.gnome-terminal - pkgs.gnome.gedit - pkgs.epiphany - pkgs.gnome.geary - #pkgs.evince - #pkgs.gnome.gnome-characters - pkgs.gnome.totem - pkgs.gnome.tali - pkgs.gnome.iagno - pkgs.gnome.hitori - pkgs.gnome.atomix - pkgs.gnome-tour - pkgs.gnome-console - ]; - # Configure keymap in X11 services.xserver.layout = "fr"; services.xserver.xkbOptions = "caps:escape"; @@ -95,16 +75,14 @@ }; nixpkgs.config.allowUnfree = true; + nix.gc.automatic = true; + nix.gc.options = "--delete-older-than 30d"; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; environment.systemPackages = with pkgs; [ home-manager profont - qgnomeplatform - - gnome.gnome-tweaks - gnomeExtensions.appindicator - gnomeExtensions.dash-to-panel vim vimPlugins.vim-nix @@ -123,7 +101,6 @@ gcc gnumake - gnome.gnome-terminal alacritty firefox qutebrowser @@ -133,6 +110,7 @@ vlc mpv jellyfin-media-player + nheko ]; programs.vim.defaultEditor = true; @@ -167,6 +145,5 @@ # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "22.11"; # Did you read the comment? - } diff --git a/kusanagi/nixos/gnome.nix b/kusanagi/nixos/gnome.nix new file mode 100644 index 0000000..623d601 --- /dev/null +++ b/kusanagi/nixos/gnome.nix @@ -0,0 +1,32 @@ +{ config, pkgs, ... }: +{ + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + environment.gnome.excludePackages = [ + pkgs.gnome.cheese + pkgs.gnome-photos + pkgs.gnome.gnome-music + #pkgs.gnome.gnome-terminal + pkgs.gnome.gedit + pkgs.epiphany + pkgs.gnome.geary + #pkgs.evince + #pkgs.gnome.gnome-characters + pkgs.gnome.totem + pkgs.gnome.tali + pkgs.gnome.iagno + pkgs.gnome.hitori + pkgs.gnome.atomix + pkgs.gnome-tour + pkgs.gnome-console + ]; + + environment.systemPackages = with pkgs; [ + qgnomeplatform + + gnome.gnome-tweaks + gnomeExtensions.appindicator + gnomeExtensions.dash-to-panel + gnome.gnome-terminal + ] +} diff --git a/kusanagi/nixos/kde.nix b/kusanagi/nixos/kde.nix new file mode 100644 index 0000000..06b7c51 --- /dev/null +++ b/kusanagi/nixos/kde.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: +{ + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + + environment.systemPackages = with pkgs.libsForQt5; [ + kgpg + ]; +} -- cgit v1.2.3