christoph/flake-nixinator
1
Fork 0
Code Activity

Compare commits

base: christoph:214b5818cc05275c6118eff524948e30603585c1
Branches Tags
christoph:master
...
compare: christoph:52415d44f7cb62a9fdda62a41c41b5689bcece80
Branches Tags
christoph:master

4 Commits
214b5818cc ... 52415d44f7

Author SHA1 Message Date
Christoph Urlacher
52415d44f7 Update flake 2024-10-09 17:31:12 +02:00
Christoph Urlacher
5b273973ae Update neovim mappings 2024-10-09 17:31:08 +02:00
Christoph Urlacher
f76c7d16d5 Add Oil + Wakatime to neovim config 2024-10-09 17:31:01 +02:00
Christoph Urlacher
27eeb79674 Update firefox hwaccel config 
Matches the nvidia-vaapi-driver docs now, but still doesn't work :(
 2024-10-09 17:30:46 +02:00
7 changed files with 304 additions and 281 deletions
Expand all files Collapse all files

96
flake.lock generated
View File

@ -46,11 +46,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1727021989, "lastModified": 1728205869,
"narHash": "sha256-UnGVpO2bTMPSAvc3KoA2Z75Ey5Bezg7oo0h5QTjK/ZE=", "narHash": "sha256-nUoDO1cB/9G26aSWECRU/UhMp7tKX7oE3jK9MgZlK+0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "6ae6f2b182f996c14df856ddb8ec68269d04f403", "rev": "705b1d0be622b52a8b40d64a701e56b8924d8fb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -62,11 +62,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723137499, "lastModified": 1727973442,
"narHash": "sha256-MOE9NeU2i6Ws1GhGmppMnjOHkNLl2MQMJmGhaMzdoJM=", "narHash": "sha256-nf+0/UR5TZArp3Dn3NS3nB+ZGqecTOTOZRCFM3a1veM=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "fb5b578a4f49ae8705e5fea0419242ed1b8dba70", "rev": "59eee4080aa79a0671e98358f91ae1ef0c0806e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -112,11 +112,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726153070, "lastModified": 1727826117,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -166,11 +166,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,11 +196,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726745158, "lastModified": 1728092656,
"narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -233,11 +233,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1726905744, "lastModified": 1728056216,
"narHash": "sha256-xyNtG5C+xvfsnOVEamFe9zCCnuNwk93K/TlFC/4DmCI=", "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b493dfd4a8cf9552932179e56ff3b5819a9b8381", "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -253,11 +253,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726985855, "lastModified": 1728041527,
"narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=", "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d", "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -274,11 +274,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726902823, "lastModified": 1728041527,
"narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "14929f7089268481d86b83ed31ffd88713dcd415", "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -317,11 +317,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726742753, "lastModified": 1727999297,
"narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=", "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2", "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -400,11 +400,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1726838390, "lastModified": 1728067476,
"narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -416,11 +416,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1726755586, "lastModified": 1728018373,
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -448,11 +448,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1726755586, "lastModified": 1728018373,
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -477,11 +477,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1727021727, "lastModified": 1728176751,
"narHash": "sha256-Jz+idyFzP5Gkk1dBMVQp72VKb4Uufibmm/AWDqV3/L8=", "narHash": "sha256-hVmdzrZMFC/5q3dSjbKX9qocWN9coPBhs8muLsL3738=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "d2f9e011d9c6e3d765422b78039e61ddf9e69749", "rev": "d42c804ad515f45f8addaf5a4bb0b8ce405ea140",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -492,11 +492,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1727017850, "lastModified": 1728215254,
"narHash": "sha256-C361iPL0hyKNbCRpkU4MbaoGCN2Z1Tc3dqfO/0sbnKk=", "narHash": "sha256-z/fDpgmuRI/X3h74cGph7DU0VEBC8VWcrKY8AdTVABw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d65b8378613424be887a23730febc25a7a06c337", "rev": "e6ad3593324e2a96526177ec7c3041ea97bf6946",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -514,11 +514,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726816132, "lastModified": 1728017046,
"narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=", "narHash": "sha256-ofWYux/uUAv8wq7sWw8XWke0sh8p4qYxSOn8d+EaJ8c=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "7733a39a1321057172d87e6251ded7cdeb67171e", "rev": "ba81d9c1eae20fc3a1cd066062a05ac2e799e629",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -594,11 +594,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726734507, "lastModified": 1727984844,
"narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=", "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f", "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
"type": "github" "type": "github"
}, },
"original": { "original": {

29
flake.nix
View File

@ -11,32 +11,31 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
hardware.url = "github:nixos/nixos-hardware"; hardware.url = "github:nixos/nixos-hardware";
# Home manager # Home Manager
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
# Other Flakes # Other
emacs-overlay.url = "github:nix-community/emacs-overlay";
nur.url = "github:nix-community/NUR";
devshell.url = "github:numtide/devshell";
nixvim.url = "github:nix-community/nixvim"; nixvim.url = "github:nix-community/nixvim";
nixvim.inputs.nixpkgs.follows = "nixpkgs"; nixvim.inputs.nixpkgs.follows = "nixpkgs";
emacs-overlay.url = "github:nix-community/emacs-overlay";
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
nix-alien.url = "github:thiagokokada/nix-alien"; nix-alien.url = "github:thiagokokada/nix-alien";
devshell.url = "github:numtide/devshell";
nur.url = "github:nix-community/NUR"; # Nix User Repository
firefox-gnome-theme.url = "github:rafaelmardojai/firefox-gnome-theme";
firefox-gnome-theme.flake = false;
# Disabled
# adwaita-for-steam.url = "github:tkashkin/Adwaita-for-Steam";
# adwaita-for-steam.flake = false;
# plasma-manager.url = "github:pjones/plasma-manager";
# plasma-manager.inputs.nixpkgs.follows = "nixpkgs";
# plasma-manager.inputs.home-manager.follows = "home-manager";
# musnix.url = "github:musnix/musnix"; # musnix.url = "github:musnix/musnix";
# nixified-ai.url = "github:nixified-ai/flake"; # nixified-ai.url = "github:nixified-ai/flake";
# nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor"; # nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor";
# nix-matlab.url = "gitlab:doronbehar/nix-matlab"; # nix-matlab.url = "gitlab:doronbehar/nix-matlab";
# plasma-manager.url = "github:pjones/plasma-manager";
# plasma-manager.inputs.nixpkgs.follows = "nixpkgs";
# plasma-manager.inputs.home-manager.follows = "home-manager";
firefox-gnome-theme.url = "github:rafaelmardojai/firefox-gnome-theme";
firefox-gnome-theme.flake = false;
# adwaita-for-steam.url = "github:tkashkin/Adwaita-for-Steam";
# adwaita-for-steam.flake = false;
}; };
# Outputs is a function that takes the inputs as arguments. # Outputs is a function that takes the inputs as arguments.

