Merge branch 'master' of ssh://ssh.nx2.site:20022/nx2/dotfiles
This commit is contained in:
7
system-modules/adb.nix
Normal file
7
system-modules/adb.nix
Normal file
@@ -0,0 +1,7 @@
|
||||
{ host, lib, ... }:
|
||||
lib.mkIf (host != "NxACE")
|
||||
{
|
||||
programs.adb = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
@@ -1,28 +1,87 @@
|
||||
{ pkgs-unstable, ... }:
|
||||
{ pkgs, pkgs-unstable, ... }:
|
||||
{
|
||||
# i18n.inputMethod = {
|
||||
# type = "fcitx5";
|
||||
# enable = true;
|
||||
# fcitx5.addons = with pkgs; [
|
||||
# fcitx5-gtk # alternatively, kdePackages.fcitx5-qt
|
||||
# fcitx5-chinese-addons # table input method support
|
||||
# fcitx5-nord # a color theme
|
||||
# ];
|
||||
# };
|
||||
i18n.inputMethod = {
|
||||
enabled = "fcitx5";
|
||||
# type = "fcitx5"; # for later than 24.05
|
||||
# enable = true;
|
||||
fcitx5 = {
|
||||
waylandFrontend = true;
|
||||
addons = with pkgs-unstable; [
|
||||
rime-data
|
||||
fcitx5-rime
|
||||
fcitx5-gtk
|
||||
fcitx5-chinese-addons
|
||||
fcitx5-catppuccin
|
||||
];
|
||||
};
|
||||
};
|
||||
services.xserver.desktopManager.runXdgAutostartIfNone = true;
|
||||
environment.variables = {
|
||||
GLFW_IM_MODULE = "fcitx";
|
||||
GTK_IM_MODULE = "fcitx";
|
||||
INPUT_METHOD = "fcitx";
|
||||
XMODIFIERS = "@im=fcitx";
|
||||
IMSETTINGS_MODULE = "fcitx";
|
||||
QT_IM_MODULE = "fcitx";
|
||||
SDL_IM_MODULE = "fcitx";
|
||||
fcitx5.waylandFrontend = true;
|
||||
fcitx5.addons = with pkgs; [
|
||||
fcitx5-gtk # alternatively, kdePackages.fcitx5-qt
|
||||
fcitx5-chinese-addons # table input method support
|
||||
fcitx5-nord # a color theme
|
||||
];
|
||||
};
|
||||
# i18n.inputMethod = {
|
||||
# enabled = "fcitx5";
|
||||
# ignoreUserConfig = true;
|
||||
# waylandFrontend = true;
|
||||
# fcitx5 = {
|
||||
# addons = with pkgs-unstable; [
|
||||
# rime-data
|
||||
# fcitx5-rime
|
||||
|
||||
# # Chinese
|
||||
# fcitx5-chinese-addons
|
||||
# fcitx5-table-extra
|
||||
# fcitx5-pinyin-moegirl
|
||||
# fcitx5-pinyin-zhwiki
|
||||
|
||||
# # Japanese
|
||||
# # fcitx5-mozc
|
||||
# ];
|
||||
# settings = {
|
||||
# globalOptions = {
|
||||
# Hotkey = {
|
||||
# # Enumerate when press trigger key repeatedly
|
||||
# EnumerateWithTriggerKeys = "True";
|
||||
# # Skip first input method while enumerating
|
||||
# EnumerateSkipFirst = "False";
|
||||
# };
|
||||
# "Hotkey/EnumerateForwardKeys" = { "0" = "Control+space"; };
|
||||
# "Hotkey/EnumerateBackwardKeys" = { "0" = "Control+Shift+space"; };
|
||||
# "Hotkey/PrevPage" = { "0" = "Up"; };
|
||||
# "Hotkey/NextPage" = { "0" = "Down"; };
|
||||
# "Hotkey/PrevCandidate" = { "0" = "Shift+Tab"; };
|
||||
# "Hotkey/NextCandidate" = { "0" = "Tab"; };
|
||||
# Behavior = {
|
||||
# ActiveByDefault = "False"; # Active By Default
|
||||
# ShareInputState = "No"; # Share Input State
|
||||
# PreeditEnabledByDefault = "True"; # Show preedit in application
|
||||
# ShowInputMethodInformation = "True"; # Show Input Method Information when switch input method
|
||||
# showInputMethodInformationWhenFocusIn = "False"; # Show Input Method Information when changing focus
|
||||
# CompactInputMethodInformation = "True"; # Show compact input method information
|
||||
# ShowFirstInputMethodInformation = "True"; # Show first input method information
|
||||
# DefaultPageSize = "5"; # Default page size
|
||||
# OverrideXkbOption = "False"; # Override Xkb Option
|
||||
# PreloadInputMethod = "True"; # Preload input method to be used by default
|
||||
# };
|
||||
# };
|
||||
# inputMethod = {
|
||||
# "Groups/0" = {
|
||||
# "Name" = "Default";
|
||||
# "Default Layout" = "us";
|
||||
# "DefaultIM" = "mozc";
|
||||
# };
|
||||
# "Groups/0/Items/0" = {
|
||||
# "Name" = "keyboard-us";
|
||||
# "Layout" = null;
|
||||
# };
|
||||
# "Groups/0/Items/1" = {
|
||||
# "Name" = "mozc";
|
||||
# "Layout" = null;
|
||||
# };
|
||||
# "GroupOrder" = {
|
||||
# "0" = "Default";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
}
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
{ config, pkgs, ...}:
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
jmtpfs
|
||||
];
|
||||
}
|
||||
environment = {
|
||||
systemPackages = with pkgs; [
|
||||
jmtpfs
|
||||
simple-mtpfs
|
||||
android-file-transfer
|
||||
];
|
||||
};
|
||||
programs.fuse.userAllowOther = true;
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
fileSystems = if host != "NxACE" then {
|
||||
"/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; };
|
||||
"/boot" = { device = "/dev/disk/by-label/EFI"; fsType = "vfat"; };
|
||||
"/home/${user}/shared" = { device = "/dev/disk/by-label/shared"; fsType = "ntfs"; options = [ "uid:1000" "gid:100" ]; };
|
||||
"/home/${user}/shared" = { device = "/dev/disk/by-label/shared"; fsType = "ntfs"; options = [ "uid=1000" "gid=100" ]; };
|
||||
} else {
|
||||
"/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; };
|
||||
"/boot" = { device = "/dev/disk/by-label/EFI"; fsType = "vfat"; };
|
||||
|
||||
@@ -1,17 +1,23 @@
|
||||
|
||||
{ config, pkgs, host, ... }:
|
||||
let
|
||||
in
|
||||
{ pkgs, lib, host, secrets, ... }:
|
||||
{
|
||||
networking.nameservers = [
|
||||
"1.1.1.1"
|
||||
"8.8.8.8"
|
||||
];
|
||||
|
||||
networking.hostName = host;
|
||||
# sops.secrets = {
|
||||
# "wireless-networking.env" = {};
|
||||
# };
|
||||
|
||||
networking.networkmanager = {
|
||||
enable = true;
|
||||
networking = {
|
||||
nameservers = [
|
||||
"1.1.1.1"
|
||||
"8.8.8.8"
|
||||
];
|
||||
hostName = host;
|
||||
networkmanager = {
|
||||
enable = true;
|
||||
};
|
||||
enableIPv6 = false;
|
||||
firewall.allowedTCPPorts = [
|
||||
80
|
||||
443
|
||||
];
|
||||
};
|
||||
|
||||
networking.enableIPv6 = true;
|
||||
|
||||
8
system-modules/nixd.nix
Normal file
8
system-modules/nixd.nix
Normal file
@@ -0,0 +1,8 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
nix.nixPath = [
|
||||
"nixpkgs=${inputs.nixpkgs}"
|
||||
"nixpkgs-unstable=${inputs.nixpkgs-unstable}"
|
||||
"nixpkgs-latest=${inputs.nixpkgs-latest}"
|
||||
];
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
{ pkgs, lib, host, user, ... }:
|
||||
{ pkgs, user, ... }:
|
||||
|
||||
{
|
||||
users.defaultUserShell = pkgs.bash; # if interactive, itll switch to fish
|
||||
|
||||
users.users."${user}" = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "networkmanager" "wheel" "audio" "video" "docker" "libvirtd" "uinput" "input" "ydotool" "acme" "nginx" ];
|
||||
extraGroups = [ "networkmanager" "wheel" "audio" "video" "docker" "libvirtd" "uinput" "input" "ydotool" "acme" "nginx" "adbusers" ];
|
||||
useDefaultShell = true;
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID1RPCcS8DtIf75a2FEW4d8X6WTVeLlmretoLqppvZlJ" # From [A] GPG Sub Key
|
||||
|
||||
Reference in New Issue
Block a user