Remove macbook from repo
This commit is contained in:
parent
38c7afa96f
commit
509b44a31b
17 changed files with 3 additions and 789 deletions
|
@ -1,78 +0,0 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./common.nix ];
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
# Home Manager needs a bit of information about you and the
|
||||
# paths it should manage.
|
||||
home.username = "nki";
|
||||
home.homeDirectory = "/Users/nki";
|
||||
|
||||
# Additional packages to be used only on this MacBook.
|
||||
home.packages = with pkgs; [
|
||||
anki-bin
|
||||
];
|
||||
|
||||
# Additional settings for programs
|
||||
programs.fish.shellAliases = {
|
||||
brew64 = "arch -x86_64 /usr/local/bin/brew";
|
||||
};
|
||||
nki.programs.kitty.enable = true;
|
||||
nki.programs.kitty.package = pkgs.hello; # We install kitty for ourselves
|
||||
nki.programs.kitty.background = ./images/chise-bg.png;
|
||||
|
||||
home.sessionPath = [
|
||||
# Personal .bin
|
||||
"$HOME/.bin"
|
||||
"$HOME/.local/bin"
|
||||
|
||||
# Rust
|
||||
"$HOME/.cargo/bin"
|
||||
# Haskell
|
||||
"$HOME/.cabal/bin"
|
||||
"$HOME/.ghcup/bin"
|
||||
# Go
|
||||
"$HOME/go/bin"
|
||||
# Node.js
|
||||
"$HOME/.local/opt/node/bin"
|
||||
# Ruby
|
||||
"$HOME/.gem/bin"
|
||||
"$HOME/.gem/ruby/2.7.0/bin"
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
VISUAL = "$EDITOR";
|
||||
|
||||
# Other C++ stuff
|
||||
LIBRARY_PATH = lib.concatStringsSep ":" [
|
||||
"$LIBRARY_PATH"
|
||||
"$HOME/.local/share/lib"
|
||||
];
|
||||
CPATH = lib.concatStringsSep ":" [
|
||||
"$CPATH"
|
||||
"$HOME/.local/share/include"
|
||||
];
|
||||
|
||||
# Ruby
|
||||
GEM_HOME = "$HOME/.gem";
|
||||
|
||||
# .NET
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT = "true";
|
||||
|
||||
# Override home-manager package path to first
|
||||
PATH = "/etc/profiles/per-user/${config.home.username}/bin:$PATH";
|
||||
};
|
||||
|
||||
# This value determines the Home Manager release that your
|
||||
# configuration is compatible with. This helps avoid breakage
|
||||
# when a new Home Manager release introduces backwards
|
||||
# incompatible changes.
|
||||
#
|
||||
# You can update Home Manager without changing this value. See
|
||||
# the Home Manager release notes for a list of state version
|
||||
# changes in each release.
|
||||
home.stateVersion = "21.11";
|
||||
}
|
|
@ -1,132 +0,0 @@
|
|||
{ pkgs, config, lib, ... }:
|
||||
|
||||
let
|
||||
discord = pkgs.armcord.override { nss = pkgs.nss_latest; };
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
# Common configuration
|
||||
./common.nix
|
||||
# We use our own firefox
|
||||
# ./firefox.nix
|
||||
# osu!
|
||||
# ./osu.nix
|
||||
];
|
||||
|
||||
# Home Manager needs a bit of information about you and the
|
||||
# paths it should manage.
|
||||
home.username = "nki";
|
||||
home.homeDirectory = "/home/nki";
|
||||
|
||||
nki.programs.kitty.enable = true;
|
||||
nki.programs.kitty.fontSize = 16;
|
||||
programs.fish.shellInit = lib.mkAfter ''
|
||||
set -eg MESA_GL_VERSION_OVERRIDE
|
||||
set -eg MESA_GLSL_VERSION_OVERRIDE
|
||||
|
||||
# export GNOME_KEYRING_CONTROL=/run/user/1001/keyring
|
||||
# export SSH_AUTH_SOCK=/run/user/1001/keyring/ssh
|
||||
'';
|
||||
|
||||
# More packages
|
||||
home.packages = (with pkgs; [
|
||||
# CLI stuff
|
||||
python3
|
||||
zip
|
||||
# TeX
|
||||
texlive.combined.scheme-full
|
||||
mate.mate-terminal
|
||||
|
||||
firefox-wayland
|
||||
|
||||
discord
|
||||
|
||||
typora
|
||||
]);
|
||||
|
||||
# Graphical set up
|
||||
linux.graphical.type = "wayland";
|
||||
linux.graphical.wallpaper = ./images/wallpaper-macbook.jpg;
|
||||
# Enable sway
|
||||
programs.my-sway.enable = true;
|
||||
programs.my-sway.fontSize = 14.0;
|
||||
programs.my-sway.enableLaptopBars = true;
|
||||
programs.my-sway.enableMpd = false;
|
||||
programs.my-sway.discord = "${discord}/bin/armcord";
|
||||
# Keyboard options
|
||||
wayland.windowManager.sway.config.input."type:keyboard".xkb_layout = "jp";
|
||||
wayland.windowManager.sway.config.output."eDP-1" = {
|
||||
mode = "2560x1600@60Hz";
|
||||
scale = "1.25";
|
||||
subpixel = "vrgb";
|
||||
};
|
||||
wayland.windowManager.sway.config.input."1452:641:Apple_Internal_Keyboard_/_Trackpad" = {
|
||||
# Keyboard stuff
|
||||
xkb_layout = "jp";
|
||||
repeat_delay = "300";
|
||||
repeat_rate = "15";
|
||||
# Trackpad stuff
|
||||
accel_profile = "adaptive";
|
||||
drag = "enabled";
|
||||
dwt = "enabled";
|
||||
middle_emulation = "enabled";
|
||||
natural_scroll = "enabled";
|
||||
scroll_factor = "2.5";
|
||||
pointer_accel = "0.5";
|
||||
tap = "disabled";
|
||||
};
|
||||
|
||||
# Kitty
|
||||
# nki.programs.kitty = {
|
||||
# enable = true;
|
||||
# fontSize = 22;
|
||||
# enableTabs = false;
|
||||
# };
|
||||
|
||||
# Yellow light!
|
||||
services.wlsunset = {
|
||||
enable = true;
|
||||
# # Waterloo
|
||||
# latitude = "43.3";
|
||||
# longitude = "-80.3";
|
||||
|
||||
# Lausanne
|
||||
latitude = "46.31";
|
||||
longitude = "6.38";
|
||||
};
|
||||
|
||||
home.file.".gnupg/gpg-agent.conf" = {
|
||||
text = ''
|
||||
pinentry-program ${pkgs.pinentry-gnome3}/bin/pinentry-gnome3
|
||||
'';
|
||||
onChange = ''
|
||||
echo "Reloading gpg-agent"
|
||||
echo RELOADAGENT | gpg-connect-agent
|
||||
'';
|
||||
};
|
||||
|
||||
# Autostart
|
||||
xdg.configFile."autostart/input-remapper-autoload.desktop".source =
|
||||
"${pkgs.input-remapper}/share/applications/input-remapper-autoload.desktop";
|
||||
|
||||
# Multiple screen setup
|
||||
# services.kanshi = {
|
||||
# enable = true;
|
||||
# profiles.undocked.outputs = [{ criteria = "LVDS-1"; }];
|
||||
# profiles.docked-hdmi.outputs = [
|
||||
# { criteria = "LVDS-1"; status = "disable"; }
|
||||
# { criteria = "HDMI-A-1"; }
|
||||
# ];
|
||||
# };
|
||||
|
||||
# This value determines the Home Manager release that your
|
||||
# configuration is compatible with. This helps avoid breakage
|
||||
# when a new Home Manager release introduces backwards
|
||||
# incompatible changes.
|
||||
#
|
||||
# You can update Home Manager without changing this value. See
|
||||
# the Home Manager release notes for a list of state version
|
||||
# changes in each release.
|
||||
home.stateVersion = "21.05";
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
{ pkgs, config, lib, ... }:
|
||||
let
|
||||
cfg = config.nki.programs.kitty;
|
||||
cmd = "cmd";
|
||||
in
|
||||
with lib; {
|
||||
programs.kitty = mkIf (cfg.enable && pkgs.stdenv.isDarwin) {
|
||||
|
||||
# Darwin-specific setup
|
||||
darwinLaunchOptions = [
|
||||
"--single-instance"
|
||||
"--start-as=fullscreen"
|
||||
];
|
||||
|
||||
# Tabs and layouts keybindings
|
||||
keybindings = {
|
||||
# Backslash
|
||||
"0x5d" = "send_text all \\u005c";
|
||||
};
|
||||
|
||||
settings = {
|
||||
# MacOS specific
|
||||
macos_option_as_alt = "left";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,10 @@
|
|||
|
||||
let
|
||||
cfg = config.nki.programs.kitty;
|
||||
cmd = if pkgs.stdenv.isDarwin then "cmd" else "ctrl";
|
||||
in
|
||||
with lib;
|
||||
{
|
||||
imports = [ ./darwin.nix ./linux.nix ./tabs.nix ];
|
||||
imports = [ ./linux.nix ./tabs.nix ];
|
||||
|
||||
options.nki.programs.kitty = {
|
||||
enable = mkEnableOption "Enable kitty";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue