Bump version
This commit is contained in:
parent
ec6476d470
commit
c78890f6ea
12 changed files with 175 additions and 58 deletions
|
@ -46,12 +46,18 @@
|
|||
LC_TIME = "en_US.utf8";
|
||||
};
|
||||
|
||||
i18n.inputMethod = {
|
||||
enabled = "fcitx5";
|
||||
fcitx5.addons = with pkgs; [ fcitx5-rime ];
|
||||
};
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
services.xserver.enable = true;
|
||||
|
||||
# Enable the GNOME Desktop Environment.
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.xserver.windowManager.icewm.enable = true;
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver = {
|
||||
|
@ -88,6 +94,9 @@
|
|||
services.xserver.displayManager.autoLogin.enable = true;
|
||||
services.xserver.displayManager.autoLogin.user = "xin";
|
||||
|
||||
# Smart services
|
||||
services.smartd.enable = true;
|
||||
|
||||
# Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229
|
||||
systemd.services."getty@tty1".enable = false;
|
||||
systemd.services."autovt@tty1".enable = false;
|
||||
|
@ -95,6 +104,7 @@
|
|||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"openssl-1.1.1t"
|
||||
# For wechat-uos
|
||||
"electron-19.0.7"
|
||||
];
|
||||
|
@ -116,10 +126,11 @@
|
|||
|
||||
grc
|
||||
|
||||
# ==== Development ==== #
|
||||
# VCS
|
||||
sops
|
||||
git-crypt
|
||||
|
||||
# ==== Development ==== #
|
||||
|
||||
jetbrains.jdk # patch jetbrain runtime java
|
||||
jetbrains.clion
|
||||
jetbrains.pycharm-professional
|
||||
|
@ -174,9 +185,6 @@
|
|||
qq
|
||||
config.nur.repos.xddxdd.wechat-uos
|
||||
|
||||
# Mail
|
||||
thunderbird
|
||||
|
||||
# Password manager
|
||||
keepassxc
|
||||
|
||||
|
@ -189,10 +197,13 @@
|
|||
obsidian
|
||||
zotero
|
||||
wpsoffice
|
||||
onlyoffice-bin
|
||||
|
||||
config.nur.repos.linyinfeng.wemeet
|
||||
|
||||
virt-manager
|
||||
|
||||
ghidra
|
||||
];
|
||||
|
||||
programs.steam = {
|
||||
|
|
|
@ -3,11 +3,30 @@
|
|||
{
|
||||
# Enable networking
|
||||
networking = {
|
||||
nameservers = [ "127.0.0.1" "::1" ];
|
||||
networkmanager = {
|
||||
enable = true;
|
||||
dns = "systemd-resolved";
|
||||
# dns = "none";
|
||||
|
||||
};
|
||||
resolvconf.useLocalResolver = true;
|
||||
};
|
||||
|
||||
services.resolved = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
[Resolve]
|
||||
Domains=~.
|
||||
DNS=114.114.114.114 1.1.1.1
|
||||
DNSOverTLS=opportunistic
|
||||
'';
|
||||
};
|
||||
|
||||
# Configure network proxy if necessary
|
||||
networking.proxy = {
|
||||
allProxy = "socks5://127.0.0.1:7891/";
|
||||
httpProxy = "http://127.0.0.1:7890/";
|
||||
httpsProxy = "http://127.0.0.1:7890/";
|
||||
noProxy = "127.0.0.1,localhost,internal.domain,.coho-tet.ts.net";
|
||||
};
|
||||
|
||||
# Enable Tailscale
|
||||
|
@ -15,10 +34,13 @@
|
|||
# services.tailscale.useRoutingFeatures = "both";
|
||||
|
||||
# Open ports in the firewall.
|
||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||
networking.firewall.allowedTCPPorts = [ ];
|
||||
networking.firewall.allowedUDPPorts = [ 41641 ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
networking.firewall.trustedInterfaces = [
|
||||
"tailscale0"
|
||||
];
|
||||
|
||||
programs.steam.remotePlay.openFirewall = true;
|
||||
|
||||
|
@ -34,4 +56,7 @@
|
|||
};
|
||||
|
||||
# services.gnome.gnome-remote-desktop.enable = true;
|
||||
}
|
||||
# services.xrdp.enable = true;
|
||||
# services.xrdp.openFirewall = true;
|
||||
# services.xrdp.defaultWindowManager = icewm;
|
||||
}
|
||||
|
|
Binary file not shown.
22
machines/netdrives.nix
Normal file
22
machines/netdrives.nix
Normal file
|
@ -0,0 +1,22 @@
|
|||
{ pkgs, config, ... }:
|
||||
{
|
||||
sops.secrets = {
|
||||
autofs-nas = {
|
||||
owner = "davfs2";
|
||||
};
|
||||
autofs-nas-secret = {
|
||||
path = "/etc/davfs2/secrets";
|
||||
};
|
||||
};
|
||||
fileSystems."/media/nas" = {
|
||||
device = "https://home.xinyang.life:5244/dav";
|
||||
fsType = "davfs";
|
||||
options = [
|
||||
"uid=1000"
|
||||
"gid=1000"
|
||||
"rw"
|
||||
"_netdev"
|
||||
];
|
||||
|
||||
};
|
||||
}
|
|
@ -40,6 +40,11 @@
|
|||
interfaces.eth0.useDHCP = true;
|
||||
};
|
||||
|
||||
networking.proxy = {
|
||||
default = "http://127.0.0.1:7890/";
|
||||
noProxy = "127.0.0.1,localhost,internal.domain,.coho-tet.ts.net";
|
||||
};
|
||||
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
};
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
clash_subscription_link: ENC[AES256_GCM,data:QwszQooTzHboIgIsbxcL1ZrVgOn91pKC8mMUSY7R0FB426ERiVPNyGWBy5ar4m0yk/XwcFLdFRmiWOrQG9mWsx9J6/tH7K8=,iv:zeDuLmDRUiCtKfUlpl1KJl62DP4DnQ2c6gOjpiHw+4c=,tag:w5AQIUC1p3nrwepdxH7Kkw==,type:str]
|
||||
autofs-nas: ENC[AES256_GCM,data:wcrA2t8/i9PaxA1PQ3CDVJZUhVchGV4vCfa5j/ReNahKV3cfDf2owbpeB827sMpjYyyvSH6nri7mra/BLMAPcgySCpZNAgdR9DQZXAQ=,iv:QJzsS5a6vWeoBxkB13yXdVbyn0tt2QTvqj0LaHn6S2g=,tag:TtgubLgWBBzl67MVal5BvQ==,type:str]
|
||||
autofs-nas-secret: ENC[AES256_GCM,data:OBh8h5CFv1Z4G6bMesna4zmXNASKhYdjFBvg47T9aKBCLDp/xVWnnQj8N7AFGg49wJ+0gYuqb33lIqpSnQ==,iv:UCaGeE8j4RqJzA0xhu3oB2xvzombzQD3fjLKCWd5fDg=,tag:+Oc78ddpLH7R2aT7gW3Ouw==,type:str]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
|
@ -32,8 +34,8 @@ sops:
|
|||
dWVDd2VSd213NmpYdDcvNUZXTHdzSDgKj68TLxSYYExtGg/hyuAiPqmdXPGIWzou
|
||||
DnCdBitTPPswI+BVwYufnGmHdt8xz5nofBxACWg/bS3NUTGFcnIPWQ==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2023-04-23T03:03:14Z"
|
||||
mac: ENC[AES256_GCM,data:LxnM5wRjyV0VxOWm0/XDF6iVoe2PoJ/Ps8iW6mNI4JDDy8EK7pRElcU0W+IuOq09eUCBJ4KzIssbUTqumUtQHXIOhkCx0qrsf4XWsLnKNqteMwkDuWhQAiUgzGa4T0zD7B1chnos9J85rHGrGLZ9aGzC04hwUrADcw0HbxQIBm4=,iv:U2sYlCl8cppaJT8ldJhVoHj2NbTCanJyPblsO11/hBs=,tag:h8cE/+uNDz5CXoX29RKCgQ==,type:str]
|
||||
lastmodified: "2023-04-25T04:49:58Z"
|
||||
mac: ENC[AES256_GCM,data:Xig/sBJAEs9D6hsoeTAJ4CL156IrFLipacI7eHfBd79Lsa0IXPfLvVn/tVTIfEixmBA9QKkQ9QYjTFVZNr0BTRqHC/C7izgZbOBn73EE+KXYLQEiZ4RbgRfrFb8gU2/uSWXGZEO6YELuom9BEXWCMp0HTS+MQTKk8Tz20/hVyV4=,iv:Uq74PG7DDanb5WpcXUdylT8LW4ERlEsT8YX0BxZdo8w=,tag:7zKveIEJjh0Yc2fLKsTUjA==,type:str]
|
||||
pgp: []
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.7.3
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue