fix: waybar | fix temperature sensors

fix: use full url for uv pip index
fix: use go proxy without ',direct' proxy
2026-05-06 20:57:59 +05:00 · 2026-04-30 01:36:36 +05:00 · 2026-04-30 00:15:42 +05:00 · 2026-04-29 23:57:43 +05:00 · 2026-04-23 20:48:20 +05:00 · 2026-04-23 15:10:55 +05:00
17 changed files with 170 additions and 101 deletions
--- a/dotfiles/hypr/hosts/blueocean.conf
+++ b/dotfiles/hypr/hosts/blueocean.conf
@@ -0,0 +1,23 @@
+# Host-specific Hyprland config: blueocean
+# Sourced from ../hyprland.conf via ~/.config/hypr/host.conf symlink.
+
+#################
+### AUTOSTART ###
+#################
+
+exec-once = 1password & firefox & thunderbird & slack & zoom &
+exec-once = waybar & mako & hypridle & swww-daemon &
+exec-once = $terminal
+exec-once = systemctl --user start hyprpolkitagent
+
+
+####################
+### WINDOW RULES ###
+####################
+
+windowrule = match:class kitty, workspace 1
+windowrule = match:class firefox, workspace 2
+windowrule = match:class Slack, workspace 3
+windowrule = match:class thunderbird, workspace 5
+windowrule = match:class 1password, workspace 9
+windowrule = match:class zoom, workspace 10
--- a/dotfiles/hypr/hosts/rihla.conf
+++ b/dotfiles/hypr/hosts/rihla.conf
@@ -0,0 +1,21 @@
+# Host-specific Hyprland config: rihla
+# Sourced from ../hyprland.conf via ~/.config/hypr/host.conf symlink.
+
+#################
+### AUTOSTART ###
+#################
+
+exec-once = discord & 1password & firefox &
+exec-once = waybar & mako & hypridle & swww-daemon &
+exec-once = $terminal
+exec-once = systemctl --user start hyprpolkitagent
+
+
+####################
+### WINDOW RULES ###
+####################
+
+windowrule = match:class ghostty, workspace 1
+windowrule = match:class firefox, workspace 2
+windowrule = match:class discord, workspace 3
+windowrule = match:class 1password, workspace 9
--- a/dotfiles/hypr/hyprland.conf
+++ b/dotfiles/hypr/hyprland.conf
@@ -30,18 +30,13 @@ $fileManager = dolphin
 $menu = wofi --show drun


-#################
-### AUTOSTART ###
-#################
+##############################
+### HOST-SPECIFIC INCLUDES ###
+##############################

-# Autostart necessary processes (like notifications daemons, status bars, etc.)
-# Or execute your favorite apps at launch like this:
-
-exec-once = proton-mail & discord & 1password & firefox &
-exec-once = thunderbird & slack & zoom &
-exec-once = waybar & mako & hypridle & swww-daemon &
-exec-once = $terminal
-exec-once = systemctl --user start hyprpolkitagent
+# Host-specific autostart + window rules.
+# Symlinked by home-manager to dotfiles/hypr/hosts/${hostSpec.hostName}.conf.
+source = ~/.config/hypr/host.conf

 #############################
 ### ENVIRONMENT VARIABLES ###
