chore: formatter

dotfiles/hypr/hyprland.conf

@@ -37,8 +37,8 @@ $menu = wofi --show drun
 # Autostart necessary processes (like notifications daemons, status bars, etc.)
 # Or execute your favorite apps at launch like this:
 
-exec-once = steam & proton-mail & obsidian & discord & 1password & firefox &
+exec-once = steam & proton-mail & obsidian & discord & 1password & firefox
-exec-once = waybar & mako & hypridle & swww-daemon &
+exec-once = waybar & mako & hypridle
 exec-once = $terminal
 exec-once = systemctl --user start hyprpolkitagent
 
@@ -138,13 +138,13 @@ 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
+windowrulev2 = workspace 1, class:^(ghostty)$
-windowrule = match:class firefox, workspace 2
+windowrulev2 = workspace 2, class:^(firefox)$
-windowrule = match:class discord, workspace 3
+windowrulev2 = workspace 3, class:^(discord)$
-windowrule = match:class steam, workspace 4
+windowrulev2 = workspace 4, class:^(steam)$
-windowrule = match:class Proton Mail, workspace 5
+windowrulev2 = workspace 5, class:^(Proton Mail)$
-windowrule = match:class obsidian, workspace 6
+windowrulev2 = workspace 6, class:^(obsidian)$
-windowrule = match:class 1password, workspace 9
+windowrulev2 = workspace 9, class:^(1Password)$
 
 # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
 dwindle {

dotfiles/npm/.npmrc

@@ -1 +0,0 @@
-; registry=https://npm.dogar.dev

dotfiles/nvim/lazy-lock.json

@@ -8,7 +8,7 @@
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "copilot.vim": { "branch": "release", "commit": "f89e977c87180519ba3b942200e3d05b17b1e2fc" },
+  "copilot.vim": { "branch": "release", "commit": "f3d66c148aa60ad04c0a21d3e0a776459de09eb2" },
   "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
   "formatter.nvim": { "branch": "master", "commit": "b9d7f853da1197b83b8edb4cc4952f7ad3a42e41" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
@@ -16,23 +16,23 @@
   "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
   "grpc-nvim": { "branch": "main", "commit": "cd235398a9922ae412f59ebeabb0b13957be0d39" },
   "indent-blankline.nvim": { "branch": "master", "commit": "b7aa0aed55887edfaece23f7b46ab22232fc8741" },
-  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydocker.nvim": { "branch": "main", "commit": "b69ff84a6223de39d34a150b980d3b9ef19549fb" },
-  "lazygit.nvim": { "branch": "main", "commit": "2305deed25bc61b866d5d39189e9105a45cf1cfb" },
+  "lazygit.nvim": { "branch": "main", "commit": "3c524ebec6072568064235c407195e9f9fd0cb8a" },
   "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
+  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
   "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" },
-  "nvim-dap": { "branch": "master", "commit": "5860c7c501eb428d3137ee22c522828d20cca0b3" },
+  "nvim-dap": { "branch": "master", "commit": "968f89f8aac11b6bdbfc942c71d3436658c1435f" },
-  "nvim-dap-python": { "branch": "master", "commit": "64652d1ae1db80870d9aac7132d76e37acd86a26" },
+  "nvim-dap-python": { "branch": "master", "commit": "030385d03363988370adaa5cf21fa465daddb088" },
   "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
   "nvim-lspconfig": { "branch": "master", "commit": "3d97ec4174bcc750d70718ddedabf150536a5891" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
+  "nvim-notify": { "branch": "master", "commit": "397c7c1184745fca649e5104de659e6392ef5a4d" },
   "nvim-tree.lua": { "branch": "master", "commit": "fefa335f1c8f690eb668a1efd18ee4fc6d64cd3e" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "4ae47f4fb18e85b80e84b729974fe65483b06aaf" },
@@ -41,10 +41,10 @@
   "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
   "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
   "ui": { "branch": "v2.0", "commit": "d4f7e64892a24075d5fdd5a58bd0db45e86e38ed" },
   "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
   "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "48c4f271da13d380592f4907e2d1d5558044e4e5" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "e8b53c0f3aa6e6127ac2a2d2071d9aade6c6e373" },
   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }

flake.lock

@@ -1,5 +1,38 @@
 {
   "nodes": {
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1760101617,
+        "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
     "crane": {
       "locked": {
         "lastModified": 1731098351,
@@ -22,11 +55,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766150702,
+        "lastModified": 1761899396,
-        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
+        "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
+        "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998",
         "type": "github"
       },
       "original": {
@@ -36,6 +69,22 @@
       }
     },
     "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -73,6 +122,28 @@
       }
     },
     "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "gitignore_2": {
       "inputs": {
         "nixpkgs": [
           "lanzaboote",
@@ -101,11 +172,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767556355,
+        "lastModified": 1761878381,
-        "narHash": "sha256-RDTUBDQBi9D4eD9iJQWtUDN/13MDLX+KmE+TwwNUp2s=",
+        "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f894bc4ffde179d178d8deb374fcf9855d1a82b7",
+        "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa",
         "type": "github"
       },
       "original": {
@@ -114,10 +185,269 @@
         "type": "github"
       }
     },
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1753964049,
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
+    "hyprgraphics": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1760445448,
+        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
+    "hyprland": {
+      "inputs": {
+        "aquamarine": "aquamarine",
+        "hyprcursor": "hyprcursor",
+        "hyprgraphics": "hyprgraphics",
+        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-qtutils": "hyprland-qtutils",
+        "hyprlang": "hyprlang",
+        "hyprutils": "hyprutils",
+        "hyprwayland-scanner": "hyprwayland-scanner",
+        "nixpkgs": "nixpkgs",
+        "pre-commit-hooks": "pre-commit-hooks",
+        "systems": "systems",
+        "xdph": "xdph"
+      },
+      "locked": {
+        "lastModified": 1761869718,
+        "narHash": "sha256-jLfwwlPGpnGRAtVDyoGj9FgH2D9hWwyEu0yHkflG2EI=",
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "rev": "8e9add2afda58d233a75e4c5ce8503b24fa59ceb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "type": "github"
+      }
+    },
+    "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1759610243,
+        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprland-qt-support": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-qtutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-qtutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749154592,
+        "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "type": "github"
+      }
+    },
+    "hyprland-qtutils": {
+      "inputs": {
+        "hyprland-qt-support": "hyprland-qt-support",
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1759080228,
+        "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "type": "github"
+      }
+    },
+    "hyprlang": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1758927902,
+        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprutils": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1759619523,
+        "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
+    "hyprwayland-scanner": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1755184602,
+        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "type": "github"
+      }
+    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts",
         "nixpkgs": [
           "nixpkgs"
@@ -160,11 +490,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1767185284,
+        "lastModified": 1761933221,
-        "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
+        "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
+        "rev": "7467f155fcba189eb088a7601f44fbef7688669b",
         "type": "github"
       },
       "original": {
@@ -175,15 +505,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767379071,
+        "lastModified": 1761114652,
-        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -205,13 +535,52 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1761672384,
+        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1760663237,
+        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": [
           "lanzaboote",
           "flake-compat"
         ],
