diff options
| -rw-r--r-- | flake.lock | 32 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | nixos/apps.nix | 1 | ||||
| -rw-r--r-- | nixos/apps/browser.nix | 5 | ||||
| -rw-r--r-- | nixos/environment.nix | 6 | ||||
| -rw-r--r-- | nixos/games/default.nix | 4 | ||||
| -rw-r--r-- | nixos/opt/llm.nix | 4 | ||||
| -rw-r--r-- | nixos/services.nix | 28 | ||||
| -rw-r--r-- | quickshell/AppLauncher.qml | 9 | ||||
| -rw-r--r-- | quickshell/Calendar.qml | 7 |
10 files changed, 51 insertions, 47 deletions
@@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1764866045, - "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", + "lastModified": 1775425411, + "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", + "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764831616, - "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", + "lastModified": 1775595990, + "narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", + "rev": "4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -60,11 +60,11 @@ ] }, "locked": { - "lastModified": 1764663772, - "narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=", + "lastModified": 1775720097, + "narHash": "sha256-p+vqkCuFfVNyQBo370wr6MebNUvz55RZiC0m8YKUhvQ=", "ref": "refs/heads/master", - "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", - "revCount": 713, + "rev": "d4c92973b53d9fa34cc110d3b974eb6bde5b3027", + "revCount": 800, "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell" }, @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1765514052, - "narHash": "sha256-YdwI+u4exAo0nRZsC9arapchD4Urt5Oeo+wZIrvlMa4=", + "lastModified": 1775699406, + "narHash": "sha256-YpDALorsidLjSyS5ozvsNI7Gz/bkmDs/ls/9oHKPv40=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3f55518bd994195cfdd835e86c41e984ac1241e8", + "rev": "b05c87c1a474cdd6979a4e5f7058edf4073554df", "type": "github" }, "original": { @@ -36,7 +36,7 @@ hostname = "pegasus"; opt = { nvidia = true; - llm = false; + llm = true; }; languages = { c = true; diff --git a/nixos/apps.nix b/nixos/apps.nix index cbe809c..fc759b1 100644 --- a/nixos/apps.nix +++ b/nixos/apps.nix @@ -10,6 +10,7 @@ discord localsend bitwarden-desktop + parted obsidian libreoffice-qt6-fresh kdePackages.dolphin diff --git a/nixos/apps/browser.nix b/nixos/apps/browser.nix index 5b6ea42..0b5a330 100644 --- a/nixos/apps/browser.nix +++ b/nixos/apps/browser.nix @@ -4,10 +4,7 @@ inputs.zen-browser.packages."${system}".default ]; xdg.mime = let - value = let - zen-browser = inputs.zen-browser.packages.${system}.default; - in - zen-browser.meta.desktopFileName; + value = "zen-browser.desktop"; associations = builtins.listToAttrs (map (name: { inherit name value; diff --git a/nixos/environment.nix b/nixos/environment.nix index 18b1101..d9585f0 100644 --- a/nixos/environment.nix +++ b/nixos/environment.nix @@ -37,7 +37,6 @@ btop yazi scrcpy - cloc wf-recorder cava @@ -48,6 +47,7 @@ inetutils android-tools sqlite + bc zoxide starship @@ -59,8 +59,12 @@ cowsay lolcat just + jq + + termshark ]; fonts.packages = with pkgs; [ + dejavu_fonts nerd-fonts.jetbrains-mono ]; } diff --git a/nixos/games/default.nix b/nixos/games/default.nix index d928476..5894464 100644 --- a/nixos/games/default.nix +++ b/nixos/games/default.nix @@ -3,12 +3,14 @@ imports = (if games.minecraft then [ ./minecraft.nix ] else []); programs.steam.enable = true; + programs.steam.protontricks.enable = true; programs.steam.extraCompatPackages = with pkgs; [ proton-ge-bin ]; environment.systemPackages = with pkgs; [ steam-run - protontricks mangohud + freetype + fontconfig ]; } diff --git a/nixos/opt/llm.nix b/nixos/opt/llm.nix index a944d5c..f9dad3a 100644 --- a/nixos/opt/llm.nix +++ b/nixos/opt/llm.nix @@ -1,5 +1,7 @@ -{ config, pkgs, ... }: +{ config, pkgs, unstable, ... }: + { + services.ollama.package = unstable.ollama; services.ollama = { enable = true; acceleration = "cuda"; diff --git a/nixos/services.nix b/nixos/services.nix index a5e4b53..0aa96d5 100644 --- a/nixos/services.nix +++ b/nixos/services.nix @@ -32,20 +32,20 @@ services.cloudflare-warp.enable = true; services.openssh.enable = true; services.flatpak.enable = true; - services.postgresql = { - enable = true; - ensureUsers = [ - { - name = username; - ensureDBOwnership = true; - } - ]; - ensureDatabases = [ username ]; - authentication = pkgs.lib.mkOverride 10 '' - #type database DBuser auth-method - local all all trust - ''; - }; + # services.postgresql = { + # enable = true; + # ensureUsers = [ + # { + # name = username; + # ensureDBOwnership = true; + # } + # ]; + # ensureDatabases = [ username ]; + # authentication = pkgs.lib.mkOverride 10 '' + # #type database DBuser auth-method + # local all all trust + # ''; + # }; services.kanata = { enable = true; keyboards = { diff --git a/quickshell/AppLauncher.qml b/quickshell/AppLauncher.qml index a4f1ffd..f903f1f 100644 --- a/quickshell/AppLauncher.qml +++ b/quickshell/AppLauncher.qml @@ -67,15 +67,6 @@ Rectangle { const parts = line.split('|'); if (parts.length < 4) continue; - if (parts[0].toLowerCase().includes("zen")) { - apps.push({ - appName: "Zen browser", - appDescription: "it's zen", - appIcon: "nigga", - appCommand: "zen" - }); - } - apps.push({ appName: parts[0], appDescription: parts[1], diff --git a/quickshell/Calendar.qml b/quickshell/Calendar.qml index 0b79553..1ad3c15 100644 --- a/quickshell/Calendar.qml +++ b/quickshell/Calendar.qml @@ -18,6 +18,13 @@ Rectangle { monthOffset = 0; requestClose() } + Keys.onPressed: (event) => { + if (event.key == Qt.Key_Comma) { + monthOffset--; + } else if (event.key == Qt.Key_Period) { + monthOffset++; + } + } Column { anchors.fill: parent |