@@ -139,14 +134,7 @@ animations {
 # uncomment all if you wish to use that.
 # workspace = w[tv1], gapsout:0, gapsin:0
 # workspace = f[1], gapsout:0, gapsin:0
-windowrule = match:class ghostty, workspace 1
-windowrule = match:class firefox, workspace 2
-windowrule = match:class discord, workspace 3
-windowrule = match:class slack, workspace 3
-windowrule = match:class Proton Mail, workspace 5
-windowrule = match:class Thunderbird, workspace 5
-windowrule = match:class 1password, workspace 9
-windowrule = match:class Zoom Workplace, workspace 10
+# Host-specific windowrule match:class entries live in host.conf (sourced above).

 # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
 dwindle {
--- a/dotfiles/nvim/lazy-lock.json
+++ b/dotfiles/nvim/lazy-lock.json
@@ -9,12 +9,12 @@
  "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
  "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" },
  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
-  "copilot.lua": { "branch": "master", "commit": "aeca454727486d488a6ecbcde30db72e741e3524" },
+  "conform.nvim": { "branch": "master", "commit": "dca1a190aa85f9065979ef35802fb77131911106" },
+  "copilot.lua": { "branch": "master", "commit": "adff470bca742b7658228ed144589250ecb3dc0a" },
  "crates.nvim": { "branch": "main", "commit": "694357861ec9ebf12475ddcdd04ea45a0923c32d" },
  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
-  "fzf-lua": { "branch": "main", "commit": "beaa4e83e6be4174af291a464e4f49548c943963" },
+  "fzf-lua": { "branch": "main", "commit": "58f52b7df97aa3104db8a6763f4523e3e14e4b9b" },
  "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
  "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" },
  "grpc-nvim": { "branch": "main", "commit": "cd235398a9922ae412f59ebeabb0b13957be0d39" },
@@ -32,7 +32,7 @@
  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
  "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
  "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
-  "nvim-lspconfig": { "branch": "master", "commit": "e146efacbafed3789ac568abcc5a981c5decaa58" },
+  "nvim-lspconfig": { "branch": "master", "commit": "81878de76c0de4ce289513734ad80c31ec7871b8" },
  "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
  "nvim-tree.lua": { "branch": "master", "commit": "d277467fc0d1d0e2bca88165a1de6b526f9f6fe8" },
  "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
@@ -42,7 +42,7 @@
  "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
  "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
  "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
-  "telescope.nvim": { "branch": "master", "commit": "028d9a0695a0cc4cfa893889f8c408ed7ccc8adc" },
+  "telescope.nvim": { "branch": "master", "commit": "506338434fec5ad19cb1f8d45bf92d66c4917393" },
  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
  "ui": { "branch": "v3.0", "commit": "cb75908a86720172594b30de147272c1b3a7f452" },
  "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" },
