cleanup
This commit is contained in:
parent
67de72906b
commit
648a230f05
4 changed files with 63 additions and 139 deletions
|
|
@ -6,9 +6,7 @@
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
waypipe
|
|
||||||
# inputs.helix.packages.${pkgs.system}.default
|
# inputs.helix.packages.${pkgs.system}.default
|
||||||
# screen
|
|
||||||
bat
|
bat
|
||||||
bottom
|
bottom
|
||||||
cifs-utils
|
cifs-utils
|
||||||
|
|
@ -28,40 +26,18 @@
|
||||||
ouch
|
ouch
|
||||||
pueue
|
pueue
|
||||||
ripgrep
|
ripgrep
|
||||||
# rustdesk
|
rustdesk
|
||||||
sendme
|
sendme
|
||||||
skim
|
skim
|
||||||
tree
|
tree
|
||||||
|
waypipe
|
||||||
wezterm
|
wezterm
|
||||||
wget
|
wget
|
||||||
|
zellij
|
||||||
zstd
|
zstd
|
||||||
];
|
];
|
||||||
programs.partition-manager.enable = lib.mkDefault true;
|
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.graphics.enable = true;
|
||||||
# hardware.opengl = {
|
# hardware.opengl = {
|
||||||
|
|
@ -84,6 +60,7 @@
|
||||||
cosmic-wallpapers
|
cosmic-wallpapers
|
||||||
];
|
];
|
||||||
|
|
||||||
|
services.flatpak.enable = true;
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
users.users.root.openssh.authorizedKeys.keys = [
|
users.users.root.openssh.authorizedKeys.keys = [
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,11 @@
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
services.syncplay = {
|
||||||
|
enable = true;
|
||||||
|
motd = "we only watch kino here";
|
||||||
|
};
|
||||||
|
|
||||||
services.displayManager.cosmic-greeter.enable = false;
|
services.displayManager.cosmic-greeter.enable = false;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
|
||||||
|
|
@ -4,43 +4,7 @@
|
||||||
pkgs,
|
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 = [
|
# nixpkgs.overlays = [
|
||||||
# (final: prev: {
|
# (final: prev: {
|
||||||
# libinput = prev.libinput.overrideAttrs (old: {
|
# libinput = prev.libinput.overrideAttrs (old: {
|
||||||
|
|
@ -66,6 +30,39 @@
|
||||||
services.tailscale.useRoutingFeatures = "client";
|
services.tailscale.useRoutingFeatures = "client";
|
||||||
systemd.services."backlight@backlight:amdgpu_bl2".enable = false;
|
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 = [
|
nix.buildMachines = [
|
||||||
{
|
{
|
||||||
hostName = "nocomputer";
|
hostName = "nocomputer";
|
||||||
|
|
@ -84,38 +81,5 @@
|
||||||
'';
|
'';
|
||||||
nix.distributedBuilds = true;
|
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";
|
networking.hostName = "NOlaptop";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,30 +5,17 @@
|
||||||
lib,
|
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; [
|
users.users.tao.packages = with pkgs; [
|
||||||
printrun
|
|
||||||
zotero
|
|
||||||
openscad
|
|
||||||
syncplay
|
|
||||||
# boxxy
|
# boxxy
|
||||||
calibre
|
|
||||||
# carapace
|
# carapace
|
||||||
# cloud-hypervisor
|
# cloud-hypervisor
|
||||||
# davinci-resolve
|
# davinci-resolve
|
||||||
# fractal
|
# fractal
|
||||||
# freerdp
|
# freerdp
|
||||||
# inputs.plasma-manager.packages.${pkgs.system}.default
|
# inputs.plasma-manager.packages.${pkgs.system}.default
|
||||||
jellyfin-mpv-shim
|
# jellyfin-media-player
|
||||||
# libsForQt5.kcharselect
|
# libsForQt5.kcharselect
|
||||||
# mendeley
|
|
||||||
# piper
|
# piper
|
||||||
# slack
|
|
||||||
# tectonic
|
# tectonic
|
||||||
# texlab
|
# texlab
|
||||||
# thunderbird
|
# thunderbird
|
||||||
|
|
@ -37,16 +24,15 @@
|
||||||
aspell
|
aspell
|
||||||
aspellDicts.en
|
aspellDicts.en
|
||||||
bottles
|
bottles
|
||||||
# darktable
|
calibre
|
||||||
|
darktable
|
||||||
deluge
|
deluge
|
||||||
discord
|
discord
|
||||||
freecad-wayland
|
freecad-wayland
|
||||||
gocryptfs
|
gocryptfs
|
||||||
gurk-rs
|
gurk-rs
|
||||||
# jellyfin-media-player
|
jellyfin-mpv-shim
|
||||||
# kdePackages.plasma-vault
|
|
||||||
keepassxc
|
keepassxc
|
||||||
# leetcode-cli
|
|
||||||
man-pages
|
man-pages
|
||||||
man-pages-posix
|
man-pages-posix
|
||||||
miniserve
|
miniserve
|
||||||
|
|
@ -59,8 +45,10 @@
|
||||||
obs-studio
|
obs-studio
|
||||||
oculante
|
oculante
|
||||||
onlyoffice-bin
|
onlyoffice-bin
|
||||||
|
openscad
|
||||||
pandoc
|
pandoc
|
||||||
pipe-rename
|
pipe-rename
|
||||||
|
printrun
|
||||||
prusa-slicer
|
prusa-slicer
|
||||||
qmk
|
qmk
|
||||||
qmk-udev-rules
|
qmk-udev-rules
|
||||||
|
|
@ -70,6 +58,7 @@
|
||||||
slack
|
slack
|
||||||
snapper
|
snapper
|
||||||
starship
|
starship
|
||||||
|
syncplay
|
||||||
syncthingtray
|
syncthingtray
|
||||||
taskwarrior3
|
taskwarrior3
|
||||||
tinymist
|
tinymist
|
||||||
|
|
@ -81,14 +70,26 @@
|
||||||
wl-clipboard-rs
|
wl-clipboard-rs
|
||||||
yt-dlp
|
yt-dlp
|
||||||
zathura
|
zathura
|
||||||
zellij
|
|
||||||
zoom-us
|
zoom-us
|
||||||
|
zotero
|
||||||
zoxide
|
zoxide
|
||||||
];
|
];
|
||||||
programs.adb.enable = true;
|
programs.adb.enable = true;
|
||||||
programs.kdeconnect.enable = true;
|
programs.kdeconnect.enable = true;
|
||||||
environment.shells = with pkgs; [nushell];
|
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.enable = true;
|
||||||
# virtualisation.libvirtd.qemu.swtpm.enable = true;
|
# virtualisation.libvirtd.qemu.swtpm.enable = true;
|
||||||
# virtualisation.spiceUSBRedirection.enable = true;
|
# virtualisation.spiceUSBRedirection.enable = true;
|
||||||
|
|
@ -99,22 +100,11 @@
|
||||||
# enableExtensionPack = true;
|
# 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];
|
imports = [../extras/snapper.nix];
|
||||||
services.snapper.configs = {
|
services.snapper.configs = {
|
||||||
home = {
|
home = {
|
||||||
SUBVOLUME = "/home";
|
SUBVOLUME = "/home";
|
||||||
# FSTYPE = "bcachefs";
|
|
||||||
FSTYPE =
|
FSTYPE =
|
||||||
if lib.strings.hasPrefix "NOlaptop" (builtins.readFile /etc/hostname)
|
if lib.strings.hasPrefix "NOlaptop" (builtins.readFile /etc/hostname)
|
||||||
then "bcachefs"
|
then "bcachefs"
|
||||||
|
|
@ -141,18 +131,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
|
||||||
'';
|
'';
|
||||||
|
|
||||||
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;
|
# age.secrets.password-tao.file = ../secrets/syncthing-uwuraid.age;
|
||||||
users.users.tao = {
|
users.users.tao = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue