diff --git a/docs/WALLPAPERS.md b/docs/WALLPAPERS.md index 4304d72..424e510 100644 --- a/docs/WALLPAPERS.md +++ b/docs/WALLPAPERS.md @@ -28,8 +28,8 @@ Wallpapers can be found in the `/home/wallpapers` folder. | mountains.png | ![mountains.png](../home/wallpapers/mountains.png) | | nix.png | ![nix.png](../home/wallpapers/nix.png) | | problems.png | ![problems.png](../home/wallpapers/problems.png) | +| sea2.png | ![sea2.png](../home/wallpapers/sea2.png) | | sea.png | ![sea.png](../home/wallpapers/sea.png) | -| see.png | ![see.png](../home/wallpapers/see.png) | | space2.png | ![space2.png](../home/wallpapers/space2.png) | | space.png | ![space.png](../home/wallpapers/space.png) | | street.png | ![street.png](../home/wallpapers/street.png) | diff --git a/home/programs/spicetify/default.nix b/home/programs/spicetify/default.nix index 48c1124..dac9951 100644 --- a/home/programs/spicetify/default.nix +++ b/home/programs/spicetify/default.nix @@ -33,6 +33,7 @@ in { lastfm historyShortcut hidePodcasts + adblock fullAppDisplay shuffle ]; diff --git a/home/scripts/default.nix b/home/scripts/default.nix index c96171b..a5c0725 100644 --- a/home/scripts/default.nix +++ b/home/scripts/default.nix @@ -12,6 +12,5 @@ ./battery ./compress ./misc - ./tofi ]; } diff --git a/home/scripts/tofi/default.nix b/home/scripts/tofi/default.nix deleted file mode 100644 index a7e4dcd..0000000 --- a/home/scripts/tofi/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ pkgs, config, ... }: - -let - - tofi = pkgs.writeShellScriptBin "tofi" '' - hyprexec="hyprctl dispatch exec" - function exec() { - $@ - } - - function ui(){ - DEFAULT_ICON="󰘳" - - # "icon;name;command"[] - apps=( - ";Nixy;nixy" - ";Nerdfont FZF;nerdfont-fzf" - ";Brightness Up;brightness-up" - ";Brightness Down;brightness-down" - ";Sound Up;sound-up" - ";Sound Down;sound-down" - ";Sound Toggle Mute;sound-toggle" - ";Sound Change Output;sound-output" - ";Caffeine;caffeine" - ";Night Shift Toggle;night-shift-toggle" - ";Firefox;$hyprexec firefox" - ";Qutebrowser;$hyprexec qutebrowser" - ";Kitty;$hyprexec kitty" - ";Thunar;$hyprexec thunar" - ";Powermenu;powermenu" - ";Wofi;menu" - ";Lock;lock" - ";Bitwarden;$hyprexec bitwarden" - ";Clock; peaclock" - ";Nextcloud;$hyprexec nextcloud" - ";Spotify;$hyprexec spotify" - ";Btop;btop" - ";Cava;cava" - ";Discord;$hyprexec discord" - ";Vlc;$hyprexec vlc" - ";Obsidian;$hyprexec obsidian" - ) - - # Apply default icons if empty: - for i in "''${!apps[@]}"; do - apps[i]=$(echo "''${apps[i]}" | sed 's/^;/'$DEFAULT_ICON';/') - done - - fzf_result=$(printf "%s\n" "''${apps[@]}" | awk -F ';' '{print $1" "$2}' | fzf) - [[ -z $fzf_result ]] && exit 0 - fzf_result=''${fzf_result/ /;} - line=$(printf "%s\n" "''${apps[@]}" | grep "$fzf_result") - command=$(echo "$line" | sed 's/^[^;]*;//;s/^[^;]*;//') - - exec "$command" - exit 0 - } - - ui - ''; - -in { home.packages = [ tofi ]; } diff --git a/home/wallpapers/see.png b/home/wallpapers/see.png deleted file mode 100644 index 985cb43..0000000 Binary files a/home/wallpapers/see.png and /dev/null differ diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix index e55fad5..38f592f 100644 --- a/hosts/laptop/variables.nix +++ b/hosts/laptop/variables.nix @@ -27,6 +27,7 @@ # change the nvim's obsidian configuration if you want to enable that: obsidian = true; tailscale = true; + usbguard = false; theme = import ../themes/nixy.nix; # select your theme here }; diff --git a/hosts/modules/usb.nix b/hosts/modules/usb.nix index b184b2f..0cfa49d 100644 --- a/hosts/modules/usb.nix +++ b/hosts/modules/usb.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, ... }: { # USB Automounting @@ -7,16 +7,14 @@ # services.devmon.enable = true; # Enable USB Guard - # services.usbguard = { - # enable = true; - # dbus.enable = true; - # implicitPolicyTarget = "block"; - # # FIXME: set yours pref USB devices (change {id} to your trusted USB device), use `lsusb` command (from usbutils package) to get list of all connected USB devices including integrated devices like camera, bluetooth, wifi, etc. with their IDs or just disable `usbguard` - # rules = '' - # allow id {id} # device 1 - # allow id {id} # device 2 - # ''; - # }; + services.usbguard = { + enable = config.var.usbguard; + dbus.enable = true; + implicitPolicyTarget = "block"; + # FIXME: set yours pref USB devices (change {id} to your trusted USB device), use `lsusb` command (from usbutils package) to get list of all connected USB devices including integrated devices like camera, bluetooth, wifi, etc. with their IDs or just disable `usbguard` + # allow id {id} # device 1... + rules = ""; + }; # Enable USB-specific packages environment.systemPackages = with pkgs; [ usbutils ];