--- a/dotfiles/waybar/config.jsonc
+++ b/dotfiles/waybar/config.jsonc
@@ -67,8 +67,8 @@
        "format": "{}% "
    },
    "temperature": {
-        // "thermal-zone": 2,
-        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "hwmon-path-abs": "/sys/devices/platform/coretemp.0/hwmon",
+        "input-filename": "temp1_input",
        "critical-threshold": 80,
        // "format-critical": "{temperatureC}°C {icon}",
        "format": "{temperatureC}°C",
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1774211390,
-        "narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=",
+        "lastModified": 1776702787,
+        "narHash": "sha256-qc5uwEWbuubzYthmZcfCapooZGXhoYZWfTQ24TozbCQ=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70",
+        "rev": "9a1ca6b8cb4d86a599787a55b78f2ddf809bf945",
        "type": "github"
      },
      "original": {
@@ -55,11 +55,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773889306,
-        "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=",
+        "lastModified": 1776613567,
+        "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347",
+        "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d",
        "type": "github"
      },
      "original": {
@@ -172,11 +172,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1775544097,
-        "narHash": "sha256-fwI8PbrUT4W+z+J4TAS/D69So/MLan1WZjUsYQpoSvI=",
+        "lastModified": 1776950293,
+        "narHash": "sha256-t6KMARLILjPuTBSRoYanUxV+FU50IFZ7L5XVdOcdtaY=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2bd16b16a77d68a1e14c1b4da725a6590181a706",
+        "rev": "6837e0d6c5eda81fd26308489799fbf83a160465",
        "type": "github"
      },
      "original": {
@@ -201,11 +201,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772461003,
-        "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=",
+        "lastModified": 1776511930,
+        "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=",
        "owner": "hyprwm",
        "repo": "hyprcursor",
-        "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7",
+        "rev": "39435900785d0c560c6ae8777d29f28617d031ef",
        "type": "github"
      },
      "original": {
@@ -230,11 +230,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772461523,
-        "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=",
+        "lastModified": 1776426399,
+        "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804",
+        "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84",
        "type": "github"
      },
      "original": {
@@ -260,11 +260,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1775416789,
-        "narHash": "sha256-0IELkB6YXCZGqZqLdmOcTw8mki6NNhDmG47y7Qynuj8=",
+        "lastModified": 1776889279,
+        "narHash": "sha256-oKSqtplor0a6xzWRq6KL2um504x5VZ0Afw1N6ZiiC48=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "aaa2fc342f002bf4acd965f1ad2ead3796347e35",
+        "rev": "300cdb7c3241969ac04cd02a5e13010a28ebb830",
        "type": "github"
      },
      "original": {
@@ -306,11 +306,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772467975,
-        "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=",
+        "lastModified": 1776426575,
+        "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=",
        "owner": "hyprwm",
        "repo": "hyprland-guiutils",
-        "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507",
+        "rev": "a968d211048e3ed538e47b84cb3649299578f19d",
        "type": "github"
      },
      "original": {
@@ -360,11 +360,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772459629,
-        "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=",
+        "lastModified": 1776426736,
+        "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "7615ee388de18239a4ab1400946f3d0e498a8186",
+        "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9",
        "type": "github"
      },
      "original": {
@@ -437,11 +437,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1774211405,
-        "narHash": "sha256-6KNwP4ojUzv3YBlZU5BqCpTrWHcix1Jo01BISsTT0xk=",
+        "lastModified": 1776428866,
+        "narHash": "sha256-XfRlBolGtjvalTHJp3XvvpYLBjkMhaZLLU0WqZ91Fcg=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "cb4e152dc72095a2af422956c6b689590572231a",
+        "rev": "eedd60805cd96d4442586f2ba5fe51d549b12674",
        "type": "github"
      },
      "original": {
@@ -462,11 +462,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772459835,
-        "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=",
+        "lastModified": 1776430932,
+        "narHash": "sha256-Yv3RPiUvl7CAsJgwIVsqcj7akn1gLyJP1F/mocof5hA=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "0a692d4a645165eebd65f109146b8861e3a925e7",
+        "rev": "4c2fcc06dc9722c97dbb54ba649c69b18ce83d2e",
        "type": "github"
      },
      "original": {
@@ -491,11 +491,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773074819,
-        "narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=",
+        "lastModified": 1776728575,
+        "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=",
        "owner": "hyprwm",
        "repo": "hyprwire",
-        "rev": "f68afd0e73687598cc2774804fedad76693046f0",
+        "rev": "f3a80888783702a39691b684d099e16b83ed4702",
        "type": "github"
      },
      "original": {
@@ -550,11 +550,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1775490113,
-        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
+        "lastModified": 1776830795,
+        "narHash": "sha256-PAfvLwuHc1VOvsLcpk6+HDKgMEibvZjCNvbM1BJOA7o=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
+        "rev": "72674a6b5599e844c045ae7449ba91f803d44ebc",
        "type": "github"
      },
      "original": {
@@ -565,11 +565,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1774106199,
-        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
+        "lastModified": 1776548001,
+        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
+        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
        "type": "github"
      },
      "original": {
@@ -597,11 +597,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1775423009,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "lastModified": 1776548001,
+        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
        "type": "github"
      },
      "original": {
@@ -621,11 +621,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1774104215,
-        "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=",
+        "lastModified": 1776796298,
+        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "f799ae951fde0627157f40aec28dec27b22076d0",
+        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
        "type": "github"
      },
      "original": {
@@ -701,11 +701,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1775365543,
-        "narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=",
+        "lastModified": 1776771786,
+        "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "a4ee2de76efb759fe8d4868c33dec9937897916f",
+        "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
        "type": "github"
      },
      "original": {
@@ -757,11 +757,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773601989,
-        "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=",
+        "lastModified": 1776608502,
+        "narHash": "sha256-UH8YoQxx4hFOm6qjMdjRQNRvSejFIR/wBZ8fW1p9sME=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d",
+        "rev": "4a293523d36dfa367e67ec304cc718ea66a8fec2",
        "type": "github"
      },
      "original": {
--- a/home/dogar/blueocean.nix
+++ b/home/dogar/blueocean.nix
@@ -36,7 +36,7 @@
    sessionVariables = {
      EDITOR = "nvim";
      NIXOS_OZONE_WL = "1";
-      GOPROXY = "https://go.dogar.dev,direct";
+      GOPROXY = "https://go.dogar.dev";
    };
    file.".npmrc".source =
      config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/npm/.npmrc";
--- a/home/dogar/common/optional/ghostty.nix
+++ b/home/dogar/common/optional/ghostty.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
  programs.ghostty = {
-    enable = true;
+    enable = false;

    settings = {
      theme = "catppuccin-mocha";
--- a/home/dogar/common/optional/git.nix
+++ b/home/dogar/common/optional/git.nix
@@ -38,6 +38,9 @@
      lfs = {
        locksverify = true;
      };
+      "url \"ssh://git@github.com/\"" = {
+        insteadOf = "https://github.com/";
+      };
    };
  };
 }
