servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: Update stuff

Browse Source
This commit is contained in:
uttarayan21
2024-11-08 15:38:01 +05:30
parent 0d1842302f
commit aefef6e7fb
8 changed files with 390 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/gui.nix
View File

@@ -25,8 +25,6 @@ lib.attrsets.optionalAttrs device.hasGui {
# }; # };
home.packages = with pkgs; home.packages = with pkgs;
[ [
_1password
neovide
] ]
++ lib.optionals pkgs.stdenv.isLinux [ ++ lib.optionals pkgs.stdenv.isLinux [
(mpv-unwrapped.wrapper {mpv = mpv-unwrapped.override {sixelSupport = true;};}) (mpv-unwrapped.wrapper {mpv = mpv-unwrapped.override {sixelSupport = true;};})

7
common/home.nix
View File

@@ -54,8 +54,7 @@ in {
home.packages = with pkgs; home.packages = with pkgs;
[ [
spotify-player # spotify-player
sd sd
go go
pandoc pandoc
@@ -244,8 +243,8 @@ in {
set fish_greeting set fish_greeting
yes | fish_config theme save "Catppuccin Mocha" yes | fish_config theme save "Catppuccin Mocha"
''; '';
# ${pkgs.spotify-player}/bin/spotify_player generate fish | source
interactiveShellInit = '' interactiveShellInit = ''
${pkgs.spotify-player}/bin/spotify_player generate fish | source
${pkgs.pfetch-rs}/bin/pfetch ${pkgs.pfetch-rs}/bin/pfetch
function _aichat_fish function _aichat_fish
set -l _old (commandline) set -l _old (commandline)
@@ -311,7 +310,7 @@ in {
enable = true; enable = true;
# enableAliases = true; # enableAliases = true;
git = true; git = true;
icons = true; icons = "auto";
}; };
# carapace = { # carapace = {
# # enable = true; # # enable = true;

2
common/kitty.nix
View File

@@ -23,7 +23,7 @@
darwinLaunchOptions = [ darwinLaunchOptions = [
"--single-instance" "--single-instance"
]; ];
theme = "Catppuccin-Mocha"; themeFile = "Catppuccin-Mocha";
package = inputs.nixpkgs-master.legacyPackages.${device.system}.kitty; package = inputs.nixpkgs-master.legacyPackages.${device.system}.kitty;
}; };
} }

3
common/tmux.nix
View File

@@ -11,7 +11,6 @@
in { in {
programs.tmux = { programs.tmux = {
enable = true; enable = true;
shell = "${pkgs.fish}/bin/fish";
terminal = "tmux-256color"; terminal = "tmux-256color";
prefix = "C-q"; prefix = "C-q";
historyLimit = 100000; historyLimit = 100000;
@@ -68,6 +67,8 @@ in {
set -ga update-environment TERM_PROGRAM set -ga update-environment TERM_PROGRAM
set -sg escape-time 10 set -sg escape-time 10
set -sa terminal-features ',wezterm:RGB' set -sa terminal-features ',wezterm:RGB'
set -g default-command "${pkgs.fish}/bin/fish";
set -g default-shell "${pkgs.fish}/bin/fish";

485
flake.lock generated
View File

File diff suppressed because it is too large Load Diff

167
neovim/flake.lock generated
View File

@@ -24,11 +24,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722113426, "lastModified": 1728330715,
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -123,11 +123,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726153070, "lastModified": 1730504689,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -144,11 +144,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726153070, "lastModified": 1730504689,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -183,11 +183,11 @@
"systems": "systems" "systems": "systems"
}, },
"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": {
@@ -261,11 +261,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725513492, "lastModified": 1730814269,
"narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "7570de7b9b504cfe92025dd1be797bf546f66528", "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -288,11 +288,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725513492, "lastModified": 1730814269,
"narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "7570de7b9b504cfe92025dd1be797bf546f66528", "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -348,11 +348,11 @@
"gp-nvim": { "gp-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725969177, "lastModified": 1726734798,
"narHash": "sha256-Tvcu8oRfbuc7JX+uYFmpMjzcrnUudJMEMxjd+yNfn5o=", "narHash": "sha256-QUZrFU/+TPBEU8yi9gmyRYjI/u7DP88AxcS0RMk7Jvk=",
"owner": "Robitx", "owner": "Robitx",
"repo": "gp.nvim", "repo": "gp.nvim",
"rev": "f4cbbf489fb621ae8f4e512c38ae234ce1157fa7", "rev": "2372d5323c6feaa2e9c19f7ccb537c615d878e18",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -364,11 +364,11 @@
"guihua": { "guihua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717591195, "lastModified": 1730516234,
"narHash": "sha256-V5rlORFlhgjAT0n+LcpMNdY+rEqQpur/KGTGH6uFxMY=", "narHash": "sha256-XpUsbj1boDfbyE8C6SdOvZdkd97682VVC81fvQ5WA/4=",
"owner": "ray-x", "owner": "ray-x",
"repo": "guihua.lua", "repo": "guihua.lua",
"rev": "225db770e36aae6a1e9e3a65578095c8eb4038d3", "rev": "d783191eaa75215beae0c80319fcce5e6b3beeda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -386,11 +386,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724947644, "lastModified": 1730903510,
"narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -407,11 +407,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726357542, "lastModified": 1730837930,
"narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -420,14 +420,42 @@
"type": "github" "type": "github"
} }
}, },
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729958008,
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.6",
"repo": "ixx",
"type": "github"
}
},
"navigator": { "navigator": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725848935, "lastModified": 1729765416,
"narHash": "sha256-c6LjkRlR4g8lAqI7GqqtJ/tn48Gx2PxXYeeAM/YORbg=", "narHash": "sha256-54GXyf4Q77dNCg4NZzNcHvr07nVvi9uYreTKMnRisAg=",
"owner": "ray-x", "owner": "ray-x",
"repo": "navigator.lua", "repo": "navigator.lua",
"rev": "df3d3a09d5b4986558062425639ca8dd1e9a34c2", "rev": "e2e870c606d28b4247a205972e56a6de2325e34e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -505,11 +533,11 @@
"neorg_2": { "neorg_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725804232, "lastModified": 1730333767,
"narHash": "sha256-IOhb06MIC8LLPpa1XnZ7TRqKWUabHeBa3X2p9Y/bT4s=", "narHash": "sha256-qTo8rxwvANrgP8UccFhzsNsH+Jbmqv2iOlw0ccLNYm4=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "neorg", "repo": "neorg",
"rev": "ba35900b21921c439e676b063a79c8fad914eac9", "rev": "488507bb996f75ee29073f50dec32fa220867ca5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -521,11 +549,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726482815, "lastModified": 1730893053,
"narHash": "sha256-M2syKjdJH3uBCOAm9PZndNI46m6xGLXsOadUSen8wpY=", "narHash": "sha256-ifiJfPkhyg/9I9aJSbtcHy3jRV4CLig7iF9ACQUycPU=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "a0d8c2b86e788ce4273f0b8df258cd9e8e432d38", "rev": "f7e32fb6e626ab198bf401765236783890f3a0d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -542,11 +570,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726188813, "lastModified": 1730779758,
"narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", "narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", "rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -557,11 +585,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726463316, "lastModified": 1730785428,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -618,11 +646,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1726502324, "lastModified": 1731009822,
"narHash": "sha256-I/WFSIBeIjlY3CgSJ6IRYxP2aEJ6b42Y1HAeATlBh48=", "narHash": "sha256-VwGfFYHjizs7yQwh8JRlDUVkHLPc34jdqkQ2vyv6ddY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "2e3083e42509c399b224239f6d7fa17976b18536", "rev": "aabbd60633947baba11db44df84f402edc241440",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -643,11 +671,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726550932, "lastModified": 1730914682,
"narHash": "sha256-3iDVHqGq8mhP46XqIpepiURz4RJXwGUO0cHtplHhbX0=", "narHash": "sha256-UHFvVeJY64rA5HKoeKCLuJET224GEDGdj7/m1PuShgw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "90aaa1e9e6ff67b29840d357413f822056212c08", "rev": "59630b2edb91b71ac0a60b865aaa91cd39946577",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -668,11 +696,11 @@
"norg-meta": "norg-meta" "norg-meta": "norg-meta"
}, },
"locked": { "locked": {
"lastModified": 1726621796, "lastModified": 1731010605,
"narHash": "sha256-LVrXwElj1mYcHTZADzIB0eoXon+kDFkeTkeC3f7IIbY=", "narHash": "sha256-W0dUDwGcL856Yc2dWnwL4Xu/y0+24qBVEFBzVpmTIvg=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "nixpkgs-neorg-overlay", "repo": "nixpkgs-neorg-overlay",
"rev": "1f0b123a6b1e4d670e5e7ab5acfc32333846377c", "rev": "d9ccf1ae1782327308b030d52fbd7f57816d6e8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -725,17 +753,18 @@
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"ixx": "ixx",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1726392886, "lastModified": 1730760712,
"narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=", "narHash": "sha256-F4H98tjNgySlSLItuOqHYo9LF85rFoS/Vr0uOrq7BM4=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "97d34b70deed4878fcb2449ac89dab717d72efa1", "rev": "aa5214c81b904a19f7a54f7a8f288f7902586eee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -779,11 +808,11 @@
"rest-nvim": { "rest-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726329214, "lastModified": 1728616090,
"narHash": "sha256-Xg2rVQurH/7qnYoIDHeYjRg9rOImeGiWBd/XMI+MTg8=", "narHash": "sha256-bn5z+2D0vk0JE9SONOv99N95kgIx2EFpHkFdLJiZTDI=",
"owner": "rest-nvim", "owner": "rest-nvim",
"repo": "rest.nvim", "repo": "rest.nvim",
"rev": "9f6f9dd928d612e52e756f0a0c057ee3cf16c39b", "rev": "113dce7749eb22b84cbde052d1cdc1f70702ed58",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -861,11 +890,11 @@
"tree-sitter-d2": { "tree-sitter-d2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1694985317, "lastModified": 1730834872,
"narHash": "sha256-Auap3+yBBxv4RyiSaQ1sHKsSfzgrKdq0F1ethWnM+pE=", "narHash": "sha256-wlGDBtXSCvCoEHap8bJIi6oCiChU40cqz43ZmIbq/ow=",
"owner": "ravsii", "owner": "ravsii",
"repo": "tree-sitter-d2", "repo": "tree-sitter-d2",
"rev": "c21126b5ee97b0dffe4b2f982932739f0a772743", "rev": "db3cfff85d2ad97b23f71925c78c842512766a60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -877,11 +906,11 @@
"tree-sitter-just": { "tree-sitter-just": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1722314416, "lastModified": 1730072251,
"narHash": "sha256-EVISh9r+aJ6Og1UN8bGCLk4kVjS/cEOYyhqHF40ztqg=", "narHash": "sha256-8vr55zhJOJxZhc8bXZpvO6a/eEYUJQ+HBWC4xRYbrgk=",
"owner": "IndianBoy42", "owner": "IndianBoy42",
"repo": "tree-sitter-just", "repo": "tree-sitter-just",
"rev": "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21", "rev": "1014d2fd6396856c312054d6c30df4d78b62966c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -898,11 +927,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725271838, "lastModified": 1730321837,
"narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
neovim/nvim.nix
View File

@@ -52,7 +52,7 @@ in rec {
"openapikey" ( "openapikey" (
if pkgs.stdenv.isDarwin if pkgs.stdenv.isDarwin
then '' then ''
${pkgs._1password}/bin/op item get 'OpenAI API Token' --fields label='api key' ${pkgs._1password-cli}/bin/op item get 'OpenAI API Token' --fields label='api key'
'' ''
else '' else ''
/run/wrappers/bin/op item get 'OpenAI API Token' --fields label='api key' /run/wrappers/bin/op item get 'OpenAI API Token' --fields label='api key'
@@ -183,6 +183,7 @@ in rec {
noice = { noice = {
enable = true; enable = true;
settings = {
notify.enabled = false; notify.enabled = false;
lsp.override = { lsp.override = {
"vim.lsp.util.convert_input_to_markdown_lines" = true; "vim.lsp.util.convert_input_to_markdown_lines" = true;
@@ -197,6 +198,7 @@ in rec {
lsp_doc_border = true; lsp_doc_border = true;
}; };
}; };
};
treesitter = { treesitter = {
enable = true; enable = true;

2
nixos/ryu.nix
View File

@@ -10,7 +10,7 @@
}: { }: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")]; imports = [(modulesPath + "/installer/scan/not-detected.nix")];
programs = { programs = {
_1password.enable = true; _1password-cli.enable = true;
_1password-gui = { _1password-gui = {
enable = true; enable = true;
polkitPolicyOwners = ["servius"]; polkitPolicyOwners = ["servius"];