adriangl
/
nix-dotfiles
mirror of https://github.com/adrlau/nix-dotfiles.git
1
2
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update inputs to nixos24.05

This commit is contained in:
Adrian Gunnar Lauterer 2024-05-31 13:59:46 +02:00
parent 6eeabb35be
commit 97ab291ffa
9 changed files with 65 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flake.lock
View File

@ -141,16 +141,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716729592, "lastModified": 1716736833,
"narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -315,16 +315,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1716633019, "lastModified": 1717090882,
"narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "narHash": "sha256-Up5tvtY9YlVEyVn9hfZcxFQi5qVhQ5hdVNGPQOUchNw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "rev": "d24e7fdcfaecdca496ddd426cae98c9e2d12dfe8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View File

@ -2,10 +2,10 @@
description = "My System flake"; description = "My System flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
ozai.url = "git+https://git.pvv.ntnu.no/Projects/ozai.git"; ozai.url = "git+https://git.pvv.ntnu.no/Projects/ozai.git";

2
home/sway.nix
View File

@ -68,7 +68,7 @@ imports =
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
qt.platformTheme = "qt5c"; qt.platformTheme = "qt5ct";
# Configure keymap in X11 # Configure keymap in X11
services.xserver = { services.xserver = {

71
machines/aragon/configuration.nix
View File

@ -10,6 +10,7 @@
#profiles #profiles
../../profiles/base.nix
../../profiles/desktop.nix ../../profiles/desktop.nix
@ -66,38 +67,10 @@
description = "Adrian Gunnar Lauterer"; description = "Adrian Gunnar Lauterer";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [ "networkmanager" "wheel" ];
packages = with pkgs; [ packages = with pkgs; [
firefox
kate
unstable.ollama
python310
python310Packages.scipy
python310Packages.sympy
python310Packages.numpy
python310Packages.matplotlib
python310Packages.torchWithRocm
python310Packages.torchvision
gcc
gpp
cmake
rustup
rustc
cargo
etcher
rpi-imager
minecraft
prismlauncher
hmcl
appimage-run
vscode-fhs
]; ];
}; };
#allow electron 19 becasue of etcher
nixpkgs.config.permittedInsecurePackages = [
"electron-19.1.9"
];
# 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; [
@ -109,27 +82,47 @@
#sleep #sleep
pmutils pmutils
#basic programming
python310
python310Packages.scipy
python310Packages.sympy
python310Packages.numpy
python310Packages.matplotlib
#python310Packages.torch
python310Packages.torchvision
python310Packages.torchWithRocm
# When nixos bad
docker-compose
appimage-run
steam-run
xwayland-run
#basic programming
kate
vscode-fhs
gcc
gpp gpp
gdb gdb
cmake cmake
rustup rustup
rustc rustc
cargo cargo
python3
python3Packages.scipy
python3Packages.sympy
python3Packages.numpy
python3Packages.matplotlib
#python3Packages.torch
#python3Packages.torchvision
#python3Packages.torchWithRocm
rocmPackages.hipcc
rocmPackages.half
rocmPackages.hipify
rocmPackages.rocm-smi
firefox
ollama
rpi-imager
prismlauncher
cura cura
prusa-slicer prusa-slicer
openscad openscad
htop
docker-compose
]; ];
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;

7
machines/galadriel/nvidia.nix
View File

@ -41,9 +41,10 @@
# Enable the CUDA toolkit # Enable the CUDA toolkit
#install packages #install packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
cudaPackages.cudnn #cudaPackages.cudnn
cudaPackages.cudatoolkit #cudaPackages.cudatoolkit
nvtop-nvidia
nvtopPackages.nvidia
#cudaPackages.tensorrt_8_6_0 #needs to be added manually, to the store and is a pain because of the license agreement and garbage collection #cudaPackages.tensorrt_8_6_0 #needs to be added manually, to the store and is a pain because of the license agreement and garbage collection
]; ];

16
profiles/desktop.nix
View File

@ -15,13 +15,8 @@ imports =
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wings
openscad openscad
cura cura
super-slicer
prusa-slicer
pdfslicer
libsForQt5.qt5ct libsForQt5.qt5ct
qt6Packages.qt6ct qt6Packages.qt6ct
@ -45,15 +40,16 @@ imports =
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
services.xserver.displayManager.sddm.enable = true; services.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true; services.desktopManager.plasma6.enable = true;
services.desktopManager.plasma6.enableQt5Integration = true;
qt.platformTheme = "qt5c"; qt.platformTheme = "qt5ct";
# Configure keymap in X11 # Configure keymap in X11
services.xserver = { services.xserver.xkb = {
layout = "no"; layout = "no";
xkbVariant = ""; variant = "";
}; };

1
profiles/sound.nix
View File

@ -68,7 +68,6 @@ imports =
spotifyd spotifyd
spotifywm spotifywm
spotify-qt spotify-qt
spotify-tui
spotify-tray spotify-tray
tenacity tenacity

22
profiles/video.nix
View File

@ -14,20 +14,20 @@ imports =
obs-studio obs-studio
obs-cli obs-cli
obs-studio-plugins.obs-3d-effect #obs-studio-plugins.obs-3d-effect
obs-studio-plugins.wlrobs obs-studio-plugins.wlrobs
#obs-studio-plugins.obs-ndi #obs-studio-plugins.obs-ndi
obs-studio-plugins.waveform #obs-studio-plugins.waveform
obs-studio-plugins.obs-vaapi #obs-studio-plugins.obs-vaapi
obs-studio-plugins.obs-teleport #obs-studio-plugins.obs-teleport
#obs-studio-plugins.obs-hyperion #obs-studio-plugins.obs-hyperion
obs-studio-plugins.droidcam-obs #obs-studio-plugins.droidcam-obs
obs-studio-plugins.input-overlay #obs-studio-plugins.input-overlay
obs-studio-plugins.obs-mute-filter #obs-studio-plugins.obs-mute-filter
obs-studio-plugins.obs-source-clone #obs-studio-plugins.obs-source-clone
obs-studio-plugins.obs-source-record #obs-studio-plugins.obs-source-record
obs-studio-plugins.obs-replay-source #obs-studio-plugins.obs-replay-source
obs-studio-plugins.obs-source-switcher #obs-studio-plugins.obs-source-switcher
obs-studio-plugins.obs-backgroundremoval obs-studio-plugins.obs-backgroundremoval
obs-studio-plugins.obs-pipewire-audio-capture obs-studio-plugins.obs-pipewire-audio-capture

3
services/smb.nix
View File

@ -58,8 +58,7 @@ networking.firewall.allowPing = true;
#services.avahi.openfirewall = true; #services.avahi.openfirewall = true;
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns = true; nssmdns4 = true;
#nssmdns4 = true;
publish = { publish = {
enable = true; enable = true;
addresses = true; addresses = true;