--- a/home/dogar/common/optional/hyprland.nix
+++ b/home/dogar/common/optional/hyprland.nix
@@ -2,6 +2,7 @@
  config,
  lib,
  pkgs,
+  hostSpec,
  ...
 }:
 {
@@ -9,6 +10,8 @@
    file = {
      "${config.xdg.configHome}/hypr/hyprland.conf".source =
        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hyprland.conf"}";
+      "${config.xdg.configHome}/hypr/host.conf".source =
+        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hosts/${hostSpec.hostName}.conf"}";
      "${config.xdg.configHome}/hypr/hypridle.conf".source =
        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hypridle.conf"}";
      "${config.xdg.configHome}/hypr/hyprlock.conf".source =
--- a/home/dogar/common/optional/misc-packages.nix
+++ b/home/dogar/common/optional/misc-packages.nix
@@ -3,6 +3,7 @@
  home.packages = with pkgs; [
    awscli2
    btop
+    lm_sensors
    zoxide
    unzip
    tmux
--- a/home/dogar/common/optional/nvim.nix
+++ b/home/dogar/common/optional/nvim.nix
@@ -1,13 +1,13 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    viAlias = true;
-    vimAlias = true;
-  };
+  home.packages = [ pkgs.neovim ];

-  # Create a symlink from ~/.config/nvim to the dotfiles directory
-  home.file.".config/nvim".source =
-    config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/nvim";
+  home.sessionVariables.EDITOR = "nvim";
+
+  home.file = {
+    ".local/bin/vi".source = "${pkgs.neovim}/bin/nvim";
+    ".local/bin/vim".source = "${pkgs.neovim}/bin/nvim";
+    ".config/nvim".source =
+      config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/nvim";
+  };
 }
--- a/home/dogar/common/optional/uv.nix
+++ b/home/dogar/common/optional/uv.nix
@@ -5,7 +5,7 @@
  programs.uv = {
    enable = true;
    settings = {
-      pip.index-url = "https://pip.dogar.dev";
+      pip.index-url = "https://pip.dogar.dev/root/pypi/+simple";
    };
  };
 }
--- a/home/shahab/common/optional/hyprland.nix
+++ b/home/shahab/common/optional/hyprland.nix
@@ -2,6 +2,7 @@
  config,
  lib,
  pkgs,
