new nvim changes
This commit is contained in:
parent
d14e84eae8
commit
6198cf14d4
GPG key ID:
81FB9FECDD6A33E2
11 changed files with 1115 additions and 663 deletions
195
flake.lock
generated
195
flake.lock
generated
|
|
@ -139,11 +139,11 @@
|
||||||
"nixpkgs": "nixpkgs_4"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756365413,
|
"lastModified": 1756741629,
|
||||||
"narHash": "sha256-rWJqnFNh+xAoXLPMOUWvb2jMUUgGs4PKI/p2lgUczBA=",
|
"narHash": "sha256-n+mgH3NoQf8d1jd8cDp/9Mt++hhyuE3LO3ZAxzjWRZw=",
|
||||||
"owner": "catppuccin",
|
"owner": "catppuccin",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "842da43be0d00d7cf4c26faf279bc71a614c259b",
|
"rev": "cd22197da06df1eb6fabdaa2fc22c170c4f67382",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -161,11 +161,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756487150,
|
"lastModified": 1756606761,
|
||||||
"narHash": "sha256-aKMJ091Mqg4YeaK7Q+C0AASS7WBD2yjCY00/FE/37Us=",
|
"narHash": "sha256-lcHMwq0LVcS1mP9o0pq00Von8PsXMsFPPo3ZXGWa7DU=",
|
||||||
"owner": "chaotic-cx",
|
"owner": "chaotic-cx",
|
||||||
"repo": "nyx",
|
"repo": "nyx",
|
||||||
"rev": "364bbaea9034c1e723f4fc96774fc23e77503f6c",
|
"rev": "9e9e58125b4ba190658235106858f9733b25a1b4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -290,11 +290,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756115622,
|
"lastModified": 1756733629,
|
||||||
"narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=",
|
"narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "bafad29f89e83b2d861b493aa23034ea16595560",
|
"rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -309,11 +309,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756571337,
|
"lastModified": 1756832996,
|
||||||
"narHash": "sha256-bUg/plnHv4aHxriwF9RvYpbg2q2xD/n9Fs7/AFiM9O0=",
|
"narHash": "sha256-pW+QqeXIIKzo4GkX+WM86t7vai++RHaDE32aMDAIUJs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "134039e337e85d114e26f9265ba5d113c81f2c98",
|
"rev": "73c17b083cd9383d9dd0c98ca33c5d7cdabfec6c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -330,11 +330,11 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1756526623,
|
"lastModified": 1756785812,
|
||||||
"narHash": "sha256-G8N9zjlLZyI/BkrlI/fSrP0Zif/ttr3JWq1m5VxTLR4=",
|
"narHash": "sha256-B3cR5keCkTTaI7hCI1YIopLWT3CviWf/uwOjC9AQ27Y=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "702be0c726c76de3e069ae95c7b1dab5bd568000",
|
"rev": "eeb9ccaba785ca13fc2dcf9d83613633a0605feb",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -569,11 +569,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754487366,
|
"lastModified": 1756770412,
|
||||||
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
|
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
|
"rev": "4524271976b625a4a605beefd893f270620fd751",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -859,11 +859,11 @@
|
||||||
"zon2nix": "zon2nix"
|
"zon2nix": "zon2nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756568519,
|
"lastModified": 1756850146,
|
||||||
"narHash": "sha256-qDC1Ntc4Cs6S6XlXkPgDmO8uRYWYqxTlTgWRv6TU7Zw=",
|
"narHash": "sha256-6bHIDP99bxK4H3PsEQjKaGG3RhxZY3HrMzL/soqXzfk=",
|
||||||
"owner": "ghostty-org",
|
"owner": "ghostty-org",
|
||||||
"repo": "ghostty",
|
"repo": "ghostty",
|
||||||
"rev": "75e3835a9e74cd092dbd86f0bc07399b0d2d25ce",
|
"rev": "8d11c08db3263e0507bfe010e4c423a61b323ac0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1080,11 +1080,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756496801,
|
"lastModified": 1756842514,
|
||||||
"narHash": "sha256-IYIsnPy+cJxe8RbDHBrCtfJY0ry2bG2H7WvMcewiGS8=",
|
"narHash": "sha256-XbtRMewPGJwTNhBC4pnBu3w/xT1XejvB0HfohC2Kga8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "77a71380c38fb2a440b4b5881bbc839f6230e1cb",
|
"rev": "30fc1b532645a21e157b6e33e3f8b4c154f86382",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1213,11 +1213,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756498600,
|
"lastModified": 1756811803,
|
||||||
"narHash": "sha256-PpTYKc25vw6PYKJBe33sbgHrCYADpGryYBMm4sPsdj4=",
|
"narHash": "sha256-MuR2EcPnJ7VOhK1ipdOcyRvGgRFZbRWA1fl27Gzrie0=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "ea42041f936d5810c5cfa45d6bece12dde2fd9b6",
|
"rev": "127aab815908ecbd3db4d23f127d2e96b79855f9",
|
||||||
"revCount": 6402,
|
"revCount": 6408,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland"
|
"url": "https://github.com/hyprwm/Hyprland"
|
||||||
|
|
@ -1665,11 +1665,11 @@
|
||||||
"treefmt-nix": "treefmt-nix_3"
|
"treefmt-nix": "treefmt-nix_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756541118,
|
"lastModified": 1756857991,
|
||||||
"narHash": "sha256-K/OUNJk8yceRmeoHmC8VQi49bWpXn7FNhGz5zA4TONw=",
|
"narHash": "sha256-RCdKAApSgXHhwt7236TygtgV04qlIojySDAJXVNM1Nc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "neovim-nightly-overlay",
|
"repo": "neovim-nightly-overlay",
|
||||||
"rev": "cf56619cc17583342cdc50ddced41b73d9c0f72f",
|
"rev": "d18b36e17f51d0e5ff51d4e74f573c6683e496ab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1681,11 +1681,11 @@
|
||||||
"neovim-src": {
|
"neovim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756509733,
|
"lastModified": 1756837279,
|
||||||
"narHash": "sha256-f3u4hq5ZuTN6u7S+iAYP17tN9kOmdDMytjG5EU9FmU0=",
|
"narHash": "sha256-exFuBMScGX9vjLGQ4p/uZKyDCot5xF5Ta864Dv0ys/0=",
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"repo": "neovim",
|
"repo": "neovim",
|
||||||
"rev": "834e1181da08c203fa3352ca5f2f492ad7db15ad",
|
"rev": "431004dda2bbfe1565afcaa5117a0287317b0215",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1704,11 +1704,11 @@
|
||||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756569958,
|
"lastModified": 1756801989,
|
||||||
"narHash": "sha256-opB/FzhCvN+9M5dzmHN5O5VeufydtCFdUbOXOVPKpRw=",
|
"narHash": "sha256-eOIQ1CUMHwU4zsBGaCj9jCgNTxzyq2aeHuwgx0xLFwo=",
|
||||||
"owner": "sodiboo",
|
"owner": "sodiboo",
|
||||||
"repo": "niri-flake",
|
"repo": "niri-flake",
|
||||||
"rev": "e752c7d07e98455e6d164339ff8dc31d9c7261b6",
|
"rev": "d6a98b86d86b512c6167601ea646ab785137bada",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1725,15 +1725,16 @@
|
||||||
"rust-overlay": "rust-overlay_5"
|
"rust-overlay": "rust-overlay_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756556321,
|
"lastModified": 1756761382,
|
||||||
"narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
|
"narHash": "sha256-1XIhLlAc/x9K6LXRK8yMD8G3RiHPOiVRHmWNgIFGVi0=",
|
||||||
"owner": "YaLTeR",
|
"owner": "visualglitch91",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
|
"rev": "ceda5689ce260339ba5cb6d1da5d776f830d7c96",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "YaLTeR",
|
"owner": "visualglitch91",
|
||||||
|
"ref": "feat/blur",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -1741,16 +1742,16 @@
|
||||||
"niri-stable": {
|
"niri-stable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748151941,
|
"lastModified": 1756556321,
|
||||||
"narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=",
|
"narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7",
|
"rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"ref": "v25.05.1",
|
"ref": "v25.08",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -1758,11 +1759,11 @@
|
||||||
"niri-unstable": {
|
"niri-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756556321,
|
"lastModified": 1756728273,
|
||||||
"narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
|
"narHash": "sha256-7tYNlNO/qVRA6shdWxNuBMYOE+pGgxqE0f54S4Wr9PE=",
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
|
"rev": "77465e11fe36fdd9bc0a304b96bb2558116568af",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1851,11 +1852,11 @@
|
||||||
},
|
},
|
||||||
"nixos-stable": {
|
"nixos-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756469547,
|
"lastModified": 1756754095,
|
||||||
"narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=",
|
"narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "41d292bfc37309790f70f4c120b79280ce40af16",
|
"rev": "7c815e513adbf03c9098b2bd230c1e0525c8a7f9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1867,11 +1868,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756386758,
|
"lastModified": 1756542300,
|
||||||
"narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=",
|
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dfb2f12e899db4876308eba6d93455ab7da304cd",
|
"rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1997,11 +1998,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_3": {
|
"nixpkgs-stable_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756217674,
|
"lastModified": 1756754095,
|
||||||
"narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=",
|
"narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620",
|
"rev": "7c815e513adbf03c9098b2bd230c1e0525c8a7f9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2103,11 +2104,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_16": {
|
"nixpkgs_16": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756381814,
|
"lastModified": 1756819007,
|
||||||
"narHash": "sha256-tzo7YvAsGlzo4WiIHT0ooR59VHu+aKRQdHk7sIyoia4=",
|
"narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "aca2499b79170038df0dbaec8bf2f689b506ad32",
|
"rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2119,11 +2120,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_17": {
|
"nixpkgs_17": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756266583,
|
"lastModified": 1756542300,
|
||||||
"narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
|
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
|
"rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2135,11 +2136,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_18": {
|
"nixpkgs_18": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756386758,
|
"lastModified": 1756542300,
|
||||||
"narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=",
|
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dfb2f12e899db4876308eba6d93455ab7da304cd",
|
"rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2309,11 +2310,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755615617,
|
"lastModified": 1756266583,
|
||||||
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
|
"narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
|
"rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2325,11 +2326,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756386758,
|
"lastModified": 1756542300,
|
||||||
"narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=",
|
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dfb2f12e899db4876308eba6d93455ab7da304cd",
|
"rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2389,11 +2390,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_9": {
|
"nixpkgs_9": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756386758,
|
"lastModified": 1756542300,
|
||||||
"narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=",
|
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dfb2f12e899db4876308eba6d93455ab7da304cd",
|
"rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2574,11 +2575,11 @@
|
||||||
"systems": "systems_14"
|
"systems": "systems_14"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756328075,
|
"lastModified": 1756660474,
|
||||||
"narHash": "sha256-mvTlmcFJWur+V0Fy/KIj6pqdH2sooEx12TM70b7o90o=",
|
"narHash": "sha256-1bNQXQGTfBvzbY13r+dCE5CXsvdLVpKYCnegm5TrzRc=",
|
||||||
"owner": "raphamorim",
|
"owner": "raphamorim",
|
||||||
"repo": "rio",
|
"repo": "rio",
|
||||||
"rev": "7fb3971029ab3db2ac8f2fc2a22d4eda6855832d",
|
"rev": "1b5c90a33841214cefce281ed117ac11653f5213",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2737,11 +2738,11 @@
|
||||||
"nixpkgs": "nixpkgs_22"
|
"nixpkgs": "nixpkgs_22"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755916474,
|
"lastModified": 1756521112,
|
||||||
"narHash": "sha256-r0WnHKwA8DQNSHDmN3LNaqu41GbWDYqLS7IQAGR+6Wg=",
|
"narHash": "sha256-/YW9DI+vZ2lbTvYAek6BsudUXdpWr0FybTDod4P42L4=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "897ecf2b25be05e6ccb7661703f9f2fdec155f42",
|
"rev": "2243e3f251ea18486f83133cf8e325d2b9b71e89",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2757,11 +2758,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756521112,
|
"lastModified": 1756780571,
|
||||||
"narHash": "sha256-/YW9DI+vZ2lbTvYAek6BsudUXdpWr0FybTDod4P42L4=",
|
"narHash": "sha256-xX0B7Sgx3OQvf6anaNW0vXyYDXbchSx2mnT8rqAPbWA=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "2243e3f251ea18486f83133cf8e325d2b9b71e89",
|
"rev": "2c18db2acc837a71146ed2d6dae27bf03e3b7a4b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -2865,11 +2866,11 @@
|
||||||
"systems": "systems_17"
|
"systems": "systems_17"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756009939,
|
"lastModified": 1756614537,
|
||||||
"narHash": "sha256-lD4Zn37DWEx0X1DqM3npH68b7oh81H8BaaO3c6Ol/DQ=",
|
"narHash": "sha256-qyszmZO9CEKAlj5NBQo1AIIADm5Fgqs5ZggW1sU1TVo=",
|
||||||
"owner": "Gerg-L",
|
"owner": "Gerg-L",
|
||||||
"repo": "spicetify-nix",
|
"repo": "spicetify-nix",
|
||||||
"rev": "2bedaf52261ef2adbe71af70820aeb41dfe9a5ef",
|
"rev": "374eb5d97092b97f7aaafd58a2012943b388c0df",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -3223,11 +3224,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755934250,
|
"lastModified": 1756662192,
|
||||||
"narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=",
|
"narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5",
|
"rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -3371,11 +3372,11 @@
|
||||||
"xwayland-satellite-unstable": {
|
"xwayland-satellite-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756260173,
|
"lastModified": 1756679414,
|
||||||
"narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=",
|
"narHash": "sha256-yQGJ/n6mRwoIQnaL5oV2TGOHg4SEHpINTaoHrvkjr1Q=",
|
||||||
"owner": "Supreeeme",
|
"owner": "Supreeeme",
|
||||||
"repo": "xwayland-satellite",
|
"repo": "xwayland-satellite",
|
||||||
"rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb",
|
"rev": "c0497c990d46fcc012d9deff885bbe533e91e044",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -3390,11 +3391,11 @@
|
||||||
"nixpkgs": "nixpkgs_25"
|
"nixpkgs": "nixpkgs_25"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756524600,
|
"lastModified": 1756840469,
|
||||||
"narHash": "sha256-uORxiu9IMsTcapawMwXs7fXrk5rNnY4MNlRL0tgLMuI=",
|
"narHash": "sha256-TtOazKYiRtYEEKnLmeBihr/E+PN1xdT/to1NPNsoxQQ=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "79ce4212f93e81e0e37572645b419c0a954c5486",
|
"rev": "0532bd5938efddca7d9462778ba7989b3734f965",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -141,7 +141,10 @@
|
||||||
disko.url = "github:nix-community/disko";
|
disko.url = "github:nix-community/disko";
|
||||||
disko.inputs.nixpkgs.follows = "nixpkgs";
|
disko.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
niri-src.url = "github:YaLTeR/niri";
|
# niri-src.url = "github:YaLTeR/niri";
|
||||||
|
# niri-src.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
|
niri-src.url = "github:visualglitch91/niri/feat/blur";
|
||||||
niri-src.inputs.nixpkgs.follows = "nixpkgs";
|
niri-src.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
quickshell = {
|
quickshell = {
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,6 @@ in {
|
||||||
gtk-single-instance = true;
|
gtk-single-instance = true;
|
||||||
gtk-titlebar = false;
|
gtk-titlebar = false;
|
||||||
|
|
||||||
background = colors.crust.hex;
|
|
||||||
|
|
||||||
alpha-blending = "linear-corrected";
|
alpha-blending = "linear-corrected";
|
||||||
|
|
||||||
window-padding-x = 20;
|
window-padding-x = 20;
|
||||||
|
|
|
||||||
|
|
@ -27,35 +27,13 @@ in {
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
window_padding_width = 20;
|
window_padding_width = 20;
|
||||||
# background_opacity = "0.9";
|
background_opacity = "0.9";
|
||||||
background = colors.crust.hex;
|
|
||||||
foreground = colors.text.hex;
|
|
||||||
|
|
||||||
font_hinting = "slight";
|
font_hinting = "slight";
|
||||||
|
|
||||||
cursor_trail = 3;
|
cursor_trail = 3;
|
||||||
|
|
||||||
text_composition_strategy = "1.2 10";
|
text_composition_strategy = "1.2 10";
|
||||||
|
|
||||||
# Normal colors
|
|
||||||
color0 = colors.surface1.hex; # black
|
|
||||||
color1 = colors.red.hex; # red
|
|
||||||
color2 = colors.green.hex; # green
|
|
||||||
color3 = colors.yellow.hex; # yellow
|
|
||||||
color4 = colors.blue.hex; # blue
|
|
||||||
color5 = colors.mauve.hex; # magenta
|
|
||||||
color6 = colors.teal.hex; # cyan
|
|
||||||
color7 = colors.text.hex; # white
|
|
||||||
|
|
||||||
# Bright colors
|
|
||||||
color8 = colors.surface2.hex; # bright black
|
|
||||||
color9 = colors.red.hex; # bright red
|
|
||||||
color10 = colors.green.hex; # bright green
|
|
||||||
color11 = colors.yellow.hex; # bright yellow
|
|
||||||
color12 = colors.blue.hex; # bright blue
|
|
||||||
color13 = colors.mauve.hex; # bright magenta
|
|
||||||
color14 = colors.teal.hex; # bright cyan
|
|
||||||
color15 = colors.text.hex; # bright white
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,16 @@ vim.g.lazyvim_blink_main = true
|
||||||
vim.g.snacks_animate = false
|
vim.g.snacks_animate = false
|
||||||
vim.o.termguicolors = true
|
vim.o.termguicolors = true
|
||||||
|
|
||||||
|
-- Minimal UI borders for floats
|
||||||
|
vim.diagnostic.config({
|
||||||
|
virtual_text = false,
|
||||||
|
float = { border = "none" },
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Use crisp single-line borders in LSP handlers
|
||||||
|
local border = "none"
|
||||||
|
local handlers = vim.lsp.handlers
|
||||||
|
handlers["textDocument/hover"] = vim.lsp.with(handlers.hover, { border = border })
|
||||||
|
handlers["textDocument/signatureHelp"] = vim.lsp.with(handlers.signature_help, { border = border })
|
||||||
|
|
||||||
vim.g.lazyvim_prettier_needs_config = true
|
vim.g.lazyvim_prettier_needs_config = true
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,82 @@ return {
|
||||||
module.get = module.get_theme
|
module.get = module.get_theme
|
||||||
end
|
end
|
||||||
opts.transparent_background = true
|
opts.transparent_background = true
|
||||||
|
opts.flavour = "mocha"
|
||||||
|
opts.no_bold = true
|
||||||
|
opts.no_italic = true
|
||||||
|
opts.dim_inactive = {
|
||||||
|
enabled = true,
|
||||||
|
percentage = 0.75,
|
||||||
|
}
|
||||||
|
opts.integrations = vim.tbl_deep_extend("force", opts.integrations or {}, {
|
||||||
|
noice = true,
|
||||||
|
blink_cmp = true,
|
||||||
|
notify = true,
|
||||||
|
treesitter = true,
|
||||||
|
lsp_trouble = true,
|
||||||
|
telescope = true,
|
||||||
|
which_key = true,
|
||||||
|
native_lsp = {
|
||||||
|
enabled = true,
|
||||||
|
inlay_hints = {
|
||||||
|
background = false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
indent_blankline = {
|
||||||
|
enabled = true,
|
||||||
|
scope_color = "overlay0",
|
||||||
|
colored_indent_levels = false,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
opts.custom_highlights = function(colors)
|
||||||
|
return {
|
||||||
|
Normal = { bg = "NONE" },
|
||||||
|
NormalNC = { bg = "NONE" },
|
||||||
|
NormalFloat = { bg = "NONE" },
|
||||||
|
FloatBorder = { fg = "NONE", bg = "NONE" },
|
||||||
|
FloatTitle = { fg = colors.subtext0, bg = "NONE" },
|
||||||
|
-- WinSeparator = { fg = colors.surface1 },
|
||||||
|
-- CursorLine = { bg = colors.mantle },
|
||||||
|
-- Visual = { bg = colors.surface0 },
|
||||||
|
-- Pmenu = { bg = colors.bg, fg = colors.text },
|
||||||
|
-- PmenuSel = { bg = colors.surface0, fg = colors.text },
|
||||||
|
-- PmenuSbar = { bg = colors.bg },
|
||||||
|
-- PmenuThumb = { bg = colors.surface1 },
|
||||||
|
-- StatusLine = { bg = colors.bg, fg = colors.subtext0 },
|
||||||
|
-- StatusLineNC = { bg = colors.bg, fg = colors.overlay0 },
|
||||||
|
-- TabLine = { bg = colors.bg, fg = colors.overlay1 },
|
||||||
|
-- TabLineSel = { bg = colors.bg, fg = colors.text },
|
||||||
|
-- TabLineFill = { bg = colors.bg },
|
||||||
|
-- SignColumn = { bg = colors.bg },
|
||||||
|
-- LineNr = { fg = colors.overlay1 },
|
||||||
|
DiagnosticUnderlineError = { sp = colors.red, undercurl = true },
|
||||||
|
DiagnosticUnderlineWarn = { sp = colors.yellow, undercurl = true },
|
||||||
|
DiagnosticUnderlineInfo = { sp = colors.teal, undercurl = true },
|
||||||
|
DiagnosticUnderlineHint = { sp = colors.sky, undercurl = true },
|
||||||
|
-- Noice popup and cmdline transparent, borderless
|
||||||
|
NoiceCmdlinePopup = { bg = "NONE", fg = colors.text },
|
||||||
|
NoiceCmdlinePopupBorder = { fg = "NONE", bg = "NONE" },
|
||||||
|
NoiceCmdlinePopupTitle = { bg = "NONE", fg = colors.subtext0 },
|
||||||
|
NoicePopup = { bg = "NONE", fg = colors.text },
|
||||||
|
NoicePopupBorder = { fg = "NONE", bg = "NONE" },
|
||||||
|
-- Blink.cmp: flat boxes with padding and pop colors
|
||||||
|
BlinkCmpMenu = { bg = "NONE", fg = colors.text },
|
||||||
|
BlinkCmpMenuBorder = { fg = "NONE", bg = "NONE" },
|
||||||
|
BlinkCmpMenuSelection = { bg = colors.surface0, fg = colors.text },
|
||||||
|
BlinkCmpMenuMatch = { fg = colors.mauve },
|
||||||
|
BlinkCmpDoc = { bg = "NONE" },
|
||||||
|
BlinkCmpDocBorder = { fg = "NONE", bg = "NONE" },
|
||||||
|
BlinkCmpDocSelection = { bg = colors.surface0 },
|
||||||
|
BlinkCmpKind = { fg = colors.sky },
|
||||||
|
BlinkCmpSource = { fg = colors.subtext0 },
|
||||||
|
-- Reduce scope highlighting prominence
|
||||||
|
IlluminatedWordText = { bg = colors.mantle },
|
||||||
|
IlluminatedWordRead = { bg = colors.mantle },
|
||||||
|
IlluminatedWordWrite = { bg = colors.mantle },
|
||||||
|
TreesitterContext = { bg = colors.mantle },
|
||||||
|
TreesitterContextLineNumber = { fg = colors.subtext0, bg = colors.mantle },
|
||||||
|
}
|
||||||
|
end
|
||||||
return opts
|
return opts
|
||||||
end,
|
end,
|
||||||
-- config = function()
|
-- config = function()
|
||||||
|
|
@ -50,7 +126,7 @@ return {
|
||||||
-- end,
|
-- end,
|
||||||
-- color_overrides = {
|
-- color_overrides = {
|
||||||
-- mocha = {
|
-- mocha = {
|
||||||
-- base = "#11111b",
|
-- bg = "#11111b",
|
||||||
-- mantle = "#11111b",
|
-- mantle = "#11111b",
|
||||||
-- crust = "#11111b",
|
-- crust = "#11111b",
|
||||||
-- },
|
-- },
|
||||||
|
|
@ -138,8 +214,80 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
--- minimal crisp single-line borders for LSP windows
|
||||||
|
inlay_hints = { enabled = true },
|
||||||
|
diagnostics = { virtual_text = false },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
-- Minimal Noice styling
|
||||||
|
{
|
||||||
|
"folke/noice.nvim",
|
||||||
|
opts = function(_, opts)
|
||||||
|
opts = opts or {}
|
||||||
|
opts.presets = vim.tbl_deep_extend("force", opts.presets or {}, {
|
||||||
|
bottom_search = false,
|
||||||
|
command_palette = false,
|
||||||
|
long_message_to_split = true,
|
||||||
|
inc_rename = false,
|
||||||
|
lsp_doc_border = false,
|
||||||
|
})
|
||||||
|
opts.cmdline = vim.tbl_deep_extend("force", opts.cmdline or {}, {
|
||||||
|
view = "cmdline_popup",
|
||||||
|
})
|
||||||
|
opts.views = vim.tbl_deep_extend("force", opts.views or {}, {
|
||||||
|
cmdline_popup = {
|
||||||
|
border = { style = "none", padding = { 1, 2 } },
|
||||||
|
win_options = {
|
||||||
|
-- winhighlight = { "Normal:NoiceCmdlinePopup,FloatBorder:NoiceCmdlinePopupBorder,FloatTitle:NoiceCmdlinePopupTitle" },
|
||||||
|
winhighlight = {
|
||||||
|
Normal = "NoiceCmdlinePopup",
|
||||||
|
FloatBorder = "NoiceCmdlinePopupBorder",
|
||||||
|
FloatTitle = "NoiceCmdlinePopupTitle",
|
||||||
|
},
|
||||||
|
winblend = 0,
|
||||||
|
},
|
||||||
|
position = { row = "40%", col = "50%" },
|
||||||
|
size = { width = 60 },
|
||||||
|
},
|
||||||
|
popupmenu = {
|
||||||
|
border = { style = "none", padding = { 1, 2 } },
|
||||||
|
win_options = { winblend = 0, winhighlight = "Normal:NoicePopup,FloatBorder:NoicePopupBorder" },
|
||||||
|
},
|
||||||
|
mini = {
|
||||||
|
border = { style = "none", padding = { 1, 2 } },
|
||||||
|
win_options = { winblend = 0, winhighlight = "Normal:NoicePopup,FloatBorder:NoicePopupBorder" },
|
||||||
|
},
|
||||||
|
})
|
||||||
|
return opts
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
-- Minimal bufferline (if present in LazyVim)
|
||||||
|
{
|
||||||
|
"akinsho/bufferline.nvim",
|
||||||
|
opts = function(_, opts)
|
||||||
|
opts = opts or {}
|
||||||
|
opts.options = vim.tbl_deep_extend("force", opts.options or {}, {
|
||||||
|
separator_style = "none",
|
||||||
|
show_buffer_close_icons = false,
|
||||||
|
show_close_icon = false,
|
||||||
|
always_show_bufferline = false,
|
||||||
|
indicator = { style = "underline" },
|
||||||
|
})
|
||||||
|
return opts
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
-- Minimal indent guides
|
||||||
|
{
|
||||||
|
"lukas-reineke/indent-blankline.nvim",
|
||||||
|
main = "ibl",
|
||||||
|
opts = function(_, opts)
|
||||||
|
opts = opts or {}
|
||||||
|
opts.indent = { char = "│" }
|
||||||
|
opts.scope = { enabled = false }
|
||||||
|
opts.whitespace = { remove_blankline_trail = true }
|
||||||
|
return opts
|
||||||
|
end,
|
||||||
|
},
|
||||||
"pimalaya/himalaya-vim",
|
"pimalaya/himalaya-vim",
|
||||||
{
|
{
|
||||||
"rachartier/tiny-inline-diagnostic.nvim",
|
"rachartier/tiny-inline-diagnostic.nvim",
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,24 @@ return {
|
||||||
-- Author: shadmansaleh
|
-- Author: shadmansaleh
|
||||||
-- Credit: glepnir
|
-- Credit: glepnir
|
||||||
local lualine = require("lualine")
|
local lualine = require("lualine")
|
||||||
local ctp = require("catppuccin.palettes").get_palette("mocha")
|
local ctp = require("catppuccin.palettes").get_palette("macchiato")
|
||||||
|
|
||||||
|
-- Utility to blend two hex colors: result = (1 - alpha) * a + alpha * b
|
||||||
|
local function blend_hex(hex_a, hex_b, alpha)
|
||||||
|
local function hex_to_rgb(h)
|
||||||
|
h = h:gsub("#", "")
|
||||||
|
return tonumber(h:sub(1, 2), 16), tonumber(h:sub(3, 4), 16), tonumber(h:sub(5, 6), 16)
|
||||||
|
end
|
||||||
|
local function rgb_to_hex(r, g, b)
|
||||||
|
return string.format("#%02x%02x%02x", math.floor(r + 0.5), math.floor(g + 0.5), math.floor(b + 0.5))
|
||||||
|
end
|
||||||
|
local ar, ag, ab = hex_to_rgb(hex_a)
|
||||||
|
local br, bg, bb = hex_to_rgb(hex_b)
|
||||||
|
local r = ar * (1 - alpha) + br * alpha
|
||||||
|
local g = ag * (1 - alpha) + bg * alpha
|
||||||
|
local b = ab * (1 - alpha) + bb * alpha
|
||||||
|
return rgb_to_hex(r, g, b)
|
||||||
|
end
|
||||||
|
|
||||||
local conditions = {
|
local conditions = {
|
||||||
buffer_not_empty = function()
|
buffer_not_empty = function()
|
||||||
|
|
@ -24,15 +41,11 @@ return {
|
||||||
-- Config
|
-- Config
|
||||||
local config = {
|
local config = {
|
||||||
options = {
|
options = {
|
||||||
-- Disable sections and component separators
|
|
||||||
component_separators = "",
|
component_separators = "",
|
||||||
section_separators = "",
|
section_separators = "",
|
||||||
theme = {
|
theme = {
|
||||||
-- We are going to use lualine_c an lualine_x as left and
|
normal = { c = { fg = ctp.text, bg = "NONE" } },
|
||||||
-- right section. Both are highlighted by c theme . So we
|
inactive = { c = { fg = ctp.overlay0, bg = "NONE" } },
|
||||||
-- are just setting default looks o statusline
|
|
||||||
normal = { c = { fg = ctp.text, bg = ctp.base } },
|
|
||||||
inactive = { c = { fg = ctp.overlay0, bg = ctp.base } },
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
sections = {
|
sections = {
|
||||||
|
|
@ -164,6 +177,41 @@ return {
|
||||||
return mode_colors[current_mode] or ctp.subtext0 -- Default to a neutral color if mode not found
|
return mode_colors[current_mode] or ctp.subtext0 -- Default to a neutral color if mode not found
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Human-readable mode labels
|
||||||
|
local function get_mode_label()
|
||||||
|
local m = vim.api.nvim_get_mode().mode
|
||||||
|
local normal = {
|
||||||
|
n = true,
|
||||||
|
no = true,
|
||||||
|
nov = true,
|
||||||
|
["noV"] = true,
|
||||||
|
["no\22"] = true,
|
||||||
|
niI = true,
|
||||||
|
niR = true,
|
||||||
|
niV = true,
|
||||||
|
nt = true,
|
||||||
|
}
|
||||||
|
if normal[m] then
|
||||||
|
return "NORM"
|
||||||
|
end
|
||||||
|
if m == "i" or m == "ic" or m == "ix" then
|
||||||
|
return "INS"
|
||||||
|
end
|
||||||
|
if m == "v" or m == "V" or m == "\22" or m == "vs" or m == "Vs" or m == "\22s" then
|
||||||
|
return "VIS"
|
||||||
|
end
|
||||||
|
if m == "R" or m == "Rc" or m == "Rx" or m == "Rv" or m == "Rvc" or m == "Rvx" then
|
||||||
|
return "REPL"
|
||||||
|
end
|
||||||
|
if m == "c" or m == "cv" or m == "ce" then
|
||||||
|
return "CMD"
|
||||||
|
end
|
||||||
|
if m == "t" or m == "!" then
|
||||||
|
return "TERM"
|
||||||
|
end
|
||||||
|
return "?"
|
||||||
|
end
|
||||||
|
|
||||||
-- Inserts a component in lualine_c at left section
|
-- Inserts a component in lualine_c at left section
|
||||||
local function ins_left(component)
|
local function ins_left(component)
|
||||||
table.insert(config.sections.lualine_c, component)
|
table.insert(config.sections.lualine_c, component)
|
||||||
|
|
@ -176,13 +224,14 @@ return {
|
||||||
|
|
||||||
ins_left({
|
ins_left({
|
||||||
function()
|
function()
|
||||||
return get_mode_abbr()
|
return get_mode_label()
|
||||||
end,
|
end,
|
||||||
color = function()
|
color = function()
|
||||||
local color = get_mode_color()
|
local mode_color = get_mode_color()
|
||||||
return { fg = ctp.base, bg = color, gui = "bold" }
|
local mode_bg = blend_hex(ctp.base, mode_color, 0.254)
|
||||||
end, -- Sets highlighting of component
|
return { fg = mode_color, bg = mode_bg, gui = "bold" }
|
||||||
padding = { left = 1, right = 1 }, -- We don't need space before this
|
end,
|
||||||
|
padding = { left = 1, right = 1 },
|
||||||
})
|
})
|
||||||
|
|
||||||
ins_left({
|
ins_left({
|
||||||
|
|
@ -191,19 +240,13 @@ return {
|
||||||
color = { fg = ctp.subtext0 },
|
color = { fg = ctp.subtext0 },
|
||||||
})
|
})
|
||||||
|
|
||||||
ins_left({
|
-- visual separation using color only, no ASCII separators
|
||||||
-- filesize component
|
ins_left({ "location", color = { fg = ctp.overlay1 } })
|
||||||
"filesize",
|
|
||||||
cond = conditions.buffer_not_empty,
|
|
||||||
color = { fg = ctp.subtext1 },
|
|
||||||
})
|
|
||||||
|
|
||||||
ins_left({ "location", color = { fg = ctp.subtext1 } })
|
|
||||||
|
|
||||||
ins_left({
|
ins_left({
|
||||||
"diagnostics",
|
"diagnostics",
|
||||||
sources = { "nvim_diagnostic" },
|
sources = { "nvim_diagnostic" },
|
||||||
symbols = { error = " ", warn = " ", info = " " },
|
symbols = { error = "", warn = "", info = "" },
|
||||||
diagnostics_color = {
|
diagnostics_color = {
|
||||||
error = { fg = ctp.red },
|
error = { fg = ctp.red },
|
||||||
warn = { fg = ctp.yellow },
|
warn = { fg = ctp.yellow },
|
||||||
|
|
@ -219,14 +262,13 @@ return {
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- LSP client indicator (badge)
|
||||||
ins_right({
|
ins_right({
|
||||||
-- Lsp server name .
|
|
||||||
function()
|
function()
|
||||||
local msg = "none"
|
|
||||||
local buf_ft = vim.api.nvim_get_option_value("filetype", { buf = 0 })
|
local buf_ft = vim.api.nvim_get_option_value("filetype", { buf = 0 })
|
||||||
local clients = vim.lsp.get_clients()
|
local clients = vim.lsp.get_clients()
|
||||||
if next(clients) == nil then
|
if next(clients) == nil then
|
||||||
return msg
|
return ""
|
||||||
end
|
end
|
||||||
for _, client in ipairs(clients) do
|
for _, client in ipairs(clients) do
|
||||||
local filetypes = client.config.filetypes
|
local filetypes = client.config.filetypes
|
||||||
|
|
@ -234,42 +276,41 @@ return {
|
||||||
return client.name
|
return client.name
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return msg
|
return ""
|
||||||
end,
|
|
||||||
icon = "",
|
|
||||||
color = { fg = ctp.overlay1, gui = "bold" },
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Add components to right sections
|
|
||||||
ins_right({
|
|
||||||
"branch",
|
|
||||||
icon = "",
|
|
||||||
color = { fg = ctp.mauve, gui = "bold" },
|
|
||||||
})
|
|
||||||
|
|
||||||
ins_right({
|
|
||||||
"diff",
|
|
||||||
-- Is it me or the symbol for modified us really weird
|
|
||||||
symbols = { added = " ", modified = " ", removed = " " },
|
|
||||||
diff_color = {
|
|
||||||
added = { fg = ctp.green },
|
|
||||||
modified = { fg = ctp.peach },
|
|
||||||
removed = { fg = ctp.red },
|
|
||||||
},
|
|
||||||
cond = conditions.hide_in_width,
|
|
||||||
})
|
|
||||||
|
|
||||||
ins_right({
|
|
||||||
function()
|
|
||||||
return "▊"
|
|
||||||
end,
|
end,
|
||||||
color = function()
|
color = function()
|
||||||
local color = get_mode_color()
|
return { fg = ctp.sapphire, bg = blend_hex(ctp.base, ctp.sapphire, 0.254), gui = "bold" }
|
||||||
return { fg = color }
|
end,
|
||||||
end, -- Sets highlighting of component
|
padding = { left = 1, right = 1 },
|
||||||
padding = { left = 1 },
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- CMP badge (visible in insert mode)
|
||||||
|
ins_right({
|
||||||
|
function()
|
||||||
|
return "CMP"
|
||||||
|
end,
|
||||||
|
cond = function()
|
||||||
|
local mode = vim.api.nvim_get_mode().mode
|
||||||
|
return mode == "i" or mode == "ic" or mode == "ix"
|
||||||
|
end,
|
||||||
|
color = { fg = ctp.base, bg = ctp.teal },
|
||||||
|
padding = { left = 1, right = 1 },
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Language/filetype badge
|
||||||
|
ins_right({
|
||||||
|
"filetype",
|
||||||
|
colored = false,
|
||||||
|
icon_only = false,
|
||||||
|
color = function()
|
||||||
|
return { fg = ctp.text, ctp.surface0, gui = "bold" }
|
||||||
|
end,
|
||||||
|
padding = { left = 1, right = 1 },
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Minimal right side
|
||||||
|
ins_right({ "progress", color = { fg = ctp.overlay1 } })
|
||||||
|
|
||||||
-- Now don't forget to initialize lualine
|
-- Now don't forget to initialize lualine
|
||||||
lualine.setup(config)
|
lualine.setup(config)
|
||||||
end,
|
end,
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@ in {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
set -g @catppuccin_window_status_style "basic"
|
set -g @catppuccin_window_status_style "basic"
|
||||||
set -g @catppuccin_status_background "#11111b"
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -43,7 +43,14 @@ in {
|
||||||
nvidiaSettings = false;
|
nvidiaSettings = false;
|
||||||
|
|
||||||
# Optionally, you may need to select the appropriate driver version for your specific GPU.
|
# Optionally, you may need to select the appropriate driver version for your specific GPU.
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
|
||||||
|
version = "580.82.07";
|
||||||
|
sha256_64bit = "sha256-Bh5I4R/lUiMglYEdCxzqm3GLolQNYFB0/yJ/zgYoeYw=";
|
||||||
|
sha256_aarch64 = "sha256-or3//aV4TQcPDgcLxFB75H/kB8n+3RzwTO1C2ZbJAJI=";
|
||||||
|
openSha256 = "sha256-8/7ZrcwBMgrBtxebYtCcH5A51u3lAxXTCY00LElZz08=";
|
||||||
|
settingsSha256 = "sha256-lx1WZHsW7eKFXvi03dAML6BoC5glEn63Tuiz3T867nY=";
|
||||||
|
persistencedSha256 = "sha256-1JCk2T3H5NNFQum0gA9cnio31jc0pGvfGIn2KkAz9kA=";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.kernelModules = ["nvidia"];
|
boot.initrd.kernelModules = ["nvidia"];
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,7 @@
|
||||||
# services.scx.scheduler = "scx_rusty";
|
# services.scx.scheduler = "scx_rusty";
|
||||||
# services.scx.package = pkgs.scx_git.full;
|
# services.scx.package = pkgs.scx_git.full;
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_cachyos-lto;
|
boot.kernelPackages = pkgs.linuxPackages_zen;
|
||||||
# CachyOS-inspired kernel parameters for better desktop responsiveness and gaming
|
# CachyOS-inspired kernel parameters for better desktop responsiveness and gaming
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"nowatchdog"
|
"nowatchdog"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue