From 648a230f050e3037f5f4bae72493d88ad1f917e5 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Thu, 16 Oct 2025 17:07:43 -0700 Subject: [PATCH] cleanup --- systems/BASED.nix | 31 ++----------- systems/NOcomputer.nix | 5 ++ systems/NOlaptop.nix | 102 +++++++++++++---------------------------- users/tao.nix | 64 +++++++++----------------- 4 files changed, 63 insertions(+), 139 deletions(-) diff --git a/systems/BASED.nix b/systems/BASED.nix index 3fc2847..f98ffd7 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -6,9 +6,7 @@ ... }: { environment.systemPackages = with pkgs; [ - waypipe # inputs.helix.packages.${pkgs.system}.default - # screen bat bottom cifs-utils @@ -28,40 +26,18 @@ ouch pueue ripgrep - # rustdesk + rustdesk sendme skim tree + waypipe wezterm wget + zellij zstd ]; programs.partition-manager.enable = lib.mkDefault true; - # programs.nh = { - # enable = true; - # }; - - programs.firefox.enable = true; - programs.firefox.policies = { - DisablePocket = true; - PasswordManagerEnabled = false; - NoDefaultBookmarks = false; - }; - programs.firefox.preferences = { - "media.ffmpeg.vaapi.enabled" = true; - - "widget.use-xdg-desktop-portal.file-picker" = 1; - "widget.use-xdg-desktop-portal.location" = 1; - "widget.use-xdg-desktop-portal.mime-handler" = 1; - "widget.use-xdg-desktop-portal.open-uri" = 1; - "widget.use-xdg-desktop-portal.settings" = 1; - - "accessibility.browsewithcaret_shortcut.enabled" = false; - "browser.bookmarks.restore_default_bookmarks" = false; - }; - - services.flatpak.enable = true; hardware.graphics.enable = true; # hardware.opengl = { @@ -84,6 +60,7 @@ cosmic-wallpapers ]; + services.flatpak.enable = true; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = [ ]; diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 33fc38b..44372e3 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -4,6 +4,11 @@ lib, ... }: { + services.syncplay = { + enable = true; + motd = "we only watch kino here"; + }; + services.displayManager.cosmic-greeter.enable = false; environment.systemPackages = with pkgs; [ diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 5dbc248..840a037 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -4,43 +4,7 @@ pkgs, ... }: -# let -# boostless = pkgs.pipewire.overrideAttrs (old: { -# postInstall = -# old.postInstall or "" -# + '' -# ''; -# }); -# in { - environment.etc."alsa-card-profile/analog-input-internal-mic.conf".source = ../extras/analog-input-internal-mic.conf; - - hardware.graphics.extraPackages = with pkgs; [ - amdvlk - ]; - hardware.graphics.extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; - services.xserver.videoDrivers = [ - "amdgpu" - ]; - - # services.pipewire.wireplumber.extraConfig = { - # "wireplumber.settings" = { - # "device.routes.default-source-volume" = 0.42; - # }; - # }; - - services.rsyslogd = { - enable = true; - extraConfig = '' - module(load="imudp") - input(type="imudp" port="514") - - THENAS.* -/var/log/THENAS - ''; - }; - # nixpkgs.overlays = [ # (final: prev: { # libinput = prev.libinput.overrideAttrs (old: { @@ -66,6 +30,39 @@ services.tailscale.useRoutingFeatures = "client"; systemd.services."backlight@backlight:amdgpu_bl2".enable = false; + services.udev.extraRules = '' + # ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness" + # ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chmod g+w /sys/class/backlight/%k/brightness" + + ACTION=="add|change", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0012", ATTR{power/wakeup}="disabled" + ACTION=="add|change", KERNEL=="i2c", SUBSYSTEM=="i2c", DEVPATH=="/sys/devices/platform/AMDI0010:03/i2c-1/i2c-PIXA3854:00", ATTR{power/wakeup}="disabled" + + # ACTION=="add", SUBSYSTEM=="acpi", DRIVERS=="button", ATTRS{hid}=="PNP0C0D", ATTR{power/wakeup}="disabled" + # ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled" + # ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled" + ''; + + services.fprintd.enable = true; + + services.xserver.videoDrivers = [ + "amdgpu" + ]; + hardware.graphics.extraPackages = with pkgs; [ + amdvlk + ]; + hardware.graphics.extraPackages32 = with pkgs; [ + driversi686Linux.amdvlk + ]; + + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelParams = [ + "amdgpu.abmlevel=1" + "mem_sleep_default=deep" + ]; + boot.kernelModules = ["amdgpu"]; + powerManagement.cpuFreqGovernor = "powersave"; + systemd.sleep.extraConfig = "HibernateDelaySec=360m"; + nix.buildMachines = [ { hostName = "nocomputer"; @@ -84,38 +81,5 @@ ''; nix.distributedBuilds = true; - services.udev.extraRules = '' - # ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness" - # ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chmod g+w /sys/class/backlight/%k/brightness" - - ACTION=="add|change", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0012", ATTR{power/wakeup}="disabled" - ACTION=="add|change", KERNEL=="i2c", SUBSYSTEM=="i2c", DEVPATH=="/sys/devices/platform/AMDI0010:03/i2c-1/i2c-PIXA3854:00", ATTR{power/wakeup}="disabled" - - # ACTION=="add", SUBSYSTEM=="acpi", DRIVERS=="button", ATTRS{hid}=="PNP0C0D", ATTR{power/wakeup}="disabled" - # ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled" - # ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled" - ''; - - services.fprintd.enable = true; - - boot.kernelPackages = pkgs.linuxPackages_latest; - # boot.initrd.availableKernelModules = [ - # "nvme" - # "sd_mod" - # "thunderbolt" - # "usb_storage" - # "xhci_pci" - # "usbhid" - # "uas" - # ]; - boot.kernelParams = [ - "amdgpu.abmlevel=1" - # "amdgpu.dcdebugmask=0x400" - "mem_sleep_default=deep" - ]; - boot.kernelModules = ["amdgpu"]; - powerManagement.cpuFreqGovernor = "powersave"; - systemd.sleep.extraConfig = "HibernateDelaySec=360m"; - networking.hostName = "NOlaptop"; } diff --git a/users/tao.nix b/users/tao.nix index 5618ef2..751060b 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -5,30 +5,17 @@ lib, ... }: { - # environment.sessionVariables.XDG_RUNTIME_DIR = "/run/user/${toString config.users.tao.uid}"; - services.syncplay = { - enable = true; - motd = "we only watch kino here"; - }; - users.users.tao.packages = with pkgs; [ - printrun - zotero - openscad - syncplay # boxxy - calibre # carapace # cloud-hypervisor # davinci-resolve # fractal # freerdp # inputs.plasma-manager.packages.${pkgs.system}.default - jellyfin-mpv-shim + # jellyfin-media-player # libsForQt5.kcharselect - # mendeley # piper - # slack # tectonic # texlab # thunderbird @@ -37,16 +24,15 @@ aspell aspellDicts.en bottles - # darktable + calibre + darktable deluge discord freecad-wayland gocryptfs gurk-rs - # jellyfin-media-player - # kdePackages.plasma-vault + jellyfin-mpv-shim keepassxc - # leetcode-cli man-pages man-pages-posix miniserve @@ -59,8 +45,10 @@ obs-studio oculante onlyoffice-bin + openscad pandoc pipe-rename + printrun prusa-slicer qmk qmk-udev-rules @@ -70,6 +58,7 @@ slack snapper starship + syncplay syncthingtray taskwarrior3 tinymist @@ -81,14 +70,26 @@ wl-clipboard-rs yt-dlp zathura - zellij zoom-us + zotero zoxide ]; programs.adb.enable = true; programs.kdeconnect.enable = true; environment.shells = with pkgs; [nushell]; + fonts.packages = with pkgs; [ + # (nerdfonts.override {fonts = ["FiraCode"];}) + nerd-fonts.fira-code + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-color-emoji + ibm-plex + cooper-hewitt + ]; + + documentation.enable = true; + # virtualisation.libvirtd.enable = true; # virtualisation.libvirtd.qemu.swtpm.enable = true; # virtualisation.spiceUSBRedirection.enable = true; @@ -99,22 +100,11 @@ # enableExtensionPack = true; # }; - # nixpkgs.overlays = [ - # (final: prev: { - # options.services.snapper.configs = prev.options.services.snapper.configs.overrideAttrs (old: { - # configOptions.FSTYPE = lib.mkOption { - # type = lib.types.enum ["btrfs" "bcachefs"]; - # }; - # }); - # }) - # ]; - - disabledModules = ["services/misc/snapper.nix"]; + disabledModules = ["services/misc/snapper.nix"]; imports = [../extras/snapper.nix]; services.snapper.configs = { home = { SUBVOLUME = "/home"; - # FSTYPE = "bcachefs"; FSTYPE = if lib.strings.hasPrefix "NOlaptop" (builtins.readFile /etc/hostname) then "bcachefs" @@ -141,18 +131,6 @@ options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 ''; - fonts.packages = with pkgs; [ - # (nerdfonts.override {fonts = ["FiraCode"];}) - nerd-fonts.fira-code - noto-fonts-cjk-sans - noto-fonts-cjk-serif - noto-fonts-color-emoji - ibm-plex - cooper-hewitt - ]; - - documentation.enable = true; - # age.secrets.password-tao.file = ../secrets/syncthing-uwuraid.age; users.users.tao = { isNormalUser = true;