cspark
/
Personal-NixOS-Configuration
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a lot of dev stuff a we're finally using nix shells

This commit is contained in:
Curt Spark 2025-11-22 18:25:52 +00:00
parent 4d70e2e822
commit 9cfe98fbc9
5 changed files with 44 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configurations/desktop/configuration.nix
View File

@ -19,6 +19,10 @@
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
services.xserver = {
videoDrivers = [ "amdgpu" ];
};
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;

6
configurations/laptop/configuration.nix
View File

@ -86,6 +86,11 @@
# gamescopeSession.enable = true; # gamescopeSession.enable = true;
#}; #};
# Intel graphics driver setup
services.xserver = {
videoDrivers = [ "intel" ];
};
# Waydroid Android Emulation # Waydroid Android Emulation
virtualisation.waydroid.enable = true; virtualisation.waydroid.enable = true;
@ -95,6 +100,7 @@
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
xorg.xf86videointel
nvtopPackages.intel nvtopPackages.intel
]; ];

75
global.nix
View File

@ -116,31 +116,23 @@
htop-vim htop-vim
# Programming Stuff, language servers etc # Programming Stuff, language servers etc
gcc
cmake
libtool
#swift
#swiftPackages.Foundation
#swiftpm
#sourcekit-lsp
gradle
nodejs
typescript
deno
go
gopls
# Purely for the tooling # Purely for the tooling
postgresql postgresql
sqlite # For development and also telescope-all-recent sqlite # For development and also telescope-all-recent
# Notcurses Demo Tools and Benchmark
notcurses
# Debugging/LSP related tooling # Debugging/LSP related tooling
gdb gdb
lldb_18 # For lldb-dap lldb_18 # For lldb-dap
clang-tools # clangd
jdt-language-server # Java language server jdt-language-server # Java language server
gnumake gnumake
cargo
#ccls
rust-analyzer
lua-language-server lua-language-server
yaml-language-server yaml-language-server
#ansible-language-server # Removed as unmaintained in nix packages #ansible-language-server # Removed as unmaintained in nix packages
@ -299,6 +291,7 @@
# pidginPackages.tdlib-purple # pidginPackages.tdlib-purple
lutris lutris
protontricks
adwsteamgtk adwsteamgtk
protonup-qt protonup-qt
qpwgraph qpwgraph
@ -379,44 +372,17 @@
# dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
#gamescopeSession.enable = true; #gamescopeSession.enable = true;
#package = pkgs.steam.override { package = with pkgs; steam.override { extraPkgs = pkgs: [
# extraLibraries = p: with p; [ jq
# gfxreconstruct cabextract
# glslang wget
# spirv-cross git
# spirv-headers pkgsi686Linux.libpulseaudio
# spirv-tools pkgsi686Linux.freetype
# vulkan-extension-layer pkgsi686Linux.xorg.libXcursor
# vulkan-headers pkgsi686Linux.xorg.libXcomposite
# vulkan-loader pkgsi686Linux.xorg.libXi
# 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
# ];
#};
}; };
programs.gamescope = { programs.gamescope = {
enable = true; enable = true;
@ -567,6 +533,9 @@
vkd3d vkd3d
vkd3d-proton vkd3d-proton
vk-bootstrap vk-bootstrap
# C/C++ Libraries
notcurses
]; ];
# Systemwide Java support # Systemwide Java support

4
modules/nixos/cspark-desktop-niri/home.nix
View File

@ -100,8 +100,8 @@ fi
SDL_VIDEODRIVER = "wayland,x11,windows"; SDL_VIDEODRIVER = "wayland,x11,windows";
_JAVA_AWT_WM_NONREPARENTING = "1"; _JAVA_AWT_WM_NONREPARENTING = "1";
SSH_ASKPASS_REQUIRE = "force"; SSH_ASKPASS_REQUIRE = "force";
#SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass"; 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/zenity-askpass";
MOZ_ENABLE_WAYLAND = "1"; MOZ_ENABLE_WAYLAND = "1";
# Enable native wayland support for chromium and electron based applications # Enable native wayland support for chromium and electron based applications
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";

