From c2f796760a4bdbf5d9ba3eab87f1977db919d4d2 Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Tue, 18 Mar 2025 04:38:51 -0600 Subject: [PATCH] bump --- hosts/hardware-configuration.nix | 2 +- hosts/local-packages.nix | 1 + modules/i3-xfce.nix | 56 +++----------------------------- modules/nvidia.nix | 7 ++-- 4 files changed, 11 insertions(+), 55 deletions(-) diff --git a/hosts/hardware-configuration.nix b/hosts/hardware-configuration.nix index 350633c..8b598b7 100644 --- a/hosts/hardware-configuration.nix +++ b/hosts/hardware-configuration.nix @@ -14,7 +14,7 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/07f76e3c-2dcf-4cda-99bf-657f1dc5885f"; + { device = "/dev/disk/by-uuid/b7877a82-a67d-4362-ad36-ac513d7c0fc6"; fsType = "ext4"; }; diff --git a/hosts/local-packages.nix b/hosts/local-packages.nix index d1ad6bc..f90f8fc 100644 --- a/hosts/local-packages.nix +++ b/hosts/local-packages.nix @@ -107,5 +107,6 @@ in { unzip starship flameshot + yarn ]; } diff --git a/modules/i3-xfce.nix b/modules/i3-xfce.nix index 1fa3ae5..feda22c 100644 --- a/modules/i3-xfce.nix +++ b/modules/i3-xfce.nix @@ -15,26 +15,10 @@ in { services.xserver.windowManager.i3 = { enable = true; package = pkgs.i3-gaps; - extraPackages = with pkgs; [ - dmenu - i3status - i3lock - i3blocks - picom - feh - rofi - dunst - polybar - i3-auto-layout - ]; + extraPackages = with pkgs; [dmenu i3status i3lock i3blocks picom feh rofi dunst polybar i3-auto-layout]; extraSessionCommands = '' - # Set random wallpaper ${pkgs.feh}/bin/feh --randomize --bg-fill ~/wallpapers/* || ${pkgs.feh}/bin/feh --bg-fill ${pkgs.nixos-artwork.wallpapers.nineish-dark-gray}/share/backgrounds/nixos/nineish-dark-gray.png & - export GTK_THEME="Tokyonight-Dark" - export XCURSOR_THEME="Vivid-Dark-Icons" - export XCURSOR_SIZE="24" - export QT_STYLE_OVERRIDE="adwaita-dark" - ${pkgs.gtk3}/bin/gsettings set org.gnome.desktop.interface gtk-theme "Tokyonight-Dark" + ${pkgs.gtk3}/bin/gsettings set org.gnome.desktop.interface gtk-theme "Tokyo Night Storm" ${pkgs.gtk3}/bin/gsettings set org.gnome.desktop.interface icon-theme "Vivid-Dark-Icons" ''; }; @@ -52,7 +36,7 @@ in { enable = true; theme = { package = customPkgs.tokyo-night-gtk; - name = "Tokyonight-Dark"; + name = "Tokyo Night Storm"; }; iconTheme = { package = customPkgs.vivid-icons; @@ -60,8 +44,6 @@ in { }; extraConfig = '' [greeter] - theme-name=Tokyonight-Dark - icon-theme-name=Vivid-Dark-Icons font-name=Clear Sans 10 cursor-theme-name=Vivid-Dark-Icons ''; @@ -74,50 +56,22 @@ in { user = "cobray"; }; - environment.etc."xdg/autostart/i3-setup.desktop" = { - text = '' - [Desktop Entry] - Type=Application - Name=i3 Setup - Exec=${pkgs.bash}/bin/bash -c "${pkgs.feh}/bin/feh --randomize --bg-fill ~/wallpapers/* || ${pkgs.feh}/bin/feh --bg-fill ${pkgs.nixos-artwork.wallpapers.nineish-dark-gray}/share/backgrounds/nixos/nineish-dark-gray.png" - Terminal=false - X-GNOME-Autostart-enabled=true - ''; - mode = "0644"; - }; - qt.enable = true; qt.platformTheme = "qt5ct"; qt.style = "adwaita-dark"; - environment.etc."gtk-2.0/gtkrc".text = '' - gtk-theme-name="Tokyonight-Dark" - gtk-icon-theme-name="Vivid-Dark-Icons" - gtk-font-name="Clear Sans 10" - ''; - environment.etc."gtk-3.0/settings.ini".text = '' [Settings] gtk-application-prefer-dark-theme=1 - gtk-theme-name=Tokyonight-Dark - gtk-icon-theme-name=Vivid-Dark-Icons - gtk-font-name=Clear Sans 10 - ''; - - environment.etc."gtk-4.0/settings.ini".text = '' - [Settings] - gtk-application-prefer-dark-theme=1 - gtk-theme-name=Tokyonight-Dark + gtk-theme-name=Tokyo Night Storm gtk-icon-theme-name=Vivid-Dark-Icons gtk-font-name=Clear Sans 10 ''; environment.variables = { - GTK_THEME = "Tokyonight-Dark"; + GTK_THEME = "Tokyo Night Storm"; XCURSOR_THEME = "Vivid-Dark-Icons"; XCURSOR_SIZE = "24"; - QT_STYLE_OVERRIDE = "adwaita-dark"; - GTK2_RC_FILES = "$HOME/.gtkrc-2.0"; }; environment.systemPackages = with pkgs; diff --git a/modules/nvidia.nix b/modules/nvidia.nix index fdafe7b..27234b6 100644 --- a/modules/nvidia.nix +++ b/modules/nvidia.nix @@ -7,8 +7,8 @@ services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = { - modesetting.enable = true; - powerManagement.enable = true; + modesetting.enable = false; + powerManagement.enable = false; # Set to true for RTX 4000 series and newer GPUs open = true; package = config.boot.kernelPackages.nvidiaPackages.stable; @@ -16,6 +16,7 @@ }; environment.systemPackages = with pkgs; [ - #cudaPackages.cudatoolkit + cudaPackages.cudatoolkit + glxinfo ]; }