From 9fe34a4377abc3fc635dd6faf040905e9e6fcfb6 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Wed, 14 Feb 2024 04:36:41 +0800 Subject: [PATCH] flake: drop nixpak --- flake.lock | 78 ------------------------- flake.nix | 17 ------ home/applications/firefox/_nixpak.nix | 52 +++++++++++++++++ home/applications/firefox/default.nix | 52 +---------------- home/applications/librewolf/_nixpak.nix | 51 ++++++++++++++++ home/applications/librewolf/default.nix | 53 +---------------- 6 files changed, 105 insertions(+), 198 deletions(-) create mode 100644 home/applications/firefox/_nixpak.nix create mode 100644 home/applications/librewolf/_nixpak.nix diff --git a/flake.lock b/flake.lock index 0272a2b..b602299 100755 --- a/flake.lock +++ b/flake.lock @@ -138,29 +138,6 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1704029560, - "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -292,58 +269,6 @@ "type": "github" } }, - "nixpak": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "hercules-ci-effects": [ - "hercules-ci-effects" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707358904, - "narHash": "sha256-WYP9+8nHYWmBh3tsQhos7GJ+SozP9/jv0dZsQLYlwo0=", - "owner": "nixpak", - "repo": "nixpak", - "rev": "903020fdc3e77e896404a2888f4b896638400854", - "type": "github" - }, - "original": { - "owner": "nixpak", - "repo": "nixpak", - "type": "github" - } - }, - "nixpak-pkgs": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "hercules-ci-effects": [ - "hercules-ci-effects" - ], - "nixpak": [ - "nixpak" - ] - }, - "locked": { - "lastModified": 1707374866, - "narHash": "sha256-aivOcd9Qw1HeU+Fs/3EF3jmFSOAcl86DEfnC1zd+lsQ=", - "owner": "nixpak", - "repo": "pkgs", - "rev": "b45f46c1cd7f151c71b61294df7394a7deb3698b", - "type": "github" - }, - "original": { - "owner": "nixpak", - "repo": "pkgs", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1707546158, @@ -443,15 +368,12 @@ "flake-parts": "flake-parts", "flake-utils": "flake-utils", "gitignore": "gitignore", - "hercules-ci-effects": "hercules-ci-effects", "home-manager": "home-manager", "impermanence": "impermanence", "lanzaboote": "lanzaboote", "nix-darwin": "nix-darwin", "nix-gaming": "nix-gaming", "nixos-hardware": "nixos-hardware", - "nixpak": "nixpak", - "nixpak-pkgs": "nixpak-pkgs", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "nvfetcher": "nvfetcher", diff --git a/flake.nix b/flake.nix index e31f6a9..9b14666 100755 --- a/flake.nix +++ b/flake.nix @@ -50,18 +50,6 @@ nixos-hardware = { url = "github:NixOS/nixos-hardware"; }; - nixpak = { - url = "github:nixpak/nixpak"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; - inputs.hercules-ci-effects.follows = "hercules-ci-effects"; - }; - nixpak-pkgs = { - url = "github:nixpak/pkgs"; - inputs.nixpak.follows = "nixpak"; - inputs.flake-parts.follows = "flake-parts"; - inputs.hercules-ci-effects.follows = "hercules-ci-effects"; - }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -91,11 +79,6 @@ url = "github:hercules-ci/gitignore.nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - hercules-ci-effects = { - url = "github:hercules-ci/hercules-ci-effects"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; - }; nvfetcher = { url = "github:berberman/nvfetcher"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/applications/firefox/_nixpak.nix b/home/applications/firefox/_nixpak.nix new file mode 100644 index 0000000..3c20ccb --- /dev/null +++ b/home/applications/firefox/_nixpak.nix @@ -0,0 +1,52 @@ +{ + inputs, + pkgs, + ... +}: let + mkNixPak = inputs.nixpak.lib.nixpak { + inherit (pkgs) lib; + inherit pkgs; + }; + + firefox = mkNixPak { + config = { + config, + sloth, + ... + }: { + app.package = pkgs.firefox; + flatpak.appId = "org.mozilla.firefox"; + + imports = [ + (inputs.nixpak-pkgs + "/pkgs/modules/gui-base.nix") + (inputs.nixpak-pkgs + "/pkgs/modules/network.nix") + ]; + + # Specified in https://github.com/schizofox/schizofox/blob/main/modules/hm/default.nix + # I really don't have any idea what am I doing, it just works™ + dbus.policies = { + "org.mozilla.firefox.*" = "own"; + #"org.mozilla.firefox_beta.*" = "own"; + }; + + bubblewrap = let + envSuffix = envKey: sloth.concat' (sloth.env envKey); + in { + bind.rw = [ + "/tmp/.X11-unix" + (sloth.envOr "XAUTHORITY" "/no-xauth") + (envSuffix "XDG_RUNTIME_DIR" "/dconf") + (sloth.concat' sloth.homeDir "/.mozilla") + (sloth.concat' sloth.homeDir "/Downloads") + ]; + bind.ro = [ + "/etc/localtime" + "/sys/bus/pci" + + ["${config.app.package}/lib/firefox" "/app/etc/firefox"] + (sloth.concat' sloth.xdgConfigHome "/dconf") + ]; + }; + }; + }; +in [firefox] diff --git a/home/applications/firefox/default.nix b/home/applications/firefox/default.nix index 157af1e..9516731 100644 --- a/home/applications/firefox/default.nix +++ b/home/applications/firefox/default.nix @@ -1,56 +1,6 @@ -{pkgs, ...}: -#let -#mkNixPak = inputs.nixpak.lib.nixpak { -# inherit (pkgs) lib; -# inherit pkgs; -#}; -# -#firefox = mkNixPak { -# config = { -# config, -# sloth, -# ... -# }: { -# app.package = pkgs.firefox; -# flatpak.appId = "org.mozilla.firefox"; -# -# imports = [ -# (inputs.nixpak-pkgs + "/pkgs/modules/gui-base.nix") -# (inputs.nixpak-pkgs + "/pkgs/modules/network.nix") -# ]; -# -# # Specified in https://github.com/schizofox/schizofox/blob/main/modules/hm/default.nix -# # I really don't have any idea what am I doing, it just works™ -# dbus.policies = { -# "org.mozilla.firefox.*" = "own"; -# #"org.mozilla.firefox_beta.*" = "own"; -# }; -# -# bubblewrap = let -# envSuffix = envKey: sloth.concat' (sloth.env envKey); -# in { -# bind.rw = [ -# "/tmp/.X11-unix" -# (sloth.envOr "XAUTHORITY" "/no-xauth") -# (envSuffix "XDG_RUNTIME_DIR" "/dconf") -# (sloth.concat' sloth.homeDir "/.mozilla") -# (sloth.concat' sloth.homeDir "/Downloads") -# ]; -# bind.ro = [ -# "/etc/localtime" -# "/sys/bus/pci" -# -# ["${config.app.package}/lib/firefox" "/app/etc/firefox"] -# (sloth.concat' sloth.xdgConfigHome "/dconf") -# ]; -# }; -# }; -#}; -#in -{ +{pkgs, ...}: { programs.firefox = { enable = true; - #package = firefox.config.env; # it didnt work profiles."default" = { extraConfig = '' ${builtins.readFile (pkgs.fetchurl { diff --git a/home/applications/librewolf/_nixpak.nix b/home/applications/librewolf/_nixpak.nix new file mode 100644 index 0000000..b3696ab --- /dev/null +++ b/home/applications/librewolf/_nixpak.nix @@ -0,0 +1,51 @@ +{ + inputs, + pkgs, + ... +}: let + mkNixPak = inputs.nixpak.lib.nixpak { + inherit (pkgs) lib; + inherit pkgs; + }; + + librewolf = mkNixPak { + config = { + config, + sloth, + ... + }: { + app.package = pkgs.librewolf; + flatpak.appId = "io.gitlab.librewolf-community"; + + imports = [ + (inputs.nixpak-pkgs + "/pkgs/modules/gui-base.nix") + (inputs.nixpak-pkgs + "/pkgs/modules/network.nix") + ]; + + # Specified in https://github.com/schizofox/schizofox/blob/main/modules/hm/default.nix + # I really don't have any idea what am I doing, it just works™ + dbus.policies = { + "io.gitlab.librewolf.*" = "own"; + }; + + bubblewrap = let + envSuffix = envKey: sloth.concat' (sloth.env envKey); + in { + bind.rw = [ + "/tmp/.X11-unix" + (sloth.envOr "XAUTHORITY" "/no-xauth") + (envSuffix "XDG_RUNTIME_DIR" "/dconf") + (sloth.concat' sloth.homeDir "/.librewolf") + (sloth.concat' sloth.homeDir "/Downloads") + ]; + bind.ro = [ + "/etc/localtime" + "/sys/bus/pci" + + ["${config.app.package}/lib/librewolf" "/app/etc/librewolf"] + (sloth.concat' sloth.xdgConfigHome "/dconf") + ]; + }; + }; + }; +in [librewolf] diff --git a/home/applications/librewolf/default.nix b/home/applications/librewolf/default.nix index 3913b22..213f197 100644 --- a/home/applications/librewolf/default.nix +++ b/home/applications/librewolf/default.nix @@ -1,57 +1,6 @@ -{ - inputs, - pkgs, - ... -}: let - mkNixPak = inputs.nixpak.lib.nixpak { - inherit (pkgs) lib; - inherit pkgs; - }; - - librewolf = mkNixPak { - config = { - config, - sloth, - ... - }: { - app.package = pkgs.librewolf; - flatpak.appId = "io.gitlab.librewolf-community"; - - imports = [ - (inputs.nixpak-pkgs + "/pkgs/modules/gui-base.nix") - (inputs.nixpak-pkgs + "/pkgs/modules/network.nix") - ]; - - # Specified in https://github.com/schizofox/schizofox/blob/main/modules/hm/default.nix - # I really don't have any idea what am I doing, it just works™ - dbus.policies = { - "io.gitlab.librewolf.*" = "own"; - }; - - bubblewrap = let - envSuffix = envKey: sloth.concat' (sloth.env envKey); - in { - bind.rw = [ - "/tmp/.X11-unix" - (sloth.envOr "XAUTHORITY" "/no-xauth") - (envSuffix "XDG_RUNTIME_DIR" "/dconf") - (sloth.concat' sloth.homeDir "/.librewolf") - (sloth.concat' sloth.homeDir "/Downloads") - ]; - bind.ro = [ - "/etc/localtime" - "/sys/bus/pci" - - ["${config.app.package}/lib/librewolf" "/app/etc/librewolf"] - (sloth.concat' sloth.xdgConfigHome "/dconf") - ]; - }; - }; - }; -in { +_: { programs.librewolf = { enable = true; - package = librewolf.config.env; settings = { # https://codeberg.org/librewolf/settings/src/branch/master/librewolf.cfg # https://github.com/yokoffing/Betterfox/blob/main/librewolf.overrides.cfg