Make m1-linux run again!

This commit is contained in:
Natsu Kagami 2023-02-25 21:43:29 +01:00
parent 7684299ddc
commit b8e1b46b5c
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51
8 changed files with 100 additions and 57 deletions

View file

@ -1,16 +1,5 @@
{ config, pkgs, lib, ... }:
let
fd =
if pkgs.stdenv.isAarch64 && pkgs.stdenv.isLinux then
pkgs.fd.overrideAttrs
(attrs:
{
preBuild = ''
export JEMALLOC_SYS_WITH_LG_PAGE=16
'';
}) else pkgs.fd;
in
{
imports = [
./kakoune/kak.nix

View file

@ -35,8 +35,7 @@ let
src = pkgs.sources.kak-lsp;
buildInputs = (with pkgs;
lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ])
) ++ (with pkgs; [ libiconv ]
);
) ++ (with pkgs; [ libiconv libgcc ]);
};
in

View file

@ -56,7 +56,7 @@ in
programs.my-sway.discord = "${discord}/bin/discord";
# Keyboard options
wayland.windowManager.sway.config.input."type:keyboard".xkb_layout = "jp";
wayland.windowManager.sway.config.output."Unknown-1" = {
wayland.windowManager.sway.config.output."eDP-1" = {
mode = "2560x1600@60Hz";
scale = "1";
subpixel = "vrgb";

View file

@ -139,8 +139,11 @@ in
{ command = "${cfg.browser}"; }
] ++ (if cfg.discord != null then [
{ command = "${cfg.discord}"; }
{ command = "${pkgs.premid}/bin/premid"; }
] else [ ]);
] ++ lib.lists.optional
(!pkgs.stdenv.isAarch64)
(
{ command = "${pkgs.premid}/bin/premid"; }
) else [ ]);
### Keybindings
#
@ -642,3 +645,4 @@ in
font-awesome
]);
}