-        "gitignore": "gitignore",
+        "gitignore": "gitignore_2",
         "nixpkgs": [
           "lanzaboote",
           "nixpkgs"
@@ -236,10 +605,11 @@
       "inputs": {
         "disko": "disko",
         "home-manager": "home-manager",
+        "hyprland": "hyprland",
         "lanzaboote": "lanzaboote",
         "nix-secrets": "nix-secrets",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "sops-nix": "sops-nix"
       }
     },
@@ -271,11 +641,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767499857,
+        "lastModified": 1760998189,
-        "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=",
+        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190",
+        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
         "type": "github"
       },
       "original": {
@@ -283,6 +653,62 @@
         "repo": "sops-nix",
         "type": "github"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "xdph": {
+      "inputs": {
+        "hyprland-protocols": [
+          "hyprland",
+          "hyprland-protocols"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1760713634,
+        "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -9,6 +9,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # Hyprland cachix flake
+    hyprland.url = "github:hyprwm/Hyprland";
+
     # NixOS community managed hardware specific features/fixes
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 

home/dogar/blueocean.nix

@@ -1,43 +0,0 @@
-{config, lib, ...}: {
-  imports = lib.flatten [
-    #
-    # ========== Required Configs ==========
-    #
-    ./common/core
-
-    #
-    # ========== Host-specific Optional Configs ==========
-    #
-    (map (config: "${builtins.toString ./.}/common/optional/${config}.nix") [
-      "btop"
-      "direnv"
-      "firefox"
-      "fonts"
-      "ghostty"
-      "git"
-      "hyprland"
-      "kitty"
-      "misc-packages"
-      "nvim"
-      "ssh"
-      "starship"
-      "tmux"
-      "uv"
-      "zsh"
-    ])
-  ];
-
-  services.yubikey-touch-detector.enable = true;
-
-  home = {
-    # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-    stateVersion = "25.05";
-    sessionVariables = {
-      EDITOR = "nvim";
-      NIXOS_OZONE_WL = "1";
-      GO_PROXY="https://go.dogar.dev";
-    };
-    file.".npmrc".source = config.lib.file.mkOutOfStoreSymlink
-      "${config.home.homeDirectory}/git/nix-config/dotfiles/npm/.npmrc";
-  };
-}

home/dogar/common/core/default.nix

@@ -1,39 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  hostSpec,
-  ...
-}: {
-  imports = lib.flatten [
-    (map lib.custom.relativeToRoot ["modules/common" "modules/home-manager"])
-  ];
-
-  inherit hostSpec;
-
-  home = {
-    username = lib.mkDefault config.hostSpec.username;
-    homeDirectory = lib.mkDefault config.hostSpec.home;
-    stateVersion = lib.mkDefault "25.05";
-    sessionPath = ["$HOME/.local/bin"];
-    sessionVariables = {
-      FLAKE = "$HOME/src/nix/nix-config";
-      SHELL = "zsh";
-      VISUAL = "nvim";
-      EDITOR = "nvim";
-    };
-  };
-
-  nix = {
-    package = lib.mkDefault pkgs.nix;
-    settings = {
-      experimental-features = ["nix-command" "flakes"];
-      warn-dirty = false;
-    };
-  };
-
-  programs.home-manager.enable = true;
-
-  # Nicely reload system units when changing configs
-  systemd.user.startServices = "sd-switch";
-}

home/dogar/common/optional/btop.nix

@@ -1,3 +0,0 @@
-{...}: {
-  programs.btop = {enable = true;};
-}

home/dogar/common/optional/direnv.nix

@@ -1,8 +0,0 @@
-{
-  programs.direnv = {
-    enable = true;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-    nix-direnv.enable = true;
-  };
-}

home/dogar/common/optional/firefox.nix

@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  programs.firefox = {
-    enable = true;
-    package = pkgs.firefox.override {
-      cfg = {
-        # Gnome shell native connector
-        enableGnomeExtensions = true;
-      };
-    };
-  };
-}

home/dogar/common/optional/fonts.nix

@@ -1,4 +0,0 @@
-{pkgs, ...}: {
-  fonts.fontconfig.enable = true;
-  home.packages = with pkgs; [nerd-fonts.jetbrains-mono];
-}

home/dogar/common/optional/ghostty.nix

@@ -1,12 +0,0 @@
-{config, ...}: {
-  programs.ghostty = {
-    enable = true;
-
-    settings = {
-      theme = "catppuccin-mocha";
-      font-family = config.hostSpec.font;
-      font-size = 14;
-      initial-command = "tmux";
-    };
-  };
-}

home/dogar/common/optional/git.nix

@@ -1,30 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: {
-  programs.git = {
-    enable = true;
-    lfs.enable = true;
-
-    settings = {
-      core = {
-        excludesfile = "~/.gitignore";
-      };
-      user = {
-        name = config.hostSpec.userFullName;
-        email = config.hostSpec.email.user;
-      };
-      gpg = {format = "ssh";};
-      "gpg \"ssh\"" = {
-        program = "${lib.getExe' pkgs._1password-gui "op-ssh-sign"}";
-      };
-      commit = {gpgsign = true;};
-      user = {signingKey = "~/.ssh/id_ed25519.pub";};
-      pull = {rebase = true;};
-      init = {defaultBranch = "main";};
-      lfs = {locksverify = true;};
-    };
-  };
-}

home/dogar/common/optional/hyprland.nix

@@ -1,33 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
-  home = {
-    file = {
-      "${config.xdg.configHome}/hypr/hyprland.conf".source =
-        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hyprland.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 =
-        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hyprlock.conf"}";
-      "${config.xdg.configHome}/waybar".source =
-        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/waybar"}";
-      "${config.xdg.configHome}/wofi".source =
-        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/wofi"}";
-      "${config.xdg.configHome}/mako".source =
-        config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/mako"}";
-    };
-
-    packages = with pkgs; [
-      hyprshot
-      hyprlock
-      hypridle
-      hyprpolkitagent
-      waybar
-      wofi
-      mako
-    ];
-  };
-}

home/dogar/common/optional/kitty.nix

@@ -1,14 +0,0 @@
-{config, ...}: {
-  programs.kitty = {
-    enable = true;
-
-    shellIntegration.enableZshIntegration = true;
-    settings = {
-      font = config.hostSpec.font;
-      shell = "tmux";
-      font-size = 16.0;
-      active_border_color = "#44ffff";
-      single_window_margin_width = 0;
-    };
-  };
-}

home/dogar/common/optional/misc-packages.nix

@@ -1,36 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    awscli2
-    btop
-    zoxide
-    unzip
-    tmux
-    gcc
-    zig
-    gparted
-    gnupg
-    dig
-    bash
-    kdePackages.dolphin
-    font-awesome
-    tree
-    wl-clipboard-rs
-    brightnessctl
-    age
-    nerd-fonts.jetbrains-mono
-    lazygit
-    gh
-    dbeaver-bin
-    cloudflare-warp
-    protonmail-desktop
-    rpi-imager
-    kubectl
-    k9s
-    postgresql_17
-    kitty
-    waybar
-    obsidian
-    yq
-    jq
-  ];
-}

