Compare commits
No commits in common. "15e00efe3e5d9ea77075ebd11267306af9b9d6c0" and "85553a4a9c6c49233e42344de5095aad06bccfe1" have entirely different histories.
15e00efe3e
...
85553a4a9c
8 changed files with 20 additions and 72 deletions
|
|
@ -45,7 +45,6 @@
|
|||
"spotify"
|
||||
"steam" "steam-original" "steam-run"
|
||||
"vista-fonts"
|
||||
"nvidia-persistenced" # Docker
|
||||
];
|
||||
in
|
||||
utils.lib.mkFlake {
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
];
|
||||
|
||||
sisyphus = {
|
||||
desktop.sway.enable = true;
|
||||
|
||||
hardware.nvidia = {
|
||||
enable = true;
|
||||
model = "Quadro T2000";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
imports = [
|
||||
./gnome
|
||||
./hyprland
|
||||
./plasma
|
||||
./sway
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.sisyphus.desktop.hyprland;
|
||||
in {
|
||||
options.sisyphus.desktop.hyprland.enable = lib.mkEnableOption "Hyprland";
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -38,26 +38,6 @@ let
|
|||
export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
|
||||
gnome_schema=org.gnome.desktop.interface
|
||||
# gsettings set $gnome_schema gtk-theme 'Dracula'
|
||||
|
||||
# https://github.com/crispyricepc/sway-nvidia/blob/2101a18698151a61266740f1297158119bf660ac/wlroots-env-nvidia.sh
|
||||
# Hardware cursors not yet working on wlroots
|
||||
export WLR_NO_HARDWARE_CURSORS=1
|
||||
# Set wlroots renderer to Vulkan to avoid flickering
|
||||
export WLR_RENDERER=vulkan
|
||||
# General wayland environment variables
|
||||
export XDG_SESSION_TYPE=wayland
|
||||
export QT_QPA_PLATFORM=wayland
|
||||
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
|
||||
# Firefox wayland environment variable
|
||||
export MOZ_ENABLE_WAYLAND=1
|
||||
export MOZ_USE_XINPUT2=1
|
||||
# OpenGL Variables
|
||||
export GBM_BACKEND=nvidia-drm
|
||||
export __GL_GSYNC_ALLOWED=0
|
||||
export __GL_VRR_ALLOWED=0
|
||||
export __GLX_VENDOR_LIBRARY_NAME=nvidia
|
||||
# Xwayland compatibility
|
||||
export XWAYLAND_NO_GLAMOR=1
|
||||
'';
|
||||
};
|
||||
in {
|
||||
|
|
@ -94,7 +74,7 @@ in {
|
|||
SCRIPT_DIR = ../../../../scripts;
|
||||
};
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
fonts.fonts = with pkgs; [
|
||||
dejavu_fonts
|
||||
font-awesome
|
||||
noto-fonts
|
||||
|
|
@ -120,17 +100,14 @@ in {
|
|||
|
||||
power-profiles-daemon.enable = true;
|
||||
|
||||
xserver = {
|
||||
displayManager.session = [{
|
||||
manage = "window";
|
||||
name = "Sway";
|
||||
start = ''
|
||||
${pkgs.sway}/bin/sway --unsupported-gpu &
|
||||
waitPID=$!
|
||||
'';
|
||||
}];
|
||||
videoDrivers = [ "nouveau" ];
|
||||
};
|
||||
xserver.displayManager.session = [{
|
||||
manage = "window";
|
||||
name = "Sway";
|
||||
start = ''
|
||||
${pkgs.sway}/bin/sway --unsupported-gpu &
|
||||
waitPID=$!
|
||||
'';
|
||||
}];
|
||||
};
|
||||
|
||||
xdg.portal = {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
let
|
||||
cfg = config.sisyphus.hardware.nvidia;
|
||||
|
||||
# The graphics cards for which to do offloading
|
||||
do-offloading = builtins.elem cfg.model [ "Quadro T2000" ];
|
||||
nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
|
||||
export __NV_PRIME_RENDER_OFFLOAD=1
|
||||
|
|
@ -25,16 +24,7 @@ in {
|
|||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
# boot = {
|
||||
# extraModprobeConfig = "options nvidia-drm modeset=1";
|
||||
#
|
||||
# initrd.kernelModules = [
|
||||
# "nvidia"
|
||||
# "nvidia_modeset"
|
||||
# "nvidia_uvm"
|
||||
# "nvidia_drm"
|
||||
# ];
|
||||
# };
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
||||
hardware = {
|
||||
opengl = {
|
||||
|
|
@ -43,7 +33,7 @@ in {
|
|||
driSupport32Bit = true;
|
||||
};
|
||||
nvidia = {
|
||||
open = false;
|
||||
open = true;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
modesetting.enable = true;
|
||||
nvidiaSettings = cfg.gui-settings;
|
||||
|
|
@ -52,9 +42,6 @@ in {
|
|||
finegrained = do-offloading;
|
||||
};
|
||||
|
||||
# Avoid flickering
|
||||
forceFullCompositionPipeline = true;
|
||||
|
||||
prime = lib.mkMerge [
|
||||
(lib.mkIf do-offloading {
|
||||
offload = {
|
||||
|
|
|
|||
|
|
@ -61,6 +61,9 @@ in {
|
|||
icosystem # Personal icon theme
|
||||
spotify-adblock
|
||||
]) ++ (with pkgs-unstable; [
|
||||
# logseq
|
||||
# obsidian
|
||||
|
||||
brave
|
||||
chafa # Terminal image viewer
|
||||
duf # Df alternative
|
||||
|
|
@ -69,7 +72,6 @@ in {
|
|||
jellyfin-media-player
|
||||
kitty
|
||||
libreoffice-fresh
|
||||
logseq
|
||||
mpv
|
||||
nextcloud-client
|
||||
nsxiv # Lightweight image viewer
|
||||
|
|
@ -94,7 +96,9 @@ in {
|
|||
]);
|
||||
|
||||
pointerCursor = {
|
||||
inherit (cursor) package name size;
|
||||
package = cursor.package;
|
||||
name = cursor.name;
|
||||
size = cursor.size;
|
||||
gtk.enable = true;
|
||||
x11.enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,9 +15,8 @@ set {
|
|||
$scrollUp button4
|
||||
$scrollDown button5
|
||||
|
||||
# $term kitty || alacritty || foot
|
||||
$term kitty
|
||||
$menu j4-dmenu-desktop --dmenu "rofi -dmenu -i" --usage-log="/home/tdpeuter/.local/state/dmenu.log"
|
||||
$term kitty || alacritty || foot
|
||||
$menu j4-dmenu-desktop --dmenu "rofi -dmenu -i"
|
||||
# TODO Find better location and better way to reference this.
|
||||
$window_switcher /home/tdpeuter/projects/fzf-jump/new.sh
|
||||
$lock swaylock -f
|
||||
|
|
|
|||
Loading…
Reference in a new issue