diff --git a/flake.lock b/flake.lock index 69d55c0..bb10b31 100644 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1725753098, - "narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=", + "lastModified": 1726665257, + "narHash": "sha256-rEzEZtd3iyVo5RJ1OGujOlnywNf3gsrOnjAn1NLciD4=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52", + "rev": "752d0fbd141fabb5a1e7f865199b80e6e76f8d8e", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1726222338, - "narHash": "sha256-KuA8ciNR8qCF3dQaCaeh0JWyQUgEwkwDHr/f49Q5/e8=", + "lastModified": 1726611255, + "narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "503af483e1b328691ea3a434d331995595fb2e3d", + "rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457", "type": "github" }, "original": { @@ -282,11 +282,11 @@ ] }, "locked": { - "lastModified": 1726036828, - "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=", + "lastModified": 1726357542, + "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a1671642826633586d12ac3158e463c7a50a112", + "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", "type": "github" }, "original": { @@ -336,11 +336,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1726246604, - "narHash": "sha256-cScS34F71HzhIUeMScfKrT7iSZA0tr8pGIjOqHF+ue8=", + "lastModified": 1726681673, + "narHash": "sha256-n7EMRe/uMZ4QdM/DWsewc7LLRaR0GGzQIV3uu9BFZbU=", "ref": "refs/heads/main", - "rev": "d35e70a8c6599bb058cf86eb87c783ce1cf72471", - "revCount": 5218, + "rev": "e6cf643f5ab1c1545fb858ab1fd9d7538ef9e0f3", + "revCount": 5235, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -443,11 +443,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1726048625, - "narHash": "sha256-c2NbLfqnoH/r9xaLnuX1KGWEbXIvmGKIbq/bNLgRGI8=", + "lastModified": 1726623416, + "narHash": "sha256-o/8yw7Mjy4QEeDQyxfQ3hCcOYKvdlQ2EnAyDEt8eGyA=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "0156d2d8c177ebffe12e71c10115a1aad56c3fa3", + "rev": "a8919c395fe69ec339bb34ad9000575b93e6994a", "type": "github" }, "original": { @@ -514,11 +514,11 @@ ] }, "locked": { - "lastModified": 1726032244, - "narHash": "sha256-3VvRGPkpBJobQrFD3slQzMAwZlo4/UwxT8933U5tRVM=", + "lastModified": 1726188813, + "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f4f18f3d7229845e1c9d517457b7a0b90a38b728", + "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", "type": "github" }, "original": { @@ -529,11 +529,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725885300, - "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", + "lastModified": 1726650330, + "narHash": "sha256-UbHzmaOQ18O/kCizipU70N0UQVFIfv8AiFKXw07oZ9Y=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", + "rev": "abb448608a56a60075468e90d8acec2a7cb689b1", "type": "github" }, "original": { @@ -641,11 +641,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1726062873, - "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", + "lastModified": 1726463316, + "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", + "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "type": "github" }, "original": { @@ -670,11 +670,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1726244717, - "narHash": "sha256-MXLk8j+fCLpMU0S9iOFdsvhoebz/k69VbmL/cmgCfhM=", + "lastModified": 1726676531, + "narHash": "sha256-i8Pbd7JszwuCb0HqzAPypv2ytdcsFeAMFqbrmLaN4BE=", "owner": "nix-community", "repo": "nixvim", - "rev": "f47e8f8f79f2095aeb60c2c8ac8681206b16753b", + "rev": "9307b201a3dc57d5b71ded4f897ea9d096544877", "type": "github" }, "original": { @@ -692,11 +692,11 @@ ] }, "locked": { - "lastModified": 1725953301, - "narHash": "sha256-4DDSCLE4+5mT7HEt7OqBWVBKpY5d+jRPmaobHzEoSas=", + "lastModified": 1726392886, + "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=", "owner": "NuschtOS", "repo": "search", - "rev": "9eaa0246f803758c26f00d21188de00098b79c8b", + "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1", "type": "github" }, "original": { @@ -720,11 +720,11 @@ "plugin-markdown": { "flake": false, "locked": { - "lastModified": 1726229389, - "narHash": "sha256-U1/6FLCfAkAm692nqMl1qQh6Z1og/Gqoe3NZpa5py9g=", + "lastModified": 1726691478, + "narHash": "sha256-8P1B0mSz7Z5oiK6kZ3J2VgfemZFE87KpeCb6DBunDa0=", "owner": "MeanderingProgrammer", "repo": "markdown.nvim", - "rev": "4bf3247dfd06844088768b37cf1976efef1bca26", + "rev": "354baf485370b670bb1c1cd64309438607b0465d", "type": "github" }, "original": { @@ -805,11 +805,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726218807, - "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", + "lastModified": 1726524647, + "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", + "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", "type": "github" }, "original": { @@ -826,11 +826,11 @@ ] }, "locked": { - "lastModified": 1726201008, - "narHash": "sha256-qiW2nZ6yo2NdkoH0+K2/p4eUElEtWIOo711dOB4rJhg=", + "lastModified": 1726633022, + "narHash": "sha256-Ef/kTMoV3aPfecL2X27sxYshsLJJDIBFKYjPsqaTUBw=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "856a4212b354cfa1f1c747691e1ddf37ff9b1984", + "rev": "9f373314f087e11183afe6928d48a816d44929d4", "type": "github" }, "original": { diff --git a/home/programs/nvim/keymaps.nix b/home/programs/nvim/keymaps.nix index 1b40f4a..3b2761c 100644 --- a/home/programs/nvim/keymaps.nix +++ b/home/programs/nvim/keymaps.nix @@ -5,20 +5,55 @@ action = "lua vim.lsp.buf.format()"; options.desc = "LSP Format"; } + + # UI { - key = "w"; + key = "uw"; action = "set wrap!"; options.desc = "Toggle word wrapping"; } { - key = "W"; + key = "uW"; action = "set linebreak!"; options.desc = "Toggle linebreak"; } + { - key = "z"; + key = "uz"; action = "ZenMode"; - options.desc = "ZenMode"; + options.desc = "Toggle ZenMode"; + } + + # Trouble + { + key = "tx"; + action = "Trouble diagnostics toggle"; + options.desc = "Diagnostics (Trouble)"; + } + { + key = "tX"; + action = "Trouble diagnostics toggle filter.buf=0"; + options.desc = "Buffer Diagnostics (Trouble)"; + } + { + key = "ts"; + action = "Trouble symbols toggle focus=false"; + options.desc = "Symbols (Trouble)"; + } + { + key = "tl"; + action = "Trouble lsp toggle focus=false win.position=right"; + options.desc = "LSP Definitions / references / ... (Trouble)"; + } + { + key = "tL"; + action = "Trouble loclist toggle"; + options.desc = "Location List (Trouble)"; + } + { + key = "tQ"; + action = "Trouble qflist toggle"; + options.desc = "Quickfix List (Trouble)"; } ]; } diff --git a/home/programs/nvim/plugins/ui.nix b/home/programs/nvim/plugins/ui.nix index fddf81c..f30239d 100644 --- a/home/programs/nvim/plugins/ui.nix +++ b/home/programs/nvim/plugins/ui.nix @@ -20,12 +20,10 @@ indent-blankline.enable = true; which-key.enable = true; nvim-colorizer.enable = true; - tagbar.enable = true; # FIXME: Tagbar is not working + tagbar = { + enable = true; + tagsPackage = pkgs.universal-ctags; + }; }; - keymaps = [{ - key = "t"; - action = "TroubleToggle"; - options.desc = "Trouble"; - }]; }; } diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix index 98a3fe1..1e27263 100644 --- a/home/system/hyprland/default.nix +++ b/home/system/hyprland/default.nix @@ -131,6 +131,7 @@ "ELECTRON_OZONE_PLATFORM_HINT,auto" "GTK_THEME,FlatColor:dark" "GTK2_RC_FILES,/home/hadi/.local/share/themes/FlatColor/gtk-2.0/gtkrc" + "AQ_DRM_DEVICES,/dev/dri/card2" ]; cursor = { @@ -177,10 +178,6 @@ new_window_takes_over_fullscreen = 2; }; - render = { explicit_sync = "0"; }; - - opengl = { nvidia_anti_flicker = false; }; - input = { kb_layout = config.var.keyboardLayout; diff --git a/hosts/modules/prime.nix b/hosts/modules/prime.nix index f6bd772..350adcc 100644 --- a/hosts/modules/prime.nix +++ b/hosts/modules/prime.nix @@ -1,11 +1,11 @@ { hardware.nvidia.prime = { - # offload = { - # enable = true; - # enableOffloadCmd = true; - # }; + offload = { + enable = true; + enableOffloadCmd = true; + }; - sync.enable = true; + # sync.enable = true; amdgpuBusId = "PCI:5:0:0"; nvidiaBusId = "PCI:1:0:0";