aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--home/nipsy/arrakis.nix2
-rw-r--r--home/nipsy/common/optional/desktops/fonts.nix140
-rw-r--r--hosts/arrakis/default.nix6
-rw-r--r--hosts/arrakis/hardware-configuration.nix24
4 files changed, 86 insertions, 86 deletions
diff --git a/home/nipsy/arrakis.nix b/home/nipsy/arrakis.nix
index aa0b4c1..382f4d9 100644
--- a/home/nipsy/arrakis.nix
+++ b/home/nipsy/arrakis.nix
@@ -49,7 +49,7 @@
xsession = {
initExtra = ''
- xrandr --output DP-2 --primary --mode 2560x1440 --rate 165
+ xrandr --output DisplayPort-0 --primary --mode 2560x1440 --rate 165
# disable VRR because it causes the display to go to sleep on my GeForce 1080 (now 3070 Ti) sometimes; maybe monitor related?
#nvidia-settings -a AllowVRR=0
diff --git a/home/nipsy/common/optional/desktops/fonts.nix b/home/nipsy/common/optional/desktops/fonts.nix
index ef27e02..6935029 100644
--- a/home/nipsy/common/optional/desktops/fonts.nix
+++ b/home/nipsy/common/optional/desktops/fonts.nix
@@ -2,75 +2,75 @@
{
fonts.fontconfig.enable = true;
home.packages = [
- (builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts))
-# pkgs.nerd-fonts._0xproto
-# pkgs.nerd-fonts._3270
-# pkgs.nerd-fonts.agave
-# pkgs.nerd-fonts.anonymice
-# pkgs.nerd-fonts.arimo
-# pkgs.nerd-fonts.aurulent-sans-mono
-# pkgs.nerd-fonts.bigblue-terminal
-# pkgs.nerd-fonts.bitstream-vera-sans-mono
-# pkgs.nerd-fonts.blex-mono
-# pkgs.nerd-fonts.caskaydia-cove
-# pkgs.nerd-fonts.caskaydia-mono
-# pkgs.nerd-fonts.code-new-roman
-# pkgs.nerd-fonts.comic-shanns-mono
-# pkgs.nerd-fonts.commit-mono
-# pkgs.nerd-fonts.cousine
-# pkgs.nerd-fonts.d2coding
-# pkgs.nerd-fonts.daddy-time-mono
-# pkgs.nerd-fonts.departure-mono
-# pkgs.nerd-fonts.dejavu-sans-mono
-# pkgs.nerd-fonts.droid-sans-mono
-# pkgs.nerd-fonts.envy-code-r
-# pkgs.nerd-fonts.fantasque-sans-mono
-# pkgs.nerd-fonts.fira-code
-# pkgs.nerd-fonts.fira-mono
-# pkgs.nerd-fonts.geist-mono
-# pkgs.nerd-fonts.go-mono
-# pkgs.nerd-fonts.gohufont
-# pkgs.nerd-fonts.hack
-# pkgs.nerd-fonts.hasklug
-# pkgs.nerd-fonts.heavy-data
-# pkgs.nerd-fonts.hurmit
-# pkgs.nerd-fonts.im-writing
-# pkgs.nerd-fonts.inconsolata
-# pkgs.nerd-fonts.inconsolata-go
-# pkgs.nerd-fonts.inconsolata-lgc
-# pkgs.nerd-fonts.intone-mono
-# pkgs.nerd-fonts.iosevka
-# pkgs.nerd-fonts.iosevka-term
-# pkgs.nerd-fonts.iosevka-term-slab
-# pkgs.nerd-fonts.jetbrains-mono
-# pkgs.nerd-fonts.lekton
-# pkgs.nerd-fonts.liberation
-# pkgs.nerd-fonts.lilex
-# pkgs.nerd-fonts.martian-mono
-# pkgs.nerd-fonts.meslo-lg
-# pkgs.nerd-fonts.monaspace
-# pkgs.nerd-fonts.monofur
-# pkgs.nerd-fonts.monoid
-# pkgs.nerd-fonts.mononoki
-# #pkgs.nerd-fonts.mplus
-# pkgs.nerd-fonts.noto
-# pkgs.nerd-fonts.open-dyslexic
-# pkgs.nerd-fonts.overpass
-# pkgs.nerd-fonts.profont
-# pkgs.nerd-fonts.proggy-clean-tt
-# pkgs.nerd-fonts.recursive-mono
-# pkgs.nerd-fonts.roboto-mono
-# pkgs.nerd-fonts.shure-tech-mono
-# pkgs.nerd-fonts.sauce-code-pro
-# pkgs.nerd-fonts.space-mono
-# pkgs.nerd-fonts.symbols-only
-# pkgs.nerd-fonts.terminess-ttf
-# pkgs.nerd-fonts.tinos
-# pkgs.nerd-fonts.ubuntu
-# pkgs.nerd-fonts.ubuntu-mono
-# pkgs.nerd-fonts.ubuntu-sans
-# pkgs.nerd-fonts.victor-mono
-# pkgs.nerd-fonts.zed-mono
-# pkgs.noto-fonts
+ #(builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts))
+ pkgs.nerd-fonts._0xproto
+ pkgs.nerd-fonts._3270
+ pkgs.nerd-fonts.agave
+ pkgs.nerd-fonts.anonymice
+ pkgs.nerd-fonts.arimo
+ pkgs.nerd-fonts.aurulent-sans-mono
+ pkgs.nerd-fonts.bigblue-terminal
+ pkgs.nerd-fonts.bitstream-vera-sans-mono
+ pkgs.nerd-fonts.blex-mono
+ pkgs.nerd-fonts.caskaydia-cove
+ pkgs.nerd-fonts.caskaydia-mono
+ pkgs.nerd-fonts.code-new-roman
+ pkgs.nerd-fonts.comic-shanns-mono
+ pkgs.nerd-fonts.commit-mono
+ pkgs.nerd-fonts.cousine
+ pkgs.nerd-fonts.d2coding
+ pkgs.nerd-fonts.daddy-time-mono
+ pkgs.nerd-fonts.departure-mono
+ pkgs.nerd-fonts.dejavu-sans-mono
+ pkgs.nerd-fonts.droid-sans-mono
+ pkgs.nerd-fonts.envy-code-r
+ pkgs.nerd-fonts.fantasque-sans-mono
+ pkgs.nerd-fonts.fira-code
+ pkgs.nerd-fonts.fira-mono
+ pkgs.nerd-fonts.geist-mono
+ pkgs.nerd-fonts.go-mono
+ pkgs.nerd-fonts.gohufont
+ pkgs.nerd-fonts.hack
+ pkgs.nerd-fonts.hasklug
+ pkgs.nerd-fonts.heavy-data
+ pkgs.nerd-fonts.hurmit
+ pkgs.nerd-fonts.im-writing
+ pkgs.nerd-fonts.inconsolata
+ pkgs.nerd-fonts.inconsolata-go
+ pkgs.nerd-fonts.inconsolata-lgc
+ pkgs.nerd-fonts.intone-mono
+ pkgs.nerd-fonts.iosevka
+ pkgs.nerd-fonts.iosevka-term
+ pkgs.nerd-fonts.iosevka-term-slab
+ pkgs.nerd-fonts.jetbrains-mono
+ pkgs.nerd-fonts.lekton
+ pkgs.nerd-fonts.liberation
+ pkgs.nerd-fonts.lilex
+ pkgs.nerd-fonts.martian-mono
+ pkgs.nerd-fonts.meslo-lg
+ pkgs.nerd-fonts.monaspace
+ pkgs.nerd-fonts.monofur
+ pkgs.nerd-fonts.monoid
+ pkgs.nerd-fonts.mononoki
+ #pkgs.nerd-fonts.mplus
+ pkgs.nerd-fonts.noto
+ pkgs.nerd-fonts.open-dyslexic
+ pkgs.nerd-fonts.overpass
+ pkgs.nerd-fonts.profont
+ pkgs.nerd-fonts.proggy-clean-tt
+ pkgs.nerd-fonts.recursive-mono
+ pkgs.nerd-fonts.roboto-mono
+ pkgs.nerd-fonts.shure-tech-mono
+ pkgs.nerd-fonts.sauce-code-pro
+ pkgs.nerd-fonts.space-mono
+ pkgs.nerd-fonts.symbols-only
+ pkgs.nerd-fonts.terminess-ttf
+ pkgs.nerd-fonts.tinos
+ pkgs.nerd-fonts.ubuntu
+ pkgs.nerd-fonts.ubuntu-mono
+ pkgs.nerd-fonts.ubuntu-sans
+ pkgs.nerd-fonts.victor-mono
+ pkgs.nerd-fonts.zed-mono
+ pkgs.noto-fonts
];
}
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index 19918b7..9fda650 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -1,6 +1,6 @@
{ config, inputs, outputs, pkgs, ... }: {
boot = {
- initrd.kernelModules = [ "zfs" ];
+ initrd.kernelModules = [ "amdgpu" "zfs" ];
kernel.sysctl = {
"net.ipv4.ip_forward" = 1;
"net.ipv4.conf.all.proxy_arp" = 1;
@@ -226,7 +226,7 @@
};
hostPlatform = "x86_64-linux";
overlays = [
- inputs.nvidia-patch.overlays.default
+ #inputs.nvidia-patch.overlays.default
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.master-packages
@@ -236,7 +236,7 @@
};
services.openssh.settings.X11Forwarding = true;
- services.xserver.videoDrivers = [ "nvidia" ];
+ services.xserver.videoDrivers = [ "amdgpu" ];
sops = {
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix
index c709789..94367e0 100644
--- a/hosts/arrakis/hardware-configuration.nix
+++ b/hosts/arrakis/hardware-configuration.nix
@@ -17,7 +17,7 @@
};
environment.sessionVariables = {
- LIBVA_DRIVER_NAME = "nvidia";
+ #LIBVA_DRIVER_NAME = "nvidia";
MOZ_DISABLE_RDD_SANDBOX = "1";
};
@@ -53,19 +53,19 @@
graphics = {
enable = true;
- extraPackages = with pkgs; [ nvidia-vaapi-driver ];
- extraPackages32 = with pkgs.pkgsi686Linux; [ nvidia-vaapi-driver ];
+ #extraPackages = with pkgs; [ nvidia-vaapi-driver ];
+ #extraPackages32 = with pkgs.pkgsi686Linux; [ nvidia-vaapi-driver ];
};
- nvidia = let
- betaPkg = config.boot.kernelPackages.nvidiaPackages.beta;
- pkgAfterFbc = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.fbc then pkgs.nvidia-patch.patch-fbc betaPkg else betaPkg;
- finalPkg = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.nvenc then pkgs.nvidia-patch.patch-nvenc pkgAfterFbc else pkgAfterFbc;
- in {
- modesetting.enable = true;
- open = true;
- package = if finalPkg == betaPkg then betaPkg else finalPkg;
- };
+ #nvidia = let
+ # betaPkg = config.boot.kernelPackages.nvidiaPackages.beta;
+ # pkgAfterFbc = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.fbc then pkgs.nvidia-patch.patch-fbc betaPkg else betaPkg;
+ # finalPkg = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.nvenc then pkgs.nvidia-patch.patch-nvenc pkgAfterFbc else pkgAfterFbc;
+ #in {
+ # modesetting.enable = true;
+ # open = true;
+ # package = if finalPkg == betaPkg then betaPkg else finalPkg;
+ #};
printers = let
brother = "Brother_HL-L2340D";
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 08:28:15 +0000