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

Compare commits

base: cspark:7ea6338ae87eb50185b69b6139e1512446769ea8
Branches Tags
cspark:master
..
compare: cspark:cf6471ac98d89a8863992fc61c877f10c911b0e8
Branches Tags
cspark:master

No commits in common. "7ea6338ae87eb50185b69b6139e1512446769ea8" and "cf6471ac98d89a8863992fc61c877f10c911b0e8" have entirely different histories.
7ea6338ae8 ... cf6471ac98

5 changed files with 81 additions and 84 deletions
Show Stats Expand all files Collapse all files

12
configurations/desktop/configuration.nix
View File

@ -133,13 +133,13 @@
#}; #};
# Single GPU Passthru Configuration # Single GPU Passthru Configuration
#cspark-single-gpu-passthru.enable = true; cspark-single-gpu-passthru.enable = true;
#cspark-single-gpu-passthru.vmName = "win11"; cspark-single-gpu-passthru.vmName = "win11";
#cspark-single-gpu-passthru.gpuPCI = "0000:08:00.0"; cspark-single-gpu-passthru.gpuPCI = "0000:08:00.0";
#cspark-single-gpu-passthru.gpuAudioPCI = "0000:08:00.1"; cspark-single-gpu-passthru.gpuAudioPCI = "0000:08:00.1";
# Waydroid Android Emulation # Waydroid Android Emulation
#virtualisation.waydroid.enable = true; virtualisation.waydroid.enable = true;
# Docker for development # Docker for development
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
@ -150,7 +150,7 @@
nvtopPackages.amd nvtopPackages.amd
# Use the android-studio-full attribute for a very complete Android SDK, including system images # Use the android-studio-full attribute for a very complete Android SDK, including system images
android-studio # android-studio-full
]; ];
#environment.variables = { #environment.variables = {

15
configurations/desktop/hardware-configuration.nix
View File

