diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 8ad2f56..2ee2395 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -1,4 +1,3 @@ - name: "Check & Build (with Cachix)" on: push: @@ -8,33 +7,33 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 - - uses: cachix/install-nix-action@v13 - with: - install_url: https://nixos-nix-install-tests.cachix.org/serve/8d8xah1f6ypccpmw9cfsl8ziw1chj4cl/install - install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve' - extra_nix_config: > - experimental-features = nix-command flakes - system-features = nixos-test benchmark big-parallel kvm recursive-nix - extra-platforms = aarch64-linux - keep-going = true - substituters = - https://aciceri-fleet.cachix.org - https://nrdxp.cachix.org - https://nix-community.cachix.org - arm.cachix.org - https://cache.nixos.org - trusted-public-keys = > - aciceri-fleet.cachix.org-1:WiHJIK4UFTdfvWx0lG3mCR4EddyYsRhIuMGSje3/YGI= - nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= - nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= - arm.cachix.org-1:K3XjAeWPgWkFtSS9ge5LJSLw3xgnNqyOaG7MDecmTQ8= - cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= - - uses: cachix/cachix-action@v10 - with: - name: aciceri-fleet - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - run: sed -i 's/#\(.*checks.aarch64.*\)/\1/g' flake.nix # disabling aarch64 outputs - - run: nix -Lv flake check - - run: nix -Lv build ".#nixosConfigurations.pc.config.system.build.toplevel" - - run: nix -Lv develop -c echo OK + - uses: actions/checkout@v2.3.4 + - uses: cachix/install-nix-action@v13 + with: + install_url: https://nixos-nix-install-tests.cachix.org/serve/8d8xah1f6ypccpmw9cfsl8ziw1chj4cl/install + install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve" + extra_nix_config: > + experimental-features = nix-command flakes + system-features = nixos-test benchmark big-parallel kvm recursive-nix + extra-platforms = aarch64-linux + keep-going = true + substituters = + https://aciceri-fleet.cachix.org + https://nrdxp.cachix.org + https://nix-community.cachix.org + arm.cachix.org + https://cache.nixos.org + trusted-public-keys = > + aciceri-fleet.cachix.org-1:WiHJIK4UFTdfvWx0lG3mCR4EddyYsRhIuMGSje3/YGI= + nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= + nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= + arm.cachix.org-1:K3XjAeWPgWkFtSS9ge5LJSLw3xgnNqyOaG7MDecmTQ8= + cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= + - uses: cachix/cachix-action@v10 + with: + name: aciceri-fleet + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + - run: sed 's/#\(.*\)/\1/g' flake.nix # disabling outputs unsupported inside the GitHub action + - run: nix -Lv flake check + - run: nix -Lv build ".#nixosConfigurations.pc.config.system.build.toplevel" + - run: nix -Lv develop -c echo OK diff --git a/flake.nix b/flake.nix index 2c86fdf..f177b97 100644 --- a/flake.nix +++ b/flake.nix @@ -182,9 +182,11 @@ } // { budModules = { devos = import ./bud; }; - # checks.aarch64-linux = { }; # this line will be uncommented by Github Action in order since it can't build aarch64 derivations - } - // { + + # checks.aarch64-linux = { }; # ga-uncomment + # checks.x86_64-darwin = { }; # ga-uncomment + # packages.x86_64-darwin = { }; # ga-uncomment + darwinConfigurations."mbp" = darwin.lib.darwinSystem { system = "x86_64-darwin"; modules = [ home.darwinModules.home-manager ./hosts/mbp ]; diff --git a/pkgs/default.nix b/pkgs/default.nix index 3484178..6ff38fd 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,7 +2,5 @@ final: prev: { # keep sources this first sources = prev.callPackage (import ./_sources/generated.nix) { }; customEmacs = prev.callPackage (import ./emacs) { }; - ungoogled-chromium = import ./ungoogled-chromium { inherit prev; }; - vscodium = import ./vscodium { inherit prev; }; # then, call packages with `final.callPackage` } diff --git a/pkgs/ungoogled-chromium/default.nix b/pkgs/ungoogled-chromium/default.nix deleted file mode 100644 index 2074a0b..0000000 --- a/pkgs/ungoogled-chromium/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ prev, ... }: - -prev.runCommandNoCC "wrap-chromium" -{ buildInputs = with prev.pkgs; [ makeWrapper ]; } - '' - makeWrapper ${prev.pkgs.chromium}/bin/chromium $out/bin/chromium \ - --add-flags "--enable-features=UseOzonePlatform" \ - --add-flags "--ozone-platform=wayland" - ln -sf ${prev.pkgs.chromium}/share $out/share - '' diff --git a/pkgs/vscodium/default.nix b/pkgs/vscodium/default.nix deleted file mode 100644 index d73377c..0000000 --- a/pkgs/vscodium/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ prev, ... }: - -prev.runCommandNoCC "codium" -{ buildInputs = with prev.pkgs; [ makeWrapper ]; } - '' - makeWrapper ${prev.pkgs.vscodium}/bin/codium $out/bin/codium \ - --add-flags "--enable-features=UseOzonePlatform" \ - --add-flags "--ozone-platform=wayland" - ln -sf ${prev.pkgs.vscodium}/share $out/share - '' diff --git a/users/profiles/emacs/default.nix b/users/profiles/emacs/default.nix index e1bfd29..63532ff 100644 --- a/users/profiles/emacs/default.nix +++ b/users/profiles/emacs/default.nix @@ -12,7 +12,6 @@ }; home.packages = with pkgs; [ - python-language-server python fd ag @@ -29,5 +28,5 @@ mimeType = "x-scheme-handler/org-protocol"; } ) - ]; + ] ++ (if pkgs.system == "x86_64-linux" then [ python-language-server ] else [ ]); }