taotien/NOflake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
extras/dev.nix
View file

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

43
flake.nix
View file

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

16
systems/NObangers.nix
View file

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

15
users/tao.nix
View file

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