diff --git a/flake.lock b/flake.lock index 3ce32ad..2d5c85e 100644 --- a/flake.lock +++ b/flake.lock @@ -141,16 +141,16 @@ ] }, "locked": { - "lastModified": 1716729592, - "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -315,16 +315,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716633019, - "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", + "lastModified": 1717090882, + "narHash": "sha256-Up5tvtY9YlVEyVn9hfZcxFQi5qVhQ5hdVNGPQOUchNw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", + "rev": "d24e7fdcfaecdca496ddd426cae98c9e2d12dfe8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index d48c2e5..0975e4c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "My System flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; 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"; ozai.url = "git+https://git.pvv.ntnu.no/Projects/ozai.git"; diff --git a/home/sway.nix b/home/sway.nix index d6f34c3..11ef5d7 100644 --- a/home/sway.nix +++ b/home/sway.nix @@ -68,7 +68,7 @@ imports = services.xserver.displayManager.sddm.enable = true; - qt.platformTheme = "qt5c"; + qt.platformTheme = "qt5ct"; # Configure keymap in X11 services.xserver = { diff --git a/machines/aragon/configuration.nix b/machines/aragon/configuration.nix index b957aa7..b412442 100644 --- a/machines/aragon/configuration.nix +++ b/machines/aragon/configuration.nix @@ -10,6 +10,7 @@ #profiles + ../../profiles/base.nix ../../profiles/desktop.nix @@ -66,38 +67,10 @@ description = "Adrian Gunnar Lauterer"; extraGroups = [ "networkmanager" "wheel" ]; 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: # $ nix search wget environment.systemPackages = with pkgs; [ @@ -108,28 +81,48 @@ #sleep pmutils + + + # When nixos bad + docker-compose + appimage-run + steam-run + xwayland-run + + #basic programming - python310 - python310Packages.scipy - python310Packages.sympy - python310Packages.numpy - python310Packages.matplotlib - #python310Packages.torch - python310Packages.torchvision - python310Packages.torchWithRocm - + kate + vscode-fhs + gcc gpp gdb cmake rustup rustc 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 prusa-slicer openscad - htop - docker-compose + ]; hardware.bluetooth.enable = true; diff --git a/machines/galadriel/nvidia.nix b/machines/galadriel/nvidia.nix index 504778a..c3b959e 100644 --- a/machines/galadriel/nvidia.nix +++ b/machines/galadriel/nvidia.nix @@ -41,9 +41,10 @@ # Enable the CUDA toolkit #install packages environment.systemPackages = with pkgs; [ - cudaPackages.cudnn - cudaPackages.cudatoolkit - nvtop-nvidia + #cudaPackages.cudnn + #cudaPackages.cudatoolkit + + 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 ]; diff --git a/profiles/desktop.nix b/profiles/desktop.nix index 7721db4..4e63088 100644 --- a/profiles/desktop.nix +++ b/profiles/desktop.nix @@ -15,13 +15,8 @@ imports = ]; environment.systemPackages = with pkgs; [ - wings openscad cura - super-slicer - prusa-slicer - - pdfslicer libsForQt5.qt5ct qt6Packages.qt6ct @@ -45,15 +40,16 @@ imports = # Enable CUPS to print documents. services.printing.enable = true; - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; + services.displayManager.sddm.enable = true; + services.desktopManager.plasma6.enable = true; + services.desktopManager.plasma6.enableQt5Integration = true; - qt.platformTheme = "qt5c"; + qt.platformTheme = "qt5ct"; # Configure keymap in X11 - services.xserver = { + services.xserver.xkb = { layout = "no"; - xkbVariant = ""; + variant = ""; }; diff --git a/profiles/sound.nix b/profiles/sound.nix index cd546f3..7b5a743 100644 --- a/profiles/sound.nix +++ b/profiles/sound.nix @@ -68,7 +68,6 @@ imports = spotifyd spotifywm spotify-qt - spotify-tui spotify-tray tenacity diff --git a/profiles/video.nix b/profiles/video.nix index 098b4b9..e57abb2 100644 --- a/profiles/video.nix +++ b/profiles/video.nix @@ -14,20 +14,20 @@ imports = obs-studio obs-cli - obs-studio-plugins.obs-3d-effect + #obs-studio-plugins.obs-3d-effect obs-studio-plugins.wlrobs #obs-studio-plugins.obs-ndi - obs-studio-plugins.waveform - obs-studio-plugins.obs-vaapi - obs-studio-plugins.obs-teleport + #obs-studio-plugins.waveform + #obs-studio-plugins.obs-vaapi + #obs-studio-plugins.obs-teleport #obs-studio-plugins.obs-hyperion - obs-studio-plugins.droidcam-obs - obs-studio-plugins.input-overlay - obs-studio-plugins.obs-mute-filter - obs-studio-plugins.obs-source-clone - obs-studio-plugins.obs-source-record - obs-studio-plugins.obs-replay-source - obs-studio-plugins.obs-source-switcher + #obs-studio-plugins.droidcam-obs + #obs-studio-plugins.input-overlay + #obs-studio-plugins.obs-mute-filter + #obs-studio-plugins.obs-source-clone + #obs-studio-plugins.obs-source-record + #obs-studio-plugins.obs-replay-source + #obs-studio-plugins.obs-source-switcher obs-studio-plugins.obs-backgroundremoval obs-studio-plugins.obs-pipewire-audio-capture diff --git a/services/smb.nix b/services/smb.nix index 944ff05..731a425 100644 --- a/services/smb.nix +++ b/services/smb.nix @@ -58,8 +58,7 @@ networking.firewall.allowPing = true; #services.avahi.openfirewall = true; services.avahi = { enable = true; - nssmdns = true; - #nssmdns4 = true; + nssmdns4 = true; publish = { enable = true; addresses = true;