From b1ec229a3ee8b55cf5ecbf7373dd32d9b25a9169 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Sat, 30 Sep 2023 21:59:04 -0700 Subject: [PATCH] not werk --- flake.nix | 6 +++--- systems/BASED.nix | 16 ++++++++-------- systems/NObangers.nix | 7 ++++--- users/tao.nix | 28 ++++++++++++++-------------- 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/flake.nix b/flake.nix index 7807c1d..85efc8a 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ unstable = import nixpkgs-unstable { system = "aarch64-linux"; config.allowUnfree = true; - config.allowUnsupportedSystem = true; + # config.allowUnsupportedSystem = true; }; }; nixosSystem = (systemModules: nixpkgs.lib.nixosSystem { modules = systemModules; }); @@ -50,11 +50,11 @@ ./extras/gaming.nix ]; NObangers = nixosSystem [ - ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable-arm ]; }) + # ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable-arm ]; }) nixos-hw.raspberry-pi-4 ./systems/BASED.nix ./systems/NObangers.nix - ./users/tao.nix + ./users/pi.nix ./extras/uwuraid.nix ]; }; diff --git a/systems/BASED.nix b/systems/BASED.nix index 0beb84d..3546b49 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -2,7 +2,7 @@ environment.systemPackages = with pkgs; [ # exfatprogs # rustup - appimage-run + # appimage-run bat bottom cifs-utils @@ -13,18 +13,18 @@ helix mesa mpv - nfs-utils + # nfs-utils nil - nixpkgs-fmt + # nixpkgs-fmt # onlyoffice-bin ouch - ripgrep-all + # ripgrep-all skim - snapper + # snapper tree - unstable.yazi - unstable.joshuto - unstable.oculante + # unstable.yazi + # unstable.joshuto + # xunstable.oculante wezterm wget yt-dlp diff --git a/systems/NObangers.nix b/systems/NObangers.nix index fb05016..255e98f 100644 --- a/systems/NObangers.nix +++ b/systems/NObangers.nix @@ -7,6 +7,7 @@ fileSystems."/" = { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; fsType = "ext4"; + autoResize = true; }; programs.partition-manager.enable = false; @@ -22,17 +23,17 @@ boot.loader.efi.canTouchEfiVariables = false; boot.loader.generic-extlinux-compatible.enable = true; console.enable = false; - powerManagement.cpuFreqGovernor = "ondemand"; + # powerManagement.cpuFreqGovernor = "ondemand"; hardware = { raspberry-pi."4" = { apply-overlays-dtmerge.enable = true; - audio.enable = true; + #audio.enable = true; fkms-3d.enable = true; }; deviceTree = { enable = true; - filter = "*rpi-4-*.dtb"; + # filter = "*rpi-4-*.dtb"; }; }; diff --git a/users/tao.nix b/users/tao.nix index 13cfe49..a0e4d3d 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -14,35 +14,35 @@ # nuspell # hunspellDicts.en-us-large # rustdesk - bottles - cider + # bottles + # cider darktable deluge - discord + # discord gh keepassxc libsForQt5.kcharselect libsForQt5.kdeconnect-kde - mdbook - partition-manager - slack + # mdbook + # partition-manager + # slack tectonic texlab tio - unstable.typst + # unstable.typst ocs-url typst-lsp - unstable.nushell - unstable.prusa-slicer - unstable.starship - unstable.wezterm + # unstable.nushell + # unstable.prusa-slicer + # unstable.starship + # unstable.wezterm virt-manager - zoom-us + # zoom-us zoxide obs-studio ]; # programs.nushell.enable = true; - environment.shells = with pkgs; [ unstable.nushell ]; + # environment.shells = with pkgs; [ unstable.nushell ]; # services.expressvpn.enable = true; @@ -65,7 +65,7 @@ users.users.tao = { isNormalUser = true; extraGroups = [ "wheel" "libvirtd" "dialout" "scanner" "lp" ]; - shell = pkgs.unstable.nushell; + # shell = pkgs.unstable.nushell; }; # i18n.inputMethod = {