From 63070a33c4e06e04afaf8bd54228262268bfca9e Mon Sep 17 00:00:00 2001
From: KeksNino <KeksNino@proton.me>
Date: Mon, 3 Aug 2026 03:08:05 +0200
Subject: [PATCH] add flatpak (cloudredirect)

---
 flake.lock                          | 17 +++++++++++++++++
 flake.nix                           |  6 +++++-
 hosts/desktop/configuration.nix     |  3 ++-
 modules/desktop/flatpak.nix         | 24 ++++++++++++++++++++++++
 modules/programs/neovim/keymaps.nix |  5 -----
 modules/programs/neovim/lsp.nix     | 26 ++++++++++++++------------
 modules/programs/neovim/neovim.nix  |  3 ++-
 7 files changed, 64 insertions(+), 20 deletions(-)
 create mode 100644 modules/desktop/flatpak.nix

diff --git a/flake.lock b/flake.lock
index e7e404a..fed1fa9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -654,6 +654,22 @@
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1767983141,
+        "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "440818969ac2cbd77bfe025e884d0aa528991374",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "ref": "latest",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1785698632,
@@ -862,6 +878,7 @@
         "home-manager": "home-manager",
         "hyprsplit": "hyprsplit",
         "millennium": "millennium",
+        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs_5",
         "nixvim": "nixvim",
         "sls-steam": "sls-steam",
diff --git a/flake.nix b/flake.nix
index 84ffad4..8063fd1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,6 +20,7 @@
     bcdl-free.url = "git+https://git.pizzasucht.net/KeksNino/free-bandcamp-downloader";
     nixvim.url = "github:nix-community/nixvim";
     hyprsplit.url = "github:shezdy/hyprsplit";
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
   };
 
   outputs =
@@ -35,13 +36,14 @@
       bcdl-free,
       nixvim,
       hyprsplit,
+      nix-flatpak,
       ...
     }@inputs:
     let
       system = "x86_64-linux";
     in
     {
-      nixosConfigurations.desktop = nixpkgs.lib.nixosSystem {
+      nixosConfigurations.nixos-desktop = nixpkgs.lib.nixosSystem {
         specialArgs = {
           inherit
             sls-steam
@@ -49,6 +51,7 @@
             xremap-flake
             system
             nixvim
+            nix-flatpak
             ;
         };
         modules = [
@@ -56,6 +59,7 @@
           ./hosts/desktop/hardware-configuration.nix
           ./modules/common.nix
           ./modules/desktop/xremap.nix
+          ./modules/desktop/flatpak.nix
           home-manager.nixosModules.home-manager
           gsr-ui.nixosModules.default
           {
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 91e7a39..9ac6424 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -123,10 +123,11 @@ in
   virtualisation.docker.enable = true;
   services.gvfs.enable = true;
   services.goxlr-utility.enable = true;
+  services.flatpak.enable = true;
   services.lact.enable = true;
   services.rsync.enable = true;
   programs.kdeconnect.enable = true;
-  # programs.neovim.enable = true;
+  programs.neovim.enable = true;
   programs.tmux.enable = true;
   programs.bat.enable = true;
   programs.git = {
diff --git a/modules/desktop/flatpak.nix b/modules/desktop/flatpak.nix
new file mode 100644
index 0000000..852f516
--- /dev/null
+++ b/modules/desktop/flatpak.nix
@@ -0,0 +1,24 @@
+{ nix-flatpak, ... }:
+{
+  imports = [
+    nix-flatpak.nixosModules.nix-flatpak
+  ];
+
+  services.flatpak.remotes = [
+    {
+      name = "cloudredirect";
+      location = "https://raw.githubusercontent.com/Selectively11/CloudRedirect/master/flatpak/cloudredirect.flatpakrepo";
+    }
+    {
+      name = "flathub";
+      location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
+    }
+  ];
+
+  services.flatpak.packages = [
+    {
+      appId = "org.cloudredirect.CloudRedirect";
+      origin = "cloudredirect";
+    }
+  ];
+}
diff --git a/modules/programs/neovim/keymaps.nix b/modules/programs/neovim/keymaps.nix
index dd2ee30..3ec4f34 100644
--- a/modules/programs/neovim/keymaps.nix
+++ b/modules/programs/neovim/keymaps.nix
@@ -55,11 +55,6 @@
         action = ''"_d'';
         key = "d";
       }
-      {
-        mode = [ "v" ];
-        action = ''"_p'';
-        key = "p";
-      }
       {
         mode = [ "n" ];
         action = "<cmd>Telescope live_grep<CR>";
diff --git a/modules/programs/neovim/lsp.nix b/modules/programs/neovim/lsp.nix
index 1187386..54b60b8 100644
--- a/modules/programs/neovim/lsp.nix
+++ b/modules/programs/neovim/lsp.nix
@@ -5,19 +5,21 @@
       nixd = {
         enable = true;
         config = {
-          nixd = {
-            nixpkgs = {
-              expr = ''import (builtins.getFlake "/home/user/nix-config").inputs.nixpkgs { }'';
-            };
-            formatting = {
-              command = "nixfmt";
-            };
-            options = {
-              nixos = {
-                expr = ''(builtins.getFlake "/home/user/nix-config").nixosConfigurations.desktop.options'';
+          settings = {
+            nixd = {
+              nixpkgs = {
+                expr = ''import (builtins.getFlake "/home/user/nix-config").inputs.nixpkgs { }'';
               };
-              home_manager = {
-                expr = ''(builtins.getFlake "/home/user/nix-config").nixosConfigurations.desktop.options.home-manager.users.type.getSubOptions []'';
+              formatting = {
+                command = [ "nixfmt" ];
+              };
+              options = {
+                nixos = {
+                  expr = ''(builtins.getFlake "/home/user/nix-config").nixosConfigurations.desktop.options'';
+                };
+                home_manager = {
+                  expr = ''(builtins.getFlake "/home/user/nix-config").nixosConfigurations.desktop.options.home-manager.users.type.getSubOptions []'';
+                };
               };
             };
           };
diff --git a/modules/programs/neovim/neovim.nix b/modules/programs/neovim/neovim.nix
index db8f0fa..5aea00e 100644
--- a/modules/programs/neovim/neovim.nix
+++ b/modules/programs/neovim/neovim.nix
@@ -12,7 +12,7 @@
   ];
 
   programs.nixvim = {
-    enable = true;
+    enable = false;
     defaultEditor = true;
 
     clipboard.register = "unnamedplus";
@@ -131,6 +131,7 @@
           };
         };
       };
+      colorizer.enable = true;
     };
   };