materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: materus:6d16c995e2075433cb44e445d5627cd7945e7727
Branches Tags
materus:master
materus:experimental
materus:inputs
..
compare: materus:533691247de217854f72179742fd89e0307f6663
Branches Tags
materus:experimental
materus:master
materus:inputs

No commits in common. "6d16c995e2075433cb44e445d5627cd7945e7727" and "533691247de217854f72179742fd89e0307f6663" have entirely different histories.
6d16c995e2 ... 533691247d

9 changed files with 43 additions and 50 deletions
Show Stats Expand all files Collapse all files

2
configurations/host/materusPC/default.nix
View File

@ -13,6 +13,8 @@
./tmp.nix
./network.nix
./kde.nix
./audio.nix
];

10
configurations/host/materusPC/other/desktop/gnome.nix → configurations/host/materusPC/gnome.nix
View File

@ -1,7 +1,13 @@
{ config, pkgs, lib, ... }:
{
services.displayManager.defaultSession = "gnome";
services.xserver.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.wayland = true;
services.xserver.desktopManager.gnome.enable = true;
services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ];

4
configurations/host/materusPC/home/materus/default.nix
View File

@ -6,6 +6,10 @@
programs.git.signing.signByDefault = true;
xdg.userDirs.enable = true;
xdg.portal.enable = true;
xdg.portal.xdgOpenUsePortal = true;
xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
xdg.portal.configPackages = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
materus.profile = {
fonts.enable = lib.mkDefault true;
nixpkgs.enable = lib.mkDefault false;

26
configurations/host/materusPC/other/desktop/sddm.nix → configurations/host/materusPC/kde.nix
View File

@ -31,6 +31,7 @@ let
'';
in
{
services.displayManager.defaultSession = "plasma";
services.displayManager.sddm.enable = true;
services.displayManager.sddm.wayland.enable = true;
services.displayManager.sddm.wayland.compositor = lib.mkForce "weston";
@ -49,4 +50,27 @@ in
CursorSize = "24";
};
};
}
services.desktopManager.plasma6.enable = true;
services.desktopManager.plasma6.enableQt5Integration = true;
programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
environment.variables = {
# Old fix for black cursor on amdgpu, seems to work fine now
#KWIN_DRM_NO_AMS = "1";
#Fix for amdgpu crashes
KWIN_DRM_USE_MODIFIERS = "0";
KWIN_DRM_NO_DIRECT_SCANOUT = "1";
QT_PLUGIN_PATH = [
"${pkgs.qt6.qtimageformats}/${pkgs.qt6.qtbase.qtPluginPrefix}"
"${pkgs.kdePackages.ffmpegthumbs}/${pkgs.qt6.qtbase.qtPluginPrefix}"
];
XCURSOR_THEME = "breeze_cursors";
};
environment.systemPackages = with pkgs; [
kdePackages.ark
];
programs.kdeconnect.enable = true;
materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin pkgs.vlc pkgs.vkbasalt-cli ];
}

5
configurations/host/materusPC/other/apps.nix
View File

@ -2,11 +2,6 @@
{
services.jackett.enable = true;
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [
];
environment.systemPackages = with pkgs; [
#(pkgs.lutris.override { extraLibraries = pkgs: with pkgs; [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })

1
configurations/host/materusPC/other/default.nix
View File

@ -3,7 +3,6 @@
imports = [
./apps.nix
./java.nix
./desktop
];
}

9
configurations/host/materusPC/other/desktop/default.nix
View File

@ -1,9 +0,0 @@
{ ... }:
{
imports = [
./kde.nix
./sddm.nix
];
}

32
configurations/host/materusPC/other/desktop/kde.nix
View File

@ -1,32 +0,0 @@
{ config, pkgs, lib, ... }:
{
services.displayManager.defaultSession = "plasma";
xdg.portal.enable = true;
xdg.portal.wlr.enable = true;
xdg.portal.xdgOpenUsePortal = true;
xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
services.desktopManager.plasma6.enable = true;
services.desktopManager.plasma6.enableQt5Integration = true;
programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
environment.variables = {
# Old fix for black cursor on amdgpu, seems to work fine now
#KWIN_DRM_NO_AMS = "1";
#Fix for amdgpu crashes
KWIN_DRM_USE_MODIFIERS = "0";
KWIN_DRM_NO_DIRECT_SCANOUT = "1";
QT_PLUGIN_PATH = [
"${pkgs.qt6.qtimageformats}/${pkgs.qt6.qtbase.qtPluginPrefix}"
"${pkgs.kdePackages.ffmpegthumbs}/${pkgs.qt6.qtbase.qtPluginPrefix}"
];
XCURSOR_THEME = "breeze_cursors";
};
environment.systemPackages = with pkgs; [
kdePackages.ark
];
programs.kdeconnect.enable = true;
materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin pkgs.vlc pkgs.vkbasalt-cli ];
}

4
configurations/host/materusPC/tmp.nix
View File

@ -30,6 +30,10 @@
services.xserver.displayManager.startx.enable = false;
xdg.portal.enable = true;
xdg.portal.wlr.enable = true;
xdg.portal.xdgOpenUsePortal = true;
services.xserver.exportConfiguration = true;
services.xserver.extraConfig = pkgs.lib.mkDefault ''
Section "OutputClass"