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

unstable all

Browse source
This commit is contained in:
Tao Tien 2024-01-30 09:32:08 -08:00
parent fcafc4a15a
commit 9f2626935c
10 changed files with 86 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

30
extras/dev.nix
View file

@ -4,12 +4,12 @@
nodejs nodejs
python310Packages.python-lsp-server python310Packages.python-lsp-server
sqlite sqlite
unstable.sqlx-cli sqlx-cli
unstable.ruff ruff
unstable.ruff-lsp ruff-lsp
pypy3 pypy3
python3 python3
# unstable.swagger-cli # swagger-cli
# swagger-codegen # swagger-codegen
sshfs sshfs
openapi-generator-cli openapi-generator-cli
@ -25,17 +25,17 @@
nil nil
nixpkgs-fmt nixpkgs-fmt
rustup rustup
unstable.cargo cargo
unstable.cargo-edit cargo-edit
unstable.cargo-feature cargo-feature
unstable.cargo-rr cargo-rr
unstable.clippy clippy
unstable.elf2uf2-rs elf2uf2-rs
unstable.pijul pijul
unstable.rust-analyzer rust-analyzer
unstable.rustc rustc
unstable.rustfmt rustfmt
unstable.sccache sccache
vulkan-loader vulkan-loader
]; ];

10
extras/gaming.nix
View file

@ -2,12 +2,12 @@
imports = [ aagl.nixosModules.default ]; imports = [ aagl.nixosModules.default ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
unstable.heroic heroic
unstable.lutris lutris
unstable.mangohud mangohud
unstable.prismlauncher prismlauncher
wine wine
# unstable.parsec-bin # parsec-bin
]; ];
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [

26
flake.lock generated
View file

@ -123,13 +123,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1706191920, "lastModified": 1706371002,
"narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ae5c332cbb5827f6b1f02572496b141021de335f", "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -138,29 +138,13 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1706098335,
"narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect"
}
},
"root": { "root": {
"inputs": { "inputs": {
"aagl": "aagl", "aagl": "aagl",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-raspberrypi": "nixos-raspberrypi", "nixos-raspberrypi": "nixos-raspberrypi",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2"
"nixpkgs-unstable": "nixpkgs-unstable"
} }
} }
}, },

98
flake.nix
View file

@ -15,99 +15,49 @@
aagl.inputs.nixpkgs.follows = "nixpkgs"; aagl.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs@{ nixpkgs, nixos-hardware, nixos-raspberrypi, home-manager, aagl, ... }: outputs = { self, nixpkgs, nixos-hardware, nixos-raspberrypi, home-manager, aagl, ... }@attrs:
# let
# nixos-system = (systemModules: nixpkgs.lib.nixosSystem {
# modules = systemModules;
# specialArgs = attrs;
# });
# overlay-unstable = final: prev: {
# unstable = import nixpkgs {
# system = "x86_64-linux";
# config.allowUnfree = true;
# config.permittedInsecurePackages = [
# # "electron-24.8.6"
# ];
# };
# };
# # 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;
# # overlay-home-manager = final: prev: {
# # hw = import home-manager;
# # };
# in
{ {
nixosConfigurations = { nixosConfigurations = {
NOcomputer = nixpkgs.lib.nixosSystem { # NOcomputer = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; # system = "x86_64-linux";
config.allowUnfree = true; # # config.allowUnfree = true;
modules = [ # modules = [
nixos-hardware.nixosModules.common-cpu-amd # nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-gpu-nvidia-nonprime # nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
./systems/BASED.nix # ./systems/BASED.nix
./systems/NOcomputer.nix # ./systems/NOcomputer.nix
# ./users/tao.nix # # ./users/tao.nix
home-manager.nixosModules.home-manager # home-manager.nixosModules.home-manager
{ # {
home-manager.useGlobalPkgs = true; # home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; # home-manager.useUserPackages = true;
home-manager.users.jdoe = import ./tao.nix; # home-manager.users.jdoe = import ./tao.nix;
} # }
./extras/uwuraid.nix # ./extras/uwuraid.nix
./extras/dev.nix # ./extras/dev.nix
./extras/gaming.nix # ./extras/gaming.nix
]; # ];
}; # };
NOlaptop = nixpkgs.lib.nixosSystem { NOlaptop = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
config.allowUnfree = true; specialArgs = attrs;
# config.allowUnfree = true;
modules = [ modules = [
nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-cpu-intel
# inputs.nixos-hardware.nixosModules.framework # inputs.nixos-hardware.nixosModules.framework
./systems/BASED.nix ./systems/BASED.nix
./systems/NOlaptop.nix ./systems/NOlaptop.nix
# ./users/tao.nix ./users/tao.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.jdoe = import ./tao.nix;
} }
./extras/uwuraid.nix ./extras/uwuraid.nix
./extras/dev.nix ./extras/dev.nix
./extras/gaming.nix ./extras/gaming.nix
]; ];
}; };
# NOcomputer = nixos-system [
# ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
# nixos-hw.common-cpu-amd
# nixos-hw.common-gpu-nvidia-nonprime
# ./systems/BASED.nix
# ./systems/NOcomputer.nix
# # home-manager.nixosModules.home-manager
# ./users/tao.nix
# ./extras/uwuraid.nix
# ./extras/dev.nix
# ./extras/gaming.nix
# ];
# NOlaptop = nixos-system [
# ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
# nixos-hw.common-cpu-intel
# # inputs.nixos-hardware.nixosModules.framework
# ./systems/BASED.nix
# ./systems/NOlaptop.nix
# ./users/tao.nix
# ./extras/uwuraid.nix
# ./extras/dev.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

6
systems/BASED.nix
View file

@ -13,10 +13,10 @@
ffmpeg ffmpeg
firefox firefox
git git
unstable.helix helix
localsend localsend
mesa mesa
unstable.mpv mpv
ouch ouch
ripgrep ripgrep
skim skim
@ -29,7 +29,7 @@
programs.partition-manager.enable = lib.mkDefault true; programs.partition-manager.enable = lib.mkDefault true;
services.tailscale.enable = true; services.tailscale.enable = true;
services.tailscale.package = pkgs.unstable.tailscale; services.tailscale.package = pkgs.tailscale;
services.openssh.enable = true; services.openssh.enable = true;
services.flatpak.enable = lib.mkDefault true; services.flatpak.enable = lib.mkDefault true;

8
systems/NOcomputer.nix
View file

@ -82,7 +82,7 @@
# }; # };
# boot.kernelPackages = pkgs.linuxPackages_6_5; # boot.kernelPackages = pkgs.linuxPackages_6_5;
boot.kernelPackages = pkgs.unstable.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.kernelModules = [ "i2c-dev" "kvm-amd" ]; boot.kernelModules = [ "i2c-dev" "kvm-amd" ];
boot.kernelParams = [ "nvidia-drm.modeset=1" ]; boot.kernelParams = [ "nvidia-drm.modeset=1" ];
@ -100,9 +100,9 @@
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = true; powerManagement.enable = true;
# package = config.boot.kernelPackages.nvidiaPackages.latest; # package = config.boot.kernelPackages.nvidiaPackages.latest;
# package = pkgs.unstable.linuxPackages_latest.nvidiaPackages.vulkan_beta; # package = pkgs.linuxPackages_latest.nvidiaPackages.vulkan_beta;
# package = pkgs.unstable.linuxPackages_latest.nvidiaPackages.latest; # package = pkgs.linuxPackages_latest.nvidiaPackages.latest;
package = pkgs.unstable.linuxPackages_latest.nvidiaPackages.production; package = pkgs.linuxPackages_latest.nvidiaPackages.production;
}; };
# enable core and mem freq sliders for nvidia # enable core and mem freq sliders for nvidia
services.xserver.deviceSection = '' services.xserver.deviceSection = ''

