From 083dc759d1436fdc4a2b0c7492cfc833555b5b99 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Sat, 22 Jun 2024 06:56:38 +0200 Subject: [PATCH 1/7] Add toggle-idle script --- .../graphical/wms/hyprland/config/keybinds.nix | 1 + .../graphical/wms/hyprland/default.nix | 1 + .../wms/hyprland/packages/default.nix | 1 + .../hyprland/packages/toggle-idle/default.nix | 14 ++++++++++++++ .../packages/toggle-idle/toggle-idle.sh | 18 ++++++++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 home/programs/graphical/wms/hyprland/packages/toggle-idle/default.nix create mode 100644 home/programs/graphical/wms/hyprland/packages/toggle-idle/toggle-idle.sh diff --git a/home/programs/graphical/wms/hyprland/config/keybinds.nix b/home/programs/graphical/wms/hyprland/config/keybinds.nix index 5ae8a89..f7301da 100644 --- a/home/programs/graphical/wms/hyprland/config/keybinds.nix +++ b/home/programs/graphical/wms/hyprland/config/keybinds.nix @@ -36,6 +36,7 @@ # TODO: Requires programs "SUPER_SHIFT, L, exec, wlogout -p layer-shell" "SUPER_CTRL, L, exec, loginctl lock-session" + "SUPER_SHIFT, T, exec, toggle-idle" # # Screenshots diff --git a/home/programs/graphical/wms/hyprland/default.nix b/home/programs/graphical/wms/hyprland/default.nix index 6c31cf0..c9026cf 100644 --- a/home/programs/graphical/wms/hyprland/default.nix +++ b/home/programs/graphical/wms/hyprland/default.nix @@ -21,6 +21,7 @@ in { hyprPkgs.quick-record hyprPkgs.toggle-fake-fullscreen hyprPkgs.toggle-notifications + hyprPkgs.toggle-idle hyprPkgs.brightness pkgs.brightnessctl pkgs.hyprpicker diff --git a/home/programs/graphical/wms/hyprland/packages/default.nix b/home/programs/graphical/wms/hyprland/packages/default.nix index 2f15f04..715d5f4 100644 --- a/home/programs/graphical/wms/hyprland/packages/default.nix +++ b/home/programs/graphical/wms/hyprland/packages/default.nix @@ -9,6 +9,7 @@ quick-record = pkgs.callPackage ./quick-record {}; toggle-fake-fullscreen = pkgs.callPackage ./toggle-fake-fullscreen {}; toggle-notifications = pkgs.callPackage ./toggle-notifications {}; + toggle-idle = pkgs.callPackage ./toggle-idle {}; }; in packages diff --git a/home/programs/graphical/wms/hyprland/packages/toggle-idle/default.nix b/home/programs/graphical/wms/hyprland/packages/toggle-idle/default.nix new file mode 100644 index 0000000..9d2e187 --- /dev/null +++ b/home/programs/graphical/wms/hyprland/packages/toggle-idle/default.nix @@ -0,0 +1,14 @@ +{pkgs, ...}: +pkgs.writeShellApplication { + name = "toggle-idle"; + runtimeInputs = with pkgs; [ + coreutils + gnugrep + procps + libnotify + hypridle + ]; + text = '' + ${builtins.readFile ./toggle-idle.sh} + ''; +} diff --git a/home/programs/graphical/wms/hyprland/packages/toggle-idle/toggle-idle.sh b/home/programs/graphical/wms/hyprland/packages/toggle-idle/toggle-idle.sh new file mode 100644 index 0000000..4edf63c --- /dev/null +++ b/home/programs/graphical/wms/hyprland/packages/toggle-idle/toggle-idle.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +set -euo pipefail + +idleprog="hypridle" # or swayidle + +pid="$(pidof "$idleprog" || true)" +if [ -n "$pid" ]; then + # is process suspended? + if ps -o stat= -p "$pid" | grep T >/dev/null; then + kill -CONT "$pid" + notify-send "Idle-Toggle" "Idle timeouts enabled" + else + kill -STOP "$pid" + notify-send "Idle-Toggle" "Idle timeouts disabled" + fi +else + notify-send "Idle-Toggle" "$idleprog not running!" +fi From 702c4a00df6226562f8f3499a573a98f728cffde Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Sat, 22 Jun 2024 07:41:08 +0200 Subject: [PATCH 2/7] Add xdg-desktop-portal-gtk --- home/programs/xdg/default.nix | 1 + home/programs/xdg/portal.nix | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 home/programs/xdg/portal.nix diff --git a/home/programs/xdg/default.nix b/home/programs/xdg/default.nix index d683831..9365821 100644 --- a/home/programs/xdg/default.nix +++ b/home/programs/xdg/default.nix @@ -3,6 +3,7 @@ ./mime-apps.nix ./user-dirs.nix ./config-files.nix + ./portal.nix ]; xdg = { diff --git a/home/programs/xdg/portal.nix b/home/programs/xdg/portal.nix new file mode 100644 index 0000000..bbca32f --- /dev/null +++ b/home/programs/xdg/portal.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + xdg.portal = { + enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + ]; + }; +} From 827b355c5e51634c41cc2e2a6b01c763a8696435 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Sat, 22 Jun 2024 07:42:40 +0200 Subject: [PATCH 3/7] Move bluetooth to hardware dir --- system/shared/default.nix | 1 - system/shared/{ => hardware}/bluetooth.nix | 0 system/shared/hardware/default.nix | 1 + 3 files changed, 1 insertion(+), 1 deletion(-) rename system/shared/{ => hardware}/bluetooth.nix (100%) diff --git a/system/shared/default.nix b/system/shared/default.nix index b94792b..0c0019e 100644 --- a/system/shared/default.nix +++ b/system/shared/default.nix @@ -11,7 +11,6 @@ _: { ./programs.nix ./system.nix ./network.nix - ./bluetooth.nix ./localisation.nix ./packages.nix ]; diff --git a/system/shared/bluetooth.nix b/system/shared/hardware/bluetooth.nix similarity index 100% rename from system/shared/bluetooth.nix rename to system/shared/hardware/bluetooth.nix diff --git a/system/shared/hardware/default.nix b/system/shared/hardware/default.nix index 2c3dc2f..171698d 100644 --- a/system/shared/hardware/default.nix +++ b/system/shared/hardware/default.nix @@ -3,6 +3,7 @@ _: { ./cpu ./gpu ./tpm.nix + ./bluetooth.nix ./generic.nix ]; } From c92924295e206541e6927109b4663bac7c20598a Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Sat, 22 Jun 2024 08:05:26 +0200 Subject: [PATCH 4/7] Fix nomacs config path for persistence --- hosts/voyager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix index 97daeff..aebebc3 100644 --- a/hosts/voyager/default.nix +++ b/hosts/voyager/default.nix @@ -70,7 +70,7 @@ # Applications ".config/spotify" ".config/vesktop" - "./config/nomacs" + ".config/nomacs" ".local/share/Smart Code ltd/Stremio" # Tools From 62b8124b9cf59ad240b979cbd98fb01a41b7d85b Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Sat, 22 Jun 2024 08:31:23 +0200 Subject: [PATCH 5/7] Add mpv settings --- home/packages/gui/mpv.nix | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/home/packages/gui/mpv.nix b/home/packages/gui/mpv.nix index 812aee1..7518265 100644 --- a/home/packages/gui/mpv.nix +++ b/home/packages/gui/mpv.nix @@ -12,6 +12,44 @@ in { home.packages = with pkgs; [ mpv ]; + + xdg.configFile = { + "mpv/mpv.conf".text = '' + loop=yes + ''; + + "mpv/input.conf".text = '' + # Vim keys seeking + l seek 5 + h seek -5 + j seek -60 + k seek 60 + + # Set A-B Loop key to g, since l was rebound + g ab-loop + + # Swap i and I, use lowercase for toggle + i script-binding stats/display-stats-toggle + I script-binding stats/display-stats + + UP add volume 2 + DOWN add volume -2 + + # Zooming + - add video-zoom -.25 + + add video-zoom .25 + + # Moving/panning video + kp8 add video-pan-y .05 + kp6 add video-pan-x -.05 + kp2 add video-pan-y -.05 + kp4 add video-pan-x .05 + kp5 set video-pan-x 0; set video-pan-y 0; set video-zoom 0 + + # Rotation + ctrl+r cycle_values video-rotate "90" "180" "270" "0" + ''; + }; }; } From 17b444cda166d58518132762063486d713d57b08 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Sat, 22 Jun 2024 08:46:17 +0200 Subject: [PATCH 6/7] Add nomacs config --- home/packages/gui/nomacs.nix | 95 ++++++++++++++++++++++++++++++++++++ hosts/voyager/default.nix | 1 - 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/home/packages/gui/nomacs.nix b/home/packages/gui/nomacs.nix index 33d003c..143387b 100644 --- a/home/packages/gui/nomacs.nix +++ b/home/packages/gui/nomacs.nix @@ -12,5 +12,100 @@ in { home.packages = with pkgs; [ nomacs ]; + + xdg.configFile = { + "nomacs/Image Lounge.conf".text = '' + [General] + DkEditDock=2 + DkExplorer=1 + DkMetaDataDock=2 + firstTime=false + + [AppSettings] + appMode=0 + currentAppMode=0 + defaultJpgQuality=97 + firstTime.nomacs.3=false + hideAllPanels=true + showMenuBar=false + showRecentFiles=false + + [Crop] + AspectRatioHorizontal=0 + AspectRatioVertical=0 + cropToMetadata=false + guides=1 + info=true + inverted=false + + [DisplaySettings] + bgColorNoMacsRGBA=4281545523 + bgColorWidgetRGBA=2852126720 + fadeSec=0 + fontColorRGBA=4292730333 + highlightColorRGBA=4278233855 + iconColorRGBA=4292730333 + themeName312=Dark-Theme.css + transition=0 + + [DkAppManager] + Apps\size=0 + + [DkCompressionDialog] + CompressionCombo0=0 + bgCompressionColor0=4294967295 + + [DkDialog] + deleteFileDialog=false + deleteFileDialog-answer=16384 + overwriteDialog=false + overwriteDialog-answer=16384 + saveEditDialog=false + saveEditDialog-answer=16384 + saveTabsDialog=true + saveTabsDialog-answer=16384 + + [DkExplorer] + Date%20ModifiedHidden=true + Date%20ModifiedSize=0 + LoadSelected=false + NameHidden=false + NameSize=243 + ReadOnly=true + RootPath=/home/itsdrike + SizeHidden=true + SizeSize=0 + TypeHidden=true + TypeSize=0 + + [DkFilePreview] + windowPosition=1 + + [DkMetaDataDock] + KeySize=100 + ValueSize=113 + expandedNames=@Invalid() + + [DkMetaDataHUD] + keyValues=File.Filename, File.Path, File.Size, Exif.Image.Make, Exif.Image.Model, Exif.Image.DateTime, Exif.Image.ImageDescription, Exif.Photo.ISO, Exif.Photo.FocalLength, Exif.Photo.ExposureTime, Exif.Photo.Flash, Exif.Photo.FNumber + numColumns=-1 + windowPosition=3 + + [GlobalSettings] + logRecentFiles=false + + [MetaDataSettings] + ignoreExifOrientation=false + saveExifOrientation=false + + [SynchronizeSettings] + checkForUpdates=true + disableUpdateInteraction=false + + [zooming] + useLevels=false + zoomLevels="0.0001,0.001,0.01,0.05,0.1,0.125,0.166,0.25,0.333,0.5,0.66,1,1.5,2,3,4,5,6,7,8,12,16,32,64,128" + ''; + }; }; } diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix index aebebc3..07b6738 100644 --- a/hosts/voyager/default.nix +++ b/hosts/voyager/default.nix @@ -70,7 +70,6 @@ # Applications ".config/spotify" ".config/vesktop" - ".config/nomacs" ".local/share/Smart Code ltd/Stremio" # Tools From 5ebc43b05aacfc7f18a961de26a86e9c6162141a Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Sun, 23 Jun 2024 09:52:18 +0200 Subject: [PATCH 7/7] Auto-mount btrfs root on voyager --- hosts/voyager/hardware-configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hosts/voyager/hardware-configuration.nix b/hosts/voyager/hardware-configuration.nix index 9a3901a..9edebd4 100644 --- a/hosts/voyager/hardware-configuration.nix +++ b/hosts/voyager/hardware-configuration.nix @@ -46,6 +46,12 @@ options = [ "fmask=0022" "dmask=0022" ]; }; + fileSystems."/.btrfs" = + { device = "/dev/disk/by-label/NIXOS-FS"; + fsType = "btrfs"; + options = [ "noatime" "compress=zstd:3" ]; + }; + swapDevices = [ { device = "/dev/disk/by-label/SWAP"; } ];