diff --git a/flake.lock b/flake.lock index 3645bff..afbfa29 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1765900596, - "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", + "lastModified": 1762356719, + "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", + "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1767104570, - "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { @@ -271,11 +271,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1766066098, - "narHash": "sha256-d3HmUbmfTDIt9mXEHszqyo2byqQMoyJtUJCZ9U1IqHQ=", + "lastModified": 1759613406, + "narHash": "sha256-PzgQJydp+RlKvwDi807pXPlURdIAVqLppZDga3DwPqg=", "owner": "hyprwm", "repo": "contrib", - "rev": "41dbcac8183bb1b3a4ade0d8276b2f2df6ae4690", + "rev": "32e1a75b65553daefb419f0906ce19e04815aa3a", "type": "github" }, "original": { @@ -329,11 +329,11 @@ ] }, "locked": { - "lastModified": 1763733840, - "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", + "lastModified": 1762462052, + "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", + "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", "type": "github" }, "original": { @@ -352,7 +352,6 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "hyprwire": "hyprwire", "nixpkgs": [ "nixpkgs" ], @@ -361,11 +360,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1767300597, - "narHash": "sha256-lGE1j1bEuNp7XoDP+oyyF/c+MzYAs6S+sz0NK71nXZE=", + "lastModified": 1763681820, + "narHash": "sha256-gAdAtZ/VLTrbLEQXeAZRk0OkmFrJucMLP3zdqHai/cc=", "ref": "refs/heads/main", - "rev": "31d3181e1ee91e338fb4fb8207d64b8d689310fc", - "revCount": 6766, + "rev": "b5a2ef77b7876798d33502f8de006f9c478c12db", + "revCount": 6636, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -409,11 +408,11 @@ ] }, "locked": { - "lastModified": 1765643131, - "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", + "lastModified": 1762755186, + "narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", + "rev": "66356e20a8ed348aa49c1b9ceace786e224225b3", "type": "github" }, "original": { @@ -439,11 +438,11 @@ ] }, "locked": { - "lastModified": 1767304464, - "narHash": "sha256-HsdfmPf5291Y3yXScMoj53P/9SS1DK3KgbprBuR8A4k=", + "lastModified": 1765207366, + "narHash": "sha256-s0jO2kEj5cLLTgTblKnAKjqt3MjYFnmyrQT3SxiUugM=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "7a8521112361997d071fd1fef06d6becc7e53240", + "rev": "e058ea23b80775cf20c675d064678416df2d9d04", "type": "github" }, "original": { @@ -464,11 +463,11 @@ ] }, "locked": { - "lastModified": 1765214753, - "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", + "lastModified": 1759610243, + "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", + "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", "type": "github" }, "original": { @@ -493,11 +492,11 @@ ] }, "locked": { - "lastModified": 1764612430, - "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", + "lastModified": 1763254292, + "narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0d00dc118981531aa731150b6ea551ef037acddd", + "rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b", "type": "github" }, "original": { @@ -545,11 +544,11 @@ ] }, "locked": { - "lastModified": 1764592794, - "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", + "lastModified": 1762463729, + "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", + "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", "type": "github" }, "original": { @@ -570,11 +569,11 @@ ] }, "locked": { - "lastModified": 1766160771, - "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", + "lastModified": 1763323331, + "narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", + "rev": "0c6411851cc779d551edc89b83966696201611aa", "type": "github" }, "original": { @@ -595,11 +594,11 @@ ] }, "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -608,35 +607,6 @@ "type": "github" } }, - "hyprwire": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1766253200, - "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", - "owner": "hyprwm", - "repo": "hyprwire", - "rev": "1079777525b30a947c8d657fac158e00ae85de9d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwire", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -669,11 +639,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1767185284, - "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -715,11 +685,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -779,11 +749,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -827,11 +797,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1767116409, - "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -843,11 +813,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1766840161, - "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", + "lastModified": 1763191728, + "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", + "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", "type": "github" }, "original": { @@ -864,11 +834,11 @@ "nixvim": "nixvim_2" }, "locked": { - "lastModified": 1767307820, - "narHash": "sha256-5L9VbYzjeaq1npMXyAFFak9G/+c9akZoFummW7Een9c=", + "lastModified": 1755612464, + "narHash": "sha256-a77eam3zh4Lr4CrzOo/QKBD+etz4+TQZv/THVoLAhBA=", "owner": "ahwxorg", "repo": "nixvim-config", - "rev": "a0ff3802e67a281acc7ab957d716a994660bb3f9", + "rev": "76880a7e5930e8255f0d5c19b865beada4bf0573", "type": "github" }, "original": { @@ -903,11 +873,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1767347500, - "narHash": "sha256-v+O3SCBPq5qSmz+trAvcizq+cKrd8qco7Z2XG+YLRC8=", + "lastModified": 1763722179, + "narHash": "sha256-7czFIGsaaoO4oqL6srEd3LUyA7MDbuSknpN6GAvwWDc=", "owner": "nix-community", "repo": "NUR", - "rev": "91f6328555690ffc84ab2ada1d21f544940811ac", + "rev": "bb1508be2d4fbfe82bf010aaa3c0ecff6d27694d", "type": "github" }, "original": { @@ -943,7 +913,7 @@ "oisd": { "flake": false, "locked": { - "narHash": "sha256-FAfdtuHCMBZtkhSqHUCQj5AtMcfiem8/D3VuV+pOfo4=", + "narHash": "sha256-BEGZgyaI3g9WwpnTyW2cYT0rh3248eL0sC0z76filNM=", "type": "file", "url": "https://big.oisd.nl/domainswild" }, @@ -962,11 +932,11 @@ ] }, "locked": { - "lastModified": 1765911976, - "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "type": "github" }, "original": { @@ -1015,11 +985,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1766894905, - "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", + "lastModified": 1763607916, + "narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", + "rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b", "type": "github" }, "original": { @@ -1034,11 +1004,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1767195736, - "narHash": "sha256-0xvPSbhIGeJzsJXNTkgJ3PjwdVItKm85wzYKA9NmSzI=", + "lastModified": 1763267524, + "narHash": "sha256-CywB4iCpGr4CYZAD+WboFwBQ7Wnc7LdfSemFWuH/1Ro=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "465adc0ab6ff0c4b9b1db1c6e7fd7eeb553b3261", + "rev": "cf33e39bd1a21993a28ffee8be433e212ecf346a", "type": "github" }, "original": { diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 074b71b..316be83 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -30,7 +30,7 @@ bitwarden-cli imagemagick foot - # termpdfpy # shit broke again smfh + termpdfpy vimv pass lm_sensors diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix index 193dd32..0778834 100644 --- a/modules/home/waybar/default.nix +++ b/modules/home/waybar/default.nix @@ -108,7 +108,7 @@ }, "custom/music": { - "interval": 60, + "interval": "once", "return-type": "json", "exec": "~/.local/bin/waybar-music", "on-click": "playerctl play-pause", diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix index 54f020d..244bd07 100644 --- a/modules/home/zsh.nix +++ b/modules/home/zsh.nix @@ -128,38 +128,6 @@ printf "%s\n" "''${url}" } - function cd() { - if [ -f "$1" ]; then - ${pkgs.zoxide}/bin/zoxide "$(dirname "$1")" - return - fi - - ${pkgs.zoxide}/bin/zoxide $@ - } - - get-git-root() { - echo "$(${pkgs.git}/bin/git rev-parse --show-toplevel 2>/dev/null)" - } - - cd-git-root() { - pushd "$(get-git-root)" - } - - pushd-git-root-widget() { - setopt localoptions pipefail no_aliases 2> /dev/null - local dir="$(eval "get-git-root")" - if [[ -z "$dir" ]]; then - zle redisplay - return 0 - fi - zle push-line - BUFFER="builtin pushd -- ''${(q)dir}" - zle accept-line - local ret=$? - zle reset-prompt - return $ret - } - function nixcd () { PACKAGE_NAME="$1" if [[ "$PACKAGE_NAME" = "" ]]; then diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix index e43b7fa..ab504ce 100644 --- a/modules/services/mpd.nix +++ b/modules/services/mpd.nix @@ -14,19 +14,17 @@ services.mpd = { enable = true; - settings = { - playlist_directory = "/home/${username}/Music/.playlists"; - music_directory = "/home/${username}/Music"; - restore_paused = "yes"; - auto_update = "yes"; + musicDirectory = "/home/${username}/Music"; + playlistDirectory = "/home/${username}/Music/.playlists"; + extraConfig = '' + restore_paused "yes" + auto_update "yes" - audio_output = [ - { - type = "pipewire"; - name = "pipewire"; - } - ]; - }; + audio_output { + type "pipewire" + name "pipewire" + } + ''; user = "${username}"; # PipeWire requires this as it runs as the normal user and mpd normally runs as a system user. # Optional: diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix index ee95a54..928725f 100644 --- a/modules/services/ollama.nix +++ b/modules/services/ollama.nix @@ -1,10 +1,9 @@ -{ pkgs, ... }: { services.ollama = { enable = true; # Optional: preload models, see https://ollama.com/library # loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b"]; - package = pkgs.ollama-rocm; # nope, 5700XT is too old for this + acceleration = "rocm"; # nope, 5700XT is too old for this }; services.open-webui.enable = false; }