2
home/christoph/default.nix
View File

@ -64,7 +64,7 @@ rec {
firefox = { firefox = {
enable = true; enable = true;
wayland = true; wayland = true;
vaapi = true; # NOTE: Crashes AMDGPU driver fairly often (don't know why exactly) vaapi = true;
disableTabBar = true; disableTabBar = true;
defaultBookmarks = true; defaultBookmarks = true;
gnomeTheme = true; gnomeTheme = true;

14
home/modules/firefox/default.nix
View File

@ -160,20 +160,20 @@ in {
# "gfx.canvas.accelerated" = true; # Default value # "gfx.canvas.accelerated" = true; # Default value
# "gfx.webrender.enabled" = true; # Does not exist? # "gfx.webrender.enabled" = true; # Does not exist?
"gfx.x11-egl.force-enabled" = true;
"layers.acceleration.force-enabled" = true;
# "media.av1.enabled" = true;
"media.ffmpeg.vaapi.enabled" = true; "media.ffmpeg.vaapi.enabled" = true;
"media.hardware-video-decoding.force-enabled" = true; "media.rdd-ffmpeg.enabled" = true; # Default value
# "media.rdd-ffmpeg.enabled" = true; # Default value "media.av1.enabled" = true;
# "widget.dmabuf.force-enabled" = true; "gfx.x11-egl.force-enabled" = true;
"widget.dmabuf.force-enabled" = true;
# "layers.acceleration.force-enabled" = true;
# "media.hardware-video-decoding.force-enabled" = true;
# "widget.wayland-dmabuf-vaapi.enabled" = true; # Does not exist? # "widget.wayland-dmabuf-vaapi.enabled" = true; # Does not exist?
}) })
(let (let
# NOTE: This has to be updated when something is changed inside firefox... # NOTE: This has to be updated when something is changed inside firefox...
customizationState = ''{"placements":{"widget-overflow-fixed-list":["jid1-mnnxcxisbpnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action","cookieautodelete_kennydo_com-browser-action","skipredirect_sblask-browser-action","_ublacklist-browser-action","umatrix_raymondhill_net-browser-action","_2e5ff8c8-32fe-46d0-9fc8-6b8986621f3c_-browser-action","_287dcf75-bec6-4eec-b4f6-71948a2eea29_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","dontfuckwithpaste_raim_ist-browser-action","sponsorblocker_ajay_app-browser-action","mogultv_mogultv_org-browser-action","jid1-tsgsxbhncspbwq_jetpack-browser-action","sourcegraph-for-firefox_sourcegraph_com-browser-action","_b11bea1f-a888-4332-8d8a-cec2be7d24b9_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","_34daeb50-c2d2-4f14-886a-7160b24d66a4_-browser-action","smart-referer_meh_paranoid_pk-browser-action","jid1-ckhysaadh4nl6q_jetpack-browser-action","_e737d9cb-82de-4f23-83c6-76f70a82229c_-browser-action","_a4c4eda4-fb84-4a84-b4a1-f7c1cbf2a1ad_-browser-action","github-forks-addon_musicallyut_in-browser-action"],"nav-bar":["back-button","forward-button","downloads-button","urlbar-container","save-to-pocket-button","fxa-toolbar-menu-button","treestyletab_piro_sakura_ne_jp-browser-action","ublock0_raymondhill_net-browser-action","_531906d3-e22f-4a6c-a102-8057b88a1a63_-browser-action","display-anchors_robwu_nl-browser-action","tab-session-manager_sienori-browser-action","_d7742d87-e61d-4b78-b8a1-b469842139fa_-browser-action","keepassxc-browser_keepassxc_org-browser-action"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["firefox-view-button","tabbrowser-tabs","new-tab-button","alltabs-button"],"PersonalToolbar":["personal-bookmarks"]},"seen":["developer-button","ublock0_raymondhill_net-browser-action","_287dcf75-bec6-4eec-b4f6-71948a2eea29_-browser-action","_2e5ff8c8-32fe-46d0-9fc8-6b8986621f3c_-browser-action","_531906d3-e22f-4a6c-a102-8057b88a1a63_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","_d7742d87-e61d-4b78-b8a1-b469842139fa_-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","_ublacklist-browser-action","cookieautodelete_kennydo_com-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action","keepassxc-browser_keepassxc_org-browser-action","skipredirect_sblask-browser-action","sponsorblocker_ajay_app-browser-action","tab-session-manager_sienori-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","umatrix_raymondhill_net-browser-action","mogultv_mogultv_org-browser-action","jid1-tsgsxbhncspbwq_jetpack-browser-action","display-anchors_robwu_nl-browser-action","github-forks-addon_musicallyut_in-browser-action","_a4c4eda4-fb84-4a84-b4a1-f7c1cbf2a1ad_-browser-action","_e737d9cb-82de-4f23-83c6-76f70a82229c_-browser-action","jid1-ckhysaadh4nl6q_jetpack-browser-action","smart-referer_meh_paranoid_pk-browser-action","_34daeb50-c2d2-4f14-886a-7160b24d66a4_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","_b11bea1f-a888-4332-8d8a-cec2be7d24b9_-browser-action","sourcegraph-for-firefox_sourcegraph_com-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","widget-overflow-fixed-list"],"currentVersion":18,"newElementCount":6}''; customizationState = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["jid1-mnnxcxisbpnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action","cookieautodelete_kennydo_com-browser-action","skipredirect_sblask-browser-action","_ublacklist-browser-action","umatrix_raymondhill_net-browser-action","_2e5ff8c8-32fe-46d0-9fc8-6b8986621f3c_-browser-action","_287dcf75-bec6-4eec-b4f6-71948a2eea29_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","dontfuckwithpaste_raim_ist-browser-action","sponsorblocker_ajay_app-browser-action","mogultv_mogultv_org-browser-action","jid1-tsgsxbhncspbwq_jetpack-browser-action","sourcegraph-for-firefox_sourcegraph_com-browser-action","_b11bea1f-a888-4332-8d8a-cec2be7d24b9_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","_34daeb50-c2d2-4f14-886a-7160b24d66a4_-browser-action","smart-referer_meh_paranoid_pk-browser-action","jid1-ckhysaadh4nl6q_jetpack-browser-action","_e737d9cb-82de-4f23-83c6-76f70a82229c_-browser-action","_a4c4eda4-fb84-4a84-b4a1-f7c1cbf2a1ad_-browser-action","github-forks-addon_musicallyut_in-browser-action","_36bdf805-c6f2-4f41-94d2-9b646342c1dc_-browser-action","_605a075b-09d9-4443-bed6-4baa743f7d79_-browser-action","enhancerforyoutube_maximerf_addons_mozilla_org-browser-action"],"nav-bar":["back-button","forward-button","downloads-button","urlbar-container","save-to-pocket-button","fxa-toolbar-menu-button","treestyletab_piro_sakura_ne_jp-browser-action","ublock0_raymondhill_net-browser-action","_531906d3-e22f-4a6c-a102-8057b88a1a63_-browser-action","display-anchors_robwu_nl-browser-action","tab-session-manager_sienori-browser-action","_d7742d87-e61d-4b78-b8a1-b469842139fa_-browser-action","keepassxc-browser_keepassxc_org-browser-action","reset-pbm-toolbar-button","unified-extensions-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["firefox-view-button","tabbrowser-tabs","new-tab-button","alltabs-button"],"PersonalToolbar":["personal-bookmarks"]},"seen":["developer-button","ublock0_raymondhill_net-browser-action","_287dcf75-bec6-4eec-b4f6-71948a2eea29_-browser-action","_2e5ff8c8-32fe-46d0-9fc8-6b8986621f3c_-browser-action","_531906d3-e22f-4a6c-a102-8057b88a1a63_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","_d7742d87-e61d-4b78-b8a1-b469842139fa_-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","_ublacklist-browser-action","cookieautodelete_kennydo_com-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action","keepassxc-browser_keepassxc_org-browser-action","skipredirect_sblask-browser-action","sponsorblocker_ajay_app-browser-action","tab-session-manager_sienori-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","umatrix_raymondhill_net-browser-action","mogultv_mogultv_org-browser-action","jid1-tsgsxbhncspbwq_jetpack-browser-action","display-anchors_robwu_nl-browser-action","github-forks-addon_musicallyut_in-browser-action","_a4c4eda4-fb84-4a84-b4a1-f7c1cbf2a1ad_-browser-action","_e737d9cb-82de-4f23-83c6-76f70a82229c_-browser-action","jid1-ckhysaadh4nl6q_jetpack-browser-action","smart-referer_meh_paranoid_pk-browser-action","_34daeb50-c2d2-4f14-886a-7160b24d66a4_-browser-action","_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action","_b11bea1f-a888-4332-8d8a-cec2be7d24b9_-browser-action","sourcegraph-for-firefox_sourcegraph_com-browser-action","_36bdf805-c6f2-4f41-94d2-9b646342c1dc_-browser-action","_605a075b-09d9-4443-bed6-4baa743f7d79_-browser-action","enhancerforyoutube_maximerf_addons_mozilla_org-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","widget-overflow-fixed-list","unified-extensions-area"],"currentVersion":20,"newElementCount":6}'';
in { in {
"accessibility.force_disabled" = 1; "accessibility.force_disabled" = 1;
"app.normandy.enabled" = false; # https://mozilla.github.io/normandy/ "app.normandy.enabled" = false; # https://mozilla.github.io/normandy/

19
home/modules/neovim/default.nix
View File

@ -1240,6 +1240,16 @@ in {
}; };
}; };
oil = rec {
name = "oil";
pkg = pkgs.vimPlugins.oil-nvim;
lazy = false;
config = mkDefaultConfig name;
opts = {
default_file_explorer = true;
};
};
rainbow-delimiters = { rainbow-delimiters = {
name = "rainbow-delimiters"; name = "rainbow-delimiters";
pkg = pkgs.vimPlugins.rainbow-delimiters-nvim; pkg = pkgs.vimPlugins.rainbow-delimiters-nvim;
@ -1492,7 +1502,7 @@ in {
float_opts = { float_opts = {
border = "curved"; # 'single' | 'double' | 'shadow' | 'curved' border = "curved"; # 'single' | 'double' | 'shadow' | 'curved'
width = 80; width = 80;
height = 35; height = 45;
winblend = 0; winblend = 0;
}; };
}; };
@ -1648,6 +1658,11 @@ in {
''; '';
}; };
wakatime = {
name = "wakatime";
pkg = pkgs.vimPlugins.vim-wakatime;
};
_mini = { _mini = {
name = "mini"; name = "mini";
pkg = pkgs.vimPlugins.mini-nvim; pkg = pkgs.vimPlugins.mini-nvim;
@ -1743,6 +1758,7 @@ in {
navbuddy navbuddy
neo-tree neo-tree
noice noice
oil
rainbow-delimiters rainbow-delimiters
rustaceanvim rustaceanvim
sandwich # Manipulate pairs sandwich # Manipulate pairs
@ -1756,6 +1772,7 @@ in {
# twilight # NOTE: Don't like it # twilight # NOTE: Don't like it
ufo # Code folding ufo # Code folding
vimtex vimtex
wakatime
which-key which-key
winshift # Move windows around winshift # Move windows around
yanky yanky

416
home/modules/neovim/mappings.nix
View File

@ -5,28 +5,28 @@
mode = "n"; mode = "n";
key = "j"; key = "j";
action = "v:count == 0 ? 'gj' : 'j'"; action = "v:count == 0 ? 'gj' : 'j'";
options.desc = "Move cursor down"; options.desc = "Move Cursor Down";
options.expr = true; options.expr = true;
} }
{ {
mode = "n"; mode = "n";
key = "<Down>"; key = "<Down>";
action = "v:count == 0 ? 'gj' : 'j'"; action = "v:count == 0 ? 'gj' : 'j'";
options.desc = "Move cursor down"; options.desc = "Move Cursor Down";
options.expr = true; options.expr = true;
} }
{ {
mode = "n"; mode = "n";
key = "k"; key = "k";
action = "v:count == 0 ? 'gk' : 'k'"; action = "v:count == 0 ? 'gk' : 'k'";
options.desc = "Move cursor up"; options.desc = "Move Cursor Up";
options.expr = true; options.expr = true;
} }
{ {
mode = "n"; mode = "n";
key = "<Up>"; key = "<Up>";
action = "v:count == 0 ? 'gk' : 'k'"; action = "v:count == 0 ? 'gk' : 'k'";
options.desc = "Move cursor up"; options.desc = "Move Cursor Up";
options.expr = true; options.expr = true;
} }
@ -35,25 +35,25 @@
mode = "n"; mode = "n";
key = "<C-h>"; key = "<C-h>";
action = "<cmd>vertical resize -2<cr>"; action = "<cmd>vertical resize -2<cr>";
options.desc = "Decrease window width"; options.desc = "Decrease Window Width";
} }
{ {
mode = "n"; mode = "n";
key = "<C-l>"; key = "<C-l>";
action = "<cmd>vertical resize +2<cr>"; action = "<cmd>vertical resize +2<cr>";
options.desc = "Increase window width"; options.desc = "Increase Window Width";
} }
{ {
mode = "n"; mode = "n";
key = "<C-j>"; key = "<C-j>";
action = "<cmd>resize -2<cr>"; action = "<cmd>resize -2<cr>";
options.desc = "Decrease window height"; options.desc = "Decrease Window Height";
} }
{ {
mode = "n"; mode = "n";
key = "<C-k>"; key = "<C-k>";
action = "<cmd>resize +2<cr>"; action = "<cmd>resize +2<cr>";
options.desc = "Increase window height"; options.desc = "Increase Window Height";
} }
# Move lines # Move lines
@ -61,37 +61,37 @@
mode = "n"; mode = "n";
key = "<M-j>"; key = "<M-j>";
action = "<cmd>m .+1<cr>=="; action = "<cmd>m .+1<cr>==";
options.desc = "Move line down"; options.desc = "Move Line Down";
} }
{ {
mode = "i"; mode = "i";
key = "<M-j>"; key = "<M-j>";
action = "<Esc><cmd>m .+1<cr>==gi"; action = "<Esc><cmd>m .+1<cr>==gi";
options.desc = "Move line down"; options.desc = "Move Line Down";
} }
{ {
mode = "v"; mode = "v";
key = "<M-j>"; key = "<M-j>";
action = ":m '>+1<cr>gv=gv"; action = ":m '>+1<cr>gv=gv";
options.desc = "Move line down"; options.desc = "Move Line Down";
} }
{ {
mode = "n"; mode = "n";
key = "<M-k>"; key = "<M-k>";
action = "<cmd>m .-2<cr>=="; action = "<cmd>m .-2<cr>==";
options.desc = "Move line up"; options.desc = "Move Line Up";
} }
{ {
mode = "i"; mode = "i";
key = "<M-k>"; key = "<M-k>";
action = "<Esc><cmd>m .-2<cr>==gi"; action = "<Esc><cmd>m .-2<cr>==gi";
options.desc = "Move line up"; options.desc = "Move Line Up";
} }
{ {
mode = "v"; mode = "v";
key = "<M-k>"; key = "<M-k>";
action = ":m '<-2<cr>gv=gv"; action = ":m '<-2<cr>gv=gv";
options.desc = "Move line up"; options.desc = "Move Line Up";
} }
# Save buffers # Save buffers
@ -99,13 +99,13 @@
mode = ["n" "i" "v"]; mode = ["n" "i" "v"];
key = "<C-s>"; key = "<C-s>";
action = "<cmd>w<cr>"; action = "<cmd>w<cr>";
options.desc = "Save current buffer"; options.desc = "Save Buffer";
} }
{ {
mode = ["n" "i" "v"]; mode = ["n" "i" "v"];
key = "<C-S-s>"; key = "<C-S-s>";
action = "<cmd>wa<cr>"; action = "<cmd>wa<cr>";
options.desc = "Save all buffers"; options.desc = "Save All Buffers";
} }
# Indentation # Indentation
@ -145,25 +145,25 @@
mode = "n"; mode = "n";
key = "<C-d>"; key = "<C-d>";
action = "<C-d>zz"; action = "<C-d>zz";
options.desc = "Jump down (centered)"; options.desc = "Jump Down (Centered)";
} }
{ {
mode = "n"; mode = "n";
key = "<C-u>"; key = "<C-u>";
action = "<C-u>zz"; action = "<C-u>zz";
options.desc = "Jump up (centered)"; options.desc = "Jump Up (Centered)";
} }
{ {
mode = "n"; mode = "n";
key = "n"; key = "n";
action = "nzzzv"; action = "nzzzv";
options.desc = "Next match (centered)"; options.desc = "Next Match (Centered)";
} }
{ {
mode = "n"; mode = "n";
key = "N"; key = "N";
action = "Nzzzv"; action = "Nzzzv";
options.desc = "Previous match (centered)"; options.desc = "Previous Match (Centered)";
} }
# Delete word # Delete word
@ -171,13 +171,13 @@
mode = "i"; mode = "i";
key = "<C-BS>"; key = "<C-BS>";
action = "<C-w>"; action = "<C-w>";
options.desc = "Delete previous word"; # TODO: Breaks backspace <C-v><S-i> multiline cursor? options.desc = "Delete Previous Word"; # TODO: Breaks backspace <C-v><S-i> multiline cursor?
} }
{ {
mode = "i"; mode = "i";
key = "<M-BS>"; key = "<M-BS>";
action = "<C-w>"; action = "<C-w>";
options.desc = "Delete previous word"; # TODO: Breaks backspace <C-v><S-i> multiline cursor? options.desc = "Delete Previous Word"; # TODO: Breaks backspace <C-v><S-i> multiline cursor?
} }
# Clipboard # Clipboard
@ -185,63 +185,63 @@
mode = "i"; mode = "i";
key = "<C-S-v>"; key = "<C-S-v>";
action = "<Esc>\"+pi"; action = "<Esc>\"+pi";
options.desc = "Paste from clipboard"; options.desc = "Paste";
} }
{ {
mode = "i"; mode = "i";
key = "<C-v>"; key = "<C-v>";
action = "<Esc>\"+pi"; action = "<Esc>\"+pi";
options.desc = "Paste from clipboard"; options.desc = "Paste";
} }
{ {
mode = "v"; mode = "v";
key = "<C-S-c>"; key = "<C-S-c>";
action = "\"+y"; action = "\"+y";
options.desc = "Copy to clipboard"; options.desc = "Copy";
} }
# Flash/Search # Flash/Search
{ # {
mode = "n"; # mode = "n";
key = "s"; # key = "s";
action = "<cmd>lua require('flash').jump()<cr>"; # action = "<cmd>lua require('flash').jump()<cr>";
options.desc = "Flash jump"; # options.desc = "Flash jump";
} # }
{ # {
mode = "n"; # mode = "n";
key = "S"; # key = "S";
action = "<cmd>lua require('flash').treesitter()<cr>"; # action = "<cmd>lua require('flash').treesitter()<cr>";
options.desc = "Flash treesitter"; # options.desc = "Flash Treesitter";
} # }
# Various # Various
{ {
mode = "n"; mode = "n";
key = "<C-S-h>"; key = "<C-S-h>";
action = "<cmd>nohlsearch<cr>"; action = "<cmd>nohlsearch<cr>";
options.desc = "Clear search highlights"; options.desc = "Clear Search Highlights";
} }
{ {
mode = "n"; mode = "n";
key = "K"; key = "K";
action = "<cmd>lua vim.lsp.buf.hover()<cr>"; action = "<cmd>lua vim.lsp.buf.hover()<cr>";
options.desc = "Show LSP hover"; options.desc = "LSP Hover";
} }
{ {
mode = "n"; mode = "n";
key = "/"; key = "/";
action = "<cmd>Telescope current_buffer_fuzzy_find<cr>"; action = "<cmd>Telescope current_buffer_fuzzy_find<cr>";
options.desc = "Find in current buffer"; options.desc = "Grep Buffer";
} }
{ # {
mode = "v"; # mode = "v";
key = ";"; # key = ";";
action = "<Esc>"; # action = "<Esc>";
options.desc = "Exit visual mode"; # options.desc = "Exit visual mode";
} # }
]; ];
leader = [ leader = [
@ -249,9 +249,8 @@
mode = "n"; mode = "n";
key = "<leader>L"; key = "<leader>L";
action = "<cmd>Lazy<cr>"; action = "<cmd>Lazy<cr>";
options.desc = "Show Lazy"; options.desc = "Lazy";
} }
# Already have <C-s> and <C-S-s> # Already have <C-s> and <C-S-s>
# { # {
# mode = "n"; # mode = "n";
@ -265,109 +264,110 @@
# action = "<cmd>wa<cr>"; # action = "<cmd>wa<cr>";
# options.desc = "Save all buffers"; # options.desc = "Save all buffers";
# } # }
{ {
mode = "n"; mode = "n";
key = "<leader>R"; key = "<leader>R";
action = "<cmd>edit!<cr>"; action = "<cmd>edit!<cr>";
options.desc = "Reload current buffer"; options.desc = "Reload Buffer";
} }
{ {
mode = "n"; mode = "n";
key = "<leader><Space>"; key = "<leader><Space>";
action = "<cmd>Telescope buffers<cr>"; action = "<cmd>Telescope buffers<cr>";
options.desc = "Show open buffers"; options.desc = "List Buffers";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>f"; key = "<leader>f";
action = "<cmd>Telescope find_files<cr>"; action = "<cmd>Telescope find_files<cr>";
options.desc = "Find file"; options.desc = "Find File";
}
{
mode = "n";
key = "<leader>p";
action = "<cmd>Telescope projects<cr>";
options.desc = "Open project";
}
{
mode = "n";
key = "<leader>o";
action = "<cmd>Telescope vim_options<cr>";
options.desc = "Show Vim options";
}
{
mode = "n";
key = "<leader>u";
action = "<cmd>Telescope undo<cr>";
options.desc = "Show undo history";
}
{
mode = "n";
key = "<leader>/";
action = "<cmd>Telescope live_grep<cr>";
options.desc = "Find in working directory";
}
{
mode = "v";
key = "<leader>n";
action = ":NR!<cr>";
options.desc = "Narrow region";
} }
# {
# mode = "v";
# key = "<leader>n";
# action = ":NR!<cr>";
# options.desc = "Narrow region";
# }
{ {
mode = "n"; mode = "n";
key = "<leader>N"; key = "<leader>N";
action = "<cmd>Telescope notify<cr>"; action = "<cmd>Telescope notify<cr>";
options.desc = "Show notify history"; options.desc = "Notication History";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>r"; key = "<leader>r";
action = "<cmd>Telescope resume<cr>"; action = "<cmd>Telescope resume<cr>";
options.desc = "Show last telescope picker"; options.desc = "Last Telescope Picker";
}
{
mode = "n";
key = "<leader>?";
action = "<cmd>Telescope keymaps<cr>";
options.desc = "Show keymaps";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>:"; key = "<leader>:";
action = "<cmd>Telescope commands<cr>"; action = "<cmd>Telescope commands<cr>";
options.desc = "Execute command"; options.desc = "Find Command";
}
{
mode = "n";
key = "<leader>M";
action = "<cmd>Telescope marks<cr>";
options.desc = "Show marks";
}
{
mode = "n";
key = "<leader>J";
action = "<cmd>Telescope jumplist<cr>";
options.desc = "Show jumplist";
}
{
mode = "n";
key = "<leader>m";
action = "<cmd>Telescope man_pages<cr>";
options.desc = "Show manpages";
}
{
mode = "n";
key = "<leader>h";
action = "<cmd>Telescope help_tags<cr>";
options.desc = "Show help tags";
} }
# {
# mode = "n";
# key = "<leader>M";
# action = "<cmd>Telescope marks<cr>";
# options.desc = "Show marks";
# }
# {
# mode = "n";
# key = "<leader>J";
# action = "<cmd>Telescope jumplist<cr>";
# options.desc = "Show jumplist";
# }
{ {
mode = "n"; mode = "n";
key = "<leader>T"; key = "<leader>T";
action = "<cmd>TodoTelescope<cr>"; action = "<cmd>TodoTelescope<cr>";
options.desc = "Show TODOs"; options.desc = "List TODOs";
}
{
mode = "n";
key = "<leader>u";
action = "<cmd>Telescope undo<cr>";
options.desc = "Undo History";
}
{
mode = "n";
key = "<leader>/";
action = "<cmd>Telescope live_grep<cr>";
options.desc = "Grep Directory";
}
];
leader-help = [
{
mode = "n";
key = "<leader>h";
action = "+help";
}
{
mode = "n";
key = "<leader>hv";
action = "<cmd>Telescope vim_options<cr>";
options.desc = "Vim Options";
}
{
mode = "n";
key = "<leader>hk";
action = "<cmd>Telescope keymaps<cr>";
options.desc = "Keymaps";
}
{
mode = "n";
key = "<leader>hm";
action = "<cmd>Telescope man_pages<cr>";
options.desc = "Manpages";
}
{
mode = "n";
key = "<leader>hh";
action = "<cmd>Telescope help_tags<cr>";
options.desc = "Vim Help";
} }
]; ];
@ -387,7 +387,7 @@
mode = "n"; mode = "n";
key = "<leader>q!"; key = "<leader>q!";
action = "<cmd>quitall!<cr>"; action = "<cmd>quitall!<cr>";
options.desc = "Quit forcefully"; options.desc = "Force Quit";
} }
]; ];
@ -401,19 +401,19 @@
mode = "n"; mode = "n";
key = "<leader>sl"; key = "<leader>sl";
action = "<cmd>Telescope persisted<cr>"; action = "<cmd>Telescope persisted<cr>";
options.desc = "Restore session"; options.desc = "Restore";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>ss"; key = "<leader>ss";
action = "<cmd>SessionSave<cr>"; action = "<cmd>SessionSave<cr>";
options.desc = "Save session"; options.desc = "Save";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>sd"; key = "<leader>sd";
action = "<cmd>SessionDelete<cr>"; action = "<cmd>SessionDelete<cr>";
options.desc = "Delete current session"; options.desc = "Delete";
} }
]; ];
@ -426,26 +426,26 @@
{ {
mode = "n"; mode = "n";
key = "<leader>bb"; key = "<leader>bb";
action = "<cmd>Telescope buffers<cr>"; action = "<cmd>Telescope buffers sort_mru=true<cr>"; # There is also sort_lastused=true
options.desc = "Show open buffers"; options.desc = "List Buffers";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>bn"; key = "<leader>bn";
action = "<cmd>bnext<cr>"; action = "<cmd>bnext<cr>";
options.desc = "Goto next buffer"; options.desc = "Next Buffer";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>bp"; key = "<leader>bp";
action = "<cmd>bprevious<cr>"; action = "<cmd>bprevious<cr>";
options.desc = "Goto previous buffer"; options.desc = "Previous Buffer";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>bd"; key = "<leader>bd";
action = "<cmd>Bdelete<cr>"; action = "<cmd>Bdelete<cr>";
options.desc = "Close current buffer"; options.desc = "Close Buffer";
} }
]; ];
@ -460,64 +460,64 @@
mode = "n"; mode = "n";
key = "<leader>wd"; key = "<leader>wd";
action = "<C-w>c"; action = "<C-w>c";
options.desc = "Close current window"; options.desc = "Close Window";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>ws"; key = "<leader>ws";
action = "<C-w>s"; action = "<C-w>s";
options.desc = "Split window horizontally"; options.desc = "Split Horizontally";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>wv"; key = "<leader>wv";
action = "<C-w>v"; action = "<C-w>v";
options.desc = "Split window vertically"; options.desc = "Split Vertically";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>w="; key = "<leader>w=";
action = "<C-w>="; action = "<C-w>=";
options.desc = "Balance windows"; options.desc = "Balance Windows";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>wh"; key = "<leader>wh";
action = "<C-w>h"; action = "<C-w>h";
options.desc = "Goto left window"; options.desc = "Goto Left Window";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>wl"; key = "<leader>wl";
action = "<C-w>l"; action = "<C-w>l";
options.desc = "Goto right window"; options.desc = "Goto Wight Window";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>wj"; key = "<leader>wj";
action = "<C-w>j"; action = "<C-w>j";
options.desc = "Goto bottom window"; options.desc = "Goto Bottom Window";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>wk"; key = "<leader>wk";
action = "<C-w>k"; action = "<C-w>k";
options.desc = "Goto top window"; options.desc = "Goto Top Window";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>ww"; key = "<leader>ww";
action = "<C-w>p"; action = "<C-w>p";
options.desc = "Goto other window"; options.desc = "Goto Other Window";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>wm"; key = "<leader>wm";
action = "<cmd>WinShift<cr>"; action = "<cmd>WinShift<cr>";
options.desc = "Move window"; options.desc = "Move Window";
} }
]; ];
@ -531,7 +531,13 @@
mode = "n"; mode = "n";
key = "<leader>tt"; key = "<leader>tt";
action = "<cmd>Neotree action=show toggle=true<cr><C-w>="; action = "<cmd>Neotree action=show toggle=true<cr><C-w>=";
options.desc = "Toggle NeoTree"; options.desc = "NeoTree";
}
{
mode = "n";
key = "<leader>to";
action = "<cmd>Oil<cr>";
options.desc = "Oil";
} }
# { # {
# mode = "n"; # mode = "n";
@ -543,59 +549,59 @@
mode = "n"; mode = "n";
key = "<leader>tn"; key = "<leader>tn";
action = "<cmd>Navbuddy<cr>"; action = "<cmd>Navbuddy<cr>";
options.desc = "Toggle NavBuddy"; options.desc = "NavBuddy";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>td"; key = "<leader>td";
action = "<cmd>Trouble diagnostics toggle focus=false win.position=bottom<cr>"; action = "<cmd>Trouble diagnostics toggle focus=false win.position=bottom<cr>";
options.desc = "Toggle Trouble diagnostics"; options.desc = "Trouble Diagnostics";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>tT"; key = "<leader>tT";
action = "<cmd>Trouble todo toggle focus=false win.position=right<cr>"; action = "<cmd>Trouble todo toggle focus=false win.position=right<cr>";
options.desc = "Toggle Trouble TODOs"; options.desc = "Trouble TODOs";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>ts"; key = "<leader>ts";
action = "<cmd>Trouble symbols toggle focus=false win.position=right<cr>"; action = "<cmd>Trouble symbols toggle focus=false win.position=right<cr>";
options.desc = "Toggle Trouble symbols"; options.desc = "Trouble Symbols";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>tf"; key = "<leader>tf";
action = "<cmd>ToggleAutoformat<cr>"; action = "<cmd>ToggleAutoformat<cr>";
options.desc = "Toggle autoformat-on-save"; options.desc = "Format on Save";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>tl"; key = "<leader>tl";
action = "<cmd>ToggleAutoLint<cr>"; action = "<cmd>ToggleAutoLint<cr>";
options.desc = "Toggle autolint-on-save"; options.desc = "Lint on Save";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>tD"; key = "<leader>tD";
action = "<cmd>ToggleInlineDiagnostics<cr>"; action = "<cmd>ToggleInlineDiagnostics<cr>";
options.desc = "Toggle inline diagnostics"; options.desc = "Inline Diagnostics";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>tw"; key = "<leader>tw";
action = "<cmd>:set wrap!<cr>"; action = "<cmd>:set wrap!<cr>";
options.desc = "Toggle word-wrap"; options.desc = "Word Wrapping";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>tv"; key = "<leader>tv";
action = "<cmd>VimtexTocToggle<cr>"; action = "<cmd>VimtexTocToggle<cr>";
options.desc = "Toggle Vimtex ToC"; options.desc = "VimTex ToC";
} }
]; ];
@ -609,88 +615,44 @@
mode = "n"; mode = "n";
key = "<leader>gg"; key = "<leader>gg";
action = "<cmd>LazyGit<cr>"; action = "<cmd>LazyGit<cr>";
options.desc = "Show LazyGit"; options.desc = "LazyGit";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>gm"; key = "<leader>gm";
action = "<cmd>GitMessenger<cr>"; action = "<cmd>GitMessenger<cr>";
options.desc = "Show GitMessenger"; options.desc = "GitMessenger";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>gs"; key = "<leader>gs";
action = "<cmd>Telescope git_status<cr>"; action = "<cmd>Telescope git_status<cr>";
options.desc = "Show Git status"; options.desc = "Status";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>gl"; key = "<leader>gl";
action = "<cmd>Telescope git_commits<cr>"; action = "<cmd>Telescope git_commits<cr>";
options.desc = "Show Git log"; options.desc = "Log";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>gb"; key = "<leader>gb";
action = "<cmd>Telescope git_branches<cr>"; action = "<cmd>Telescope git_branches<cr>";
options.desc = "Show Git branches"; options.desc = "Branches";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>gf"; key = "<leader>gf";
action = "<cmd>Telescope git_bcommits<cr>"; action = "<cmd>Telescope git_bcommits<cr>";
options.desc = "Show Git log for current file"; options.desc = "File History";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>gd"; key = "<leader>gd";
action = "<cmd>DiffviewOpen<cr>"; action = "<cmd>DiffviewOpen<cr>";
options.desc = "Show Git diff for current worktree"; options.desc = "DiffView";
}
];
leader-lsp = [
{
mode = "n";
key = "<leader>l";
action = "+lsp";
}
{
mode = "n";
key = "<leader>lr";
action = "<cmd>Telescope lsp_references<cr>";
options.desc = "Goto references";
}
{
mode = "n";
key = "<leader>ld";
action = "<cmd>Telescope lsp_definitions<cr>";
options.desc = "Goto definition";
}
{
mode = "n";
key = "<leader>li";
action = "<cmd>Telescope lsp_implementations<cr>";
options.desc = "Goto implementation";
}
{
mode = "n";
key = "<leader>lt";
action = "<cmd>Telescope lsp_type_definitions<cr>";
options.desc = "Goto type definition";
}
{
mode = "n";
key = "<leader>lI";
action = "<cmd>Telescope lsp_incoming_calls<cr>";
options.desc = "Show incoming calls";
}
{
mode = "n";
key = "<leader>lO";
action = "<cmd>Telescope lsp_outgoing_calls<cr>";
options.desc = "Show outgoing calls";
} }
]; ];
@ -704,27 +666,33 @@
mode = "n"; mode = "n";
key = "<leader>cf"; key = "<leader>cf";
action = "<cmd>lua require('conform').format()<cr>"; action = "<cmd>lua require('conform').format()<cr>";
options.desc = "Format current buffer"; options.desc = "Format Buffer";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>cd"; key = "<leader>cd";
action = "<cmd>lua vim.diagnostic.open_float()<cr>"; action = "<cmd>lua vim.diagnostic.open_float()<cr>";
options.desc = "Show LSP line diagnostics"; options.desc = "Line Diagnostics";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>cD"; key = "<leader>cD";
action = "<cmd>Telescope diagnostics<cr>"; action = "<cmd>Telescope diagnostics<cr>";
options.desc = "Show diagnostics"; options.desc = "List Diagnostics";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>cr"; key = "<leader>cr";
action = "<cmd>lua vim.lsp.buf.rename()<cr>"; action = "<cmd>lua vim.lsp.buf.rename()<cr>";
options.desc = "Rename LSP symbol"; options.desc = "Rename Symbol";
}
{
mode = "n";
key = "<leader>ca";
action = "<cmd>lua vim.lsp.buf.code_action()<cr>";
options.desc = "Code Actions";
} }
# { # {
# mode = "n"; # mode = "n";
@ -732,29 +700,65 @@
# action = ":IncRename "; # action = ":IncRename ";
# options.desc = "Rename LSP symbol"; # options.desc = "Rename LSP symbol";
# } # }
{ {
mode = "n"; mode = "n";
key = "<leader>ca"; key = "<leader>cg";
action = "<cmd>lua vim.lsp.buf.code_action()<cr>"; action = "+goto";
options.desc = "Show LSP code actions";
} }
{ {
mode = "n"; mode = "n";
key = "<leader>ch"; key = "<leader>cgh";
action = "<cmd>ClangdSwitchSourceHeader<cr>"; action = "<cmd>ClangdSwitchSourceHeader<cr>";
options.desc = "Switch C/C++ source/header"; options.desc = "Switch C/C++ Source/Header";
}
{
mode = "n";
key = "<leader>cgr";
action = "<cmd>Telescope lsp_references<cr>";
options.desc = "Symbol References";
}
{
mode = "n";
key = "<leader>cgd";
action = "<cmd>Telescope lsp_definitions<cr>";
options.desc = "Symbol Definition";
}
{
mode = "n";
key = "<leader>cgi";
action = "<cmd>Telescope lsp_implementations<cr>";
options.desc = "Symbol Implementation";
}
{
mode = "n";
key = "<leader>cgt";
action = "<cmd>Telescope lsp_type_definitions<cr>";
options.desc = "Type Definition";
}
{
mode = "n";
key = "<leader>cI";
action = "<cmd>Telescope lsp_incoming_calls<cr>";
options.desc = "Incoming Calls";
}
{
mode = "n";
key = "<leader>cO";
action = "<cmd>Telescope lsp_outgoing_calls<cr>";
options.desc = "Outgoing Calls";
} }
]; ];
in in
builtins.concatLists [ builtins.concatLists [
no-leader no-leader
leader leader
leader-help
leader-quit leader-quit
leader-session leader-session
leader-buffers leader-buffers
leader-windows leader-windows
leader-toggles leader-toggles
leader-git leader-git
leader-lsp
leader-code leader-code
] ]

