From 7ce50f42f0626466cc8077b71f26eafb9a7733ee Mon Sep 17 00:00:00 2001 From: William Date: Thu, 5 Sep 2024 16:05:40 -0300 Subject: [PATCH] new nix-flatpak flake --- flake.lock | 17 ++++++ flake.nix | 20 ++----- hosts/desktops/common/packages.nix | 7 +++ hosts/desktops/common/services.nix | 1 - hosts/desktops/io.nix | 87 +++++++++++++++--------------- hosts/desktops/rotterdam.nix | 1 + 6 files changed, 75 insertions(+), 58 deletions(-) diff --git a/flake.lock b/flake.lock index f8245f7..b095401 100644 --- a/flake.lock +++ b/flake.lock @@ -190,6 +190,22 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1711997201, + "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "v0.4.1", + "repo": "nix-flatpak", + "type": "github" + } + }, "nix-index-db": { "inputs": { "nixpkgs": [ @@ -307,6 +323,7 @@ "home-manager": "home-manager_2", "homepage": "homepage", "impermanence": "impermanence", + "nix-flatpak": "nix-flatpak", "nix-index-db": "nix-index-db", "nix-minecraft": "nix-minecraft", "nixos-generators": "nixos-generators", diff --git a/flake.nix b/flake.nix index e6c03e3..560f6b1 100644 --- a/flake.nix +++ b/flake.nix @@ -41,11 +41,13 @@ url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; + + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; }; outputs = inputs@{ self, nixpkgs, home-manager, nixpkgs-stable, deploy-rs , agenix, nixos-generators, homepage, nix-minecraft, impermanence - , nix-index-db, ... }: { + , nix-flatpak, nix-index-db, ... }: { nixosConfigurations = { rotterdam = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -56,6 +58,7 @@ home-manager.nixosModules.default impermanence.nixosModules.impermanence nix-index-db.nixosModules.nix-index + nix-flatpak.nixosModules.nix-flatpak { nixpkgs.overlays = [ agenix.overlays.default self.overlays.custom ]; @@ -72,6 +75,7 @@ home-manager.nixosModules.default impermanence.nixosModules.impermanence nix-index-db.nixosModules.nix-index + nix-flatpak.nixosModules.nix-flatpak { nixpkgs.overlays = [ agenix.overlays.default self.overlays.custom ]; @@ -122,20 +126,6 @@ }; }; - # homeConfigurations = { - # desktop = home-manager.lib.homeManagerConfiguration { - # pkgs = nixpkgs.legacyPackages.x86_64-linux; - # extraSpecialArgs = { inherit inputs; }; - # modules = [ ./users/desktops/user.nix ]; - # }; - - # server = home-manager.lib.homeManagerConfiguration { - # pkgs = nixpkgs.legacyPackages.x86_64-linux; - # extraSpecialArgs = { inherit inputs; }; - # modules = [ ./users/servers/user.nix ]; - # }; - # }; - packages."x86_64-linux" = { chromeos-ectool = nixpkgs.legacyPackages."x86_64-linux".callPackage ./packages/chromeos-ectool.nix { }; diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix index f39b0c8..8e285f8 100644 --- a/hosts/desktops/common/packages.nix +++ b/hosts/desktops/common/packages.nix @@ -61,6 +61,13 @@ in { wezterm ] ++ kdepkgs; + services.flatpak = { + enable = true; + packages = [ "com.github.flxzt.rnote" "com.github.tchx84.Flatseal" ]; + uninstallUnmanaged = true; + update.auto.enable = true; + }; + programs = { adb.enable = true; steam.enable = true; diff --git a/hosts/desktops/common/services.nix b/hosts/desktops/common/services.nix index 17d53f6..1becfeb 100644 --- a/hosts/desktops/common/services.nix +++ b/hosts/desktops/common/services.nix @@ -7,7 +7,6 @@ let in { services = { - flatpak.enable = true; printing = { enable = true; drivers = with pkgs; [ epson-escpr ]; diff --git a/hosts/desktops/io.nix b/hosts/desktops/io.nix index 57b7b91..15f60c5 100644 --- a/hosts/desktops/io.nix +++ b/hosts/desktops/io.nix @@ -49,48 +49,51 @@ in { sessionVariables.ALSA_CONFIG_UCM2 = "${cml-ucm-conf}/share/alsa/ucm2"; }; - services.keyd = { - enable = true; - keyboards.main = { - ids = [ "0001:0001" ]; - settings = { - main = { - meta = "overload(meta, esc)"; - f1 = "back"; - f2 = "forward"; - f3 = "refresh"; - f4 = "M-f11"; - f5 = "M-w"; - f6 = "brightnessdown"; - f7 = "brightnessup"; - f8 = "timeout(mute, 200, micmute)"; - f9 = "play"; - f10 = "timeout(nextsong, 200, previoussong)"; - f13 = "delete"; - "102nd" = "layer(function)"; - }; - shift = { - leftshift = "capslock"; - rightshift = "capslock"; - }; - function = { - escape = "f1"; - f1 = "f2"; - f2 = "f3"; - f3 = "f4"; - f4 = "f5"; - f5 = "f6"; - f6 = "f7"; - f7 = "f8"; - f8 = "f9"; - f9 = "f10"; - f10 = "f11"; - f13 = "f12"; - u = "sysrq"; - k = "home"; - l = "pageup"; - "," = "end"; - "." = "pagedown"; + services = { + flatpak.packages = [ "com.github.scrivanolabs.scrivano" ]; + keyd = { + enable = true; + keyboards.main = { + ids = [ "0001:0001" ]; + settings = { + main = { + meta = "overload(meta, esc)"; + f1 = "back"; + f2 = "forward"; + f3 = "refresh"; + f4 = "M-f11"; + f5 = "M-w"; + f6 = "brightnessdown"; + f7 = "brightnessup"; + f8 = "timeout(mute, 200, micmute)"; + f9 = "play"; + f10 = "timeout(nextsong, 200, previoussong)"; + f13 = "delete"; + "102nd" = "layer(function)"; + }; + shift = { + leftshift = "capslock"; + rightshift = "capslock"; + }; + function = { + escape = "f1"; + f1 = "f2"; + f2 = "f3"; + f3 = "f4"; + f4 = "f5"; + f5 = "f6"; + f6 = "f7"; + f7 = "f8"; + f8 = "f9"; + f9 = "f10"; + f10 = "f11"; + f13 = "f12"; + u = "sysrq"; + k = "home"; + l = "pageup"; + "," = "end"; + "." = "pagedown"; + }; }; }; }; diff --git a/hosts/desktops/rotterdam.nix b/hosts/desktops/rotterdam.nix index 0dc0fe8..d640895 100644 --- a/hosts/desktops/rotterdam.nix +++ b/hosts/desktops/rotterdam.nix @@ -42,6 +42,7 @@ in { services = { hardware.openrgb.enable = true; + flatpak.packages = [ "net.retrodeck.retrodeck" ]; keyd = { enable = true; keyboards.main = {