home/dogar/common/optional/nvim.nix

@@ -1,13 +0,0 @@
-{config, ...}: {
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    viAlias = true;
-    vimAlias = true;
-  };
-
-  # 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/dogar/common/optional/ssh.nix

@@ -1,10 +0,0 @@
-{...}: let
-  onePassPath = "~/.1password/agent.sock";
-in {
-  programs.ssh = {
-    enable = true;
-    enableDefaultConfig = false;
-    extraConfig = "IdentityAgent ${onePassPath}";
-    matchBlocks."*" = {};
-  };
-}

home/dogar/common/optional/starship.nix

@@ -1 +0,0 @@
-{...}: {programs.starship.enable = true;}

home/dogar/common/optional/tmux.nix

@@ -1,15 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
-  home = {
-    file = {
-      "${config.xdg.configHome}/tmux".source =
-        lib.custom.relativeToRoot "dotfiles/tmux";
-    };
-
-    packages = with pkgs; [tmux];
-  };
-}

home/dogar/common/optional/uv.nix

@@ -1,10 +0,0 @@
-{
-  ...
-}: {
-  programs.uv = {
-    enable = true;
-    settings = {
-      pip.index-url = "https://pip.dogar.dev";
-    };
-  };
-}

home/dogar/common/optional/zsh.nix