9
system/nixinator/hardware-configuration.nix
View File

@ -97,8 +97,8 @@
vaapiVdpau # Taken from wiki, this is also part of nixos-hardware/common/gpu/nvidia vaapiVdpau # Taken from wiki, this is also part of nixos-hardware/common/gpu/nvidia
libvdpau-va-gl # Taken from wiki libvdpau-va-gl # Taken from wiki
# libvdpau # NOTE: Don't know if needed/where it belongs... libvdpau # NOTE: Don't know if needed/where it belongs...
# libva # NOTE: Don't know if needed/where it belongs... libva # NOTE: Don't know if needed/where it belongs...
nvidia-vaapi-driver # Experimental, doesn't work with chromium nvidia-vaapi-driver # Experimental, doesn't work with chromium
]; ];
@ -110,8 +110,11 @@
# environment.variables.AMD_VULKAN_ICD = "RADV"; # Choose mesa driver by default # environment.variables.AMD_VULKAN_ICD = "RADV"; # Choose mesa driver by default
environment.variables = { environment.variables = {
LIBVA_DRIVER_NAME = "nvidia";
GBM_BACKEND = "nvidia-drm"; GBM_BACKEND = "nvidia-drm";
# https://github.com/elFarto/nvidia-vaapi-driver?tab=readme-ov-file#environment-variables
LIBVA_DRIVER_NAME = "nvidia";
NVD_BACKEND = "egl";
}; };
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";