From 4f5af690bda572bc6cc246bf8676b2536091eb75 Mon Sep 17 00:00:00 2001 From: cnst Date: Sat, 17 Aug 2024 21:19:07 +0200 Subject: [PATCH] testing with nvidia settings and some modules fixings --- home/etc/default.nix | 1 - home/etc/utility/default.nix | 41 ------------------ home/modules/default.nix | 1 + home/modules/utils/misc/default.nix | 67 +++++++++++++++++++++++++++++ home/profiles/adam/default.nix | 17 -------- home/profiles/adam/modules.nix | 1 + home/profiles/cnst/default.nix | 17 -------- home/profiles/cnst/modules.nix | 1 + home/profiles/cnst/shell.nix | 1 + home/profiles/toothpick/default.nix | 30 ++++--------- home/profiles/toothpick/modules.nix | 1 + 11 files changed, 81 insertions(+), 97 deletions(-) delete mode 100644 home/etc/utility/default.nix create mode 100644 home/modules/utils/misc/default.nix diff --git a/home/etc/default.nix b/home/etc/default.nix index 228f9d2b..dad23a7c 100644 --- a/home/etc/default.nix +++ b/home/etc/default.nix @@ -4,7 +4,6 @@ ./dconf ./polkit ./gtk - ./utility ./xdg ]; } diff --git a/home/etc/utility/default.nix b/home/etc/utility/default.nix deleted file mode 100644 index e6d7dd07..00000000 --- a/home/etc/utility/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{pkgs, ...}: { - programs = { - ssh = { - enable = true; - }; - # image viewer - feh = { - enable = true; - }; - # system information - fastfetch = { - enable = true; - }; - # a monitor of resources - btop = { - enable = true; - settings = { - color_theme = "gruvbox_material_dark"; - }; - }; - }; - home.packages = with pkgs; [ - file-roller # archiver - gnome-calculator - nwg-look # GTK settings - hyprpicker # Color picker - pavucontrol # GUI sound control - pamixer # TUI sound control - keepassxc - calcurse # calendar - grimblast # screenshot - slurp # select region for screenshot - qbittorrent - networkmanagerapplet # tray icon for NetworkManager - usbimager # write bootable usb images! - chatgpt-cli - exiftool - libnotify - filezilla - ]; -} diff --git a/home/modules/default.nix b/home/modules/default.nix index 6f718ef3..03abc5e8 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -30,6 +30,7 @@ "${userModules}/utils/rofi" "${userModules}/utils/waybar" "${userModules}/utils/yazi" + "${userModules}/utils/misc" # "${userModules}/wm" ]; } diff --git a/home/modules/utils/misc/default.nix b/home/modules/utils/misc/default.nix new file mode 100644 index 00000000..eaac001f --- /dev/null +++ b/home/modules/utils/misc/default.nix @@ -0,0 +1,67 @@ +{ + pkgs, + config, + lib, + ... +}: let + inherit (lib) mkIf mkEnableOption; + cfg = config.modules.utils.misc; +in { + options = { + modules.utils.misc.enable = mkEnableOption "Enables miscellaneous utility apps"; + }; + config = mkIf cfg.enable { + programs = { + ssh = { + enable = true; + }; + # image viewer + feh = { + enable = true; + }; + # system information + fastfetch = { + enable = true; + }; + # a monitor of resources + btop = { + enable = true; + settings = { + color_theme = "gruvbox_material_dark"; + }; + }; + }; + home.packages = with pkgs; [ + # misc.gui + virt-manager + xfce.thunar + file-roller # archiver + gnome-calculator + keepassxc + networkmanagerapplet # tray icon for NetworkManager + nwg-look # GTK settings + pavucontrol # GUI sound control + qbittorrent + usbimager # write bootable usb images! + # misc.tui + ranger + xcur2png + calcurse # calendar + chatgpt-cli + exiftool + hyprpicker # Color picker + libnotify + pamixer # TUI sound control + slurp # select region for screenshot + # misc.system + adwaita-icon-theme + qt5.qtwayland + qt6.qtwayland + wireguard-tools + wl-clipboard + wpa_supplicant + xfce.thunar-archive-plugin + xfce.thunar-volman + ]; + }; +} diff --git a/home/profiles/adam/default.nix b/home/profiles/adam/default.nix index 380c5e73..fe3c3bab 100644 --- a/home/profiles/adam/default.nix +++ b/home/profiles/adam/default.nix @@ -11,26 +11,9 @@ extraOutputsToInstall = ["doc" "devdoc"]; packages = with pkgs; [ - # misc.gui - virt-manager - xfce.thunar - - # misc.tui - ranger - xcur2png - # misc.system brightnessctl bun - adwaita-icon-theme - qt5.qtwayland - qt6.qtwayland - # thefuck - wireguard-tools - wl-clipboard - wpa_supplicant - xfce.thunar-archive-plugin - xfce.thunar-volman ]; sessionVariables = { BROWSER = "firefox"; diff --git a/home/profiles/adam/modules.nix b/home/profiles/adam/modules.nix index 62cee7e5..7b310fa6 100644 --- a/home/profiles/adam/modules.nix +++ b/home/profiles/adam/modules.nix @@ -39,6 +39,7 @@ rofi.enable = false; waybar.enable = true; yazi.enable = true; + misc.enable = true; }; userd = { sops.enable = true; diff --git a/home/profiles/cnst/default.nix b/home/profiles/cnst/default.nix index 77c004f1..ee606916 100644 --- a/home/profiles/cnst/default.nix +++ b/home/profiles/cnst/default.nix @@ -10,25 +10,8 @@ stateVersion = "23.11"; extraOutputsToInstall = ["doc" "devdoc"]; packages = with pkgs; [ - # misc.gui - virt-manager - xfce.thunar - - # misc.tui - ranger - xcur2png - # misc.system bun - adwaita-icon-theme - qt5.qtwayland - qt6.qtwayland - # thefuck - wireguard-tools - wl-clipboard - wpa_supplicant - xfce.thunar-archive-plugin - xfce.thunar-volman ]; sessionVariables = { BROWSER = "firefox"; diff --git a/home/profiles/cnst/modules.nix b/home/profiles/cnst/modules.nix index 62cee7e5..7b310fa6 100644 --- a/home/profiles/cnst/modules.nix +++ b/home/profiles/cnst/modules.nix @@ -39,6 +39,7 @@ rofi.enable = false; waybar.enable = true; yazi.enable = true; + misc.enable = true; }; userd = { sops.enable = true; diff --git a/home/profiles/cnst/shell.nix b/home/profiles/cnst/shell.nix index e5680536..07203558 100644 --- a/home/profiles/cnst/shell.nix +++ b/home/profiles/cnst/shell.nix @@ -7,6 +7,7 @@ syntaxHighlighting.enable = true; shellAliases = { + nixmodules = "nvim /home/cnst/.nix-config/home/profiles/cnst/modules.nix"; nixclean = "sudo nix run .#cleanup-boot"; nixdev = "nix develop ~/.nix-config -c $SHELL"; nixconfig = "cd /home/cnst/.nix-config/"; diff --git a/home/profiles/toothpick/default.nix b/home/profiles/toothpick/default.nix index 5f08543e..e3f70862 100644 --- a/home/profiles/toothpick/default.nix +++ b/home/profiles/toothpick/default.nix @@ -11,25 +11,9 @@ extraOutputsToInstall = ["doc" "devdoc"]; packages = with pkgs; [ - # misc.gui - virt-manager - xfce.thunar - - # misc.tui - ranger - xcur2png - - # misc.system - adwaita-icon-theme + # user specific pkgs + filezilla egl-wayland - qt5.qtwayland - qt6.qtwayland - # thefuck - wireguard-tools - wl-clipboard - wpa_supplicant - xfce.thunar-archive-plugin - xfce.thunar-volman ]; sessionVariables = { BROWSER = "firefox"; @@ -37,10 +21,14 @@ TERM = "foot"; STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/toothpick/.steam/root/compatibilitytools.d"; # proton and steam compat - QT_QPA_PLATFORM = "wayland-egl"; - SDL_VIDEODRIVER = "wayland"; XDG_SESSION_TYPE = "wayland"; - ELECTRON_OZONE_PLATFORM_HINT = "auto"; + NIXOS_OZONE_WL = "1"; + MOZ_ENABLE_WAYLAND = "1"; + MOZ_DISABLE_RDD_SANDBOX = "1"; + WLR_DRM_NO_ATOMIC = "1"; + WLR_NO_HARDWARE_CURSORS = "1"; + LIBVA_DRIVER_NAME = "nvidia"; + EGL_PLATFORM = "wayland"; }; }; # disable manuals as nmd fails to build often diff --git a/home/profiles/toothpick/modules.nix b/home/profiles/toothpick/modules.nix index 7bbc6164..b48f98b4 100644 --- a/home/profiles/toothpick/modules.nix +++ b/home/profiles/toothpick/modules.nix @@ -39,6 +39,7 @@ rofi.enable = false; waybar.enable = true; yazi.enable = true; + misc.enable = true; }; userd = { sops.enable = false;