@@ -1,43 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  home.packages = with pkgs; [
-    eza
-    ripgrep
-    rm-improved
-    dust
-    xcp
-    nh
-    zoxide
-  ];
-
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
-
-    initContent = ''
-      eval "$(zoxide init zsh)"
-    '';
-
-    shellAliases = {
-      ".." = "cd ..";
-      ls = "exa";
-      vim = "nvim";
-      grep = "rg";
-      du = "dust";
-      rm = "rip";
-      cp = "xcp";
-      uo = "nh os switch ~/git/nix-config";
-      k = "kubectl";
-    };
-
-    history = {
-      size = 10000;
-      path = "${config.xdg.dataHome}/zsh/history";
-    };
-  };
-}

home/shahab/common/optional/hyprland.nix

@@ -28,10 +28,6 @@
       waybar
       wofi
       mako
-      sassc
-      nwg-look
     ];
   };
-
-  services.swww.enable = true;
 }

home/shahab/common/optional/misc-packages.nix

@@ -1,7 +1,7 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
+    uv
     btop
-    discord
     zoxide
     unzip
     tmux
@@ -23,7 +23,7 @@
     dbeaver-bin
     cloudflare-warp
     protonmail-desktop
-    rpi-imager
+    protonvpn-gui
     kubectl
     k9s
     postgresql_17

