From 9cfe98fbc9f311e1a87b99d3a8cbd7f3e9a5a5a5 Mon Sep 17 00:00:00 2001 From: cspark Date: Sat, 22 Nov 2025 18:25:52 +0000 Subject: [PATCH] Remove a lot of dev stuff a we're finally using nix shells --- configurations/desktop/configuration.nix | 4 ++ configurations/laptop/configuration.nix | 6 ++ global.nix | 75 ++++++-------------- modules/nixos/cspark-desktop-niri/home.nix | 4 +- modules/nixos/cspark-desktop-niri/module.nix | 19 ++--- 5 files changed, 44 insertions(+), 64 deletions(-) diff --git a/configurations/desktop/configuration.nix b/configurations/desktop/configuration.nix index 5d1d0704..98366d1b 100644 --- a/configurations/desktop/configuration.nix +++ b/configurations/desktop/configuration.nix @@ -19,6 +19,10 @@ boot.initrd.kernelModules = [ "amdgpu" ]; + services.xserver = { + videoDrivers = [ "amdgpu" ]; + }; + # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/configurations/laptop/configuration.nix b/configurations/laptop/configuration.nix index 82621dc4..bc8b4f57 100644 --- a/configurations/laptop/configuration.nix +++ b/configurations/laptop/configuration.nix @@ -86,6 +86,11 @@ # gamescopeSession.enable = true; #}; + # Intel graphics driver setup + services.xserver = { + videoDrivers = [ "intel" ]; + }; + # Waydroid Android Emulation virtualisation.waydroid.enable = true; @@ -95,6 +100,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ + xorg.xf86videointel nvtopPackages.intel ]; diff --git a/global.nix b/global.nix index 6e7e5d9e..dc3ed012 100644 --- a/global.nix +++ b/global.nix @@ -116,31 +116,23 @@ htop-vim # Programming Stuff, language servers etc - gcc - cmake - libtool - #swift - #swiftPackages.Foundation - #swiftpm - #sourcekit-lsp - gradle - nodejs - typescript - deno - go - gopls # Purely for the tooling postgresql sqlite # For development and also telescope-all-recent + # Notcurses Demo Tools and Benchmark + notcurses + # Debugging/LSP related tooling gdb lldb_18 # For lldb-dap - clang-tools # clangd + jdt-language-server # Java language server gnumake - cargo + + #ccls + rust-analyzer lua-language-server yaml-language-server #ansible-language-server # Removed as unmaintained in nix packages @@ -299,6 +291,7 @@ # pidginPackages.tdlib-purple lutris + protontricks adwsteamgtk protonup-qt qpwgraph @@ -379,44 +372,17 @@ # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server #gamescopeSession.enable = true; - #package = pkgs.steam.override { - # extraLibraries = p: with p; [ - # gfxreconstruct - # glslang - # spirv-cross - # spirv-headers - # spirv-tools - # vulkan-extension-layer - # vulkan-headers - # vulkan-loader - # vulkan-tools - # vulkan-tools-lunarg - # vulkan-utility-libraries - # vulkan-validation-layers - # vkdisplayinfo - # vkd3d - # vkd3d-proton - # vk-bootstrap - # ]; - # extraPkgs = p: with p; [ - # gfxreconstruct - # glslang - # spirv-cross - # spirv-headers - # spirv-tools - # vulkan-extension-layer - # vulkan-headers - # vulkan-loader - # vulkan-tools - # vulkan-tools-lunarg - # vulkan-utility-libraries - # vulkan-validation-layers - # vkdisplayinfo - # vkd3d - # vkd3d-proton - # vk-bootstrap - # ]; - #}; + package = with pkgs; steam.override { extraPkgs = pkgs: [ + jq + cabextract + wget + git + pkgsi686Linux.libpulseaudio + pkgsi686Linux.freetype + pkgsi686Linux.xorg.libXcursor + pkgsi686Linux.xorg.libXcomposite + pkgsi686Linux.xorg.libXi + ];}; }; programs.gamescope = { enable = true; @@ -567,6 +533,9 @@ vkd3d vkd3d-proton vk-bootstrap + + # C/C++ Libraries + notcurses ]; # Systemwide Java support diff --git a/modules/nixos/cspark-desktop-niri/home.nix b/modules/nixos/cspark-desktop-niri/home.nix index b828a220..e5607b71 100644 --- a/modules/nixos/cspark-desktop-niri/home.nix +++ b/modules/nixos/cspark-desktop-niri/home.nix @@ -100,8 +100,8 @@ fi SDL_VIDEODRIVER = "wayland,x11,windows"; _JAVA_AWT_WM_NONREPARENTING = "1"; SSH_ASKPASS_REQUIRE = "force"; - #SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass"; - SSH_ASKPASS = "/run/current-system/sw/bin/zenity-askpass"; + SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass"; + #SSH_ASKPASS = "/run/current-system/sw/bin/zenity-askpass"; MOZ_ENABLE_WAYLAND = "1"; # Enable native wayland support for chromium and electron based applications NIXOS_OZONE_WL = "1"; diff --git a/modules/nixos/cspark-desktop-niri/module.nix b/modules/nixos/cspark-desktop-niri/module.nix index 0468ddde..94c1a576 100644 --- a/modules/nixos/cspark-desktop-niri/module.nix +++ b/modules/nixos/cspark-desktop-niri/module.nix @@ -24,6 +24,7 @@ in swaybg # Set background wallpaper foot # Terminal Emulator + kitty libsixel # Load images in foot #ghostty # Terminal Emulator @@ -47,7 +48,7 @@ in libsForQt5.qt5ct # Manage QT5 Themes lxappearance # Manage GTK Themes kdePackages.polkit-kde-agent-1 # Polkit Prompt for password prompts etc - #lxqt.lxqt-openssh-askpass # GUI to query passwords on behalf of SSH agents - Issues compiling + lxqt.lxqt-openssh-askpass # GUI to query passwords on behalf of SSH agents - Issues compiling zenity # Display custom prompts (writeShellScriptBin "zenity-askpass" @@ -68,8 +69,8 @@ in export SDL_VIDEODRIVER="wayland,x11,windows" export _JAVA_AWT_WM_NONREPARENTING="1" export SSH_ASKPASS_REQUIRE="force" - # export SSH_ASKPASS="/run/current-system/sw/bin/lxqt-openssh-askpass" - export SSH_ASKPASS="/run/current-system/sw/bin/zenity-askpass" + export SSH_ASKPASS="/run/current-system/sw/bin/lxqt-openssh-askpass" + # export SSH_ASKPASS="/run/current-system/sw/bin/zenity-askpass" export MOZ_ENABLE_WAYLAND="1" # Enable native wayland support for chromium and electron based applications export NIXOS_OZONE_WL="1" @@ -171,8 +172,8 @@ in programs.ssh = { enableAskPassword = true; - #askPassword = "/run/current-system/sw/bin/lxqt-openssh-askpass"; - askPassword = "/run/current-system/sw/bin/zenity-askpass"; + askPassword = "/run/current-system/sw/bin/lxqt-openssh-askpass"; + #askPassword = "/run/current-system/sw/bin/zenity-askpass"; }; environment.sessionVariables = { @@ -184,8 +185,8 @@ in SDL_VIDEODRIVER = "wayland,x11,windows"; _JAVA_AWT_WM_NONREPARENTING = "1"; SSH_ASKPASS_REQUIRE = "force"; - #SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass"; - SSH_ASKPASS = "/run/current-system/sw/bin/zenity-askpass"; + SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass"; + #SSH_ASKPASS = "/run/current-system/sw/bin/zenity-askpass"; MOZ_ENABLE_WAYLAND = "1"; # Enable native wayland support for chromium and electron based applications NIXOS_OZONE_WL = "1"; @@ -202,8 +203,8 @@ in SDL_VIDEODRIVER = "wayland,x11,windows"; _JAVA_AWT_WM_NONREPARENTING = "1"; SSH_ASKPASS_REQUIRE = "force"; - #SSH_ASKPASS = lib.mkForce "/run/current-system/sw/bin/lxqt-openssh-askpass"; - SSH_ASKPASS = lib.mkForce "/run/current-system/sw/bin/zenity-askpass"; + SSH_ASKPASS = lib.mkForce "/run/current-system/sw/bin/lxqt-openssh-askpass"; + #SSH_ASKPASS = lib.mkForce "/run/current-system/sw/bin/zenity-askpass"; MOZ_ENABLE_WAYLAND = "1"; # Enable native wayland support for chromium and electron based applications NIXOS_OZONE_WL = "1";