atagen/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

return to kde

Browse source
This commit is contained in:
atagen 2023-01-31 19:42:12 +11:00
parent 535d41cb1d
commit 428e9731e9
5 changed files with 111 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

58
system/configuration.nix
View file

@ -1,13 +1,7 @@
{ config, pkgs, ... }:
let
flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz";
hyprland = (import flake-compat {
src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/master.tar.gz";
}).defaultNix;
in
{
{
imports = [
# where are we ?
@ -23,7 +17,6 @@ in
# declarative cachix
(import (builtins.fetchTarball "https://github.com/jonascarpay/declarative-cachix/archive/master.tar.gz"))
hyprland.nixosModules.default
];
cachix = [
@ -38,6 +31,12 @@ in
environment.sessionVariables = rec {
WLR_NO_HARDWARE_CURSORS = "1";
GBM_BACKEND = "nvidia-drm";
NVD_BACKEND = "direct";
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
LIBVA_DRIVER_NAME = "nvidia";
__GL_GSYNC_ALLOWED = "1";
__GL_VRR_ALLOWED = "1";
};
environment.pathsToLink = [ "/share/zsh" ];
@ -75,35 +74,23 @@ in
services.xserver.libinput.enable = true;
# kde time
services.xserver.desktopManager.plasma5.enable = true;
services.xserver.displayManager.lightdm.enable = false;
services.xserver.displayManager.sddm.enable = false;
services.xserver.displayManager.gdm.enable = false;
# services.xserver.displayManager.sddm = {
# enable = true;
# theme = "${(pkgs.fetchFromGitHub {
# owner = "EricKotato";
# repo = "sddm-slice";
# rev = "763b8f4e01c00c1f8590fc7a103e14f6e8449443";
# sha256 = "sha256-UW53ZdKb3RSrrcZ9GxZsJyjzS/uKR8lkaLLyi+2o27U=";
# })}";
# autoNumlock = true;
# settings = {
# General = {
# InputMethod = "";
# };
# };
# };
# services.xserver.desktopManager.plasma5.runUsingSystemd = true;
services.greetd = {
services.xserver.displayManager.lightdm.enable = false; # gets installed by default..
services.xserver.displayManager.sddm = {
enable = true;
theme = "${(pkgs.fetchFromGitHub {
owner = "EricKotato";
repo = "sddm-slice";
rev = "763b8f4e01c00c1f8590fc7a103e14f6e8449443";
sha256 = "sha256-UW53ZdKb3RSrrcZ9GxZsJyjzS/uKR8lkaLLyi+2o27U=";
})}";
autoNumlock = true;
settings = {
default_session = {
# command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd 'dbus-run-session startplasma-wayland'";
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
user = "greeter";
General = {
InputMethod = "";
};
};
};
services.xserver.desktopManager.plasma5.runUsingSystemd = true;
programs.dconf.enable = true;
xdg.autostart.enable = true;
@ -133,11 +120,6 @@ in
users.defaultUserShell = pkgs.zsh;
services.tailscale.enable = true;
programs.hyprland = {
enable = true;
package = hyprland.packages.${pkgs.system}.default;
nvidiaPatches = true;
};
environment.systemPackages = with pkgs; [
@ -186,7 +168,7 @@ in
checkReversePath = "loose";
};
systemd.services.fixNetworkingForTailscaleGodDamnit = {
systemd.services.fixNetworkingForTailscale = {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" "wg-quick-mullvad.service" ];
description = "fix the damn routing table";

30
system/quiver.nix
View file

@ -1,15 +1,11 @@
{ config, lib, pkgs, modulesPath, ... }:
# let
# unstable-small = import <nixos-unstable-small> { config = { allowUnfree = true; }; };
# in
{
nixpkgs.overlays = [
(self: super: {
system76-scheduler = pkgs.callPackage ./syspkgs/system76-scheduler.nix {};
kwin-system76-scheduler-integration = pkgs.libsForQt5.callPackage ./syspkgs/kwin-system76-scheduler-integration.nix {};
# systemd = unstable-small.systemd;
})
];
@ -18,13 +14,13 @@
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbcore" "sd_mod" ];
boot.initrd.kernelModules = [];
boot.initrd.kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" ];
boot.kernelModules = [ "kvm-amd" "i2c-dev" ];
boot.extraModulePackages = [ ];
boot.kernelParams = [ "mitigations=off" "acpi_enforce_resources=lax" "preempt=full" ];
boot.kernelParams = [ "nvidia_drm.modeset=1" "mitigations=off" "acpi_enforce_resources=lax" "preempt=full" ];
boot.loader.efi.canTouchEfiVariables = true;
boot.plymouth.enable = true;
# boot.plymouth.enable = true;
boot.supportedFilesystems = [ "ntfs" ];
@ -45,6 +41,7 @@
services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta;
# hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
hardware.nvidia.modesetting.enable = true;
hardware.nvidia.powerManagement.enable = true;
programs.xwayland.enable = true;
@ -92,22 +89,19 @@
xdg.portal = {
enable = true;
gtkUsePortal = true;
wlr = {
enable = true;
settings = {
screencast = {
output_name = "DP-1";
max_fps = 60;
chooser_type = "simple";
chooser_amd = "${pkgs.slurp}/bin/slurp -f %o -or";
};
};
# settings = {
# screencast = {
# output_name = "DP-1";
# max_fps = 60;
# chooser_type = "simple";
# chooser_nvidia = "${pkgs.slurp}/bin/slurp -f %o -or";
# };
# };
};
extraPortals = with pkgs; [
xdg-desktop-portal-wlr
xdg-desktop-portal-kde
xdg-desktop-portal-gtk
];
};