From b715d8b5335b2302fefde329723bd3b4a0986c70 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 18 Jun 2025 09:36:45 -0500 Subject: [PATCH] use flatpaks on oren and gpd --- hosts/gpdPocket3/flake.nix | 28 ++++++++++++++++------------ hosts/oren/flake.nix | 28 ++++++++++++++++------------ 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/hosts/gpdPocket3/flake.nix b/hosts/gpdPocket3/flake.nix index fbc6472..866957a 100644 --- a/hosts/gpdPocket3/flake.nix +++ b/hosts/gpdPocket3/flake.nix @@ -35,9 +35,6 @@ environment.systemPackages = with pkgs; [ lua qdirstat - rustdesk-flutter - styluslabs-write - xournalpp ]; ringofstorms_common = { @@ -55,6 +52,22 @@ tailnet.enable = true; ssh.enable = true; docker.enable = true; + flatpaks = { + enable = true; + packages = [ + "org.signal.Signal" + "com.discordapp.Discord" + "md.obsidian.Obsidian" + "com.spotify.Client" + "org.videolan.VLC" + "com.bitwarden.desktop" + "org.openscad.OpenSCAD" + "org.blender.Blender" + "im.riot.Riot" + "com.rustdesk.RustDesk" + "com.google.Chrome" + ]; + }; }; users = { # Users are all normal users and default password is password1 @@ -70,15 +83,6 @@ "input" ]; shell = pkgs.zsh; - packages = with pkgs; [ - google-chrome - discordo - discord - vlc - spotify - bitwarden - vaultwarden - ]; }; }; }; diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix index 6893ab2..b29042f 100644 --- a/hosts/oren/flake.nix +++ b/hosts/oren/flake.nix @@ -41,7 +41,6 @@ environment.systemPackages = with pkgs; [ lua qdirstat - obsidian ]; services.ollama = { @@ -54,7 +53,6 @@ systemName = configuration_name; boot.systemd.enable = true; general = { - # disableRemoteBuildsOnLio = true; enableSleep = true; }; secrets.enable = true; @@ -66,6 +64,22 @@ tailnet.enable = true; ssh.enable = true; docker.enable = true; + flatpaks = { + enable = true; + packages = [ + "org.signal.Signal" + "com.discordapp.Discord" + "md.obsidian.Obsidian" + "com.spotify.Client" + "org.videolan.VLC" + "com.bitwarden.desktop" + "org.openscad.OpenSCAD" + "org.blender.Blender" + "im.riot.Riot" + "com.rustdesk.RustDesk" + "com.google.Chrome" + ]; + }; }; users = { # Users are all normal users and default password is password1 @@ -81,16 +95,6 @@ "input" ]; shell = pkgs.zsh; - packages = with pkgs; [ - signal-desktop - google-chrome - discordo - discord - spotify - vlc - vaultwarden - bitwarden - ]; }; }; };