19
modules/nixos/cspark-desktop-niri/module.nix
View File

@ -24,6 +24,7 @@ in
swaybg # Set background wallpaper swaybg # Set background wallpaper
foot # Terminal Emulator foot # Terminal Emulator
kitty
libsixel # Load images in foot libsixel # Load images in foot
#ghostty # Terminal Emulator #ghostty # Terminal Emulator
@ -47,7 +48,7 @@ in
libsForQt5.qt5ct # Manage QT5 Themes libsForQt5.qt5ct # Manage QT5 Themes
lxappearance # Manage GTK Themes lxappearance # Manage GTK Themes
kdePackages.polkit-kde-agent-1 # Polkit Prompt for password prompts etc 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 zenity # Display custom prompts
(writeShellScriptBin "zenity-askpass" (writeShellScriptBin "zenity-askpass"
@ -68,8 +69,8 @@ in
export SDL_VIDEODRIVER="wayland,x11,windows" export SDL_VIDEODRIVER="wayland,x11,windows"
export _JAVA_AWT_WM_NONREPARENTING="1" export _JAVA_AWT_WM_NONREPARENTING="1"
export SSH_ASKPASS_REQUIRE="force" export SSH_ASKPASS_REQUIRE="force"
# export SSH_ASKPASS="/run/current-system/sw/bin/lxqt-openssh-askpass" 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/zenity-askpass"
export MOZ_ENABLE_WAYLAND="1" export MOZ_ENABLE_WAYLAND="1"
# Enable native wayland support for chromium and electron based applications # Enable native wayland support for chromium and electron based applications
export NIXOS_OZONE_WL="1" export NIXOS_OZONE_WL="1"
@ -171,8 +172,8 @@ in
programs.ssh = { programs.ssh = {
enableAskPassword = true; enableAskPassword = true;
#askPassword = "/run/current-system/sw/bin/lxqt-openssh-askpass"; askPassword = "/run/current-system/sw/bin/lxqt-openssh-askpass";
askPassword = "/run/current-system/sw/bin/zenity-askpass"; #askPassword = "/run/current-system/sw/bin/zenity-askpass";
}; };
environment.sessionVariables = { environment.sessionVariables = {
@ -184,8 +185,8 @@ in
SDL_VIDEODRIVER = "wayland,x11,windows"; SDL_VIDEODRIVER = "wayland,x11,windows";
_JAVA_AWT_WM_NONREPARENTING = "1"; _JAVA_AWT_WM_NONREPARENTING = "1";
SSH_ASKPASS_REQUIRE = "force"; SSH_ASKPASS_REQUIRE = "force";
#SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass"; 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/zenity-askpass";
MOZ_ENABLE_WAYLAND = "1"; MOZ_ENABLE_WAYLAND = "1";
# Enable native wayland support for chromium and electron based applications # Enable native wayland support for chromium and electron based applications
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
@ -202,8 +203,8 @@ in
SDL_VIDEODRIVER = "wayland,x11,windows"; SDL_VIDEODRIVER = "wayland,x11,windows";
_JAVA_AWT_WM_NONREPARENTING = "1"; _JAVA_AWT_WM_NONREPARENTING = "1";
SSH_ASKPASS_REQUIRE = "force"; 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/lxqt-openssh-askpass";
SSH_ASKPASS = lib.mkForce "/run/current-system/sw/bin/zenity-askpass"; #SSH_ASKPASS = lib.mkForce "/run/current-system/sw/bin/zenity-askpass";
MOZ_ENABLE_WAYLAND = "1"; MOZ_ENABLE_WAYLAND = "1";
# Enable native wayland support for chromium and electron based applications # Enable native wayland support for chromium and electron based applications
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";