diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix index b67ff7f..141071b 100644 --- a/etc/nixos/configuration.nix +++ b/etc/nixos/configuration.nix @@ -25,6 +25,7 @@ in ./modules/desktop.nix ./modules/ld-fix.nix ./modules/programs.nix + #./modules/audio.nix ]; @@ -76,7 +77,7 @@ in nssmdns4 = true; openFirewall = true; }; - networking.firewall = { enable = false; }; + networking.firewall.enable = false; #░█░░░█▀█░█▀▀░█▀█░█░░░█▀▀ @@ -151,7 +152,7 @@ in pulse.enable = true; alsa.enable = true; alsa.support32Bit = true; - #jack.enable = true; + jack.enable = true; }; # ISO mounting utils # @@ -164,7 +165,7 @@ in services.ollama = { enable = true; acceleration = "cuda"; - package = pkgs.ollama; + package = pkgs-unstable.ollama; environmentVariables = { CUDA_VISIBLE_DEVICES = "0"; NVIDIA_VISIBLE_DEVICES = "all"; @@ -214,4 +215,5 @@ in randomizedDelaySec = "45min"; }; + } diff --git a/etc/nixos/modules/desktop.nix b/etc/nixos/modules/desktop.nix index e89b3c2..0b696db 100644 --- a/etc/nixos/modules/desktop.nix +++ b/etc/nixos/modules/desktop.nix @@ -10,12 +10,12 @@ # Enable SDDM services.displayManager.sddm.enable = true; - environment.systemPackages = with pkgs; [ - kdePackages.qtmultimedia - libsForQt5.qt5.qtgraphicaleffects - sddm-astronaut - ]; - services.displayManager.sddm.theme = "${pkgs.sddm-chili-theme}/share/sddm/themes/chili"; + #environment.systemPackages = with pkgs; [ + # kdePackages.qtmultimedia + # libsForQt5.qt5.qtgraphicaleffects + # sddm-astronaut + # ]; + #services.displayManager.sddm.theme = "${pkgs.sddm-chili-theme}/share/sddm/themes/chili"; services.displayManager.sddm.wayland.enable = true; # Gnome Keyring (for window managers) @@ -28,6 +28,20 @@ xwayland.enable = true; }; + # i3 + #services.xserver = { + # enable = true; + # windowManager.i3 = { + # enable = true; + # extraPackages = with pkgs; [ + # dmenu #application launcher most people use + # i3status # gives you the default i3 status bar + # i3blocks #if you are planning on using i3blocks over i3status + # ]; + # }; + #}; + #programs.i3lock.enable = true; #default i3 screen locker + # SWAY #programs.sway = { # enable = true; diff --git a/etc/nixos/modules/nvidia.nix b/etc/nixos/modules/nvidia.nix index 494d55b..354a2d9 100644 --- a/etc/nixos/modules/nvidia.nix +++ b/etc/nixos/modules/nvidia.nix @@ -21,10 +21,16 @@ gsp.enable = config.hardware.nvidia.open; powerManagement.enable = false; powerManagement.finegrained = false; - nvidiaSettings = true; + nvidiaSettings = false; package = config.boot.kernelPackages.nvidiaPackages.latest; - videoAcceleration = true; + #package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + # version = "575.64.03"; + # sha256_64bit = "sha256-S7eqhgBLLtKZx9QwoGIsXJAyfOOspPbppTHUxB06DKA="; + # openSha256 = "sha256-SAl1+XH4ghz8iix95hcuJ/EVqt6ylyzFAao0mLeMmMI="; + # usePersistenced = false; + # useSettings = false; + # }; }; }; diff --git a/etc/nixos/modules/programs.nix b/etc/nixos/modules/programs.nix index 3f50806..9ec3baf 100644 --- a/etc/nixos/modules/programs.nix +++ b/etc/nixos/modules/programs.nix @@ -5,6 +5,13 @@ {config, pkgs, pkgs-unstable, lib, ... }: { + + # RISKY, REMOVE ASAP ### + nixpkgs.config.permittedInsecurePackages = [ + "qtwebengine-5.15.19" + ]; + + # Defined Programs environment.systemPackages = with pkgs; [ # TERM UTILS # neovim @@ -12,6 +19,7 @@ git fastfetch htop + btop-cuda cowsay starship cava @@ -41,7 +49,6 @@ hyprpaper swaybg hyprlock - swaylock hypridle hyprpanel hyprsunset @@ -49,8 +56,10 @@ waybar hyprpanel wlogout - rofi-wayland + rofi libnotify + wayvnc + pkgs-unstable.quickshell # OFFICE # pkgs-unstable.onlyoffice-desktopeditors @@ -62,7 +71,7 @@ simple-scan anydesk - # MEDIA EDITORS # + # PRODUCTION # gimp pinta @@ -78,8 +87,10 @@ element-desktop vesktop mailspring + tutanota-desktop teams-for-linux qbittorrent + rustdesk # DEV # vscode-fhs @@ -109,17 +120,32 @@ # UTILS # monitorets - gnome-system-monitor + #gnome-system-monitor + mission-center xdg-user-dirs brightnessctl + pkgs-unstable.openrgb + dmg2img # CUDA # cudaPackages.cudatoolkit cudaPackages.cudnn cudaPackages.cuda_cudart - # AUDIO # + # AUDIO AND DAW# helvum + reaper + #bitwig-studio + #carla + yabridge + yabridgectl + alsa-scarlett-gui + qjackctl + + # WINE # + wineWowPackages.stable + #wineWowPackages.waylandFull + winetricks ]; # Enable Flaktpak @@ -127,5 +153,10 @@ services.flatpak.packages = [ "org.pitivi.Pitivi" "app.zen_browser.zen" + "org.blender.Blender" ]; + + +services.hardware.openrgb.enable = true; } +