Slight changes in taste for macnix

This commit is contained in:
Natsu Kagami 2023-11-18 16:07:43 +01:00
parent 066344ec2f
commit a7104c6197
Signed by: nki
GPG key ID: 55A032EB38B49ADB

View file

@ -1,18 +1,7 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
let let
discord = discord = pkgs.armcord.override { nss = pkgs.nss_latest; };
(pkgs.unstable.armcord.override { nss = pkgs.nss_latest; mesa = pkgs.mesa; }).overrideAttrs (attrs: {
postInstall = ''
# Wrap the startup command
makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \
"''${gappsWrapperArgs[@]}" \
--prefix XDG_DATA_DIRS : "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}/" \
--add-flags "--ozone-platform=x11 --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath attrs.buildInputs}" \
--suffix PATH : ${lib.makeBinPath [ pkgs.xdg-utils ]}
'';
});
in in
{ {
imports = [ imports = [
@ -30,7 +19,7 @@ in
home.homeDirectory = "/home/nki"; home.homeDirectory = "/home/nki";
nki.programs.kitty.enable = true; nki.programs.kitty.enable = true;
nki.programs.kitty.fontSize = 18; nki.programs.kitty.fontSize = 16;
programs.fish.shellInit = lib.mkAfter '' programs.fish.shellInit = lib.mkAfter ''
set -eg MESA_GL_VERSION_OVERRIDE set -eg MESA_GL_VERSION_OVERRIDE
set -eg MESA_GLSL_VERSION_OVERRIDE set -eg MESA_GLSL_VERSION_OVERRIDE
@ -64,7 +53,7 @@ in
linux.graphical.wallpaper = ./images/wallpaper-macbook.jpg; linux.graphical.wallpaper = ./images/wallpaper-macbook.jpg;
# Enable sway # Enable sway
programs.my-sway.enable = true; programs.my-sway.enable = true;
programs.my-sway.fontSize = 12.0; programs.my-sway.fontSize = 14.0;
programs.my-sway.enableLaptopBars = true; programs.my-sway.enableLaptopBars = true;
programs.my-sway.enableMpd = false; programs.my-sway.enableMpd = false;
programs.my-sway.discord = "${discord}/bin/armcord"; programs.my-sway.discord = "${discord}/bin/armcord";
@ -72,7 +61,7 @@ in
wayland.windowManager.sway.config.input."type:keyboard".xkb_layout = "jp"; wayland.windowManager.sway.config.input."type:keyboard".xkb_layout = "jp";
wayland.windowManager.sway.config.output."eDP-1" = { wayland.windowManager.sway.config.output."eDP-1" = {
mode = "2560x1600@60Hz"; mode = "2560x1600@60Hz";
scale = "1.5"; scale = "1.25";
subpixel = "vrgb"; subpixel = "vrgb";
}; };
wayland.windowManager.sway.config.input."1452:641:Apple_Internal_Keyboard_/_Trackpad" = { wayland.windowManager.sway.config.input."1452:641:Apple_Internal_Keyboard_/_Trackpad" = {