From 0f7567d107a12e20013ed65f698346b4c096d628 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Fri, 21 Feb 2025 14:38:22 +0000 Subject: [PATCH] add declarative flatpak support to home-manager --- flake.lock | 165 ++++++++------------------- flake.nix | 3 +- home-manager/home.nix | 27 +---- hosts/gabbielaptop/configuration.nix | 4 +- 4 files changed, 55 insertions(+), 144 deletions(-) diff --git a/flake.lock b/flake.lock index a3a45b5..d634287 100644 --- a/flake.lock +++ b/flake.lock @@ -249,7 +249,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -286,27 +286,6 @@ "type": "github" } }, - "flatpaks": { - "inputs": { - "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", - "systems": "systems" - }, - "locked": { - "lastModified": 1733581530, - "narHash": "sha256-W+orHmF+XpZosrBFAFRs7sS1iVKYveg9SutkzSXMVsI=", - "owner": "GermanBread", - "repo": "declarative-flatpak", - "rev": "b88bd5b65f8e7c35eec0a90cfd6e096b2e7f79c0", - "type": "github" - }, - "original": { - "owner": "GermanBread", - "ref": "stable-v3", - "repo": "declarative-flatpak", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -411,25 +390,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1733572789, - "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -449,7 +409,7 @@ "type": "github" } }, - "home-manager_3": { + "home-manager_2": { "inputs": { "nixpkgs": [ "stylix", @@ -512,7 +472,7 @@ }, "musnix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1735772949, @@ -554,18 +514,34 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1734128415, + "narHash": "sha256-HLwdVNxpuTsLlM3tCkpbQU6yCehdgf3kOS1G2SDlkzY=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "8bdc2540da516006d07b04019eb57ae0781a04b3", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "latest", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -632,69 +608,37 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733412085, - "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", - "owner": "nixos", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-24.11", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", - "owner": "NixOS", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { - "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1736798957, "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", @@ -729,7 +673,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -922,7 +866,7 @@ "plugin-vim-startify": "plugin-vim-startify", "plugin-which-key": "plugin-which-key", "plugin-yanky-nvim": "plugin-yanky-nvim", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1738275588, @@ -3627,11 +3571,11 @@ "inputs": { "aagl": "aagl", "disko": "disko", - "flatpaks": "flatpaks", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "lanzaboote": "lanzaboote", "musnix": "musnix", - "nixpkgs": "nixpkgs_4", + "nix-flatpak": "nix-flatpak", + "nixpkgs": "nixpkgs_2", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable_2", "nur": "nur", @@ -3736,9 +3680,9 @@ "flake-utils": "flake-utils_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_6", - "systems": "systems_4", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_4", + "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux", @@ -3760,16 +3704,16 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -3803,21 +3747,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index ff6efd7..4a50858 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ }; # Declarative flatpak management, documentation states overriding nixpkgs is not supported - flatpaks.url = "github:GermanBread/declarative-flatpak/stable-v3"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; # Nixvim neovim distro for easier nixified configuration nvf = { @@ -144,6 +144,7 @@ ./home-manager/home.nix inputs.nvf.homeManagerModules.default inputs.stylix.homeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine + inputs.nix-flatpak.homeManagerModules.nix-flatpak ]; }; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index 9b15c35..e712654 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -28,29 +28,6 @@ # services.pass-secret-service.enable = true; # for use with protonmail-bridge services.gnome-keyring.enable = true; # used for protonmail-bridge and nextcloud-client - # Cursor configuration that I hope to one day understand, currently has a scaling issue but thats probably my fault - # home.pointerCursor = - # let - # getFrom = url: hash: name: { - # gtk.enable = true; - # x11.enable = true; - # name = name; - # size = 24; - # package = - # pkgs.runCommand "moveUp" {} '' - # mkdir -p $out/share/icons - # ln -s ${pkgs.fetchzip { - # url = url; - # hash = hash; - # }} $out/share/icons/${name} - # ''; - # }; - # in - # getFrom - # "https://github.com/ful1e5/fuchsia-cursor/releases/download/v2.0.0/Fuchsia-Pop.tar.gz" - # "sha256-BvVE9qupMjw7JRqFUj1J0a4ys6kc9fOLBPx2bGaapTk=" - # "Fuchsia-Pop"; - # General use home packages that dont require a separate module home.packages = with pkgs; [ # Add grimblast screenshot tool @@ -66,6 +43,10 @@ signal-desktop nautilus element-desktop + jetbrains.idea-community + ]; + services.flatpak.packages = [ + "io.mrarm.mcpelauncher" ]; home.sessionVariables = { diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix index e29c03a..18e0694 100644 --- a/hosts/gabbielaptop/configuration.nix +++ b/hosts/gabbielaptop/configuration.nix @@ -178,8 +178,8 @@ # Install firefox. programs.firefox.enable = true; - # Enable flatpak for delcarative-flatpak used in home-manager - # services.flatpak.enable = true; + # Enable flatpak for nix-flatpak used in home-manager + services.flatpak.enable = true; # Enable qmk for managing framework laptop keyboards hardware.keyboard.qmk.enable = true;