X11 is broken for games with plasma6.1 so I am commiting to wayland
This commit is contained in:
parent
32c1e29f42
commit
903a214e1e
|
@ -2,12 +2,13 @@
|
||||||
description = "NixOs Config";
|
description = "NixOs Config";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
# nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
|
# nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/master";
|
url = "github:nix-community/home-manager/master";
|
||||||
|
# url = "github:nix-community/home-manager/release-24.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,7 @@ in
|
||||||
enable = mkBoolOpt true "Enable Git (Default true)";
|
enable = mkBoolOpt true "Enable Git (Default true)";
|
||||||
userName = mkOpt types.str user.fullName "The name to configure git with.";
|
userName = mkOpt types.str user.fullName "The name to configure git with.";
|
||||||
userEmail = mkOpt types.str user.email "The email to configure git with.";
|
userEmail = mkOpt types.str user.email "The email to configure git with.";
|
||||||
signingKey =
|
signingKey = mkOpt types.str "6995A5FF33791B7B" "The pub key to sign commits with.";
|
||||||
mkOpt types.str "6995A5FF33791B7B" "The pub key to sign commits with.";
|
|
||||||
signByDefault = mkOpt types.bool true "Whether to sign commits by default.";
|
signByDefault = mkOpt types.bool true "Whether to sign commits by default.";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
{
|
{ lib, config, ... }:
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib;
|
with lib;
|
||||||
with lib.wyrdgard;
|
with lib.wyrdgard;
|
||||||
let
|
let
|
||||||
|
|
|
@ -15,7 +15,11 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
environment.systemPackages = with pkgs; [ polkit xdg-desktop-portal-hyprland dconf ];
|
environment.systemPackages = with pkgs; [
|
||||||
|
polkit
|
||||||
|
xdg-desktop-portal-hyprland
|
||||||
|
dconf
|
||||||
|
];
|
||||||
|
|
||||||
services.xserver = enabled;
|
services.xserver = enabled;
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,11 @@ let
|
||||||
|
|
||||||
tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --remember-session";
|
tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --remember-session";
|
||||||
|
|
||||||
command = if hyperland.enable then "${tuigreet} --sessions ${hyprland-session}" else "${tuigreet} --sessions ${kde-session}";
|
command =
|
||||||
|
if hyperland.enable then
|
||||||
|
"${tuigreet} --sessions ${hyprland-session}"
|
||||||
|
else
|
||||||
|
"${tuigreet} --sessions ${kde-session}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.wyrdgard.graphical-interface.display-manager.greetd = with types; {
|
options.wyrdgard.graphical-interface.display-manager.greetd = with types; {
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
{
|
{ config, lib, ... }:
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib;
|
with lib;
|
||||||
with lib.wyrdgard;
|
with lib.wyrdgard;
|
||||||
let
|
let
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{
|
{
|
||||||
options,
|
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
|
@ -18,18 +17,12 @@ in
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
environment.systemPackages = with pkgs; [ xdg-utils ];
|
environment.systemPackages = with pkgs; [ xdg-utils ];
|
||||||
|
|
||||||
services = {
|
wyrdgard.graphical-interface = {
|
||||||
xserver = {
|
display-manager.sddm = enabled;
|
||||||
enable = true;
|
desktop-manager = {
|
||||||
|
hyprland = enabled;
|
||||||
|
kde = enabled;
|
||||||
};
|
};
|
||||||
displayManager = {
|
|
||||||
defaultSession = "plasmax11";
|
|
||||||
sddm = {
|
|
||||||
enable = true;
|
|
||||||
wayland.enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
desktopManager.plasma6 = enabled;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{
|
{
|
||||||
options,
|
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
|
@ -16,6 +15,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_8;
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
{
|
{ lib, config, ... }:
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib;
|
with lib;
|
||||||
with lib.wyrdgard;
|
with lib.wyrdgard;
|
||||||
let
|
let
|
||||||
|
@ -14,14 +10,16 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
hardware.graphics = enabled;
|
hardware.graphics = {
|
||||||
|
enable = true;
|
||||||
|
enable32Bit = true;
|
||||||
|
};
|
||||||
|
|
||||||
hardware.nvidia = {
|
hardware.nvidia = {
|
||||||
modesetting.enable = true;
|
modesetting.enable = true;
|
||||||
powerManagement.enable = false;
|
powerManagement.enable = true;
|
||||||
powerManagement.finegrained = false;
|
|
||||||
open = false;
|
open = false;
|
||||||
nvidiaSettings = false;
|
nvidiaSettings = true;
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.beta; # stable, beta
|
package = config.boot.kernelPackages.nvidiaPackages.beta; # stable, beta
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,7 @@ in
|
||||||
enable = mkBoolOpt true "Wether or not to enable git (Default enabled)";
|
enable = mkBoolOpt true "Wether or not to enable git (Default enabled)";
|
||||||
userName = mkOpt types.str user.fullName "The name to use git with";
|
userName = mkOpt types.str user.fullName "The name to use git with";
|
||||||
userEmail = mkOpt types.str user.email "The email to use git with";
|
userEmail = mkOpt types.str user.email "The email to use git with";
|
||||||
signingKey =
|
signingKey = mkOpt types.str "6995A5FF33791B7B" "The key ID to sign commits with.";
|
||||||
mkOpt types.str "6995A5FF33791B7B" "The key ID to sign commits with.";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|
|
@ -9,7 +9,11 @@ with lib.wyrdgard;
|
||||||
{
|
{
|
||||||
imports = [ ./hardware.nix ];
|
imports = [ ./hardware.nix ];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [ jetbrains.rust-rover inputs.pyfa teamspeak_client ];
|
environment.systemPackages = with pkgs; [
|
||||||
|
jetbrains.rust-rover
|
||||||
|
inputs.pyfa
|
||||||
|
teamspeak_client
|
||||||
|
];
|
||||||
|
|
||||||
environment.pathsToLink = [ "/libexec" ];
|
environment.pathsToLink = [ "/libexec" ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue