From e488d6af8e61386388720bf6eb8a38b916080c78 Mon Sep 17 00:00:00 2001 From: Adrian Gunnar Lauterer Date: Thu, 21 Nov 2024 14:06:03 +0100 Subject: [PATCH] boinc and remove ly --- machines/aragon/configuration.nix | 1 + profiles/desktop.nix | 36 +++++++++++++++---------------- services/boinc.nix | 12 +++++++++++ 3 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 services/boinc.nix diff --git a/machines/aragon/configuration.nix b/machines/aragon/configuration.nix index 42a5909..c0697c4 100644 --- a/machines/aragon/configuration.nix +++ b/machines/aragon/configuration.nix @@ -19,6 +19,7 @@ #customised applications ../../services/podman.nix + ../../services/boinc.nix ]; # Bootloader. diff --git a/profiles/desktop.nix b/profiles/desktop.nix index 26d17e7..9f98ce7 100644 --- a/profiles/desktop.nix +++ b/profiles/desktop.nix @@ -11,8 +11,6 @@ imports = ../packages/vim.nix ../packages/steam.nix - "${args.inputs.unstable}/nixos/modules/services/display-managers/ly.nix" - ]; environment.systemPackages = with pkgs; [ @@ -21,7 +19,7 @@ imports = #libsForQt5.qt5ct #qt6Packages.qt6ct - #where-is-my-sddm-theme + where-is-my-sddm-theme swww @@ -40,8 +38,6 @@ imports = nerdfonts ubuntu_font_family - - ]; # Enable CUPS to print documents. @@ -51,26 +47,28 @@ imports = security.pam.services.swaylock = {}; security.pam.services.swaylock-effects = {}; - - security.pam.services.ly = {}; - #security.pam.services.display-manager.ly = {}; + +#security.pam.services.display-manager.ly = {}; services.displayManager = { enable = true; sessionPackages = with pkgs; [ sway ]; - execCmd = "${pkgs.unstable.ly}/bin/ly"; - #execCmd = "${unstable.pkgs.ly}/bin/ly"; - ly = { - package = pkgs.unstable.ly; + + sddm = { enable = true; - settings = { - - animation = "matrix"; - waylandsessions = "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions"; - - }; - + autoNumlock = true; }; + + ### still really broken and neds 24.11 + #ly = { + # package = pkgs.unstable.ly; + # enable = true; + # settings = { + # animation = "matrix"; + # waylandsessions = "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions"; + # }; + + #}; diff --git a/services/boinc.nix b/services/boinc.nix new file mode 100644 index 0000000..4d6f767 --- /dev/null +++ b/services/boinc.nix @@ -0,0 +1,12 @@ +{ config, pkgs, ... }: +{ + services.boinc = { + enable = true; + package = pkgs.boinc-headless; + extraEnvPackages = with pkgs ;[ + virtualbox + ocl-icd + ]; + }; + +}