+  hostSpec,
  ...
 }:
 {
@@ -9,6 +10,8 @@
    file = {
      "${config.xdg.configHome}/hypr/hyprland.conf".source =
        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hyprland.conf"}";
+      "${config.xdg.configHome}/hypr/host.conf".source =
+        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hosts/${hostSpec.hostName}.conf"}";
      "${config.xdg.configHome}/hypr/hypridle.conf".source =
        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hypridle.conf"}";
      "${config.xdg.configHome}/hypr/hyprlock.conf".source =
@@ -27,5 +30,5 @@
    ];
  };

-  services.awww.enable = true;
+  services.swww.enable = true;
 }
--- a/home/shahab/common/optional/nvim.nix
+++ b/home/shahab/common/optional/nvim.nix
@@ -1,13 +1,13 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    viAlias = true;
-    vimAlias = true;
-  };
+  home.packages = [ pkgs.neovim ];

-  # Create a symlink from ~/.config/nvim to the dotfiles directory
-  home.file."${config.xdg.configHome}/nvim".source =
-    config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/nvim";
+  home.sessionVariables.EDITOR = "nvim";
+
+  home.file = {
+    ".local/bin/vi".source = "${pkgs.neovim}/bin/nvim";
+    ".local/bin/vim".source = "${pkgs.neovim}/bin/nvim";
+    "${config.xdg.configHome}/nvim".source =
+      config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/nvim";
+  };
 }
--- a/hosts/common/optional/android-studio.nix
+++ b/hosts/common/optional/android-studio.nix
@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+let
+  androidComposition = pkgs.androidenv.composeAndroidPackages {
+    includeNDK = true;
+  };
+  androidSdk = androidComposition.androidsdk;
+in
+{
+  environment = {
+    systemPackages = with pkgs; [
+      androidSdk
+      android-studio
+    ];
+
+    variables = let
+      sdkPath = "${androidSdk}/libexec/android-sdk";
+    in {
+      ANDROID_HOME = sdkPath;
+      ANDROID_SDK_ROOT = sdkPath;
+      ANDROID_NDK_ROOT = "${sdkPath}/ndk-bundle";
+      ANDROID_USER_HOME = "\${HOME}/.android";
+    };
+  };
+}
--- a/hosts/nixos/rihla/default.nix
+++ b/hosts/nixos/rihla/default.nix
@@ -45,6 +45,7 @@
    #
    (map (c: lib.custom.relativeToRoot "hosts/common/optional/${c}.nix") [
      "1password"
+      "android-studio"
      "claude-code"
      "dconf"
      "docker"
@@ -102,6 +103,8 @@
    enableIPv6 = false;
  };

+  nixpkgs.config.android_sdk.accept_license = true;
+
  boot = {
    loader = {
      # Set this to true on first install. This must be false for secure boot.
Author	SHA1	Message	Date
Shahab Dogar	f8a3a12d86	fix: waybar \| fix temperature sensors	2026-05-06 20:57:59 +05:00
Shahab Dogar	3abd9da3eb	fix: use full url for uv pip index	2026-04-30 01:36:36 +05:00
Shahab Dogar	138ef20cd1	fix: use go proxy without ',direct' proxy	2026-04-30 00:15:42 +05:00
Shahab Dogar	a773c9d6ec	fix: use ssh instead of https for github	2026-04-29 23:57:43 +05:00
Shahab Dogar	e7f53dc359	chore: commit before wiping drive	2026-04-23 20:48:20 +05:00
Shahab Dogar	5647f2f39a	feat: Personal \| add android development tools	2026-04-23 15:10:55 +05:00
Shahab Dogar	b0d588a4c4	fix: WorkLaptop \| turn off ghostty	2026-04-23 10:54:18 +05:00
Shahab Dogar	c2b42728a3	fix: Hyprland \| finally get host specific hyprland.conf files	2026-04-23 10:53:02 +05:00
Shahab Dogar	84adedf5d1	feat: Flake \| use stable versions of nixpkgs and home-manager	2026-04-23 10:35:03 +05:00
Shahab Dogar	4f56cc32dd	fix: Nvim \| update neovim package to use homemanager	2026-04-23 10:34:46 +05:00