From b3931c5dd7006011720ac39db04136e69d02c952 Mon Sep 17 00:00:00 2001 From: adikro Date: Thu, 8 Jan 2026 19:16:18 +0100 Subject: laptop pull and rebase --- hm/env/niri/binds.nix | 2 +- hm/soft/mpv.nix | 7 +++---- hosts/desktop/configuration.nix | 6 ++++++ hosts/desktop/hardware-configuration.nix | 5 ++++- hosts/desktop/home.nix | 5 +---- hosts/laptop/configuration.nix | 1 + os/srv/files.nix | 1 + 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/hm/env/niri/binds.nix b/hm/env/niri/binds.nix index df5e34d..57cf66a 100644 --- a/hm/env/niri/binds.nix +++ b/hm/env/niri/binds.nix @@ -2,7 +2,7 @@ with config.lib.niri.actions; let playerctl = spawn "${pkgs.playerctl}/bin/playerctl"; - ss = "/media/pics/ss/$(date +%Y-%m-%d_%H-%M-%S)"; + ss = "${toString cfg.mediaPath}/pics/ss/$(date +%Y-%m-%d_%H-%M-%S)"; in { "Mod+O" = { diff --git a/hm/soft/mpv.nix b/hm/soft/mpv.nix index da4b591..4af4198 100644 --- a/hm/soft/mpv.nix +++ b/hm/soft/mpv.nix @@ -39,10 +39,9 @@ in profile = "gpu-hq"; gpu-api = "vulkan"; vo = "gpu-next"; - - hwdec = "auto-safe"; - gpu-hwdec-interop = "vaapi"; - hwdec-codecs = "all"; + hwdec = "vaapi"; + # gpu-hwdec-interop = "vaapi"; + # hwdec-codecs = "all"; scale = "ewa_lanczossharp"; cscale = "ewa_lanczos"; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index af29944..ecef098 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -71,6 +71,12 @@ rivalcfg ]; + services.blueman.enable = true; + hardware.bluetooth = { + enable = true; + powerOnBoot = true; + }; + boot = { kernelParams = [ "video=DP-1:2560x1440@240" ]; kernelModules = [ "nct6687" ]; diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index 41eb3a1..e2d32f6 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -16,6 +16,7 @@ fileSystems."/" = { device = "/dev/disk/by-uuid/aa9c6208-2cc3-413c-a52a-5e0fdf93e748"; fsType = "btrfs"; + options = [ "noatime" ]; }; fileSystems."/boot" = @@ -27,11 +28,13 @@ fileSystems."/home" = { device = "/dev/disk/by-uuid/694036da-fc6e-4c7c-8765-7b90fb9a04c8"; fsType = "btrfs"; + options = [ "noatime" ]; }; - fileSystems."/media" = + fileSystems."/run/media/adam/hdd" = { device = "/dev/disk/by-uuid/c0dc7c4d-1800-4c84-a04c-5ea7f5e86c4b"; fsType = "ext4"; + options = [ "nofail" "noatime" ]; }; swapDevices = [ ]; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 3116bc7..b485217 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -26,9 +26,7 @@ in mediaPath = /media; }; }; - editors = { - nixvim.enable = true; - }; + editors.nixvim.enable = true; env = { niri.enable = true; @@ -49,7 +47,6 @@ in librewolf.enable = true; brave.enable = true; }; - # easyeffects.enable = true; email.evolution.enable = true; kdeconnect.enable = true; kdenlive.enable = true; diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 9112b0f..40a3d7b 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -50,6 +50,7 @@ nix-helper.enable = true; }; wm = { + enable = true; niri.enable = true; }; }; diff --git a/os/srv/files.nix b/os/srv/files.nix index 72fe01a..049ec48 100644 --- a/os/srv/files.nix +++ b/os/srv/files.nix @@ -19,6 +19,7 @@ in thunar-volman thunar-archive-plugin thunar-vcs-plugin + thunar-media-tags-plugin ]; }; services = { -- cgit v1.3