foxora/nix
2
3
Fork 1
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

Compare commits

base: foxora:5e882e99149bc661d23657c71f9e133fd7a64945
Branches Tags
foxora:main
..
compare: foxora:4b7a87f3020c5e1584074788d3b61a690a01ff6f
Branches Tags
foxora:main

No commits in common. "5e882e99149bc661d23657c71f9e133fd7a64945" and "4b7a87f3020c5e1584074788d3b61a690a01ff6f" have entirely different histories.
5e882e9914 ... 4b7a87f302

7 changed files with 106 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

193
flake.lock generated
View file

@ -37,11 +37,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773436376, "lastModified": 1772292445,
"narHash": "sha256-OUPRrprbgN27BXHuWkMAPSCfLLQ/uwpWghEfKYN2iAg=", "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "43f10d24391692bba3d762931ee35e7f17f8e8b8", "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -98,11 +98,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1773610965, "lastModified": 1773166308,
"narHash": "sha256-0VcA3dwW6tJuikDj3bqx3luqrxxsPhMcCXswmgWxkVE=", "narHash": "sha256-fkJEQ1rbt/lqsA0+D3+LWtCok9Ofsz8dKDCnbt1MvOs=",
"owner": "xddxdd", "owner": "xddxdd",
"repo": "nix-cachyos-kernel", "repo": "nix-cachyos-kernel",
"rev": "0ffc149abac0215fc0d41ddb8df8b87887c2fcc8", "rev": "2396c36f247f4c1e08f3ffd953b7b958d044e224",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,11 +114,11 @@
"cachyos-kernel": { "cachyos-kernel": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1773425695, "lastModified": 1773036026,
"narHash": "sha256-O5Fr6f+iS+IVKdB59yqkCaWfkr1SSHD5BLDDlZO7RwU=", "narHash": "sha256-hRDSqn5jL0cq4aYTcAS61Jsw2DEqxHkAb01Cyu7jIDc=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "linux-cachyos", "repo": "linux-cachyos",
"rev": "3b9ae1ae5d4ee95e1509d350b65c0777dde97628", "rev": "dd72b90988e22422548f65e1ec8e2b52c8c7e35f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -130,11 +130,11 @@
"cachyos-kernel-patches": { "cachyos-kernel-patches": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1773430072, "lastModified": 1773035489,
"narHash": "sha256-0X47YCF1CUnLiQ1M6Lh4hc3ax9aV5DX/wCmMfuMyM1o=", "narHash": "sha256-qsniqHnVIZdhGO6tYyugtWpOtdYofnUcpJAj6YAAvM4=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "kernel-patches", "repo": "kernel-patches",
"rev": "ac70453c25200f0a30ad38b3caa63020869f0f8a", "rev": "d60f37176775b87d3300b333b39ae974adbda381",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -468,11 +468,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773607598, "lastModified": 1772985280,
"narHash": "sha256-nPV/IE0NwQjYcXkEGOmCIEsX9i8HFMeq2RupYzfVdiI=", "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1f8f9e001235652cf54f9c1f7983f9c0e920944a", "rev": "8f736f007139d7f70752657dff6a401a585d6cbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -489,11 +489,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773608492, "lastModified": 1773179137,
"narHash": "sha256-QZteyExJYSQzgxqdsesDPbQgjctGG7iKV/6ooyQPITk=", "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9a40ec3b78fc688d0908485887d355caa5666d18", "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -510,11 +510,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773607598, "lastModified": 1772985280,
"narHash": "sha256-nPV/IE0NwQjYcXkEGOmCIEsX9i8HFMeq2RupYzfVdiI=", "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1f8f9e001235652cf54f9c1f7983f9c0e920944a", "rev": "8f736f007139d7f70752657dff6a401a585d6cbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -532,11 +532,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773422513, "lastModified": 1772330611,
"narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -561,11 +561,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772461003, "lastModified": 1753964049,
"narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=", "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7", "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -590,11 +590,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772461523, "lastModified": 1770511807,
"narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", "rev": "7c75487edd43a71b61adb01cae8326d277aab683",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -622,11 +622,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1773615208, "lastModified": 1773171407,
"narHash": "sha256-a8So/3JL/1P+QZjqp1tBW7tkXyBX+WkbRyBNkds59aY=", "narHash": "sha256-mtSDWOrekyWpJnuPu4uFxqOfSvsow74mmCm3PffqRTE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "30c498acf4173930dfd8afd6279ebceacb1941e9", "rev": "0e083e886f02034c56b851649a6c27f55fe85e32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -668,11 +668,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772467975, "lastModified": 1767023960,
"narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=", "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-guiutils", "repo": "hyprland-guiutils",
"rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507", "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -693,11 +693,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772460177, "lastModified": 1765214753,
"narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -722,11 +722,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772459629, "lastModified": 1771866172,
"narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "7615ee388de18239a4ab1400946f3d0e498a8186", "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -774,11 +774,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772462885, "lastModified": 1764592794,
"narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprtoolkit", "repo": "hyprtoolkit",
"rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -799,11 +799,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773436263, "lastModified": 1771271487,
"narHash": "sha256-n+2xFJngUkBqUJD5FsbVnYEHBTyDFSqtBIwQIGPXWWo=", "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "5e228db6821380a5875d5643176c5c46a47b8134", "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -824,11 +824,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772459835, "lastModified": 1770501770,
"narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "0a692d4a645165eebd65f109146b8861e3a925e7", "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -853,11 +853,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773074819, "lastModified": 1771606233,
"narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=", "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwire", "repo": "hyprwire",
"rev": "f68afd0e73687598cc2774804fedad76693046f0", "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -983,11 +983,11 @@
"scenefx": "scenefx" "scenefx": "scenefx"
}, },
"locked": { "locked": {
"lastModified": 1773588376, "lastModified": 1773112723,
"narHash": "sha256-4HKHaRQnSxxYoR/m1xpwsfnd2lQL9LefcvTFrmcHD2g=", "narHash": "sha256-MXCXjnGPE+wagrHR8cxGTDhJO4xYp+aBQPApV3JG9XY=",
"owner": "DreamMaoMao", "owner": "DreamMaoMao",
"repo": "mangowc", "repo": "mangowc",
"rev": "0d8aedf691bb740290ad5c447d157a8d26a35ffe", "rev": "1fc89d01eb5aa0f3784fb4006bf9af47826444d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1214,15 +1214,14 @@
"flake-parts": "flake-parts_4", "flake-parts": "flake-parts_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"nixpkgs-nixcord": "nixpkgs-nixcord"
}, },
"locked": { "locked": {
"lastModified": 1773597570, "lastModified": 1773217223,
"narHash": "sha256-A6KsirR9kxR1wVFTr8aagk5vUT3rvKTf79Qht6YkxUA=", "narHash": "sha256-nuJm0CAgTFHQr900Euks0iTjcI5zagGfJTzeCEk3W8g=",
"owner": "FlameFlag", "owner": "FlameFlag",
"repo": "nixcord", "repo": "nixcord",
"rev": "1cc0ddb766e459b7187e6aeb8b2e046d37361dc4", "rev": "41d6b20512a433203018777b630853c96b0294f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1233,11 +1232,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1773563071, "lastModified": 1773148319,
"narHash": "sha256-p4f6smYpck1hw6gYsT2omq01gnlZ1E7HTpssDQ0fP+g=", "narHash": "sha256-Yr9ej3uSDycQZHWB5HslVgryLkdSBN2fODAqURv/1wQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1c6f50e5b62030a50799682b6babc9dcc5a271ae", "rev": "8da79c289ee165139257335eab0733d98c4ad458",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1294,11 +1293,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1773620976, "lastModified": 1773235564,
"narHash": "sha256-kgxB+kzrbxYf/CaWA5tvn7mnhzEt78aWfVakZw/TRbs=", "narHash": "sha256-ThPD82jzDYAo5wJ/eR6Nlc40vX0hsIswnessyj4rX2k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7ee76979bc1b2169d7e632572c2c31c9ee01f728", "rev": "f6b3c6a254a012c45a3d7dbf327e223737278b89",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1308,29 +1307,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-nixcord": {
"locked": {
"lastModified": 1773222311,
"narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0590cd39f728e129122770c029970378a79d076a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-staging": { "nixpkgs-staging": {
"locked": { "locked": {
"lastModified": 1773620792, "lastModified": 1773231167,
"narHash": "sha256-5WSJs2YpBJpA9VG1PwFL5vpHw4ySOz2u02S4hAQKkuU=", "narHash": "sha256-TNbxZRJ8cq6ElBfgwEChMNWG/8jx3+W4d1l1BqKwmxY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "525870a58b715d25c23fb00c7be737324d8161c3", "rev": "cddc12f674927875907317b9e22833a4e9261707",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1342,11 +1325,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1773389992, "lastModified": 1772963539,
"narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1374,11 +1357,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1773524153, "lastModified": 1773068389,
"narHash": "sha256-Jms57zzlFf64ayKzzBWSE2SGvJmK+NGt8Gli71d9kmY=", "narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9f278faa1d0c2fc835bd331d4666b59b505a410", "rev": "44bae273f9f82d480273bab26f5c50de3724f52f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1418,11 +1401,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772893680, "lastModified": 1772024342,
"narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1593,11 +1576,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773619901, "lastModified": 1773161309,
"narHash": "sha256-Br8CQy4ht+a2OxyzaRwuP5+oIFfoRvCxYgsmdrgid40=", "narHash": "sha256-k2Un0blYBeoN8mB5HO4rqCKISb427IWy0fzCdCUIcio=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "6f06ff05cd536b790b7662550a10b61a1ac4619e", "rev": "61df7293cf732c7b66cce7f8b46f7017e721a6cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1767,11 +1750,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772669058, "lastModified": 1761431178,
"narHash": "sha256-XhnY0aRuDo5LT8pmJVPofPOgO2hAR7T+XRoaQxtNPzQ=", "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "906d0ac159803a7df2dc1f948df9327670380f69", "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1788,11 +1771,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773588616, "lastModified": 1773225617,
"narHash": "sha256-Ukh79t1IMpP4FRsJDZ/3Y72VpW+QwNe/QRB5pTsH20Q=", "narHash": "sha256-IT0n3jJgf4M7U0EuZJ2XJwXBmSJVVK3auqWDGeHGMzY=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "b34b64ee5a85ab61394c491ac3dad335d3cbfbb8", "rev": "413a22ab7acf848ed4e20c3f47ea96ccd4788518",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
homes/modules/programs/neovim/init.lua
View file

@ -10,7 +10,6 @@ require("plugins")
require("lsp") require("lsp")
require("colors") require("colors")
-- move windows :3
vim.keymap.set("n", "<A-h>", function() vim.keymap.set("n", "<A-h>", function()
vim.cmd("wincmd h") vim.cmd("wincmd h")
end) end)
@ -23,11 +22,3 @@ end)
vim.keymap.set("n", "<A-l>", function() vim.keymap.set("n", "<A-l>", function()
vim.cmd("wincmd l") vim.cmd("wincmd l")
end) end)
-- splits <3 (i love splits sm)
vim.keymap.set("n", "<leader>s", function()
vim.cmd("split")
end)
vim.keymap.set("n", "<leader>v", function()
vim.cmd("vsplit")
end)

6
homes/modules/programs/neovim/lua/colors.lua
View file

@ -95,9 +95,9 @@ local function load_colors()
vim.api.nvim_set_hl(0, "TelescopePreviewNormal", { bg = bg_90 }) vim.api.nvim_set_hl(0, "TelescopePreviewNormal", { bg = bg_90 })
vim.api.nvim_set_hl(0, "TelescopeBorder", { fg = color_15, bg = bg_90 }) vim.api.nvim_set_hl(0, "TelescopeBorder", { fg = color_15, bg = bg_90 })
vim.api.nvim_set_hl(0, "TelescopePromptBorder", { fg = color_15, bg = bg_90 }) vim.api.nvim_set_hl(0, "TelescopePromptBorder", { fg = color_14, bg = bg_90 })
vim.api.nvim_set_hl(0, "TelescopeResultsBorder", { fg = color_15, bg = bg_90 }) vim.api.nvim_set_hl(0, "TelescopeResultsBorder", { fg = color_13, bg = bg_90 })
vim.api.nvim_set_hl(0, "TelescopePreviewBorder", { fg = color_15, bg = bg_90 }) vim.api.nvim_set_hl(0, "TelescopePreviewBorder", { fg = color_12, bg = bg_90 })
vim.api.nvim_set_hl(0, "TelescopePromptTitle", { fg = color_15, bg = bg_90 }) vim.api.nvim_set_hl(0, "TelescopePromptTitle", { fg = color_15, bg = bg_90 })
vim.api.nvim_set_hl(0, "TelescopeResultsTitle", { fg = color_15, bg = bg_90 }) vim.api.nvim_set_hl(0, "TelescopeResultsTitle", { fg = color_15, bg = bg_90 })

28
homes/modules/programs/neovim/lua/plugins/git.lua
View file

@ -58,34 +58,6 @@ return {
end end
vim.cmd("Gitsigns blame") vim.cmd("Gitsigns blame")
end) end)
vim.keymap.set("n", "<leader>bl", gitsigns.toggle_current_line_blame)
vim.keymap.set("n", "]c", function()
if vim.wo.diff then
vim.cmd.normal({ "]c", bang = true })
else
gitsigns.nav_hunk("next")
end
end)
vim.keymap.set("n", "[c", function()
if vim.wo.diff then
vim.cmd.normal({ "[c", bang = true })
else
gitsigns.nav_hunk("prev")
end
end)
vim.keymap.set("n", "<leader>hs", gitsigns.stage_hunk)
vim.keymap.set("n", "<leader>hu", gitsigns.undo_stage_hunk)
vim.keymap.set("n", "<leader>hS", gitsigns.stage_buffer)
vim.keymap.set("n", "<leader>hU", gitsigns.reset_buffer_index)
vim.keymap.set("n", "<leader>hi", gitsigns.toggle_current_line_blame)
vim.keymap.set("n", "<leader>hp", gitsigns.preview_hunk_inline)
end, end,
}) })
end, end,

21
homes/modules/programs/neovim/lua/plugins/telescope.lua
View file

@ -1,7 +1,6 @@
return { return {
{ {
"telescope.nvim", "telescope.nvim",
enabled = nixCats("telescope.enable") or false,
cmd = { "Telescope" }, cmd = { "Telescope" },
keys = { keys = {
{ {
@ -63,14 +62,7 @@ return {
}, },
load = function(name) load = function(name)
vim.cmd.packadd(name) vim.cmd.packadd(name)
if nixCats("telescope.fzf") then
vim.cmd.packadd("telescope-fzf-native.nvim") vim.cmd.packadd("telescope-fzf-native.nvim")
end
if nixCats("telescope.zf") then
vim.cmd.packadd("telescope-zf-native.nvim")
end
end, end,
after = function(plugin) after = function(plugin)
local telescope = require("telescope") local telescope = require("telescope")
@ -80,6 +72,11 @@ return {
defaults = { defaults = {
border = true, border = true,
borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },
-- borderchars = {
-- prompt = { "─", " ", " ", " ", "─", "─", " ", " " },
-- results = { " " },
-- preview = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },
-- },
mappings = { mappings = {
i = { i = {
["<C-k>"] = actions.move_selection_previous, -- move to prev result ["<C-k>"] = actions.move_selection_previous, -- move to prev result
@ -90,13 +87,7 @@ return {
}, },
}) })
if nixCats("telescope.fzf") then pcall(telescope.load_extension, "fzf")
telescope.load_extension("fzf")
end
if nixCats("telescope.zf") then
telescope.load_extension("zf-native")
end
end, end,
}, },
} }

17
homes/modules/programs/neovim/nixcats.nix
View file

@ -130,14 +130,11 @@ in {
undotree undotree
mini-hipatterns mini-hipatterns
]; ];
telescope = { telescope = [
enable = [
telescope-nvim telescope-nvim
telescope-fzf-native-nvim
telescope-ui-select-nvim telescope-ui-select-nvim
]; ];
fzf = [telescope-fzf-native-nvim];
zf = [telescope-zf-native-nvim];
};
fyler = [ fyler = [
fyler-nvim fyler-nvim
]; ];
@ -245,15 +242,7 @@ in {
ui = true; ui = true;
qol = true; qol = true;
telescope = true;
telescope = {
enable = true;
# only enable one at a time
fzf = false;
zf = true;
};
fyler = true; fyler = true;
lsp = true; lsp = true;

3
homes/modules/programs/nixcord.nix
View file

@ -75,6 +75,7 @@
forwardAnywhere.enable = true; forwardAnywhere.enable = true;
spotifyCrack.enable = true; spotifyCrack.enable = true;
spotifyShareCommands.enable = true; spotifyShareCommands.enable = true;
spotifyControls.enable = true;
fullUserInChatbox.enable = true; fullUserInChatbox.enable = true;
gifPaste.enable = true; gifPaste.enable = true;
ignoreActivities = { ignoreActivities = {
@ -139,7 +140,7 @@
whoReacted.enable = true; whoReacted.enable = true;
whosWatching.enable = true; whosWatching.enable = true;
quickReply.enable = true; quickReply.enable = true;
# questCompleter.enable = true; # does not seem to exist anymore? questCompleter.enable = true;
shikiCodeblocks = { shikiCodeblocks = {
enable = true; enable = true;
useDevIcon = "COLOR"; useDevIcon = "COLOR";