various
This commit is contained in:
parent
bb121c2d33
commit
8768d59f2f
6 changed files with 29 additions and 65 deletions
28
flake.nix
28
flake.nix
|
|
@ -4,7 +4,6 @@
|
|||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||
nixos-hardware.url = "nixos-hardware";
|
||||
# nixos-raspberrypi.url = "github:ramblurr/nixos-raspberrypi";
|
||||
agenix = {
|
||||
url = "github:ryantm/agenix";
|
||||
inputs.darwin.follows = "";
|
||||
|
|
@ -17,15 +16,10 @@
|
|||
url = "github:pjones/plasma-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
# stylix.url = "github:danth/stylix";
|
||||
# helix = {
|
||||
# url = "github:the-mikedavis/helix";
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
# };
|
||||
# jujutsu = {
|
||||
# url = "github:martinvonz/jj";
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
# };
|
||||
nixos-cosmic = {
|
||||
url = "github:lilyinstarlight/nixos-cosmic";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -49,13 +43,10 @@
|
|||
self,
|
||||
nixpkgs,
|
||||
nixos-hardware,
|
||||
# nixos-raspberrypi,
|
||||
agenix,
|
||||
home-manager,
|
||||
plasma-manager,
|
||||
# stylix,
|
||||
# helix,
|
||||
# jujutsu,
|
||||
nixos-cosmic,
|
||||
...
|
||||
} @ inputs: {
|
||||
|
|
@ -69,7 +60,6 @@
|
|||
nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
|
||||
agenix.nixosModules.default
|
||||
home-manager.nixosModules.home-manager
|
||||
# stylix.nixosModules.stylix
|
||||
./systems/BASED.nix
|
||||
./systems/NOcomputer.nix
|
||||
./users/tao.nix
|
||||
|
|
@ -106,7 +96,6 @@
|
|||
# inputs.nixos-hardware.nixosModules.framework-12th-gen-intel
|
||||
agenix.nixosModules.default
|
||||
home-manager.nixosModules.home-manager
|
||||
# stylix.nixosModules.stylix
|
||||
./systems/BASED.nix
|
||||
./systems/NOmom.nix
|
||||
./users/tao.nix
|
||||
|
|
@ -114,23 +103,6 @@
|
|||
./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";
|
||||
# })
|
||||
# ];
|
||||
# };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -151,6 +151,7 @@
|
|||
experimental-features = "nix-command flakes";
|
||||
auto-optimise-store = true;
|
||||
trusted-users = ["root" "@wheel"];
|
||||
show-trace = true;
|
||||
};
|
||||
nixpkgs.config = {allowUnfree = true;};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,13 @@
|
|||
{pkgs, ...}: {
|
||||
nix.settings.system-features = [
|
||||
"benchmark"
|
||||
"big-parallel"
|
||||
"gccarch-znver3"
|
||||
"gccarch-znver4"
|
||||
"kvm"
|
||||
"nixos-test"
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# egl-wayland
|
||||
# gpt4all-chat
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
|
|
@ -14,6 +15,14 @@
|
|||
# });
|
||||
# })
|
||||
# ];
|
||||
nix.settings.system-features = [
|
||||
"benchmark"
|
||||
"big-parallel"
|
||||
"gccarch-znver3"
|
||||
"gccarch-znver4"
|
||||
"kvm"
|
||||
"nixos-test"
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
framework-tool
|
||||
|
|
@ -27,15 +36,15 @@
|
|||
|
||||
environment.etc = {
|
||||
"libinput/local-overrides.quirks".text = "
|
||||
# MatchUdevType=touchpad
|
||||
# MatchDMIModalias=dmi:*svnFramework:pnLaptop*
|
||||
# AttrEventCode=-BTN_RIGHT
|
||||
# MatchUdevType=touchpad
|
||||
# MatchDMIModalias=dmi:*svnFramework:pnLaptop*
|
||||
# AttrEventCode=-BTN_RIGHT
|
||||
|
||||
[Framework Laptop 16 Keyboard Module]
|
||||
MatchName=Framework Laptop 16 Keyboard Module*
|
||||
# MatchUdevType=keyboard
|
||||
# MatchDMIModalias=dmi:*svnFramework:pnLaptop16*
|
||||
AttrKeyboardIntegration=internal";
|
||||
[Framework Laptop 16 Keyboard Module]
|
||||
MatchName=Framework Laptop 16 Keyboard Module*
|
||||
# MatchUdevType=keyboard
|
||||
# MatchDMIModalias=dmi:*svnFramework:pnLaptop16*
|
||||
AttrKeyboardIntegration=internal";
|
||||
};
|
||||
|
||||
services.displayManager.defaultSession = "plasma";
|
||||
|
|
@ -44,7 +53,7 @@ AttrKeyboardIntegration=internal";
|
|||
{
|
||||
hostName = "nocomputer";
|
||||
systems = ["x86_64-linux" "i686-linux"];
|
||||
supportedFeatures = ["big-parallel" "kvm" "nixos-test" "benchmark"];
|
||||
supportedFeatures = ["gccarch-znver4" "big-parallel" "kvm" "nixos-test" "benchmark"];
|
||||
}
|
||||
];
|
||||
nix.extraOptions = ''
|
||||
|
|
|
|||
|
|
@ -140,33 +140,6 @@
|
|||
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; [
|
||||
(nerdfonts.override {fonts = ["FiraCode"];})
|
||||
noto-fonts-cjk
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ alias b = btm;
|
|||
alias cringe = sudo bootctl set-oneshot auto-windows
|
||||
alias fetch = neofetch
|
||||
alias ff = firefox
|
||||
alias gc = sudo nix-collect-garbage -d --verbose
|
||||
alias gc = nh clean all
|
||||
alias jd = jj diff
|
||||
alias js = jj status
|
||||
alias pu = pueue
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue