From 7bd9cb16b84692a16c312b120673f50825eb93c8 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Sat, 8 Apr 2023 07:54:26 +0200
Subject: [PATCH] Small tweaks for macbook-nixos

---
 home/macbook-nixos.nix                    | 10 ++++------
 home/modules/linux/graphical/default.nix  |  4 +++-
 home/modules/programs/my-sway/default.nix |  1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/home/macbook-nixos.nix b/home/macbook-nixos.nix
index 6561331..f3d8f2e 100644
--- a/home/macbook-nixos.nix
+++ b/home/macbook-nixos.nix
@@ -1,9 +1,7 @@
 { pkgs, config, lib, ... }:
 
 let
-  discord = pkgs.writeShellScriptBin "discord" ''
-    ${pkgs.armcord}/bin/armcord --force-device-scale-factor=1.5 ts-out/main.js "$@"
-  '';
+  discord = pkgs.armcord;
 in
 {
   imports = [
@@ -21,7 +19,7 @@ in
   home.homeDirectory = "/home/nki";
 
   nki.programs.kitty.enable = true;
-  nki.programs.kitty.fontSize = 24;
+  nki.programs.kitty.fontSize = 18;
   programs.fish.shellInit = lib.mkAfter ''
     set -eg MESA_GL_VERSION_OVERRIDE
     set -eg MESA_GLSL_VERSION_OVERRIDE
@@ -52,7 +50,7 @@ in
   linux.graphical.wallpaper = ./images/wallpaper-macbook.jpg;
   # Enable sway
   programs.my-sway.enable = true;
-  programs.my-sway.fontSize = 20.0;
+  programs.my-sway.fontSize = 12.0;
   programs.my-sway.enableLaptopBars = true;
   programs.my-sway.enableMpd = false;
   programs.my-sway.discord = "${discord}/bin/discord";
@@ -60,7 +58,7 @@ in
   wayland.windowManager.sway.config.input."type:keyboard".xkb_layout = "jp";
   wayland.windowManager.sway.config.output."eDP-1" = {
     mode = "2560x1600@60Hz";
-    scale = "1";
+    scale = "1.5";
     subpixel = "vrgb";
   };
   wayland.windowManager.sway.config.input."1452:641:Apple_Internal_Keyboard_/_Trackpad" = {
diff --git a/home/modules/linux/graphical/default.nix b/home/modules/linux/graphical/default.nix
index d85b14f..2ea7582 100644
--- a/home/modules/linux/graphical/default.nix
+++ b/home/modules/linux/graphical/default.nix
@@ -3,6 +3,8 @@ with lib;
 let
   cfg = config.linux.graphical;
 
+  vscode = with pkgs; if stdenv.isAarch64 then unstable.vscode else unstable.vscode-fhs;
+
   alwaysStartup = with pkgs; [ ];
 in
 {
@@ -32,7 +34,7 @@ in
       gnome.cheese # Webcam check
       evince # PDF reader
       gparted
-      pkgs.unstable.vscode-fhs
+      vscode
       feh # For images?
       deluge # Torrent client
       pavucontrol # PulseAudio control panel
diff --git a/home/modules/programs/my-sway/default.nix b/home/modules/programs/my-sway/default.nix
index 7ca0c5d..d0d5743 100644
--- a/home/modules/programs/my-sway/default.nix
+++ b/home/modules/programs/my-sway/default.nix
@@ -382,7 +382,6 @@ in
           "cpu"
           "memory"
           "temperature"
-          "backlight"
         ] ++ (
           if cfg.enableLaptopBars
           then [ "battery" "battery#bat2" ]