jsw/NiksOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BROKEN: Expanding desktop option

Browse source
This commit is contained in:
Jurn Wubben 2025-05-24 00:03:47 +02:00
parent ebf027263f
commit 73dd477f9e
44 changed files with 272 additions and 296 deletions
Download patch file Download diff file Expand all files Collapse all files

4
system/programs/default.nix
View file

@ -3,10 +3,6 @@
./fish.nix
./games.nix
./home-manager.nix
./hyprland.nix
./neovim.nix
./plasma6.nix
./polkit.nix
./xdg.nix
];
}

113
system/programs/games.nix
View file

@ -3,65 +3,66 @@
pkgs,
lib,
...
}: {
}: let
cfg = config.niksos.games && config.niksos.desktop.enable;
in {
options.niksos.games = lib.mkEnableOption "gaming related stuff.";
config = lib.mkIf config.niksos.games {
# nixpkgs.overlays = [
# (final: prev: let
# version = "1.4.2";
# hash = "sha256-xe0qlbtt06CUK8bXyaGDtCcHOXpSnkbuvcxaDJjeS/c=";
# npmHash = "sha256-/+NhlQydGS6+2jEjpbwycwKplVo/++wcdPiBNY3R3FI=";
# cargoHash = "sha256-VwzGbm34t7mg9ndmTkht6Ho32NQ+6uxuPTKi3+VrhYo=";
# in {
# gale = prev.gale.overrideAttrs (new: old: {
# src = prev.fetchFromGitHub {
# inherit version hash;
# owner = "Kesomannen";
# repo = "gale";
# rev = "1.4.2";
# };
# npmDeps = prev.fetchNpmDeps {
# hash = npmHash;
# name = "${new.pname}-${new.version}-npm-deps";
# inherit (new) src;
# };
# cargoDeps = prev.rustPlatform.fetchCargoVendor {
# inherit
# (new)
# pname
# version
# src
# cargoRoot
# ;
# hash = cargoHash;
# };
# });
# })
# ];
users.users.jsw.packages = [pkgs.gale];
config = lib.mkIf cfg {
# nixpkgs.overlays = [
# (final: prev: let
# version = "1.4.2";
# hash = "sha256-xe0qlbtt06CUK8bXyaGDtCcHOXpSnkbuvcxaDJjeS/c=";
# npmHash = "sha256-/+NhlQydGS6+2jEjpbwycwKplVo/++wcdPiBNY3R3FI=";
# cargoHash = "sha256-VwzGbm34t7mg9ndmTkht6Ho32NQ+6uxuPTKi3+VrhYo=";
# in {
# gale = prev.gale.overrideAttrs (new: old: {
# src = prev.fetchFromGitHub {
# inherit version hash;
# owner = "Kesomannen";
# repo = "gale";
# rev = "1.4.2";
# };
# npmDeps = prev.fetchNpmDeps {
# hash = npmHash;
# name = "${new.pname}-${new.version}-npm-deps";
# inherit (new) src;
# };
# cargoDeps = prev.rustPlatform.fetchCargoVendor {
# inherit
# (new)
# pname
# version
# src
# cargoRoot
# ;
# hash = cargoHash;
# };
# });
# })
# ];
programs = {
gamescope = {
enable = true;
capSysNice = true;
args = [
"--rt"
"--expose-wayland"
];
programs = {
gamescope = {
enable = true;
capSysNice = true;
args = [
"--rt"
"--expose-wayland"
];
};
steam = {
enable = true;
extraCompatPackages = [
pkgs.proton-ge-bin
];
gamescopeSession.enable = true;
};
};
steam = {
enable = true;
extraCompatPackages = [
pkgs.proton-ge-bin
];
gamescopeSession.enable = true;
environment.variables = {
"STEAM_FORCE_DESKTOP_UI_SCALING" = "1.5"; #FIXME:.
};
};
environment.variables = {
"STEAM_FORCE_DESKTOP_UI_SCALING" = "1.5"; #FIXME:.
};
};
}

14
system/programs/home-manager.nix
View file

@ -1,13 +1,13 @@
{
inputs,
specialArgs,
lib,
config,
...
}: {
imports = [
inputs.hm.nixosModules.default
];
home-manager = {
}: let
cfg = config.niksos.desktop.enable;
in {
home-manager = lib.mkIf cfg {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = specialArgs;
@ -16,5 +16,5 @@
users.jsw = import ../../home;
};
programs.dconf.enable = true; # else gtk-managed stuff won't work
programs.dconf.enable = cfg; # else gtk-managed stuff won't work
}

19
system/programs/hyprland.nix
View file

@ -1,19 +0,0 @@
{
config,
pkgs,
lib,
...
}: {
options.niksos.desktop = lib.mkEnableOption "desktop related stuff.";
config = lib.mkIf config.niksos.desktop {
programs.hyprland = {
enable = true;
withUWSM = true;
};
environment.systemPackages = [
#FIXME: migrated to home-manager
pkgs.kitty # This is the default config's terminal and also my main one.
];
environment.sessionVariables.NIXOS_OZONE_WL = "1"; # Makes electron apps use wayland.
};
}

1
system/programs/neovim.nix
View file

@ -1,4 +1,5 @@
{lib, ...}: {
options.niksos.neovim = lib.mkEnableOption "the neovim editor";
# The actual config resides in NixOS/home/programs/neovim.
# NOTE: This is for the customisation of the neovim editor, which uses a lot of disk space. Barebones version will be installed anyhow.
}

33
system/programs/plasma6.nix
View file

@ -1,33 +0,0 @@
{
lib,
pkgs,
config,
...
}: {
options.niksos.kde = lib.mkEnableOption "a kde specialisation. Will enable desktop settings.";
config.specialisation.de.configuration = lib.mkIf config.niksos.kde {
niksos.desktop = lib.mkForce true;
services = {
greetd = let
session = {
command = "${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland";
user = "jsw";
};
in {
settings = lib.mkForce {
terminal.vt = 1;
default_session = session;
initial_session = session;
};
};
desktopManager.plasma6.enable = true;
};
home-manager.users.jsw = {
stylix.autoEnable = false;
};
};
}

22
system/programs/polkit.nix
View file

@ -1,22 +0,0 @@
{
config,
lib,
pkgs,
...
}: {
systemd = {
user.services.polkit-gnome-authentication-agent-1 = lib.mkIf config.niksos.desktop {
description = "polkit-gnome-authentication-agent-1";
wantedBy = ["graphical-session.target"];
wants = ["graphical-session.target"];
after = ["graphical-session.target"];
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
};
};
};
}

19
system/programs/xdg.nix
View file

@ -1,19 +0,0 @@
{
pkgs,
config,
lib,
...
}: {
xdg.portal = lib.mkIf config.niksos.desktop {
enable = true;
xdgOpenUsePortal = true;
config = {
common.default = ["gtk"];
hyprland.default = ["gtk" "hyprland"];
};
extraPortals = [
pkgs.xdg-desktop-portal-gtk
];
};
}