diff --git a/home/packages/gui/mpv.nix b/home/packages/gui/mpv.nix index 7518265..812aee1 100644 --- a/home/packages/gui/mpv.nix +++ b/home/packages/gui/mpv.nix @@ -12,44 +12,6 @@ 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" - ''; - }; }; } diff --git a/home/packages/gui/nomacs.nix b/home/packages/gui/nomacs.nix index 143387b..33d003c 100644 --- a/home/packages/gui/nomacs.nix +++ b/home/packages/gui/nomacs.nix @@ -12,100 +12,5 @@ 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/home/programs/graphical/wms/hyprland/config/keybinds.nix b/home/programs/graphical/wms/hyprland/config/keybinds.nix index f7301da..5ae8a89 100644 --- a/home/programs/graphical/wms/hyprland/config/keybinds.nix +++ b/home/programs/graphical/wms/hyprland/config/keybinds.nix @@ -36,7 +36,6 @@ # 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 c9026cf..6c31cf0 100644 --- a/home/programs/graphical/wms/hyprland/default.nix +++ b/home/programs/graphical/wms/hyprland/default.nix @@ -21,7 +21,6 @@ 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 715d5f4..2f15f04 100644 --- a/home/programs/graphical/wms/hyprland/packages/default.nix +++ b/home/programs/graphical/wms/hyprland/packages/default.nix @@ -9,7 +9,6 @@ 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 deleted file mode 100644 index 9d2e187..0000000 --- a/home/programs/graphical/wms/hyprland/packages/toggle-idle/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{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 deleted file mode 100644 index 4edf63c..0000000 --- a/home/programs/graphical/wms/hyprland/packages/toggle-idle/toggle-idle.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/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 diff --git a/home/programs/xdg/default.nix b/home/programs/xdg/default.nix index 9365821..d683831 100644 --- a/home/programs/xdg/default.nix +++ b/home/programs/xdg/default.nix @@ -3,7 +3,6 @@ ./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 deleted file mode 100644 index bbca32f..0000000 --- a/home/programs/xdg/portal.nix +++ /dev/null @@ -1,8 +0,0 @@ -{pkgs, ...}: { - xdg.portal = { - enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - ]; - }; -} diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix index 07b6738..97daeff 100644 --- a/hosts/voyager/default.nix +++ b/hosts/voyager/default.nix @@ -70,6 +70,7 @@ # Applications ".config/spotify" ".config/vesktop" + "./config/nomacs" ".local/share/Smart Code ltd/Stremio" # Tools diff --git a/hosts/voyager/hardware-configuration.nix b/hosts/voyager/hardware-configuration.nix index 9edebd4..9a3901a 100644 --- a/hosts/voyager/hardware-configuration.nix +++ b/hosts/voyager/hardware-configuration.nix @@ -46,12 +46,6 @@ 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"; } ]; diff --git a/system/shared/hardware/bluetooth.nix b/system/shared/bluetooth.nix similarity index 100% rename from system/shared/hardware/bluetooth.nix rename to system/shared/bluetooth.nix diff --git a/system/shared/default.nix b/system/shared/default.nix index 0c0019e..b94792b 100644 --- a/system/shared/default.nix +++ b/system/shared/default.nix @@ -11,6 +11,7 @@ _: { ./programs.nix ./system.nix ./network.nix + ./bluetooth.nix ./localisation.nix ./packages.nix ]; diff --git a/system/shared/hardware/default.nix b/system/shared/hardware/default.nix index 171698d..2c3dc2f 100644 --- a/system/shared/hardware/default.nix +++ b/system/shared/hardware/default.nix @@ -3,7 +3,6 @@ _: { ./cpu ./gpu ./tpm.nix - ./bluetooth.nix ./generic.nix ]; }