Compare commits
6 commits
3b25f74fa1
...
71c309a2b0
| Author | SHA1 | Date | |
|---|---|---|---|
71c309a2b0
|
|||
|
d852477b37
|
|||
|
5148ae7a64
|
|||
|
b25ec27797
|
|||
|
b5b2bd9a7d
|
|||
|
f35d8a45c8
|
25 changed files with 59 additions and 721 deletions
|
|
@ -11,7 +11,6 @@
|
|||
imports = [
|
||||
./nix
|
||||
./anti-features.nix
|
||||
./networking.nix
|
||||
|
||||
inputs.self.darwinModules.default
|
||||
inputs.home-manager.darwinModules.home-manager
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
{
|
||||
networking.dns = [
|
||||
### AliDNS
|
||||
"223.5.5.5"
|
||||
"223.6.6.6"
|
||||
"2400:3200::1"
|
||||
"2400:3200:baba::1"
|
||||
];
|
||||
}
|
||||
86
flake.lock
86
flake.lock
|
|
@ -10,11 +10,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721398837,
|
||||
"narHash": "sha256-RnBEAbH8a6CogvyjV3d4c+LI/udbygrsGOtZfbRRaUc=",
|
||||
"lastModified": 1721560199,
|
||||
"narHash": "sha256-XQVh+i9/m2J2AfwuqJcKpm3GM67Top8mHKgaJ7lL1l0=",
|
||||
"owner": "ezKEa",
|
||||
"repo": "aagl-gtk-on-nix",
|
||||
"rev": "d57b317f94c290f5720fa38fd16c926a8929143e",
|
||||
"rev": "cdb74c540af1d365ea799ba5d2200df707e31090",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -30,11 +30,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721322122,
|
||||
"narHash": "sha256-a0G1NvyXGzdwgu6e1HQpmK5R5yLsfxeBe07nNDyYd+g=",
|
||||
"lastModified": 1721842668,
|
||||
"narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "8a68b987c476a33e90f203f0927614a75c3f47ea",
|
||||
"rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -50,11 +50,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721417620,
|
||||
"narHash": "sha256-6q9b1h8fI3hXg2DG6/vrKWCeG8c5Wj2Kvv22RCgedzg=",
|
||||
"lastModified": 1721871128,
|
||||
"narHash": "sha256-NyWVCnSeePnJHGJxZ0l3zdGQGrVjUcx2IJbV8KIsPf0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "bec6e3cde912b8acb915fecdc509eda7c973fb42",
|
||||
"rev": "55e874b9c14764cb791e5740f0e92202e41393fc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -145,11 +145,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721534365,
|
||||
"narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
|
||||
"lastModified": 1721852138,
|
||||
"narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
|
||||
"rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -184,9 +184,6 @@
|
|||
"flake-parts": [
|
||||
"flake-parts"
|
||||
],
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
|
|
@ -198,11 +195,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721501207,
|
||||
"narHash": "sha256-umzgs8hXYUyQe6wJm7AnJ3kx8M/h0/WXR2OemAZs3Qs=",
|
||||
"lastModified": 1721581642,
|
||||
"narHash": "sha256-Bd9ujkwkxwAYCnYKEKeY1fjsvD4vyiFjFS20Lxr/FD4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lanzaboote",
|
||||
"rev": "60e4578feca3d894f1474a9b08780c9a5433ad08",
|
||||
"rev": "f3b4ade14392861388265e949b7007a8b62e21dc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -247,11 +244,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721550066,
|
||||
"narHash": "sha256-wr6sSb+VpXy8HCvBqU6xvhpaARzWUbEK7uN5tLnqYDg=",
|
||||
"lastModified": 1721719500,
|
||||
"narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "33bf7df5bbfcbbb49e6559b0c96c9e3b26d14e58",
|
||||
"rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -324,16 +321,15 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1721750544,
|
||||
"narHash": "sha256-u0aiWIcd95vRQdGjia3X5V6tP618r68gbvjuaIwUBgw=",
|
||||
"owner": "Guanran928",
|
||||
"lastModified": 1721911538,
|
||||
"narHash": "sha256-5OrkPJsiZmNe99C6+KX0qx9sphoVLvldFjuqDYAZ8GQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "d24b6083f8101c3b91d6327c06e5bb24f50f18ba",
|
||||
"rev": "d3c993c851ad40bbab7e08d566138ff72cd8744f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Guanran928",
|
||||
"ref": "lenovo-thinkpad-x1-12th-gen",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -355,11 +351,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1721497942,
|
||||
"narHash": "sha256-EDPL9qJfklXoowl3nEBmjDIqcvXKUZInt5n6CCc1Hn4=",
|
||||
"lastModified": 1721782431,
|
||||
"narHash": "sha256-UNDpwjYxNXQet/g3mgRLsQ9zxrbm9j2JEvP4ijF3AWs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d43f0636fc9492e83be8bbb41f9595d7a87106b8",
|
||||
"rev": "4f02464258baaf54992debfd010a7a3662a25536",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -426,11 +422,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1721555153,
|
||||
"narHash": "sha256-e0JMfSfyj2bpScc4KFBAgTq42IL6OankV85H/HCIMBQ=",
|
||||
"lastModified": 1721922390,
|
||||
"narHash": "sha256-Q34pkPhh8fRaHS1vZcam00dYv/BNhUR/+jb9O21PsbY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "d7cc4f32fe9233dcecbe5f7dfee84d7d0cb899bd",
|
||||
"rev": "029365c3e7a6349a706df71cc29dc8a0c1e909f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -507,11 +503,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721528458,
|
||||
"narHash": "sha256-uruH/EV8Rpa/CRxn8CiMzhoA6tJe8qO5c8NdgP1g0rM=",
|
||||
"lastModified": 1721873995,
|
||||
"narHash": "sha256-HyFmp6rktJQMxG+BZEjcQoCFKMek855Cc/dQk2YDac0=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "0b2b2da1dad1c675c45d9e23c75674de969de83b",
|
||||
"rev": "33a7853f54f1797b029739297c4593bd96077c20",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -546,11 +542,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721531171,
|
||||
"narHash": "sha256-AsvPw7T0tBLb53xZGcUC3YPqlIpdxoSx56u8vPCr6gU=",
|
||||
"lastModified": 1721688883,
|
||||
"narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "909e8cfb60d83321d85c8d17209d733658a21c95",
|
||||
"rev": "aff2f88277dabe695de4773682842c34a0b7fd54",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -566,11 +562,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721263500,
|
||||
"narHash": "sha256-6l0+MciXkktANuZ+Rwc6BZJxtMi7jHZRiSnzG+xpwyk=",
|
||||
"lastModified": 1721888498,
|
||||
"narHash": "sha256-O5/s8e6CL99AQoKEn8k6F99UoJdAzQ8z9LZ7SxFJ3c4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "srvos",
|
||||
"rev": "ef4f2248e1bbd84a0dd269ab31b9927d9c0bf2e6",
|
||||
"rev": "27b3a9b23847cb2e716334ee6ad58b82ddc3f7a7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -601,11 +597,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721458737,
|
||||
"narHash": "sha256-wNXLQ/ATs1S4Opg1PmuNoJ+Wamqj93rgZYV3Di7kxkg=",
|
||||
"lastModified": 1721769617,
|
||||
"narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "888bfb10a9b091d9ed2f5f8064de8d488f7b7c97",
|
||||
"rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
inputs.crane.follows = "crane";
|
||||
inputs.flake-compat.follows = "flake-compat";
|
||||
inputs.flake-parts.follows = "flake-parts";
|
||||
inputs.flake-utils.follows = "flake-utils";
|
||||
inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks-nix";
|
||||
inputs.rust-overlay.follows = "rust-overlay";
|
||||
};
|
||||
|
|
@ -52,7 +51,7 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixos-hardware = {
|
||||
url = "github:Guanran928/nixos-hardware/lenovo-thinkpad-x1-12th-gen";
|
||||
url = "github:NixOS/nixos-hardware";
|
||||
};
|
||||
nixos-sensible = {
|
||||
url = "github:Guanran928/nixos-sensible";
|
||||
|
|
@ -186,7 +185,6 @@
|
|||
|
||||
### NixOS
|
||||
nixosConfigurations = {
|
||||
"aristotle" = mkNixOS "x86_64-linux" [./hosts/aristotle];
|
||||
"blacksteel" = mkNixOS "x86_64-linux" [./hosts/blacksteel];
|
||||
"dust" = mkNixOS "x86_64-linux" [./hosts/dust];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
{lib, ...}: {
|
||||
nixpkgs.config = {
|
||||
allowAliases = false;
|
||||
|
||||
allowNonSource = false;
|
||||
allowNonSourcePredicate = pkg:
|
||||
lib.elem (lib.getName pkg) [
|
||||
"adoptopenjdk-hotspot-bin"
|
||||
"cargo-bootstrap"
|
||||
"cef-binary"
|
||||
"dart"
|
||||
"osu-lazer-bin"
|
||||
"rustc-bootstrap"
|
||||
"rustc-bootstrap-wrapper"
|
||||
"sof-firmware"
|
||||
"temurin-bin"
|
||||
];
|
||||
|
||||
allowUnfree = false;
|
||||
allowUnfreePredicate = pkg:
|
||||
lib.elem (lib.getName pkg) [
|
||||
"fcitx5-pinyin-minecraft"
|
||||
"fcitx5-pinyin-moegirl"
|
||||
"libXNVCtrl"
|
||||
"nvidia-x11"
|
||||
"osu-lazer-bin"
|
||||
"steam"
|
||||
"steam-original"
|
||||
"steam-run"
|
||||
"xow_dongle-firmware"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,168 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../nixos/profiles/opt-in/mihomo
|
||||
../../nixos/profiles/opt-in/wireless
|
||||
|
||||
./anti-feature.nix
|
||||
./disko.nix
|
||||
./hardware-configuration.nix
|
||||
./impermanence.nix
|
||||
./lanzaboote.nix
|
||||
];
|
||||
|
||||
networking.hostName = "aristotle";
|
||||
time.timeZone = "Asia/Shanghai";
|
||||
system.stateVersion = "23.11";
|
||||
|
||||
home-manager.users.guanranwang = import ./home;
|
||||
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
yubikey-manager
|
||||
localsend
|
||||
];
|
||||
|
||||
programs.adb.enable = true;
|
||||
programs.anime-game-launcher.enable = true;
|
||||
programs.seahorse.enable = true;
|
||||
programs.steam.enable = true;
|
||||
programs.kdeconnect = {
|
||||
enable = true;
|
||||
package = pkgs.valent;
|
||||
};
|
||||
|
||||
services.power-profiles-daemon.enable = true;
|
||||
services.gvfs.enable = true;
|
||||
services.gnome = {
|
||||
gnome-keyring.enable = true;
|
||||
gnome-online-accounts.enable = true;
|
||||
sushi.enable = true;
|
||||
};
|
||||
|
||||
# https://wiki.archlinux.org/title/Gamepad#Connect_Xbox_Wireless_Controller_with_Bluetooth
|
||||
hardware.xone.enable = true; # via wired or wireless dongle
|
||||
hardware.xpadneo.enable = true; # via Bluetooth
|
||||
|
||||
# yubikey
|
||||
services.pcscd.enable = true;
|
||||
services.udev.packages = [pkgs.yubikey-personalization];
|
||||
|
||||
fonts = {
|
||||
enableDefaultPackages = false;
|
||||
packages = with pkgs; [
|
||||
(nerdfonts.override {
|
||||
fonts = ["NerdFontsSymbolsOnly"];
|
||||
})
|
||||
(inter.overrideAttrs {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 -t $out/share/fonts/truetype/ InterVariable*.ttf
|
||||
runHook postInstall
|
||||
'';
|
||||
})
|
||||
(jetbrains-mono.overrideAttrs {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 -t $out/share/fonts/truetype/ fonts/variable/*.ttf
|
||||
runHook postInstall
|
||||
'';
|
||||
})
|
||||
(source-sans.overrideAttrs {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm444 VF/*.otf -t $out/share/fonts/variable
|
||||
runHook postInstall
|
||||
'';
|
||||
})
|
||||
(source-serif.overrideAttrs {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm444 VAR/*.otf -t $out/share/fonts/variable
|
||||
runHook postInstall
|
||||
'';
|
||||
})
|
||||
source-han-sans-vf-otf
|
||||
source-han-serif-vf-otf
|
||||
noto-fonts-color-emoji
|
||||
];
|
||||
fontconfig.defaultFonts = {
|
||||
emoji = [
|
||||
"Noto Color Emoji"
|
||||
];
|
||||
# Append emoji font for Qt apps, they might use the monochrome emoji
|
||||
monospace = [
|
||||
"JetBrains Mono"
|
||||
"Source Han Sans SC VF"
|
||||
"Symbols Nerd Font"
|
||||
"Noto Color Emoji"
|
||||
];
|
||||
sansSerif = [
|
||||
"Inter Variable"
|
||||
"Source Han Sans SC VF"
|
||||
"Noto Color Emoji"
|
||||
];
|
||||
serif = [
|
||||
"Source Serif 4 Variable"
|
||||
"Source Han Serif SC VF"
|
||||
"Noto Color Emoji"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
console = {
|
||||
earlySetup = true;
|
||||
keyMap = "dvorak";
|
||||
};
|
||||
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings.default_session.command = "${lib.getExe pkgs.greetd.tuigreet} --cmd sway";
|
||||
};
|
||||
|
||||
# polkit
|
||||
security.polkit.enable = true;
|
||||
systemd.user.services.polkit-gnome-authentication-agent-1 = {
|
||||
description = "polkit-gnome-authentication-agent-1";
|
||||
wantedBy = ["graphical-session.target"];
|
||||
wants = ["graphical-session.target"];
|
||||
after = ["graphical-session.target"];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 1;
|
||||
TimeoutStopSec = 10;
|
||||
};
|
||||
};
|
||||
|
||||
security.pam.services.swaylock = {};
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
xdgOpenUsePortal = true;
|
||||
wlr.enable = true;
|
||||
extraPortals = [pkgs.xdg-desktop-portal-gtk];
|
||||
# https://gitlab.archlinux.org/archlinux/packaging/packages/sway/-/blob/main/sway-portals.conf
|
||||
config."sway" = {
|
||||
default = "gtk";
|
||||
"org.freedesktop.impl.portal.ScreenCast" = "wlr";
|
||||
"org.freedesktop.impl.portal.Screenshot" = "wlr";
|
||||
"org.freedesktop.impl.portal.Inhibit" = "none";
|
||||
};
|
||||
};
|
||||
|
||||
### Removes debounce time
|
||||
# https://www.reddit.com/r/linux_gaming/comments/ku6gth
|
||||
environment.etc."libinput/local-overrides.quirks".text = ''
|
||||
[Never Debounce]
|
||||
MatchUdevType=mouse
|
||||
ModelBouncingKeys=1
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
let
|
||||
disks = ["/dev/nvme0n1"];
|
||||
# compress-force: https://t.me/archlinuxcn_group/3054167
|
||||
mountOptions = ["defaults" "compress-force=zstd" "noatime"];
|
||||
cryptSettings = {
|
||||
allowDiscards = true;
|
||||
bypassWorkqueues = true;
|
||||
};
|
||||
in {
|
||||
disko.devices = {
|
||||
disk = {
|
||||
"one" = {
|
||||
type = "disk";
|
||||
device = builtins.elemAt disks 0;
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
"esp" = {
|
||||
size = "2G";
|
||||
type = "EF00";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
mountOptions = ["defaults" "umask=007"];
|
||||
};
|
||||
};
|
||||
"cryptroot" = {
|
||||
end = "-16G";
|
||||
content = {
|
||||
type = "luks";
|
||||
name = "cryptroot";
|
||||
settings = cryptSettings;
|
||||
content = {
|
||||
type = "btrfs";
|
||||
subvolumes = {
|
||||
"/@nix" = {
|
||||
mountpoint = "/nix";
|
||||
inherit mountOptions;
|
||||
};
|
||||
"/@persist" = {
|
||||
mountpoint = "/persist";
|
||||
inherit mountOptions;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
"cryptswap" = {
|
||||
size = "100%";
|
||||
content = {
|
||||
type = "luks";
|
||||
name = "cryptswap";
|
||||
settings = cryptSettings;
|
||||
content = {
|
||||
type = "swap";
|
||||
resumeDevice = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
nodev = {
|
||||
"/" = {
|
||||
fsType = "tmpfs";
|
||||
mountOptions = [
|
||||
"defaults"
|
||||
"size=2G"
|
||||
"mode=755"
|
||||
"nodev"
|
||||
"nosuid"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
{inputs, ...}: {
|
||||
imports = [
|
||||
inputs.nixpkgs.nixosModules.notDetected
|
||||
inputs.nixos-hardware.nixosModules.lenovo-legion-y530-15ich
|
||||
];
|
||||
|
||||
services.hdapsd.enable = false;
|
||||
services.thermald.enable = true;
|
||||
|
||||
security.rtkit.enable = true;
|
||||
hardware.pulseaudio.enable = false;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
};
|
||||
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
settings.General.FastConnectable = true;
|
||||
};
|
||||
|
||||
# nouveou
|
||||
services.xserver.videoDrivers = [];
|
||||
|
||||
# novideo
|
||||
# hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
# hardware.nvidia.nvidiaSettings = false;
|
||||
# environment.sessionVariables."MOZ_ENABLE_WAYLAND" = "0";
|
||||
# networking.networkmanager.enable = false;
|
||||
# services.xserver.desktopManager.gnome.enable = true;
|
||||
# services.xserver.displayManager.gdm.enable = true;
|
||||
# # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1562
|
||||
# services.udev.extraRules = ''
|
||||
# ENV{DEVNAME}=="/dev/dri/card1", TAG+="mutter-device-preferred-primary"
|
||||
# '';
|
||||
|
||||
boot.loader.timeout = 0;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid"];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
nixpkgs.hostPlatform = "x86_64-linux";
|
||||
}
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports =
|
||||
[
|
||||
./theme.nix
|
||||
./xdg-mime.nix
|
||||
]
|
||||
++ map (n: ../../../home/applications/${n}) [
|
||||
"fcitx5"
|
||||
"firefox"
|
||||
"foot"
|
||||
"go"
|
||||
"mpv"
|
||||
"nautilus"
|
||||
"nix"
|
||||
"sway"
|
||||
"thunderbird"
|
||||
"ydict"
|
||||
];
|
||||
|
||||
# https://wiki.archlinux.org/title/Fish#Start_X_at_login
|
||||
programs.fish.loginShellInit = ''
|
||||
if test -z "$DISPLAY" -a "$XDG_VTNR" = 1
|
||||
exec sway
|
||||
end
|
||||
'';
|
||||
|
||||
home.packages =
|
||||
(with pkgs; [
|
||||
amberol
|
||||
dconf-editor
|
||||
file-roller
|
||||
fractal
|
||||
gnome-calculator
|
||||
hyperfine
|
||||
loupe
|
||||
mousai
|
||||
seahorse
|
||||
|
||||
(prismlauncher.override {
|
||||
glfw = glfw-wayland-minecraft;
|
||||
gamemodeSupport = false;
|
||||
})
|
||||
mumble
|
||||
osu-lazer-bin
|
||||
])
|
||||
++ (with inputs.self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.scripts; [
|
||||
lofi
|
||||
]);
|
||||
|
||||
home.sessionVariables = {
|
||||
# https://github.com/ppy/osu-framework/pull/6292
|
||||
"OSU_SDL3" = "1";
|
||||
};
|
||||
|
||||
programs.mangohud.enable = true;
|
||||
programs.obs-studio.enable = true;
|
||||
services.ssh-agent.enable = true;
|
||||
}
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
home.pointerCursor = {
|
||||
name = "Adwaita";
|
||||
package = pkgs.adwaita-icon-theme;
|
||||
size = 24;
|
||||
gtk.enable = true;
|
||||
};
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
|
||||
|
||||
gtk3.bookmarks = [
|
||||
"file://${config.home.homeDirectory}/Documents/Projects/flake"
|
||||
];
|
||||
|
||||
iconTheme = {
|
||||
name = "Adwaita";
|
||||
package = pkgs.adwaita-icon-theme;
|
||||
};
|
||||
|
||||
theme = {
|
||||
name = "Adwaita-dark";
|
||||
package = pkgs.gnome-themes-extra;
|
||||
};
|
||||
};
|
||||
|
||||
dconf.settings = {
|
||||
"org/gnome/desktop/interface" = {
|
||||
"color-scheme" = "prefer-dark";
|
||||
};
|
||||
|
||||
# Make GTK listen to fontconfig
|
||||
"org/gnome/desktop/wm/preferences" = {
|
||||
"titlebar-font" = "Sans Bold 11";
|
||||
};
|
||||
"org/gnome/desktop/interface" = {
|
||||
"font-name" = "Sans 11";
|
||||
"document-font-name" = "Sans 11";
|
||||
"monospace-font-name" = "Monospace 10";
|
||||
};
|
||||
};
|
||||
|
||||
# ??? this commit broke nautilus's spacing ???
|
||||
# https://github.com/nix-community/home-manager/commit/e9b9ecef4295a835ab073814f100498716b05a96
|
||||
xdg.configFile."gtk-4.0/gtk.css".text = lib.mkForce config.gtk.gtk4.extraCss;
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
{lib, ...}: {
|
||||
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
|
||||
xdg.mimeApps = {
|
||||
enable = true;
|
||||
defaultApplications =
|
||||
{
|
||||
"inode/directory" = ["org.gnome.Nautilus.desktop"];
|
||||
}
|
||||
### Browser
|
||||
// lib.genAttrs [
|
||||
"text/html"
|
||||
"x-scheme-handler/http"
|
||||
"x-scheme-handler/https"
|
||||
"x-scheme-handler/about"
|
||||
"x-scheme-handler/unknown"
|
||||
] (_n: ["firefox.desktop"])
|
||||
### Audio player
|
||||
// lib.genAttrs [
|
||||
"audio/aac"
|
||||
"audio/flac"
|
||||
"audio/mpeg"
|
||||
"audio/ogg"
|
||||
"audio/wav"
|
||||
] (_n: ["io.bassi.Amberol.desktop"])
|
||||
### Image viewer
|
||||
// lib.genAttrs [
|
||||
"image/gif"
|
||||
"image/jpeg"
|
||||
"image/png"
|
||||
"image/webp"
|
||||
] (_n: ["org.gnome.Loupe.desktop"])
|
||||
### Video player
|
||||
// lib.genAttrs [
|
||||
"video/mp4"
|
||||
"video/mpeg"
|
||||
"video/webm"
|
||||
] (_n: ["mpv.desktop"])
|
||||
### Code editor
|
||||
// lib.genAttrs [
|
||||
"text/css"
|
||||
"text/html"
|
||||
"text/javascript"
|
||||
"text/plain"
|
||||
] (_n: ["nvim.desktop"]);
|
||||
};
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
{lib, ...}: {
|
||||
sops.age.sshKeyPaths = lib.mkForce ["/persist/etc/ssh/ssh_host_ed25519_key"];
|
||||
fileSystems."/persist".neededForBoot = true;
|
||||
environment.persistence."/persist" = {
|
||||
hideMounts = true;
|
||||
directories = [
|
||||
"/var/log"
|
||||
"/var/lib"
|
||||
"/etc/secureboot"
|
||||
];
|
||||
files = [
|
||||
"/etc/ssh/ssh_host_ed25519_key"
|
||||
"/etc/ssh/ssh_host_ed25519_key.pub"
|
||||
"/etc/ssh/ssh_host_rsa_key"
|
||||
"/etc/ssh/ssh_host_rsa_key.pub"
|
||||
];
|
||||
users.guanranwang = {
|
||||
directories = [
|
||||
"Desktop"
|
||||
"Documents"
|
||||
"Downloads"
|
||||
"Music"
|
||||
"Pictures"
|
||||
"Videos"
|
||||
#"Public"
|
||||
#"Templates"
|
||||
|
||||
".ssh"
|
||||
".mozilla/firefox"
|
||||
".thunderbird"
|
||||
|
||||
".cache"
|
||||
".local/share"
|
||||
".local/state"
|
||||
|
||||
".config/gh"
|
||||
".config/Mumble"
|
||||
".config/fcitx5"
|
||||
".config/obs-studio"
|
||||
];
|
||||
files = [
|
||||
".config/sops/age/keys.txt"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
environment.systemPackages = [pkgs.sbctl];
|
||||
boot.lanzaboote = {
|
||||
enable = true;
|
||||
pkiBundle = "/etc/secureboot";
|
||||
};
|
||||
}
|
||||
|
|
@ -5,11 +5,9 @@
|
|||
allowNonSource = false;
|
||||
allowNonSourcePredicate = pkg:
|
||||
lib.elem (lib.getName pkg) [
|
||||
"adoptopenjdk-hotspot-bin"
|
||||
"cargo-bootstrap"
|
||||
"cef-binary"
|
||||
"dart"
|
||||
"osu-lazer-bin"
|
||||
"rustc-bootstrap"
|
||||
"rustc-bootstrap-wrapper"
|
||||
"sof-firmware"
|
||||
|
|
@ -21,13 +19,6 @@
|
|||
lib.elem (lib.getName pkg) [
|
||||
"fcitx5-pinyin-minecraft"
|
||||
"fcitx5-pinyin-moegirl"
|
||||
"libXNVCtrl"
|
||||
"nvidia-x11"
|
||||
"osu-lazer-bin"
|
||||
"steam"
|
||||
"steam-original"
|
||||
"steam-run"
|
||||
"xow_dongle-firmware"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
programs.adb.enable = true;
|
||||
programs.localsend.enable = true;
|
||||
programs.seahorse.enable = true;
|
||||
programs.steam.enable = true;
|
||||
programs.kdeconnect = {
|
||||
enable = true;
|
||||
package = pkgs.valent;
|
||||
|
|
@ -49,10 +48,6 @@
|
|||
sushi.enable = true;
|
||||
};
|
||||
|
||||
# https://wiki.archlinux.org/title/Gamepad#Connect_Xbox_Wireless_Controller_with_Bluetooth
|
||||
hardware.xone.enable = true; # via wired or wireless dongle
|
||||
hardware.xpadneo.enable = true; # via Bluetooth
|
||||
|
||||
# yubikey
|
||||
services.pcscd.enable = true;
|
||||
services.udev.packages = [pkgs.yubikey-personalization];
|
||||
|
|
@ -159,12 +154,4 @@
|
|||
"org.freedesktop.impl.portal.Inhibit" = "none";
|
||||
};
|
||||
};
|
||||
|
||||
### Removes debounce time
|
||||
# https://www.reddit.com/r/linux_gaming/comments/ku6gth
|
||||
environment.etc."libinput/local-overrides.quirks".text = ''
|
||||
[Never Debounce]
|
||||
MatchUdevType=mouse
|
||||
ModelBouncingKeys=1
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,15 +4,11 @@
|
|||
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-12th-gen
|
||||
];
|
||||
|
||||
services.hdapsd.enable = false;
|
||||
services.thermald.enable = true;
|
||||
|
||||
security.rtkit.enable = true;
|
||||
hardware.pulseaudio.enable = false;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
};
|
||||
|
|
@ -25,6 +21,8 @@
|
|||
boot.loader.timeout = 0;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
boot.kernelParams = ["ia32_emulation=0"];
|
||||
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
|
|
|
|||
|
|
@ -28,35 +28,19 @@
|
|||
end
|
||||
'';
|
||||
|
||||
home.packages =
|
||||
(with pkgs; [
|
||||
amberol
|
||||
dconf-editor
|
||||
file-roller
|
||||
fractal
|
||||
gnome-calculator
|
||||
hyperfine
|
||||
loupe
|
||||
mousai
|
||||
seahorse
|
||||
home.packages = with pkgs; [
|
||||
amberol
|
||||
dconf-editor
|
||||
file-roller
|
||||
fractal
|
||||
gnome-calculator
|
||||
hyperfine
|
||||
loupe
|
||||
mousai
|
||||
seahorse
|
||||
inputs.self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.scripts.lofi
|
||||
];
|
||||
|
||||
(prismlauncher.override {
|
||||
glfw = glfw-wayland-minecraft;
|
||||
gamemodeSupport = false;
|
||||
})
|
||||
mumble
|
||||
osu-lazer-bin
|
||||
])
|
||||
++ (with inputs.self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.scripts; [
|
||||
lofi
|
||||
]);
|
||||
|
||||
home.sessionVariables = {
|
||||
# https://github.com/ppy/osu-framework/pull/6292
|
||||
"OSU_SDL3" = "1";
|
||||
};
|
||||
|
||||
programs.mangohud.enable = true;
|
||||
programs.obs-studio.enable = true;
|
||||
services.ssh-agent.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
".local/state"
|
||||
|
||||
".config/gh"
|
||||
".config/Mumble"
|
||||
".config/fcitx5"
|
||||
".config/obs-studio"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,10 @@
|
|||
imports = [
|
||||
../../darwin/profiles/desktop
|
||||
../../darwin/profiles/common/opt-in/mihomo.nix
|
||||
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
networking.hostName = "plato";
|
||||
time.timeZone = "Asia/Shanghai";
|
||||
system.stateVersion = 4;
|
||||
nixpkgs.hostPlatform = "x86_64-darwin";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
# iMac 18,3 (2017)
|
||||
{
|
||||
networking.knownNetworkServices = [
|
||||
"Ethernet"
|
||||
"Wi-Fi"
|
||||
"Thunderbolt Bridge"
|
||||
"Thunderbolt Bridge 2"
|
||||
"iPhone USB"
|
||||
];
|
||||
|
||||
# The platform the configuration will be used on.
|
||||
nixpkgs.hostPlatform = "x86_64-darwin";
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# About this device
|
||||
|
||||
### Description
|
||||
|
||||
`blacksteel`, but running macOS. Creative, I know.
|
||||
|
|
@ -2,11 +2,10 @@
|
|||
imports = [
|
||||
../../darwin/profiles/desktop
|
||||
../../darwin/profiles/common/opt-in/mihomo.nix
|
||||
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
networking.hostName = "whitesteel";
|
||||
time.timeZone = "Asia/Shanghai";
|
||||
system.stateVersion = 4;
|
||||
nixpkgs.hostPlatform = "x86_64-darwin";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
networking.knownNetworkServices = [
|
||||
"Wi-Fi"
|
||||
"Bluetooth PAN"
|
||||
"Thunderbolt Bridge"
|
||||
];
|
||||
|
||||
# The platform the configuration will be used on.
|
||||
nixpkgs.hostPlatform = "x86_64-darwin";
|
||||
}
|
||||
|
|
@ -14,15 +14,6 @@ use: &use
|
|||
- flyairport
|
||||
- spcloud
|
||||
|
||||
use-backup: &use-backup
|
||||
type: select
|
||||
use:
|
||||
- ermaozi
|
||||
- jsnzkpg
|
||||
- pawdroid
|
||||
|
||||
convert: &convert "https://sub.maoxiongnet.com/sub?target=clash&list=true&url="
|
||||
|
||||
port: 7890
|
||||
external-controller: 127.0.0.1:9090
|
||||
log-level: warning
|
||||
|
|
@ -46,32 +37,9 @@ proxy-providers:
|
|||
<<: *fetch
|
||||
url: "@clash/proxy-providers/spcloud@"
|
||||
|
||||
# Free servers that I dont really care about
|
||||
ermaozi:
|
||||
<<: *fetch
|
||||
url: "@ermaozi@"
|
||||
jsnzkpg:
|
||||
<<: *fetch
|
||||
url: "@jsnzkpg@"
|
||||
pawdroid:
|
||||
<<: *fetch
|
||||
url: "@pawdroid"
|
||||
|
||||
proxy-groups:
|
||||
- {
|
||||
name: PROXY,
|
||||
type: select,
|
||||
proxies: [自动选择, 备用自动选择, DIRECT, lightsail],
|
||||
}
|
||||
- { name: PROXY, type: select, proxies: [自动选择, lightsail, DIRECT] }
|
||||
- { name: 自动选择, <<: *use, tolerance: 2, type: url-test }
|
||||
- { name: 备用自动选择, <<: *use-backup, tolerance: 2, type: url-test }
|
||||
|
||||
# 分隔,下面是地区分组
|
||||
#- { name: 香港, <<: *use, type: url-test, filter: "(?i)港|hk|hongkong|hong kong" }
|
||||
- { name: 台湾, <<: *use, type: url-test, filter: "(?i)台|tw|taiwan" }
|
||||
#- { name: 日本, <<: *use, type: url-test, filter: "(?i)日本|jp|japan" }
|
||||
#- { name: 美国, <<: *use, type: url-test, filter: "(?i)美|us|unitedstates|united states" }
|
||||
#- { name: 新加坡, <<: *use, type: url-test, filter: "(?i)(新|sg|singapore)" }
|
||||
|
||||
rules:
|
||||
- GEOIP, lan, DIRECT, no-resolve
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
|
||||
# why not substituteAll? see https://github.com/NixOS/nixpkgs/issues/237216
|
||||
sops.templates."clash.yaml".file = let
|
||||
convert = url: "https://sub.maoxiongnet.com/sub?target=clash&list=true&url=${url}";
|
||||
substituteV2 = {src, ...} @ args: let
|
||||
args' = lib.removeAttrs args ["src"];
|
||||
in
|
||||
|
|
@ -59,10 +58,5 @@
|
|||
"clash/proxy-providers/flyairport"
|
||||
"clash/proxy-providers/spcloud"
|
||||
;
|
||||
|
||||
# Free servers that I dont really care about
|
||||
pawdroid = convert "https://cdn.jsdelivr.net/gh/Pawdroid/Free-servers@main/sub";
|
||||
ermaozi = convert "https://cdn.jsdelivr.net/gh/ermaozi/get_subscribe@main/subscribe/v2ray.txt";
|
||||
jsnzkpg = convert "https://cdn.jsdelivr.net/gh/Jsnzkpg/Jsnzkpg@Jsnzkpg/Jsnzkpg";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue