Skip to content

Commit

Permalink
chore: Switch dionysus to KDE
Browse files Browse the repository at this point in the history
* Fix flatpak module using unrecognized repo
* Add beekeeper studio to work packages
* Fruitless attempts to make NVIDIA drivers behave
* Update `flake.lock`
  • Loading branch information
nikitawootten committed Aug 1, 2024
1 parent 9ad90e6 commit 0ffbaef
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 36 deletions.
48 changes: 24 additions & 24 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
lanzaboote = {
url = "github:nix-community/lanzaboote";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks";
};
# Provides a handy "command not found" nixpkgs hook
Expand Down
4 changes: 3 additions & 1 deletion homeModules/personal/roles/work.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ in {
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
httpie-desktop
nomachine-client
# TODO: re-enable after https://github.com/NixOS/nixpkgs/pull/330789 is merged
# nomachine-client
# AWS CLI currently pollutes the user PYTHONPATH, causing issues with virtual environments
(writeShellScriptBin "aws" ''
unset PYTHONPATH
exec ${pkgs.awscli2}/bin/aws "$@"
'')
beekeeper-studio
];

xdg.desktopEntries.httpie-desktop = {
Expand Down
1 change: 1 addition & 0 deletions hostModules/personal/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
./docker.nix
./flatpak.nix
./gnome.nix
./kde.nix
./networkmanager.nix
./nvidia.nix
./printing.nix
Expand Down
4 changes: 4 additions & 0 deletions hostModules/personal/flatpak.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ in {
"org.libreoffice.LibreOffice"
"org.signal.Signal"
];
remotes = [{
name = "flathub";
location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
}];
};
};
}
8 changes: 2 additions & 6 deletions hostModules/personal/gnome.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,14 @@ in {
};

config = lib.mkIf cfg.enable {
# Enable the X11 windowing system.
services.xserver.enable = true;
personal.sound.enable = lib.mkDefault true;

# Enable the GNOME Desktop Environment.
services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true;

# Counter-intuitively required in order for Nix-managed gnome-extensions to be picked up
programs.dconf.enable = true;

personal.sound.enable = lib.mkDefault true;

environment.gnome.excludePackages = with pkgs.gnome; [
tali # poker game
iagno # go game
Expand Down
24 changes: 24 additions & 0 deletions hostModules/personal/kde.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ pkgs, lib, config, ... }:
let cfg = config.personal.kde;
in {
options.personal.kde = { enable = lib.mkEnableOption "kde configuration"; };

config = lib.mkIf cfg.enable {
services.xserver.enable = true;
services.displayManager.sddm.enable = true;
services.displayManager.sddm.wayland.enable = true;
services.desktopManager.plasma6.enable = true;

programs.dconf.enable = true;

personal.sound.enable = lib.mkDefault true;

environment.systemPackages = with pkgs; [
kdePackages.discover
kdePackages.plasma-vault
kdePackages.krdc
];

# environment.sessionVariables.NIXOS_OZONE_WL = "1";
};
}
8 changes: 5 additions & 3 deletions hostModules/personal/nvidia.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ in {
enable = lib.mkEnableOption "nvidia configuration";
headless = lib.mkOption {
type = lib.types.bool;
description = "If true, enable NVidia settings";
description = "If not true, enable NVidia settings";
default = true;
};
betaDriver = lib.mkEnableOption "enable beta driver";
Expand Down Expand Up @@ -34,8 +34,10 @@ in {
powerManagement.enable = lib.mkDefault cfg.suspend;
};

boot.kernelParams = lib.lists.optional cfg.betaDriver
"nvidia.NVreg_PreserveVideoMemoryAllocations=1";
boot.kernelParams = lib.lists.optionals cfg.betaDriver [
"nvidia.NVreg_PreserveVideoMemoryAllocations=1"
"nvidia.NVreg_EnableGpuFirmware=0"
];

virtualisation.docker.enableNvidia = true;
};
Expand Down
2 changes: 1 addition & 1 deletion hosts/dionysus/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
};
};

personal.gnome.enable = true;
personal.kde.enable = true;

personal.networkmanager.enable = true;
personal.printing.enable = true;
Expand Down

0 comments on commit 0ffbaef

Please sign in to comment.