diff --git a/profiles/work/configuration.nix b/profiles/work/configuration.nix index 9ddf2cd..8b7e8c0 100644 --- a/profiles/work/configuration.nix +++ b/profiles/work/configuration.nix @@ -14,7 +14,7 @@ ../../system/hardware/printing.nix ../../system/hardware/bluetooth.nix (./. + "../../../system/wm"+("/"+userSettings.wm)+".nix") # My window manager - ../../system/app/flatpak.nix + #../../system/app/flatpak.nix ../../system/app/virtualization.nix ( import ../../system/app/docker.nix {storageDriver = "btrfs"; inherit userSettings lib;} ) ../../system/security/doas.nix diff --git a/profiles/work/home.nix b/profiles/work/home.nix index d693db6..4526492 100644 --- a/profiles/work/home.nix +++ b/profiles/work/home.nix @@ -21,7 +21,7 @@ ../../user/app/keepass/keepass.nix # My password manager (./. + "../../../user/app/browser"+("/"+userSettings.browser)+".nix") # My default browser selected from flake ../../user/app/virtualization/virtualization.nix # Virtual machines - ../../user/app/flatpak/flatpak.nix # Flatpaks + #../../user/app/flatpak/flatpak.nix # Flatpaks ../../user/style/stylix.nix # Styling and themes for my apps ../../user/lang/cc/cc.nix # C and C++ tools ../../user/lang/godot/godot.nix # Game development @@ -97,12 +97,11 @@ #blockbench-electron cura obs-studio - #install kdenlive via flatpak due to missing plugins - #kdenlive + kdenlive ffmpeg (pkgs.writeScriptBin "kdenlive-accel" '' #!/bin/sh - DRI_PRIME=0 flatpak run org.kde.kdenlive "$1" + DRI_PRIME=0 kdenlive "$1" '') movit mediainfo diff --git a/user/app/games/games.nix b/user/app/games/games.nix index 4839e9a..c45330e 100644 --- a/user/app/games/games.nix +++ b/user/app/games/games.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, ... }: +{ pkgs, pkgs-stable, ... }: let myRetroarch = (pkgs.retroarch.override { @@ -64,11 +64,5 @@ in url = "https://github.com/libretro/libretro-core-info/archive/refs/tags/v1.15.0.tar.gz"; sha256 = "004kgbsgbk7hn1v01jg3vj4b6dfb2cp3kcp5hgjyl030wqg1r22q"; }; - # To get steam to import into gamehub, first install it as a flatpak, then - # Set steam directory to ~/.var/app/com.valvesoftware.Steam/.steam - #services.flatpak.packages = [ - # "com.discordapp.Discord" - # "com.jaquadro.NBTExplorer" - #]; }