From c67e864d401fa690d241715276702edd39e3ff4e Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 20 Jan 2025 23:33:35 -0600 Subject: [PATCH] feat: changed some stuff --- flake.lock | 90 +++++++++---------- .../android/androidFileTransfer/default.nix | 0 .../cli/android/androidTools/default.nix | 0 home/modules/cli/android/default.nix | 0 .../cli/android/simpleMtpfs/default.nix | 0 home/modules/cli/default.nix | 0 home/modules/cli/development/default.nix | 0 .../cli/development/editing/default.nix | 0 .../development/editing/neovim/default.nix | 0 .../cli/development/versioning/default.nix | 0 .../development/versioning/git/default.nix | 0 .../versioning/lazygit/default.nix | 0 home/modules/cli/files/default.nix | 0 home/modules/cli/files/ncdu/default.nix | 0 home/modules/cli/files/samba/default.nix | 0 home/modules/cli/files/unrar/default.nix | 0 home/modules/cli/files/zip/default.nix | 0 home/modules/cli/shell/default.nix | 0 home/modules/cli/shell/nushell/default.nix | 0 home/modules/cli/shell/zellij/default.nix | 0 home/modules/cli/shell/zoxide/default.nix | 0 .../cli/utilities/alsaUtils/default.nix | 0 .../cli/utilities/brightnessCtl/default.nix | 0 .../cli/utilities/cifsUtils/default.nix | 0 home/modules/cli/utilities/default.nix | 0 home/modules/cli/utilities/direnv/default.nix | 0 home/modules/cli/utilities/ffmpeg/default.nix | 0 home/modules/cli/utilities/flac/default.nix | 0 home/modules/cli/utilities/gLib/default.nix | 0 .../cli/utilities/hardInfo/default.nix | 0 .../cli/utilities/homeManager/default.nix | 0 .../cli/utilities/inetUtils/default.nix | 0 .../cli/utilities/libgenCli/default.nix | 0 .../modules/cli/utilities/nyanCat/default.nix | 0 home/modules/cli/utilities/parted/default.nix | 0 .../cli/utilities/pciUtils/default.nix | 0 .../cli/utilities/pinEntry/default.nix | 0 .../cli/utilities/playerCtl/default.nix | 0 .../cli/utilities/protonVpn/default.nix | 0 .../cli/utilities/speedTest/default.nix | 0 home/modules/cli/utilities/sshfs/default.nix | 0 home/modules/cli/utilities/tokei/default.nix | 0 home/modules/cli/utilities/tomb/default.nix | 0 .../modules/cli/utilities/udiskie/default.nix | 0 home/modules/cli/utilities/wget/default.nix | 0 home/modules/cli/utilities/wine/default.nix | 0 .../cli/utilities/xdgUtils/default.nix | 0 .../modules/cli/utilities/xdoTool/default.nix | 0 .../cli/utilities/yaBridge/default.nix | 0 home/modules/default.nix | 0 .../gui/apps/browsers/chrome/default.nix | 0 home/modules/gui/apps/browsers/default.nix | 0 .../gui/apps/browsers/edge/default.nix | 0 .../gui/apps/browsers/epiphany/default.nix | 0 .../firefox/config/bookmarks/config/tools.nix | 11 +++ .../gui/apps/browsers/ladybird/default.nix | 0 .../gui/apps/browsers/opera/default.nix | 0 .../modules/gui/apps/browsers/tor/default.nix | 0 .../gui/apps/browsers/vivaldi/default.nix | 0 home/modules/gui/apps/default.nix | 0 home/modules/gui/apps/gaming/default.nix | 0 .../gui/apps/gaming/heroic/default.nix | 0 .../gui/apps/gaming/lutris/default.nix | 0 .../gui/apps/gaming/prismLauncher/default.nix | 0 .../modules/gui/apps/gaming/steam/default.nix | 2 + home/modules/gui/apps/ide/default.nix | 0 .../userSettings/config/assistant/default.nix | 37 ++++++-- .../ide/zed/config/userSettings/default.nix | 8 +- home/modules/gui/apps/ide/zed/default.nix | 2 +- .../apps/media/audio/audioEditing/default.nix | 0 .../audio/audioEditing/metadata/default.nix | 0 .../audioEditing/metadata/kid3/default.nix | 0 .../audioEditing/metadata/mp3Gain/default.nix | 0 .../metadata/puddleTag/default.nix | 0 .../audio/audioEditing/production/default.nix | 0 .../production/reaper/default.nix | 0 .../apps/media/audio/audioPlaying/default.nix | 0 .../audio/audioPlaying/feishin/default.nix | 0 .../audio/audioPlaying/spotify/default.nix | 0 home/modules/gui/apps/media/audio/default.nix | 0 home/modules/gui/apps/media/default.nix | 0 home/modules/gui/apps/media/doc/default.nix | 0 .../gui/apps/media/doc/docEditing/default.nix | 0 .../doc/docEditing/libreOffice/default.nix | 0 .../media/doc/docEditing/logseq/default.nix | 0 .../media/doc/docEditing/obsidian/default.nix | 0 .../doc/docEditing/wpsOffice/default.nix | 0 .../gui/apps/media/doc/docViewing/default.nix | 0 .../media/doc/docViewing/okular/default.nix | 0 .../modules/gui/apps/media/images/default.nix | 0 .../media/images/imageEditing/default.nix | 0 .../images/imageEditing/inkscape/default.nix | 0 .../imageEditing/kolourPaint/default.nix | 0 .../images/imageEditing/krita/default.nix | 0 .../media/images/imageViewing/default.nix | 0 .../images/imageViewing/gwenview/default.nix | 0 .../images/imageViewing/nomacs/default.nix | 0 home/modules/gui/apps/media/video/default.nix | 0 .../video/videoEditing/daVinci/default.nix | 0 .../apps/media/video/videoEditing/default.nix | 0 .../video/videoEditing/kdenlive/default.nix | 0 .../video/videoEditing/shotcut/default.nix | 0 .../apps/media/video/videoPlaying/default.nix | 0 .../media/video/videoPlaying/mpv/default.nix | 0 .../video/videoPlaying/stremio/default.nix | 0 .../video/videoPlaying/syncplay/default.nix | 0 .../media/video/videoPlaying/vlc/default.nix | 0 home/modules/gui/apps/messaging/default.nix | 0 .../gui/apps/messaging/discord/default.nix | 0 .../gui/apps/messaging/element/default.nix | 0 .../gui/apps/messaging/nheko/default.nix | 0 .../gui/apps/messaging/signal/default.nix | 0 .../gui/apps/messaging/slack/default.nix | 0 .../gui/apps/messaging/teams/default.nix | 0 .../gui/apps/messaging/vesktop/default.nix | 0 home/modules/gui/apps/sharing/default.nix | 0 .../gui/apps/sharing/nicotinePlus/default.nix | 0 .../gui/apps/sharing/soulseekQt/default.nix | 0 home/modules/gui/apps/terminal/default.nix | 0 .../gui/apps/terminal/kitty/default.nix | 0 .../gui/apps/tools/bitwarden/default.nix | 0 home/modules/gui/apps/tools/default.nix | 0 .../gui/apps/tools/deskreen/default.nix | 0 home/modules/gui/apps/tools/emote/default.nix | 0 .../apps/tools/gnomeCalculator/default.nix | 0 .../modules/gui/apps/tools/ledger/default.nix | 0 .../modules/gui/apps/tools/scrcpy/default.nix | 0 .../gui/apps/tools/usbImager/default.nix | 0 home/modules/gui/default.nix | 0 home/modules/gui/desktop/default.nix | 0 .../gui/desktop/easyEffects/default.nix | 0 .../modules/gui/desktop/flameshot/default.nix | 0 .../modules/gui/desktop/gammastep/default.nix | 0 .../gui/desktop/gtk/config/cursorTheme.nix | 10 ++- .../gui/desktop/gtk/config/homeCursor.nix | 2 +- home/modules/gui/desktop/gtk/default.nix | 1 + .../gui/desktop/hyprland/config/bind.nix | 2 +- .../desktop/hyprland/config/windowrulev2.nix | 4 + home/modules/gui/desktop/network/default.nix | 0 home/modules/gui/desktop/nwgLook/default.nix | 0 home/modules/gui/desktop/plasmaNm/default.nix | 0 .../gui/desktop/wlClipboard/default.nix | 0 home/modules/gui/desktop/wpaperd/default.nix | 2 +- nixos/modules/ollama.nix | 30 +++++-- systems/desktop/config/graphics.nix | 12 ++- 145 files changed, 143 insertions(+), 70 deletions(-) mode change 100644 => 100755 home/modules/cli/android/androidFileTransfer/default.nix mode change 100644 => 100755 home/modules/cli/android/androidTools/default.nix mode change 100644 => 100755 home/modules/cli/android/default.nix mode change 100644 => 100755 home/modules/cli/android/simpleMtpfs/default.nix mode change 100644 => 100755 home/modules/cli/default.nix mode change 100644 => 100755 home/modules/cli/development/default.nix mode change 100644 => 100755 home/modules/cli/development/editing/default.nix mode change 100644 => 100755 home/modules/cli/development/editing/neovim/default.nix mode change 100644 => 100755 home/modules/cli/development/versioning/default.nix mode change 100644 => 100755 home/modules/cli/development/versioning/git/default.nix mode change 100644 => 100755 home/modules/cli/development/versioning/lazygit/default.nix mode change 100644 => 100755 home/modules/cli/files/default.nix mode change 100644 => 100755 home/modules/cli/files/ncdu/default.nix mode change 100644 => 100755 home/modules/cli/files/samba/default.nix mode change 100644 => 100755 home/modules/cli/files/unrar/default.nix mode change 100644 => 100755 home/modules/cli/files/zip/default.nix mode change 100644 => 100755 home/modules/cli/shell/default.nix mode change 100644 => 100755 home/modules/cli/shell/nushell/default.nix mode change 100644 => 100755 home/modules/cli/shell/zellij/default.nix mode change 100644 => 100755 home/modules/cli/shell/zoxide/default.nix mode change 100644 => 100755 home/modules/cli/utilities/alsaUtils/default.nix mode change 100644 => 100755 home/modules/cli/utilities/brightnessCtl/default.nix mode change 100644 => 100755 home/modules/cli/utilities/cifsUtils/default.nix mode change 100644 => 100755 home/modules/cli/utilities/default.nix mode change 100644 => 100755 home/modules/cli/utilities/direnv/default.nix mode change 100644 => 100755 home/modules/cli/utilities/ffmpeg/default.nix mode change 100644 => 100755 home/modules/cli/utilities/flac/default.nix mode change 100644 => 100755 home/modules/cli/utilities/gLib/default.nix mode change 100644 => 100755 home/modules/cli/utilities/hardInfo/default.nix mode change 100644 => 100755 home/modules/cli/utilities/homeManager/default.nix mode change 100644 => 100755 home/modules/cli/utilities/inetUtils/default.nix mode change 100644 => 100755 home/modules/cli/utilities/libgenCli/default.nix mode change 100644 => 100755 home/modules/cli/utilities/nyanCat/default.nix mode change 100644 => 100755 home/modules/cli/utilities/parted/default.nix mode change 100644 => 100755 home/modules/cli/utilities/pciUtils/default.nix mode change 100644 => 100755 home/modules/cli/utilities/pinEntry/default.nix mode change 100644 => 100755 home/modules/cli/utilities/playerCtl/default.nix mode change 100644 => 100755 home/modules/cli/utilities/protonVpn/default.nix mode change 100644 => 100755 home/modules/cli/utilities/speedTest/default.nix mode change 100644 => 100755 home/modules/cli/utilities/sshfs/default.nix mode change 100644 => 100755 home/modules/cli/utilities/tokei/default.nix mode change 100644 => 100755 home/modules/cli/utilities/tomb/default.nix mode change 100644 => 100755 home/modules/cli/utilities/udiskie/default.nix mode change 100644 => 100755 home/modules/cli/utilities/wget/default.nix mode change 100644 => 100755 home/modules/cli/utilities/wine/default.nix mode change 100644 => 100755 home/modules/cli/utilities/xdgUtils/default.nix mode change 100644 => 100755 home/modules/cli/utilities/xdoTool/default.nix mode change 100644 => 100755 home/modules/cli/utilities/yaBridge/default.nix mode change 100644 => 100755 home/modules/default.nix mode change 100644 => 100755 home/modules/gui/apps/browsers/chrome/default.nix mode change 100644 => 100755 home/modules/gui/apps/browsers/default.nix mode change 100644 => 100755 home/modules/gui/apps/browsers/edge/default.nix mode change 100644 => 100755 home/modules/gui/apps/browsers/epiphany/default.nix mode change 100644 => 100755 home/modules/gui/apps/browsers/ladybird/default.nix mode change 100644 => 100755 home/modules/gui/apps/browsers/opera/default.nix mode change 100644 => 100755 home/modules/gui/apps/browsers/tor/default.nix mode change 100644 => 100755 home/modules/gui/apps/browsers/vivaldi/default.nix mode change 100644 => 100755 home/modules/gui/apps/default.nix mode change 100644 => 100755 home/modules/gui/apps/gaming/default.nix mode change 100644 => 100755 home/modules/gui/apps/gaming/heroic/default.nix mode change 100644 => 100755 home/modules/gui/apps/gaming/lutris/default.nix mode change 100644 => 100755 home/modules/gui/apps/gaming/prismLauncher/default.nix mode change 100644 => 100755 home/modules/gui/apps/ide/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/audio/audioEditing/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/audio/audioEditing/metadata/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/audio/audioEditing/metadata/kid3/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/audio/audioEditing/metadata/mp3Gain/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/audio/audioEditing/metadata/puddleTag/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/audio/audioEditing/production/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/audio/audioEditing/production/reaper/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/audio/audioPlaying/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/audio/audioPlaying/spotify/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/audio/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/doc/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/doc/docEditing/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/doc/docEditing/libreOffice/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/doc/docEditing/logseq/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/doc/docEditing/obsidian/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/doc/docEditing/wpsOffice/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/doc/docViewing/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/doc/docViewing/okular/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/images/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/images/imageEditing/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/images/imageEditing/inkscape/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/images/imageEditing/kolourPaint/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/images/imageEditing/krita/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/images/imageViewing/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/images/imageViewing/gwenview/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/images/imageViewing/nomacs/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/video/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/video/videoEditing/daVinci/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/video/videoEditing/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/video/videoEditing/shotcut/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/video/videoPlaying/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/video/videoPlaying/mpv/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/video/videoPlaying/stremio/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/video/videoPlaying/syncplay/default.nix mode change 100644 => 100755 home/modules/gui/apps/media/video/videoPlaying/vlc/default.nix mode change 100644 => 100755 home/modules/gui/apps/messaging/default.nix mode change 100644 => 100755 home/modules/gui/apps/messaging/discord/default.nix mode change 100644 => 100755 home/modules/gui/apps/messaging/element/default.nix mode change 100644 => 100755 home/modules/gui/apps/messaging/nheko/default.nix mode change 100644 => 100755 home/modules/gui/apps/messaging/signal/default.nix mode change 100644 => 100755 home/modules/gui/apps/messaging/slack/default.nix mode change 100644 => 100755 home/modules/gui/apps/messaging/teams/default.nix mode change 100644 => 100755 home/modules/gui/apps/messaging/vesktop/default.nix mode change 100644 => 100755 home/modules/gui/apps/sharing/default.nix mode change 100644 => 100755 home/modules/gui/apps/sharing/nicotinePlus/default.nix mode change 100644 => 100755 home/modules/gui/apps/sharing/soulseekQt/default.nix mode change 100644 => 100755 home/modules/gui/apps/terminal/default.nix mode change 100644 => 100755 home/modules/gui/apps/terminal/kitty/default.nix mode change 100644 => 100755 home/modules/gui/apps/tools/bitwarden/default.nix mode change 100644 => 100755 home/modules/gui/apps/tools/default.nix mode change 100644 => 100755 home/modules/gui/apps/tools/deskreen/default.nix mode change 100644 => 100755 home/modules/gui/apps/tools/emote/default.nix mode change 100644 => 100755 home/modules/gui/apps/tools/gnomeCalculator/default.nix mode change 100644 => 100755 home/modules/gui/apps/tools/ledger/default.nix mode change 100644 => 100755 home/modules/gui/apps/tools/scrcpy/default.nix mode change 100644 => 100755 home/modules/gui/apps/tools/usbImager/default.nix mode change 100644 => 100755 home/modules/gui/default.nix mode change 100644 => 100755 home/modules/gui/desktop/default.nix mode change 100644 => 100755 home/modules/gui/desktop/easyEffects/default.nix mode change 100644 => 100755 home/modules/gui/desktop/flameshot/default.nix mode change 100644 => 100755 home/modules/gui/desktop/gammastep/default.nix mode change 100644 => 100755 home/modules/gui/desktop/network/default.nix mode change 100644 => 100755 home/modules/gui/desktop/nwgLook/default.nix mode change 100644 => 100755 home/modules/gui/desktop/plasmaNm/default.nix mode change 100644 => 100755 home/modules/gui/desktop/wlClipboard/default.nix diff --git a/flake.lock b/flake.lock index e57833a..887ea06 100755 --- a/flake.lock +++ b/flake.lock @@ -161,11 +161,11 @@ }, "crane_3": { "locked": { - "lastModified": 1734324364, - "narHash": "sha256-omYTR59TdH0AumP1cfh49fBnWZ52HjfdNfaLzCMZBx0=", + "lastModified": 1736898272, + "narHash": "sha256-D10wlrU/HCpSRcb3a7yk+bU3ggpMD1kGbseKtO+7teo=", "owner": "ipetkov", "repo": "crane", - "rev": "60d7623f1320470bf2fdb92fd2dca1e9a27b98ce", + "rev": "6a589f034202a7c6e10bce6c5d1d392d7bc0f340", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1737085478, - "narHash": "sha256-EzdUQf1ljtGIWMmscVzoW3rUxxN3UKyNXOXbzUvz3BQ=", + "lastModified": 1737430029, + "narHash": "sha256-z55IQogW9z4HhVeT55LlCUFKbYD5O5aLMnU5cX1WTto=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "72d085525b22d66468c5969a4d507a0fa68d4a04", + "rev": "5cb2fa6f7594202b12a2603bf32094aa75b1bf0e", "type": "github" }, "original": { @@ -836,11 +836,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737226203, - "narHash": "sha256-maMmVQQzdd92LHiI24NyIF3QblnIUJSESDPpnDThtNU=", + "lastModified": 1737319839, + "narHash": "sha256-wGfX2YcD9Hyqi7sQ8FSqUbN8/Rhftp01YyHoTWYPL8U=", "owner": "helix-editor", "repo": "helix", - "rev": "7cc93eb1c554e72a5aa0c18d244c0fd3ec07d97f", + "rev": "e7ac2fcdecfdbf43a4f772e7f7c163b43b3d0b9b", "type": "github" }, "original": { @@ -883,11 +883,11 @@ ] }, "locked": { - "lastModified": 1737221749, - "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", + "lastModified": 1737394973, + "narHash": "sha256-EW4oXMfnfA5sNM9Jqm+y98horWVvN66Gu7YIcEpFYZc=", "owner": "nix-community", "repo": "home-manager", - "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", + "rev": "9786661d57c476021c8a0c3e53bf9fa2b4f3328b", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1737197318, - "narHash": "sha256-dzG7PTu2TvBhrVbx5ouFGclQBgfrLobiMH1LWGKSR+I=", + "lastModified": 1737398451, + "narHash": "sha256-k3GQfIFSGC364qxx1WsDaaHfTNN/rt1re8JSyAsBzug=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f56153a9c1b0a00fac0932a95e0cfa5a4f6c681f", + "rev": "a661203bb6d4714b211572759e2f74b1da194972", "type": "github" }, "original": { @@ -1070,11 +1070,11 @@ ] }, "locked": { - "lastModified": 1735774328, - "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", + "lastModified": 1737127640, + "narHash": "sha256-mIQ3/axCZ4g8ySwWRbW4fJcyC9v55uAii3cqlJRtW8g=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", + "rev": "455c055883d9639d4fcbfcedb4c6d12ce313791e", "type": "github" }, "original": { @@ -1416,11 +1416,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1737250613, - "narHash": "sha256-0QcnnQZ/il9UPVmhJtDqjPDCCcW5vTCz7QaLu+rlrRQ=", + "lastModified": 1737360510, + "narHash": "sha256-uiTiklpgmxZ7BJlQOvqULU9oCOkk9glmSDGSIkerPcc=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "6ec08f11bbf0e936ad82f1bb532f3757f8b5e3c2", + "rev": "cfc19b6d0a0940e600b995827366092405f2bf73", "type": "github" }, "original": { @@ -1479,11 +1479,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1737165118, - "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", + "lastModified": 1737299813, + "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", + "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", "type": "github" }, "original": { @@ -1566,11 +1566,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1737258869, - "narHash": "sha256-Ue2TumKTw+6VUSKdgHE93gViUTOJDmS2I0HjLbmrHls=", + "lastModified": 1737433096, + "narHash": "sha256-/p0JGjjQcBwglIMqaTB39eYGf+TI9I86XAzouME52YU=", "owner": "nix-community", "repo": "NUR", - "rev": "0b2b53ac3bd61384876cf8461d32e698064297ea", + "rev": "6ce0765cd6d8703f4de25493d30ff653f9e60f66", "type": "github" }, "original": { @@ -1611,11 +1611,11 @@ ] }, "locked": { - "lastModified": 1737043064, - "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=", + "lastModified": 1737301351, + "narHash": "sha256-2UNmLCKORvdBRhPGI8Vx0b6l7M8/QBey/nHLIxOl4jE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb", + "rev": "15a87cedeb67e3dbc8d2f7b9831990dffcf4e69f", "type": "github" }, "original": { @@ -1785,11 +1785,11 @@ ] }, "locked": { - "lastModified": 1734316514, - "narHash": "sha256-0aLx44yMblcOGpfFXKCzp2GhU5JaE6OTvdU+JYrXiUc=", + "lastModified": 1737166965, + "narHash": "sha256-vlDROBAgq+7PEVM0vaS2zboY6DXs3oKK0qW/1dVuFs4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "83ee8ff74d6294a7657320f16814754c4594127b", + "rev": "fc839c9d5d1ebc789b4657c43c4d54838c7c01de", "type": "github" }, "original": { @@ -1849,11 +1849,11 @@ ] }, "locked": { - "lastModified": 1737107480, - "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=", + "lastModified": 1737411508, + "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", + "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", "type": "github" }, "original": { @@ -1884,11 +1884,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1737207873, - "narHash": "sha256-XTCuMv753lpm8DvdVf9q2mH3rhlfsKrCUYbaADPC/bA=", + "lastModified": 1737416820, + "narHash": "sha256-PvOXfVj62pYnl2aq8l/hQkgmo22K1qa6n1JILTm4+ng=", "owner": "danth", "repo": "stylix", - "rev": "51ad2cec11e773a949bdbec88bed2524f098f49a", + "rev": "268daf22a1f93a00b7efc74c367d6711ca7f18e1", "type": "github" }, "original": { @@ -2292,11 +2292,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1737214812, - "narHash": "sha256-r46PRML09iEcdh+Oi7xheyQwLE7zSDPvXPhyMQDQhe4=", + "lastModified": 1737370740, + "narHash": "sha256-RKd8w0fZAmwxnpC2k7LRZOk06MbVghygsxgTece+UME=", "owner": "sxyazi", "repo": "yazi", - "rev": "0a5c9b61a3bca0ed6c16f8e51a657e6976fcd39d", + "rev": "245fb030df2031a8bc27e61fe3b3fc4f3681fe39", "type": "github" }, "original": { @@ -2315,11 +2315,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1737239450, - "narHash": "sha256-ckA2nKlqWhQ/E8KXy4939b5uxNdCoof90/X6uFT6M+g=", + "lastModified": 1737426798, + "narHash": "sha256-2q1fPHCBKKm7P/XH2y9H0XVF50nBNDBhtbAqOyvheB0=", "owner": "zed-industries", "repo": "zed", - "rev": "ac8220bb2e03a94e8c62022fa0efe9ff9adf1c1c", + "rev": "8f87b5637af4d4e68fbcf0ecfa0b43a03404f638", "type": "github" }, "original": { diff --git a/home/modules/cli/android/androidFileTransfer/default.nix b/home/modules/cli/android/androidFileTransfer/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/android/androidTools/default.nix b/home/modules/cli/android/androidTools/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/android/default.nix b/home/modules/cli/android/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/android/simpleMtpfs/default.nix b/home/modules/cli/android/simpleMtpfs/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/default.nix b/home/modules/cli/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/development/default.nix b/home/modules/cli/development/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/development/editing/default.nix b/home/modules/cli/development/editing/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/development/editing/neovim/default.nix b/home/modules/cli/development/editing/neovim/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/development/versioning/default.nix b/home/modules/cli/development/versioning/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/development/versioning/git/default.nix b/home/modules/cli/development/versioning/git/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/development/versioning/lazygit/default.nix b/home/modules/cli/development/versioning/lazygit/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/files/default.nix b/home/modules/cli/files/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/files/ncdu/default.nix b/home/modules/cli/files/ncdu/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/files/samba/default.nix b/home/modules/cli/files/samba/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/files/unrar/default.nix b/home/modules/cli/files/unrar/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/files/zip/default.nix b/home/modules/cli/files/zip/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/shell/default.nix b/home/modules/cli/shell/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/shell/nushell/default.nix b/home/modules/cli/shell/nushell/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/shell/zellij/default.nix b/home/modules/cli/shell/zellij/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/shell/zoxide/default.nix b/home/modules/cli/shell/zoxide/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/alsaUtils/default.nix b/home/modules/cli/utilities/alsaUtils/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/brightnessCtl/default.nix b/home/modules/cli/utilities/brightnessCtl/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/cifsUtils/default.nix b/home/modules/cli/utilities/cifsUtils/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/default.nix b/home/modules/cli/utilities/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/direnv/default.nix b/home/modules/cli/utilities/direnv/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/ffmpeg/default.nix b/home/modules/cli/utilities/ffmpeg/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/flac/default.nix b/home/modules/cli/utilities/flac/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/gLib/default.nix b/home/modules/cli/utilities/gLib/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/hardInfo/default.nix b/home/modules/cli/utilities/hardInfo/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/homeManager/default.nix b/home/modules/cli/utilities/homeManager/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/inetUtils/default.nix b/home/modules/cli/utilities/inetUtils/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/libgenCli/default.nix b/home/modules/cli/utilities/libgenCli/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/nyanCat/default.nix b/home/modules/cli/utilities/nyanCat/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/parted/default.nix b/home/modules/cli/utilities/parted/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/pciUtils/default.nix b/home/modules/cli/utilities/pciUtils/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/pinEntry/default.nix b/home/modules/cli/utilities/pinEntry/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/playerCtl/default.nix b/home/modules/cli/utilities/playerCtl/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/protonVpn/default.nix b/home/modules/cli/utilities/protonVpn/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/speedTest/default.nix b/home/modules/cli/utilities/speedTest/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/sshfs/default.nix b/home/modules/cli/utilities/sshfs/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/tokei/default.nix b/home/modules/cli/utilities/tokei/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/tomb/default.nix b/home/modules/cli/utilities/tomb/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/udiskie/default.nix b/home/modules/cli/utilities/udiskie/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/wget/default.nix b/home/modules/cli/utilities/wget/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/wine/default.nix b/home/modules/cli/utilities/wine/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/xdgUtils/default.nix b/home/modules/cli/utilities/xdgUtils/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/xdoTool/default.nix b/home/modules/cli/utilities/xdoTool/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/cli/utilities/yaBridge/default.nix b/home/modules/cli/utilities/yaBridge/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/default.nix b/home/modules/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/browsers/chrome/default.nix b/home/modules/gui/apps/browsers/chrome/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/browsers/default.nix b/home/modules/gui/apps/browsers/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/browsers/edge/default.nix b/home/modules/gui/apps/browsers/edge/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/browsers/epiphany/default.nix b/home/modules/gui/apps/browsers/epiphany/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix index 3037d7e..a4ab38f 100755 --- a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix +++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix @@ -2,6 +2,17 @@ name = "Tools"; toolbar = false; bookmarks = [ + { + name = "Hugging Face"; + url = "https://www.huggingface.co"; + tags = [ + "hugging" + "face" + "ai" + "gguf" + ]; + keyword = "Hug"; + } { name = "Uncensored AI"; url = "https://www.aiuncensored.info"; diff --git a/home/modules/gui/apps/browsers/ladybird/default.nix b/home/modules/gui/apps/browsers/ladybird/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/browsers/opera/default.nix b/home/modules/gui/apps/browsers/opera/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/browsers/tor/default.nix b/home/modules/gui/apps/browsers/tor/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/browsers/vivaldi/default.nix b/home/modules/gui/apps/browsers/vivaldi/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/default.nix b/home/modules/gui/apps/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/gaming/default.nix b/home/modules/gui/apps/gaming/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/gaming/heroic/default.nix b/home/modules/gui/apps/gaming/heroic/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/gaming/lutris/default.nix b/home/modules/gui/apps/gaming/lutris/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/gaming/prismLauncher/default.nix b/home/modules/gui/apps/gaming/prismLauncher/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/gaming/steam/default.nix b/home/modules/gui/apps/gaming/steam/default.nix index 191e287..9c39f4d 100755 --- a/home/modules/gui/apps/gaming/steam/default.nix +++ b/home/modules/gui/apps/gaming/steam/default.nix @@ -17,3 +17,5 @@ }; }; } + +# If you wanna install Sc2, it takes Proton v8 diff --git a/home/modules/gui/apps/ide/default.nix b/home/modules/gui/apps/ide/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/ide/zed/config/userSettings/config/assistant/default.nix b/home/modules/gui/apps/ide/zed/config/userSettings/config/assistant/default.nix index 3f979b8..729c207 100755 --- a/home/modules/gui/apps/ide/zed/config/userSettings/config/assistant/default.nix +++ b/home/modules/gui/apps/ide/zed/config/userSettings/config/assistant/default.nix @@ -1,8 +1,35 @@ { - enabled = true; - default_model = { - provider = "zed.dev"; - model = "claude-3-5-sonnet-latest"; + flake, + ... +}: +let + inherit (flake.config.services.instances) + ollama + web + ; + service = ollama; + localhost = web.localhost.address0; +in +{ + assistant = { + enabled = true; + default_model = { + provider = "zed.dev"; + model = "claude-3-5-sonnet-latest"; + }; + version = "2"; + }; + assistant1 = { + enabled = true; + default_model = { + provider = "ollama"; + model = "qwen2.5-coder:7b"; + }; + version = "2"; + }; + language_models = { + ollama = { + api_url = "http://${localhost}:${builtins.toString service.ports.port1}"; + }; }; - version = "2"; } diff --git a/home/modules/gui/apps/ide/zed/config/userSettings/default.nix b/home/modules/gui/apps/ide/zed/config/userSettings/default.nix index 8436f72..49b8ae5 100755 --- a/home/modules/gui/apps/ide/zed/config/userSettings/default.nix +++ b/home/modules/gui/apps/ide/zed/config/userSettings/default.nix @@ -6,7 +6,11 @@ }: let configPath = ./config; - assistantPath = import (configPath + /assistant); + assistantPath = import (configPath + /assistant) { + inherit + flake + ; + }; interfacePath = import (configPath + /interface) { inherit @@ -30,7 +34,6 @@ let miscPath = import (configPath + /misc) { inherit lib pkgs; }; in { - assistant = assistantPath; git = gitPath; languages = languagesPath; lsp = lspPath; @@ -38,5 +41,6 @@ in experimental.theme_overrides = experimentalPath; } +// assistantPath // interfacePath // miscPath diff --git a/home/modules/gui/apps/ide/zed/default.nix b/home/modules/gui/apps/ide/zed/default.nix index 304dd6c..f561be5 100755 --- a/home/modules/gui/apps/ide/zed/default.nix +++ b/home/modules/gui/apps/ide/zed/default.nix @@ -20,8 +20,8 @@ let pkgs ; }; + packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default; in -# packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default; { programs.zed-editor = { enable = true; diff --git a/home/modules/gui/apps/media/audio/audioEditing/default.nix b/home/modules/gui/apps/media/audio/audioEditing/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/audio/audioEditing/metadata/default.nix b/home/modules/gui/apps/media/audio/audioEditing/metadata/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/audio/audioEditing/metadata/kid3/default.nix b/home/modules/gui/apps/media/audio/audioEditing/metadata/kid3/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/audio/audioEditing/metadata/mp3Gain/default.nix b/home/modules/gui/apps/media/audio/audioEditing/metadata/mp3Gain/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/audio/audioEditing/metadata/puddleTag/default.nix b/home/modules/gui/apps/media/audio/audioEditing/metadata/puddleTag/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/audio/audioEditing/production/default.nix b/home/modules/gui/apps/media/audio/audioEditing/production/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/audio/audioEditing/production/reaper/default.nix b/home/modules/gui/apps/media/audio/audioEditing/production/reaper/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/audio/audioPlaying/default.nix b/home/modules/gui/apps/media/audio/audioPlaying/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix b/home/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/audio/audioPlaying/spotify/default.nix b/home/modules/gui/apps/media/audio/audioPlaying/spotify/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/audio/default.nix b/home/modules/gui/apps/media/audio/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/default.nix b/home/modules/gui/apps/media/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/doc/default.nix b/home/modules/gui/apps/media/doc/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/doc/docEditing/default.nix b/home/modules/gui/apps/media/doc/docEditing/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/doc/docEditing/libreOffice/default.nix b/home/modules/gui/apps/media/doc/docEditing/libreOffice/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/doc/docEditing/logseq/default.nix b/home/modules/gui/apps/media/doc/docEditing/logseq/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/doc/docEditing/obsidian/default.nix b/home/modules/gui/apps/media/doc/docEditing/obsidian/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/doc/docEditing/wpsOffice/default.nix b/home/modules/gui/apps/media/doc/docEditing/wpsOffice/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/doc/docViewing/default.nix b/home/modules/gui/apps/media/doc/docViewing/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/doc/docViewing/okular/default.nix b/home/modules/gui/apps/media/doc/docViewing/okular/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/images/default.nix b/home/modules/gui/apps/media/images/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/images/imageEditing/default.nix b/home/modules/gui/apps/media/images/imageEditing/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/images/imageEditing/inkscape/default.nix b/home/modules/gui/apps/media/images/imageEditing/inkscape/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/images/imageEditing/kolourPaint/default.nix b/home/modules/gui/apps/media/images/imageEditing/kolourPaint/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/images/imageEditing/krita/default.nix b/home/modules/gui/apps/media/images/imageEditing/krita/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/images/imageViewing/default.nix b/home/modules/gui/apps/media/images/imageViewing/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/images/imageViewing/gwenview/default.nix b/home/modules/gui/apps/media/images/imageViewing/gwenview/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/images/imageViewing/nomacs/default.nix b/home/modules/gui/apps/media/images/imageViewing/nomacs/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/video/default.nix b/home/modules/gui/apps/media/video/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/video/videoEditing/daVinci/default.nix b/home/modules/gui/apps/media/video/videoEditing/daVinci/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/video/videoEditing/default.nix b/home/modules/gui/apps/media/video/videoEditing/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix b/home/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/video/videoEditing/shotcut/default.nix b/home/modules/gui/apps/media/video/videoEditing/shotcut/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/video/videoPlaying/default.nix b/home/modules/gui/apps/media/video/videoPlaying/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/video/videoPlaying/mpv/default.nix b/home/modules/gui/apps/media/video/videoPlaying/mpv/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/video/videoPlaying/stremio/default.nix b/home/modules/gui/apps/media/video/videoPlaying/stremio/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/video/videoPlaying/syncplay/default.nix b/home/modules/gui/apps/media/video/videoPlaying/syncplay/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/media/video/videoPlaying/vlc/default.nix b/home/modules/gui/apps/media/video/videoPlaying/vlc/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/messaging/default.nix b/home/modules/gui/apps/messaging/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/messaging/discord/default.nix b/home/modules/gui/apps/messaging/discord/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/messaging/element/default.nix b/home/modules/gui/apps/messaging/element/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/messaging/nheko/default.nix b/home/modules/gui/apps/messaging/nheko/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/messaging/signal/default.nix b/home/modules/gui/apps/messaging/signal/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/messaging/slack/default.nix b/home/modules/gui/apps/messaging/slack/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/messaging/teams/default.nix b/home/modules/gui/apps/messaging/teams/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/messaging/vesktop/default.nix b/home/modules/gui/apps/messaging/vesktop/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/sharing/default.nix b/home/modules/gui/apps/sharing/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/sharing/nicotinePlus/default.nix b/home/modules/gui/apps/sharing/nicotinePlus/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/sharing/soulseekQt/default.nix b/home/modules/gui/apps/sharing/soulseekQt/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/terminal/default.nix b/home/modules/gui/apps/terminal/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/terminal/kitty/default.nix b/home/modules/gui/apps/terminal/kitty/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/tools/bitwarden/default.nix b/home/modules/gui/apps/tools/bitwarden/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/tools/default.nix b/home/modules/gui/apps/tools/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/tools/deskreen/default.nix b/home/modules/gui/apps/tools/deskreen/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/tools/emote/default.nix b/home/modules/gui/apps/tools/emote/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/tools/gnomeCalculator/default.nix b/home/modules/gui/apps/tools/gnomeCalculator/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/tools/ledger/default.nix b/home/modules/gui/apps/tools/ledger/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/tools/scrcpy/default.nix b/home/modules/gui/apps/tools/scrcpy/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/apps/tools/usbImager/default.nix b/home/modules/gui/apps/tools/usbImager/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/default.nix b/home/modules/gui/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/desktop/default.nix b/home/modules/gui/desktop/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/desktop/easyEffects/default.nix b/home/modules/gui/desktop/easyEffects/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/desktop/flameshot/default.nix b/home/modules/gui/desktop/flameshot/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/desktop/gammastep/default.nix b/home/modules/gui/desktop/gammastep/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/desktop/gtk/config/cursorTheme.nix b/home/modules/gui/desktop/gtk/config/cursorTheme.nix index dcbf7f7..23a9967 100755 --- a/home/modules/gui/desktop/gtk/config/cursorTheme.nix +++ b/home/modules/gui/desktop/gtk/config/cursorTheme.nix @@ -1,5 +1,13 @@ -{ pkgs, ... }: +{ + pkgs, + flake, + ... +}: +let + inherit (flake.config.aesthetics.themes) cursor; +in { name = "catppuccin-macchiato-dark-cursors"; package = pkgs.catppuccin-cursors.macchiatoDark; + size = cursor.size; } diff --git a/home/modules/gui/desktop/gtk/config/homeCursor.nix b/home/modules/gui/desktop/gtk/config/homeCursor.nix index 86bb639..037cc12 100755 --- a/home/modules/gui/desktop/gtk/config/homeCursor.nix +++ b/home/modules/gui/desktop/gtk/config/homeCursor.nix @@ -6,7 +6,7 @@ let in { gtk.enable = true; - # x11.enable = true; + x11.enable = true; name = "catppuccin-mocha-dark-cursors"; package = pkgs.catppuccin-cursors.macchiatoDark; size = cursor.size; diff --git a/home/modules/gui/desktop/gtk/default.nix b/home/modules/gui/desktop/gtk/default.nix index 1440105..16938af 100755 --- a/home/modules/gui/desktop/gtk/default.nix +++ b/home/modules/gui/desktop/gtk/default.nix @@ -3,6 +3,7 @@ let configPath = ./config; cursorThemePath = import (configPath + /cursorTheme.nix) { inherit + flake pkgs ; }; diff --git a/home/modules/gui/desktop/hyprland/config/bind.nix b/home/modules/gui/desktop/hyprland/config/bind.nix index 6cc0a99..20f79a5 100755 --- a/home/modules/gui/desktop/hyprland/config/bind.nix +++ b/home/modules/gui/desktop/hyprland/config/bind.nix @@ -10,7 +10,7 @@ let superBinds = builtins.map (x: "SUPER, " + x) [ # Apps "Space, exec, rm -r /home/$USER/.cache/tofi* ; tofi-drun" - "C, exec, code" + "C, exec, zed" "A, exec, obsidian" "D, exec, ghostty -e zellij a dotfiles" "E, exec, ghostty -e nu -e y" diff --git a/home/modules/gui/desktop/hyprland/config/windowrulev2.nix b/home/modules/gui/desktop/hyprland/config/windowrulev2.nix index 3df1531..0af2065 100755 --- a/home/modules/gui/desktop/hyprland/config/windowrulev2.nix +++ b/home/modules/gui/desktop/hyprland/config/windowrulev2.nix @@ -9,6 +9,7 @@ let emote = "(emote)"; flameshot = "(flameshot)"; bitwarden = "(.*Bitwarden.*)"; + save = "(.*Enter name of file to save to….*)"; picture = "(.*Picture-in-Picture.*)"; discord-popout = "(.*Discord Popout.*)"; signal = "(signal)"; @@ -25,11 +26,13 @@ let "maxsize 360 500, class:^${calculator}$" "maxsize 720 400, class:^${easyeffects}$" "maxsize 720 400, class:^${scrcpy}$" + "minsize 720 400, class:^${scrcpy}$" "maxsize 720 400, class:^${mpv}$" "maxsize 720 400, class:^${vlc}$" "maxsize 640 360, class:^${nomacs}$" "maxsize 800 450, title:^${bitwarden}$" "maxsize 720 400, title:^${picture}$" + "maxsize 720 400, title:^${save}$" "maxsize 720 400, title:^${discord-popout}$" ]; @@ -46,6 +49,7 @@ let "title:^(${picture})$" "title:^(${discord-popout})$" "title:^${bitwarden}$" + "title:^${save}$" ]; pinWindows = builtins.map (x: "pin, " + x) [ diff --git a/home/modules/gui/desktop/network/default.nix b/home/modules/gui/desktop/network/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/desktop/nwgLook/default.nix b/home/modules/gui/desktop/nwgLook/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/desktop/plasmaNm/default.nix b/home/modules/gui/desktop/plasmaNm/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/desktop/wlClipboard/default.nix b/home/modules/gui/desktop/wlClipboard/default.nix old mode 100644 new mode 100755 diff --git a/home/modules/gui/desktop/wpaperd/default.nix b/home/modules/gui/desktop/wpaperd/default.nix index b200e08..b24bb60 100755 --- a/home/modules/gui/desktop/wpaperd/default.nix +++ b/home/modules/gui/desktop/wpaperd/default.nix @@ -9,7 +9,7 @@ package = flake.inputs.wpaperd.packages.${pkgs.system}.default; settings = { "default" = { - path = "~/Files/Projects/dotfiles/home/modules/hypr/wpaperd/wallpaper"; + path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/wpaperd/wallpaper"; apply-shadow = true; duration = "1m"; sorting = "random"; diff --git a/nixos/modules/ollama.nix b/nixos/modules/ollama.nix index ede427d..c8ecc7f 100755 --- a/nixos/modules/ollama.nix +++ b/nixos/modules/ollama.nix @@ -1,21 +1,38 @@ -{flake, ...}: let - inherit - (flake.config.services.instances) +{ + flake, + pkgs, + ... +}: +let + inherit (flake.config.services.instances) ollama web ; service = ollama; localhost = web.localhost.address0; -in { +in +{ services = { ollama = { - acceleration = false; + acceleration = "rocm"; + package = pkgs.ollama.override { + config = { + rocmSupport = true; + cudaSupport = false; + }; + }; enable = true; group = service.name; host = "http://${localhost}"; - models = service.paths.path1; + # models = service.paths.path1; user = service.name; }; + # llama-cpp = { + # enable = true; + # port = 8080; + # host = localhost; + # model = "/models/qwen2.5-coder-32b-instruct-q8_0-00004-of-00005.gguf"; + # }; open-webui = { enable = true; host = localhost; @@ -38,6 +55,7 @@ in { networking = { firewall = { allowedTCPPorts = [ + # 8080 service.ports.port0 service.ports.port1 ]; diff --git a/systems/desktop/config/graphics.nix b/systems/desktop/config/graphics.nix index e4a09d0..b67a5df 100755 --- a/systems/desktop/config/graphics.nix +++ b/systems/desktop/config/graphics.nix @@ -1,20 +1,18 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ hardware = { graphics = { enable = true; extraPackages = builtins.attrValues { - inherit - (pkgs) + inherit (pkgs) amdvlk ; - inherit - (pkgs.rocmPackages.clr) + inherit (pkgs.rocmPackages.clr) icd ; }; extraPackages32 = builtins.attrValues { - inherit - (pkgs.driversi686Linux) + inherit (pkgs.driversi686Linux) amdvlk ; };