home/shahab/common/optional/uv.nix

@@ -1,10 +0,0 @@
-{
-  ...
-}: {
-  programs.uv = {
-    enable = true;
-    settings = {
-      pip.index-url = "https://pip.dogar.dev";
-    };
-  };
-}

home/shahab/common/optional/zsh.nix

@@ -21,7 +21,6 @@
 
     initContent = ''
       eval "$(zoxide init zsh)"
-      export PATH=/home/shahab/.opencode/bin:$PATH
     '';
 
     shellAliases = {

home/shahab/rihla.nix

@@ -1,4 +1,4 @@
-{config, lib, ...}: {
+{lib, ...}: {
   imports = lib.flatten [
     #
     # ========== Required Configs ==========
@@ -22,7 +22,6 @@
       "ssh"
       "starship"
       "tmux"
-      "uv"
       "zsh"
     ])
   ];
@@ -36,7 +35,5 @@
       EDITOR = "nvim";
       NIXOS_OZONE_WL = "1";
     };
-    file.".npmrc".source = config.lib.file.mkOutOfStoreSymlink
-      "${config.home.homeDirectory}/git/nix-config/dotfiles/npm/.npmrc";
   };
 }

home/shahab/specialisations/gaming.nix

@@ -1,5 +1,10 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
+    discord
+    protonmail-desktop
+    protonvpn-gui
+    kitty
+    waybar
     prismlauncher
   ];
 }

hosts/common/core/default.nix

@@ -16,6 +16,9 @@
   ];
 
   hostSpec = {
+    username = "shahab";
+    handle = "shahab96";
+    email = {user = "shahab@dogar.dev";};
     userFullName = "Shahab Dogar";
     networking.ports.tcp.ssh = 22;
   };
@@ -66,7 +69,7 @@
     enable = true;
     clean.enable = true;
     clean.extraArgs = "--keep-since 10d --keep 10";
-    flake = "${config.hostSpec.home}/nix-config";
+    flake = "/home/user/${config.hostSpec.home}/nix-config";
   };
 
   # ========= Sops =========

hosts/common/disks/blueocean.nix