@ -8,24 +8,27 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "uas" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "uas" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
#boot.kernelModules = [ "kvm-amd" "vendor-reset" ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/3dcedddf-8ab5-42cf-a2f7-a7ed7efc3ec4"; { device = "/dev/disk/by-uuid/f25f2830-a778-4ecd-ad9b-93331ec13ff0";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-542de15a-e6a5-4c6d-8c6a-62f916805da8".device = "/dev/disk/by-uuid/542de15a-e6a5-4c6d-8c6a-62f916805da8";
boot.initrd.luks.devices."luks-9658340a-9d7d-4dbd-be1c-c8c7393ddfc3".device = "/dev/disk/by-uuid/9658340a-9d7d-4dbd-be1c-c8c7393ddfc3";
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/0A25-5D7D"; { device = "/dev/disk/by-uuid/386A-F58F";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/52eb83d8-cf41-4657-a3af-c54a37476a55"; } [ { device = "/dev/disk/by-uuid/6a8760a6-b720-455d-8ff6-af76365374bf"; }
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@ -33,7 +36,7 @@
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp34s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

104
flake.lock
View File

@ -28,11 +28,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1714606777,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "4d34ce6412bc450b1d4208c953dc97c7fc764f1a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,11 +43,11 @@
}, },
"flake-root": { "flake-root": {
"locked": { "locked": {
"lastModified": 1723604017, "lastModified": 1713493429,
"narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=", "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
"owner": "srid", "owner": "srid",
"repo": "flake-root", "repo": "flake-root",
"rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e", "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -63,11 +63,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735724774, "lastModified": 1733769654,
"narHash": "sha256-j4RK1GVa0fqcsut5ZV0hRYNMYcMoNP7mULwXnHQ6BkM=", "narHash": "sha256-aVvYDt8eitZVF6fdOrSoIzYRkQ5Gh6kfRvqkiaDRLL0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2ac770c007cc5dc26e6fe472956e6a23134dd124", "rev": "e952e94955dcc6fa2120c1430789fc41363f5237",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +81,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1734848678, "lastModified": 1733444216,
"narHash": "sha256-HtGPXGyzOsHJLq6nwvBV763y6l7fC9FuWIM0hNh1Y6E=", "narHash": "sha256-Xs+HcLsnMy6Z1FpHr0ULsGMc1mI6ESq1dTBAYwlpuVY=",
"owner": "musnix", "owner": "musnix",
"repo": "musnix", "repo": "musnix",
"rev": "e76b3cdd23d49a11210a551f8ea4d49d7022e639", "rev": "a38011b5b96624b7f6527c0bc6df530a263297ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1735591802, "lastModified": 1733826408,
"narHash": "sha256-oAridSudDNmdIFXYAj7tikcU0NwM3RNSLY4Qu1Khv8A=", "narHash": "sha256-9OOlIYIQA9mO8ZCiGYV0elyh9NwI1iHvSlZDYNQx3V0=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "bdcb629b3a8d62b4aff1b0484f74d5ad33dcf544", "rev": "2f95cc0bda721e25816a114d9d8619f0b95af256",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -139,11 +139,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735586144, "lastModified": 1733739952,
"narHash": "sha256-YenL+60BJHF2cc4htz/iKEMgYd9dNfegzgH9tMBMhEY=", "narHash": "sha256-LU4gFrPdB29qzZKJaEoIj87m7N+XaOoFu7POuiiIKhg=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "4741ab2e0465275d58c36db426b169c742d964cf", "rev": "40fa82275cc092d313a9a60d01a2b4e3e8e3f7d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +160,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1734926609, "lastModified": 1732760430,
"narHash": "sha256-c1VS+suA1WaHag1a4Gafg6U2vfwyFKktjMQNtJExe0A=", "narHash": "sha256-HC+kuzNIL5q87s5ISeJQk3Dv8pqg8U8wDyRSBrpFeFY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixd", "repo": "nixd",
"rev": "f97db14905a050534b2b28355061f790d171f12f", "rev": "f12e2f77094ac73c1b1101390c02ec5bcf69ad46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -191,39 +191,45 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1733096140, "dir": "lib",
"narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "lastModified": 1714253743,
"type": "tarball", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "owner": "NixOS",
"repo": "nixpkgs",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github"
}, },
"original": { "original": {
"type": "tarball", "dir": "lib",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1735531152, "lastModified": 1733730953,
"narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "rev": "7109b680d161993918b0a126f38bc39763e5a709",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1735651292, "lastModified": 1733842502,
"narHash": "sha256-YLbzcBtYo1/FEzFsB3AnM16qFc6fWPMIoOuSoDwvg9g=", "narHash": "sha256-XbMLD1CxUx/nqoxKkz+jT35oU3vjryFjoHagsJZB/3U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0da3c44a9460a26d2025ec3ed2ec60a895eb1114", "rev": "0bc6de0ceb83474fc4975d9dc1422a98c015eecf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -235,11 +241,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1734424634, "lastModified": 1732837521,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -251,11 +257,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1734435836, "lastModified": 1732617236,
"narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4989a246d7a390a859852baddb1013f825435cee", "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -267,11 +273,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1735471104, "lastModified": 1733759999,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -360,11 +366,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734704479, "lastModified": 1722330636,
"narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -393,11 +399,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734745564, "lastModified": 1732233710,
"narHash": "sha256-JQNl4pqonVVPQ2JzEOLUcPVRNj//FFFNRDyvQoOkG7s=", "narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "94da1af75326d89ecb12aba0cc9362e93ffdc766", "rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
global-home.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, inputs, ... }: { config, pkgs, ... }:
let let
homedir = "/home/cspark"; homedir = "/home/cspark";
@ -218,7 +218,7 @@ fi
}; };
Service = { Service = {
ExecStart = "${script}"; ExecStart = "${script}";
Environment = "PATH=${inputs.nixpkgs-stable.legacyPackages.x86_64-linux.mpdcron}/bin:${pkgs.systemd}/bin"; Environment = "PATH=${pkgs.mpdcron}/bin:${pkgs.systemd}/bin";
}; };
Install = { Install = {
WantedBy = [ "default.target" ]; WantedBy = [ "default.target" ];

30
global.nix
View File

@ -17,7 +17,6 @@
# You can specify here if you want to add any packages from the stable branch onto your system # You can specify here if you want to add any packages from the stable branch onto your system
stablePackages = with inputs.nixpkgs-stable.legacyPackages.x86_64-linux; [ stablePackages = with inputs.nixpkgs-stable.legacyPackages.x86_64-linux; [
gtk-pipe-viewer gtk-pipe-viewer
mpdcron
]; ];
# Enable OpenGL/Vulkan hardware acceleration etc # Enable OpenGL/Vulkan hardware acceleration etc
@ -71,9 +70,6 @@
}; };
}; };
# Enable proper support for USB wifi/Wwan adapters.
hardware.usbWwan.enable = true;
# You can specify here what python packages you waint available to python # You can specify here what python packages you waint available to python
# Custom Python package with all the (Python) imports I need # Custom Python package with all the (Python) imports I need
my-python-packages = python-packages: with python-packages; [ # ... my-python-packages = python-packages: with python-packages; [ # ...
@ -94,7 +90,6 @@
nix-index nix-index
git git
wget wget
efibootmgr
ntfs3g ntfs3g
# Programming Stuff, language servers etc # Programming Stuff, language servers etc
@ -124,7 +119,7 @@
lua-language-server lua-language-server
yaml-language-server yaml-language-server
ansible-language-server ansible-language-server
#ansible-lint ansible-lint
nginx-language-server nginx-language-server
emmet-language-server emmet-language-server
vscode-langservers-extracted vscode-langservers-extracted
@ -213,18 +208,16 @@
protonup-qt protonup-qt
qpwgraph qpwgraph
#ardour ardour
#rnnoise-plugin rnnoise-plugin
#lsp-plugins lsp-plugins
#(yabridge.override { wine = wineWowPackages.waylandFull; }) (yabridge.override { wine = wineWowPackages.waylandFull; })
#(yabridgectl.override { wine = wineWowPackages.waylandFull; }) (yabridgectl.override { wine = wineWowPackages.waylandFull; })
(yabridge.override { wine = wineWowPackages.full; })
(yabridgectl.override { wine = wineWowPackages.full; })
MIDIVisualizer MIDIVisualizer
kdenlive kdenlive
vlc vlc
# unityhub unityhub
veracrypt veracrypt
boxbuddy boxbuddy
distrobox distrobox
@ -240,6 +233,8 @@
gimp gimp
obs-studio obs-studio
mpdcron
pass-wayland pass-wayland
thunderbird thunderbird
protonmail-desktop protonmail-desktop
@ -501,13 +496,6 @@
enable = true; enable = true;
}; };
# Disable powersave feature on network cards.
networking.networkmanager.wifi.powersave = false;
# Use the preserved MAC address of the network card.
networking.networkmanager.wifi.macAddress = "preserve";
networking.networkmanager.wifi.scanRandMacAddress = false;
services.udev.extraRules = '' services.udev.extraRules = ''
## Rules file for NetMD devices and HiMD devices in NetMD mode ## Rules file for NetMD devices and HiMD devices in NetMD mode
## source: https://usb-ids.gowdy.us/read/UD/054c ## source: https://usb-ids.gowdy.us/read/UD/054c