This commit is contained in:
Tao Tien 2024-01-28 19:54:19 -08:00
parent 6afc7f6fb5
commit 813df81103
4 changed files with 42 additions and 34 deletions

View file

@ -1,5 +1,6 @@
{ pkgs, ... }: {
environment.systemPackages = with pkgs; [
temurin-bin-17
nodejs
python310Packages.python-lsp-server
sqlite
@ -39,6 +40,7 @@
];
nixpkgs.config.permittedInsecurePackages = [
# probably etcher
"electron-19.1.9"
];

View file

@ -15,7 +15,6 @@
home-manager.inputs.nixpkgs.follows = "nixpkgs";
};
# outputs = { nixpkgs, nixos-hardware, nixpkgs-unstable, nixos-raspberrypi, aagl, prescurve, ... }@attrs:
outputs = { nixpkgs, nixos-hardware, nixpkgs-unstable, nixos-raspberrypi, aagl, home-manager, ... }@attrs:
let
nixos-system = (systemModules: nixpkgs.lib.nixosSystem {
@ -27,20 +26,22 @@
system = "x86_64-linux";
config.allowUnfree = true;
config.permittedInsecurePackages = [
"electron-24.8.6"
# "qtwebkit-5.212.0-alpha4"
# "electron-24.8.6"
];
};
};
overlay-unstable-arm = final: prev: {
unstable = import nixpkgs-unstable {
system = "aarch64-linux";
config.allowUnfree = true;
# config.allowUnsupportedSystem = true;
};
};
# overlay-unstable-arm = final: prev: {
# unstable = import nixpkgs-unstable {
# system = "aarch64-linux";
# config.allowUnfree = true;
# # config.allowUnsupportedSystem = true;
# };
# };
nixos-hw = nixos-hardware.nixosModules;
nixos-rpi = nixos-raspberrypi.nixosModules;
# nixos-rpi = nixos-raspberrypi.nixosModules;
# overlay-home-manager = final: prev: {
# hw = import home-manager;
# };
in
{
nixosConfigurations = {
@ -48,9 +49,9 @@
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
nixos-hw.common-cpu-amd
nixos-hw.common-gpu-nvidia-nonprime
home-manager.nixosModules.home-manager
./systems/BASED.nix
./systems/NOcomputer.nix
# home-manager.nixosModules.home-manager
./users/tao.nix
./extras/uwuraid.nix
./extras/dev.nix
@ -67,15 +68,15 @@
./extras/dev.nix
./extras/gaming.nix
];
NObangers = nixos-system [
# ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable-arm ]; })
nixos-hw.raspberry-pi-4
nixos-rpi.hardware
./systems/BASED.nix
./systems/NObangers.nix
./users/pi.nix
./extras/uwuraid.nix
];
# NObangers = nixos-system [
# # ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable-arm ]; })
# nixos-hw.raspberry-pi-4
# nixos-rpi.hardware
# ./systems/BASED.nix
# ./systems/NObangers.nix
# ./users/pi.nix
# ./extras/uwuraid.nix
# ];
};
};
}

View file

@ -24,14 +24,14 @@
"console=tty1"
# "console=ttyAMA0,115200"
];
loader = {
raspberryPi = {
enable = true;
version = 4;
};
systemd-boot.enable = false;
generic-extlinux-compatible.enable = false;
};
# loader = {
# raspberryPi = {
# enable = true;
# version = 4;
# };
# systemd-boot.enable = false;
# generic-extlinux-compatible.enable = false;
# };
kernelPackages = pkgs.linuxPackages_rpi4;
};

View file

@ -1,6 +1,7 @@
{ pkgs, ... }: {
users.users.tao.packages = with pkgs; [
unstable.typstfmt
leetcode-cli
unstable.typst-fmt
mendeley
# unstable.wkhtmltopdf
calibre
@ -58,13 +59,14 @@
zoom-us
unstable.zoxide
];
# programs.adb.enable = true;
programs.mosh.enable = true;
environment.shells = with pkgs; [ unstable.nushell ];
services.udev.extraRules = ''
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
'';
hardware.keyboard.qmk.enable = true;
# services.expressvpn.enable = true;
@ -91,6 +93,7 @@
shell = pkgs.unstable.nushell;
};
security.sudo-rs.enable = true;
security.sudo-rs.extraRules = [{
commands = [
@ -104,7 +107,9 @@
# fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-chewing fcitx5-chinese-addons fcitx5-rime ];
# };
home-manager.users.tao = {
home.stateVersion = "23.11";
};
# imports = [ (import "${home-manager}/nixos") ];
# home-manager.users.tao = {
# home.stateversion = "23.11";
# };
}