From 8caae9e267064857678e1e580879524ba8802968 Mon Sep 17 00:00:00 2001 From: Seven Of Aces Date: Mon, 26 Aug 2024 21:18:49 -0700 Subject: [PATCH] modified: hosts/shared/nixos/shared_config.nix modified: modules/default.nix modified: modules/desktop/art.nix modified: modules/desktop/games.nix modified: pkgs/default.nix deleted: pkgs/wallpaper-engine.nix --- hosts/shared/nixos/shared_config.nix | 1 + modules/default.nix | 1 + modules/desktop/art.nix | 3 +- modules/desktop/games.nix | 7 ++++- pkgs/default.nix | 3 +- pkgs/wallpaper-engine.nix | 41 ---------------------------- 6 files changed, 11 insertions(+), 45 deletions(-) delete mode 100644 pkgs/wallpaper-engine.nix diff --git a/hosts/shared/nixos/shared_config.nix b/hosts/shared/nixos/shared_config.nix index d355035..f85c1f4 100644 --- a/hosts/shared/nixos/shared_config.nix +++ b/hosts/shared/nixos/shared_config.nix @@ -11,6 +11,7 @@ git wine bottles + /* ---------------------------- System Utilities ---------------------------- */ gnupg ffmpeg unzip diff --git a/modules/default.nix b/modules/default.nix index 305fa68..2a70406 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -11,6 +11,7 @@ ./desktop/daw.nix ./desktop/art.nix ./desktop/chat.nix + ./desktop/games.nix ./system/boot/grub.nix ./system/audio.nix diff --git a/modules/desktop/art.nix b/modules/desktop/art.nix index fe447fb..565af07 100644 --- a/modules/desktop/art.nix +++ b/modules/desktop/art.nix @@ -13,7 +13,8 @@ in { config = mkIf cfg.enable { /* Driver includes support for Huion Kamvas Pro */ - hardware.opentabletdriver.enable = true; + hardware.opentabletdriver.enable = true; + #services.xserver.digimend.enable = true; environment.systemPackages = with pkgs; [ aseprite diff --git a/modules/desktop/games.nix b/modules/desktop/games.nix index af51900..afc2eb7 100644 --- a/modules/desktop/games.nix +++ b/modules/desktop/games.nix @@ -11,9 +11,14 @@ in { /* Driver includes support for Huion Kamvas Pro */ hardware.opentabletdriver.enable = true; - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs.unstable; [ steam lutris + emulationstation-de + ]; + + permittedInsecurePackages = [ + "freeimage-unstable-2021-11-01" ]; }; } \ No newline at end of file diff --git a/pkgs/default.nix b/pkgs/default.nix index 02214a6..1688710 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,6 +1,5 @@ # Custom packages, that can be defined similarly to ones from nixpkgs # You can build them using 'nix build .#example' pkgs: { - # example = pkgs.callPackage ./example { };; - wallpaper_engine = pkgs.callPackage ./wallpaper-engine.nix {}; + # example = pkgs.callPackage ./example { }; } \ No newline at end of file diff --git a/pkgs/wallpaper-engine.nix b/pkgs/wallpaper-engine.nix deleted file mode 100644 index 8d559b0..0000000 --- a/pkgs/wallpaper-engine.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ mkDerivation -, fetchFromGitHub -, cmake -, extra-cmake-modules -, mpv -, websockets -, qtwebsockets -, qtwebchannel -, qtdeclarative -, qtx11extras -, vulkan-headers -, vulkan-loader -, vulkan-tools -, pkg-config -, lz4 -, glslang -}: - -mkDerivation rec { - pname = "wallpaper-engine-kde-plugin"; - version = "0.5.3"; - - cmakeFlags = [ "-DUSE_PLASMAPKG=ON" ]; - nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; - buildInputs = [ - libsForQt5.plasma-framework mpv qtwebsockets websockets qtwebchannel - qtdeclarative qtx11extras lz4 - vulkan-headers vulkan-tools vulkan-loader - ]; - - postPatch = '' - rmdir src/backend_scene/third_party/glslang - ln -s ${glslang.src} src/backend_scene/third_party/glslang - ''; - - src = fetchFromGitHub { - owner = "catsout"; - repo = pname; - rev = "v${version}"; - sha256 = "qmg+g1you3rm1EAfZWRUBBkEQm1QQ0V9/mIn8bBgbu4="; - }; \ No newline at end of file