nki/nix-home
1
0
Fork 0
Code Issues Pull requests 1 Packages Projects Releases Wiki Activity

Small tweaks for macbook-nixos

Browse source
This commit is contained in:
Natsu Kagami 2023-04-08 07:54:26 +02:00
parent f21f4ed2d1
commit 7bd9cb16b8
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
home/macbook-nixos.nix
View file

@ -1,9 +1,7 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
let let
discord = pkgs.writeShellScriptBin "discord" '' discord = pkgs.armcord;
${pkgs.armcord}/bin/armcord --force-device-scale-factor=1.5 ts-out/main.js "$@"
'';
in in
{ {
imports = [ imports = [
@ -21,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 = 24; nki.programs.kitty.fontSize = 18;
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
@ -52,7 +50,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 = 20.0; programs.my-sway.fontSize = 12.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/discord"; 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.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"; scale = "1.5";
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" = {

4
home/modules/linux/graphical/default.nix
View file

@ -3,6 +3,8 @@ with lib;
let let
cfg = config.linux.graphical; cfg = config.linux.graphical;
vscode = with pkgs; if stdenv.isAarch64 then unstable.vscode else unstable.vscode-fhs;
alwaysStartup = with pkgs; [ ]; alwaysStartup = with pkgs; [ ];
in in
{ {
@ -32,7 +34,7 @@ in
gnome.cheese # Webcam check gnome.cheese # Webcam check
evince # PDF reader evince # PDF reader
gparted gparted
pkgs.unstable.vscode-fhs vscode
feh # For images? feh # For images?
deluge # Torrent client deluge # Torrent client
pavucontrol # PulseAudio control panel pavucontrol # PulseAudio control panel

1
home/modules/programs/my-sway/default.nix
View file

@ -382,7 +382,6 @@ in
"cpu" "cpu"
"memory" "memory"
"temperature" "temperature"
"backlight"
] ++ ( ] ++ (
if cfg.enableLaptopBars if cfg.enableLaptopBars
then [ "battery" "battery#bat2" ] then [ "battery" "battery#bat2" ]