@@ -1,116 +0,0 @@
-{
-  lib,
-  primary,
-  nix,
-  withSwap,
-  swapSize,
-  label,
-  ...
-}: {
-  disko = {
-    devices = {
-      disk = {
-        main = {
-          device = primary;
-
-          type = "disk";
-          content = {
-            type = "gpt";
-            partitions = {
-              boot = {
-                name = "boot";
-                size = "1M";
-                type = "EF02";
-              };
-              esp = {
-                name = "ESP";
-                size = "500M";
-                type = "EF00";
-                content = {
-                  type = "filesystem";
-                  format = "vfat";
-                  mountpoint = "/boot";
-                };
-              };
-              luks = {
-                size = "100%";
-                content = {
-                  name = "crypted";
-                  type = "luks";
-                  passwordFile = "/tmp/secret.key";
-                  settings = {
-                    allowDiscards = true;
-                    crypttabExtraOpts = ["fido2-device=auto" "token-timeout=10"];
-                  };
-                  content = {
-                    type = "lvm_pv";
-                    vg = "crypt_vg";
-                  };
-                };
-              };
-            };
-          };
-        };
-        secondary = {
-          device = nix;
-
-          type = "disk";
-          content = {
-            type = "gpt";
-            partitions = {
-              luks = {
-                size = "100%";
-                content = {
-                  name = "crypt-nix";
-                  type = "luks";
-                  passwordFile = "/tmp/secret.key";
-                  settings = {
-                    allowDiscards = true;
-                    crypttabExtraOpts = ["fido2-device=auto" "token-timeout=10"];
-                  };
-                  content = {
-                    type = "btrfs";
-                    extraArgs = ["-L nix -f"];
-                    subvolumes = {
-                      "@nix" = {
-                        mountpoint = "/nix";
-                        mountOptions = ["subvol=nix" "compress=zstd" "noatime"];
-                      };
-                    };
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-      lvm_vg = {
-        crypt_vg = {
-          type = "lvm_vg";
-          lvs = {
-            swap = lib.mkIf withSwap {
-              size = "${swapSize}G";
-              content = {
-                type = "swap";
-                resumeDevice = true;
-              };
-            };
-            main = {
-              size = "100%";
-              content = {
-                type = "btrfs";
-                extraArgs = ["-L" label "-f"];
-                subvolumes = {
-                  "@root" = {
-                    mountpoint = "/";
-                    mountOptions = ["subvol=root" "compress=zstd" "noatime"];
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}

hosts/common/optional/hyprland.nix

@@ -1,9 +1,14 @@
 {
+  inputs,
   pkgs,
   ...
 }: {
   programs.hyprland = {
     enable = true;
+    package =
+      inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+    portalPackage =
+      inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
   };
 
   environment.systemPackages = with pkgs; [

hosts/common/optional/services/k3s.nix

@@ -8,8 +8,7 @@
   services.k3s = {
     enable = true;
     role = "agent";
-    # Add this before running
+    token = "K10aad4485a9e2a872775c6560ab812ac1a05d2dc4c86f189fdf56e5fdc673dcc10::server:G7zhbpu7iSUYvM2e";
-    token = "";
     serverAddr = "https://rashid:6443";
   };
 }

hosts/common/optional/services/vpn.nix

@@ -1,5 +0,0 @@
-{ pkgs, ...}: {
-  services.netbird.enable = true;
-
-  environment.systemPackages = with pkgs; [ netbird-ui ];
-}

hosts/common/optional/slack.nix

@@ -1,8 +0,0 @@
-{
-  pkgs,
-  ...
-}: {
-  environment.systemPackages = with pkgs; [
-    slack
-  ];
-}

hosts/common/optional/thunderbird.nix

@@ -1,5 +0,0 @@
-{...}: {
-  programs.thunderbird = {
-    enable = true;
-  };
-}

hosts/common/optional/zoom.nix

@@ -1,8 +0,0 @@
-{
-  pkgs,
-  ...
-}: {
-  environment.systemPackages = with pkgs; [
-    zoom-us
-  ];
-}

hosts/nixos/aamil-1/default.nix

@@ -39,7 +39,6 @@ in {
   #
   hostSpec = {
     hostName = hostName;
-    username = "shahab";
   };
 
   networking = {

hosts/nixos/aamil-2/default.nix

@@ -39,7 +39,6 @@ in {
   #
   hostSpec = {
     hostName = hostName;
-    username = "shahab";
   };
 
   networking = {

hosts/nixos/aamil-3/default.nix

@@ -39,7 +39,6 @@ in {
   #
   hostSpec = {
     hostName = hostName;
-    username = "shahab";
   };
 
   networking = {

hosts/nixos/blueocean/default.nix

@@ -1,100 +0,0 @@
-{
-  inputs,
-  lib,
-  pkgs,
-  config,
-  ...
-}: {
-  imports = lib.flatten [
-    #
-    # ========= Hardware =========
-    #
-    ./hardware-configuration.nix
-    inputs.nixos-hardware.nixosModules.common-cpu-amd
-    inputs.nixos-hardware.nixosModules.common-gpu-amd
-    inputs.nixos-hardware.nixosModules.common-pc-ssd
-    inputs.nixos-hardware.nixosModules.lenovo-legion-16ithg6
-
-    #
-    # ========= Disk Layout =========
-    #
-    inputs.disko.nixosModules.disko
-    (lib.custom.relativeToRoot "hosts/common/disks/blueocean.nix")
-    {
-      _module.args = {
-        primary = "/dev/nvme0n1";
-        nix = "/dev/nvme1n1";
-        withSwap = true;
-        swapSize = "4";
-        label = "nixos";
-      };
-    }
-
-    #
-    # ========= Required Configs =========
-    #
-    (map lib.custom.relativeToRoot ["hosts/common/core"])
-
-    #
-    # ========= Optional Configs =========
-    #
-    (map (c: lib.custom.relativeToRoot "hosts/common/optional/${c}.nix") [
-      "1password"
-      "claude-code"
-      "dconf"
-      "docker"
-      "hyprland"
-      "nix-ld"
-      "thunderbird"
-      "secure-boot"
-      "slack"
-      "yubikey"
-      "zoom"
-    ])
-
-    #
-    # ========= Optional Services =========
-    #
-    (map
-      (s: lib.custom.relativeToRoot "hosts/common/optional/services/${s}.nix") [
-        "audio"
-        "bluetooth"
-        "firmware"
-        "greetd"
-        "openssh"
-        "printing"
-        "smart-card"
-        "vpn"
-      ])
-  ];
-
-  #
-  # ========= Host specification =========
-  #
-  hostSpec = {
-    hostName = "blueocean";
-    username = "dogar";
-    handle = "shadogar";
-    email = {user = "shahab.dogar@blueocean.ai";};
-    useYubikey = lib.mkForce true;
-  };
-
-  networking = {
-    networkmanager.enable = true;
-    enableIPv6 = false;
-  };
-
-  boot = {
-    loader = {
-      # Set this to true on first install. This must be false for secure boot.
-      systemd-boot = {
-        enable = lib.mkForce (!config.hostSpec.secureBoot);
-        configurationLimit = config.hostSpec.bootHistoryLimit;
-      };
-      efi.canTouchEfiVariables = true;
-    };
-  };
-
-  security.rtkit.enable = true;
-  system.stateVersion = "25.05";
-}

hosts/nixos/blueocean/hardware-configuration.nix

@@ -1,47 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}: {
-  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
-
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "nvme"
-        "xhci_pci"
-        "ahci"
-        "usbhid"
-        "thunderbolt"
-        "usb_storage"
-        "sd_mod"
-      ];
-      kernelModules = [];
-    };
-
-    kernelModules = ["kvm-amd"];
-    extraModulePackages = [];
-    binfmt.emulatedSystems = ["aarch64-linux"]; # Add other target architectures as needed
-  };
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp193s0f3u2.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware = {
-    cpu.amd.updateMicrocode =
-      lib.mkDefault config.hardware.enableRedistributableFirmware;
-    graphics = {
-      enable = true;
-    };
-  };
-}

hosts/nixos/rihla/default.nix

@@ -66,7 +66,6 @@
         "openssh"
         "printing"
         "smart-card"
-        "vpn"
       ])
 
     #
@@ -87,9 +86,6 @@
     secureBoot = false;
     persist = "/persist";
     impermanance = false;
-    username = "shahab";
-    handle = "shahab96";
-    email = {user = "shahab@dogar.dev";};
   };
 
   networking = {

hosts/nixos/rihla/hardware-configuration.nix

@@ -2,6 +2,7 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
+  config,
   lib,
   modulesPath,
   ...
@@ -37,6 +38,8 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware = {
+    cpu.amd.updateMicrocode =
+      lib.mkDefault config.hardware.enableRedistributableFirmware;
     graphics = {
       enable = true;
     };