2
systems/NOlaptop.nix
View file

@ -4,7 +4,7 @@
# libsForQt5.skanpage # libsForQt5.skanpage
intel-gpu-tools intel-gpu-tools
powertop powertop
unstable.fw-ectool fw-ectool
]; ];
fileSystems."/home" = { fileSystems."/home" = {

2
systems/NOserver.nix
View file

@ -4,7 +4,7 @@
bottom bottom
cifs-utils cifs-utils
git git
unstable.helix helix
ouch ouch
ripgrep ripgrep
skim skim

4
users/pi.nix
View file

@ -4,7 +4,7 @@
libsForQt5.kdeconnect-kde libsForQt5.kdeconnect-kde
]; ];
# programs.nushell.enable = true; # programs.nushell.enable = true;
# environment.shells = with pkgs; [ unstable.nushell ]; # environment.shells = with pkgs; [ nushell ];
# services.expressvpn.enable = true; # services.expressvpn.enable = true;
@ -24,7 +24,7 @@
users.users.tao = { users.users.tao = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "dialout" ]; extraGroups = [ "wheel" "dialout" ];
# shell = pkgs.unstable.nushell; # shell = pkgs.nushell;
}; };
# i18n.inputMethod = { # i18n.inputMethod = {

45
users/tao.nix
View file

@ -1,9 +1,9 @@
{ pkgs, ... }: { { pkgs, home-manager, ... }: {
users.users.tao.packages = with pkgs; [ users.users.tao.packages = with pkgs; [
leetcode-cli leetcode-cli
unstable.typst-fmt typst-fmt
mendeley mendeley
# unstable.wkhtmltopdf # wkhtmltopdf
calibre calibre
qmk qmk
qmk-udev-rules qmk-udev-rules
@ -29,7 +29,7 @@
discord discord
gh gh
jellyfin-media-player jellyfin-media-player
unstable.jellyfin-mpv-shim jellyfin-mpv-shim
keepassxc keepassxc
libsForQt5.kcharselect libsForQt5.kcharselect
libsForQt5.kdeconnect-kde libsForQt5.kdeconnect-kde
@ -45,23 +45,23 @@
thunderbird thunderbird
tio tio
typst-lsp typst-lsp
unstable.joshuto joshuto
unstable.nushell nushell
# unstable.oculante # oculante
unstable.pandoc pandoc
unstable.prusa-slicer prusa-slicer
unstable.starship starship
unstable.typst typst
unstable.wezterm wezterm
unstable.yazi yazi
virt-manager virt-manager
zathura zathura
zoom-us zoom-us
unstable.zoxide zoxide
]; ];
# programs.adb.enable = true; # programs.adb.enable = true;
programs.mosh.enable = true; programs.mosh.enable = true;
environment.shells = with pkgs; [ unstable.nushell ]; environment.shells = with pkgs; [ 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"
@ -90,7 +90,7 @@
users.users.tao = { users.users.tao = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "video" "wheel" "libvirtd" "dialout" "game" ]; extraGroups = [ "video" "wheel" "libvirtd" "dialout" "game" ];
shell = pkgs.unstable.nushell; shell = pkgs.nushell;
}; };
@ -108,8 +108,15 @@
# }; # };
# imports = [ (import "${home-manager}/nixos") ]; # imports = [ (import "${home-manager}/nixos") ];
# imports = [ home-manager.nixosModules.home-manager ];
# home-manager.users.tao = { # home-manager.nixosModules.home-manager
# home.stateversion = "23.11"; # {
# }; # home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
# home-manager.users.tao = import ./users/tao.nix;
# }
home-manager.users.tao = { pkgs, ... }: {
home.stateversion = "23.11";
};
} }