This commit is contained in:
Tao Tien 2024-04-29 16:25:28 -07:00
parent bb121c2d33
commit 8768d59f2f
6 changed files with 29 additions and 65 deletions

View file

@ -4,7 +4,6 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
nixos-hardware.url = "nixos-hardware"; nixos-hardware.url = "nixos-hardware";
# nixos-raspberrypi.url = "github:ramblurr/nixos-raspberrypi";
agenix = { agenix = {
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";
inputs.darwin.follows = ""; inputs.darwin.follows = "";
@ -17,15 +16,10 @@
url = "github:pjones/plasma-manager"; url = "github:pjones/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# stylix.url = "github:danth/stylix";
# helix = { # helix = {
# url = "github:the-mikedavis/helix"; # url = "github:the-mikedavis/helix";
# inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
# }; # };
# jujutsu = {
# url = "github:martinvonz/jj";
# inputs.nixpkgs.follows = "nixpkgs";
# };
nixos-cosmic = { nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic"; url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -49,13 +43,10 @@
self, self,
nixpkgs, nixpkgs,
nixos-hardware, nixos-hardware,
# nixos-raspberrypi,
agenix, agenix,
home-manager, home-manager,
plasma-manager, plasma-manager,
# stylix,
# helix, # helix,
# jujutsu,
nixos-cosmic, nixos-cosmic,
... ...
} @ inputs: { } @ inputs: {
@ -69,7 +60,6 @@
nixos-hardware.nixosModules.common-gpu-nvidia-nonprime nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
agenix.nixosModules.default agenix.nixosModules.default
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
# stylix.nixosModules.stylix
./systems/BASED.nix ./systems/BASED.nix
./systems/NOcomputer.nix ./systems/NOcomputer.nix
./users/tao.nix ./users/tao.nix
@ -106,7 +96,6 @@
# inputs.nixos-hardware.nixosModules.framework-12th-gen-intel # inputs.nixos-hardware.nixosModules.framework-12th-gen-intel
agenix.nixosModules.default agenix.nixosModules.default
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
# stylix.nixosModules.stylix
./systems/BASED.nix ./systems/BASED.nix
./systems/NOmom.nix ./systems/NOmom.nix
./users/tao.nix ./users/tao.nix
@ -114,23 +103,6 @@
./extras/uwuraid.nix ./extras/uwuraid.nix
]; ];
}; };
# NOiso = nixpkgs.lib.nixosSystem {
# system = "x86_64-linux";
# specialArgs = {inherit inputs;};
# modules = [
# "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
# home-manager.nixosModules.home-manager
# ./systems/BASED.nix
# ./users/tao.nix
# ({lib, ...}: {
# isoImage.squashfsCompression = "zstd";
# networking.wireless.enable = false;
# security.sudo-rs.enable = lib.mkForce false;
# services.btrfs.autoScrub.enable = false;
# system.stateVersion = lib.mkForce "24.05";
# })
# ];
# };
}; };
}; };
} }

View file

@ -151,6 +151,7 @@
experimental-features = "nix-command flakes"; experimental-features = "nix-command flakes";
auto-optimise-store = true; auto-optimise-store = true;
trusted-users = ["root" "@wheel"]; trusted-users = ["root" "@wheel"];
show-trace = true;
}; };
nixpkgs.config = {allowUnfree = true;}; nixpkgs.config = {allowUnfree = true;};

View file

@ -1,4 +1,13 @@
{pkgs, ...}: { {pkgs, ...}: {
nix.settings.system-features = [
"benchmark"
"big-parallel"
"gccarch-znver3"
"gccarch-znver4"
"kvm"
"nixos-test"
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# egl-wayland # egl-wayland
# gpt4all-chat # gpt4all-chat

View file

@ -1,4 +1,5 @@
{ {
lib,
config, config,
pkgs, pkgs,
... ...
@ -14,6 +15,14 @@
# }); # });
# }) # })
# ]; # ];
nix.settings.system-features = [
"benchmark"
"big-parallel"
"gccarch-znver3"
"gccarch-znver4"
"kvm"
"nixos-test"
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
framework-tool framework-tool
@ -44,7 +53,7 @@ AttrKeyboardIntegration=internal";
{ {
hostName = "nocomputer"; hostName = "nocomputer";
systems = ["x86_64-linux" "i686-linux"]; systems = ["x86_64-linux" "i686-linux"];
supportedFeatures = ["big-parallel" "kvm" "nixos-test" "benchmark"]; supportedFeatures = ["gccarch-znver4" "big-parallel" "kvm" "nixos-test" "benchmark"];
} }
]; ];
nix.extraOptions = '' nix.extraOptions = ''

View file

@ -140,33 +140,6 @@
options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
''; '';
# stylix.autoEnable = false;
# stylix.image = /home/tao/Pictures/Wallpapers/DJI_0121.JPG;
# stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml";
# stylix.fonts = with pkgs; {
# monospace = {
# package = nerdfonts.override {fonts = ["FiraCode"];};
# name = "FiraCode Nerd Font";
# };
# };
# stylix.targets = {
# console.enable = true;
# };
# home-manager.sharedModules = [
# {
# stylix.targets = {
# bat.enable = true;
# # firefox.enable = true;
# # helix.enable = true;
# kde.enable = true;
# nushell.enable = true;
# # wezterm.enable = true;
# zathura.enable = true;
# zellij.enable = true;
# };
# }
# ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
(nerdfonts.override {fonts = ["FiraCode"];}) (nerdfonts.override {fonts = ["FiraCode"];})
noto-fonts-cjk noto-fonts-cjk

View file

@ -45,7 +45,7 @@ alias b = btm;
alias cringe = sudo bootctl set-oneshot auto-windows alias cringe = sudo bootctl set-oneshot auto-windows
alias fetch = neofetch alias fetch = neofetch
alias ff = firefox alias ff = firefox
alias gc = sudo nix-collect-garbage -d --verbose alias gc = nh clean all
alias jd = jj diff alias jd = jj diff
alias js = jj status alias js = jj status
alias pu = pueue alias pu = pueue