feat: Updates to dotfiles

This commit is contained in:
uttarayan21
2024-06-28 02:26:15 +05:30
parent ba4c1f603c
commit fbc84b24b8
7 changed files with 159 additions and 171 deletions

View File

@@ -4,14 +4,14 @@
...
}: {
# import the home-manager module
imports = [inputs._1password-shell-plugins.hmModules.default];
imports = [inputs.onepassword-shell-plugins.hmModules.default];
programs = {
_1password-shell-plugins = {
# enable 1Password shell plugins for bash, zsh, and fish shell
enable = true;
# the specified packages as well as 1Password CLI will be
# automatically installed and configured to use shell plugins
plugins = with pkgs; [awscli2 cachix cargo];
plugins = with pkgs; [awscli2 cachix cargo aichat];
};
};
}

View File

@@ -28,8 +28,9 @@ lib.attrsets.optionalAttrs device.hasGui {
_1password
]
++ lib.optionals device.isLinux [
(mpv-unwrapped.wrapper {mpv = mpv-unwrapped.override {sixelSupport = true;};})
via
discord
webcord-vencord
bottles
# minecraft
jdk

View File

@@ -61,7 +61,7 @@ in {
aichat
nodejs
sqls
vcpkg
vcpkg-tool
gh
just
yarn
@@ -102,7 +102,6 @@ in {
hasklig
pfetch-rs
hotedit
# (mpv-unwrapped.wrapper {mpv = mpv-unwrapped.override {sixelSupport = true;};})
]
++ lib.optionals device.isLinux [
rr
@@ -209,8 +208,8 @@ in {
shellAliases = {
g = "git";
aichat = "op plugin run -- aichat";
# kmpv = "mpv --vo-kitty-use-shm=yes --vo=kitty --really-quiet";
# smpv = "mpv --vo-sixel-buffered=yes --vo=sixel --profile=sw-fast";
kmpv = "mpv --vo-kitty-use-shm=yes --vo=kitty --really-quiet";
smpv = "mpv --vo-sixel-buffered=yes --vo=sixel --profile=sw-fast";
};
shellInit = ''
set fish_greeting

261
flake.lock generated
View File

@@ -1,24 +1,5 @@
{
"nodes": {
"_1password-shell-plugins": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1719260329,
"narHash": "sha256-4p/WaE92QFjTtyFNQQxsKXxd2GxL4l60Y5T6y9hU0DI=",
"owner": "uttarayan21",
"repo": "shell-plugins",
"rev": "8c841a394819e5d19103b0f8bb03ed28b3ccb7d2",
"type": "github"
},
"original": {
"owner": "uttarayan21",
"repo": "shell-plugins",
"type": "github"
}
},
"advisory-db": {
"flake": false,
"locked": {
@@ -137,7 +118,7 @@
"home-manager"
],
"nixos-anywhere": "nixos-anywhere",
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1716236735,
@@ -198,7 +179,7 @@
"crane_3": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_7",
"flake-utils": "flake-utils_6",
"nixpkgs": [
"music-player",
"nixpkgs"
@@ -295,7 +276,7 @@
},
"devshell": {
"inputs": {
"flake-utils": "flake-utils_9",
"flake-utils": "flake-utils_8",
"nixpkgs": [
"neovim",
"nixvim",
@@ -318,7 +299,7 @@
},
"devshell_2": {
"inputs": {
"flake-utils": "flake-utils_13",
"flake-utils": "flake-utils_12",
"nixpkgs": [
"nixvim",
"nixpkgs"
@@ -713,11 +694,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
@@ -727,15 +708,12 @@
}
},
"flake-utils_10": {
"inputs": {
"systems": "systems_11"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
@@ -760,12 +738,15 @@
}
},
"flake-utils_12": {
"inputs": {
"systems": "systems_12"
},
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
@@ -779,11 +760,11 @@
"systems": "systems_13"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@@ -850,24 +831,6 @@
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
@@ -881,9 +844,9 @@
"type": "indirect"
}
},
"flake-utils_5": {
"flake-utils_4": {
"inputs": {
"systems": "systems_6"
"systems": "systems_5"
},
"locked": {
"lastModified": 1705309234,
@@ -899,16 +862,34 @@
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"inputs": {
"systems": "systems_7"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github"
},
"original": {
@@ -940,11 +921,11 @@
"systems": "systems_9"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
@@ -958,11 +939,11 @@
"systems": "systems_10"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@@ -1300,7 +1281,7 @@
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_5"
"systems": "systems_4"
},
"locked": {
"lastModified": 1717883389,
@@ -1369,7 +1350,7 @@
"crane": "crane_2",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_4",
"flake-utils": "flake-utils_6",
"flake-utils": "flake-utils_5",
"nixpkgs": [
"nixpkgs"
],
@@ -1395,7 +1376,7 @@
"advisory-db": "advisory-db",
"crane": "crane_3",
"fenix": "fenix",
"flake-utils": "flake-utils_8",
"flake-utils": "flake-utils_7",
"nixpkgs": [
"nixpkgs"
]
@@ -1416,7 +1397,7 @@
},
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1717067539,
@@ -1548,13 +1529,13 @@
"nvim-devdocs": "nvim-devdocs",
"pets": "pets",
"rest-nvim": "rest-nvim",
"systems": "systems_12",
"systems": "systems_11",
"tree-sitter-d2": "tree-sitter-d2",
"tree-sitter-just": "tree-sitter-just"
},
"locked": {
"lastModified": 1,
"narHash": "sha256-GQzX0Z2J2CzYp34mNrqExjQ5tFjd72R/E/zdKGBkf0M=",
"narHash": "sha256-oJ0PGUbKHGwYjnT+u0cgPybFlXQYjwdjbGm2K7rlt2w=",
"path": "./neovim",
"type": "path"
},
@@ -1644,7 +1625,7 @@
},
"nix-index-database": {
"inputs": {
"nixpkgs": "nixpkgs_8"
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1718507237,
@@ -1734,11 +1715,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1716358718,
"narHash": "sha256-NQbegJb2ZZnAqp2EJhWwTf6DrZXSpA6xZCEq+RGV1r0=",
"lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3f316d2a50699a78afe5e77ca486ad553169061e",
"rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
"type": "github"
},
"original": {
@@ -1799,22 +1780,6 @@
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1713995372,
"narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=",
@@ -1827,7 +1792,7 @@
"type": "indirect"
}
},
"nixpkgs_5": {
"nixpkgs_4": {
"locked": {
"lastModified": 1717112898,
"narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
@@ -1841,6 +1806,22 @@
"type": "indirect"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1644486793,
"narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1644486793,
@@ -1858,22 +1839,6 @@
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1644486793,
"narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1718318537,
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
@@ -1889,7 +1854,7 @@
"type": "github"
}
},
"nixpkgs_9": {
"nixpkgs_8": {
"locked": {
"lastModified": 1718530797,
"narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
@@ -1988,7 +1953,7 @@
},
"nno": {
"inputs": {
"flake-utils": "flake-utils_10",
"flake-utils": "flake-utils_9",
"neorg": "neorg_2",
"neorg-telescope": "neorg-telescope_2",
"nixpkgs": [
@@ -2015,8 +1980,8 @@
"norg": {
"inputs": {
"flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_11",
"nixpkgs": "nixpkgs_6"
"flake-utils": "flake-utils_10",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1672582520,
@@ -2036,8 +2001,8 @@
"norg-meta": {
"inputs": {
"flake-compat": "flake-compat_8",
"flake-utils": "flake-utils_12",
"nixpkgs": "nixpkgs_7"
"flake-utils": "flake-utils_11",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1713028366,
@@ -2084,6 +2049,24 @@
"type": "github"
}
},
"onepassword-shell-plugins": {
"inputs": {
"flake-utils": "flake-utils_13",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1719472508,
"narHash": "sha256-y8PNjZIu6HQXmCSKKxzAHI902Kvwikujpcm7Q5is8OI=",
"path": "/home/servius/Projects/shell-plugins",
"type": "path"
},
"original": {
"path": "/home/servius/Projects/shell-plugins",
"type": "path"
}
},
"openapi-tui": {
"flake": false,
"locked": {
@@ -2161,13 +2144,12 @@
},
"root": {
"inputs": {
"_1password-shell-plugins": "_1password-shell-plugins",
"anyrun": "anyrun",
"anyrun-hyprwin": "anyrun-hyprwin",
"anyrun-nixos-options": "anyrun-nixos-options",
"anyrun-rink": "anyrun-rink",
"cachix-deploy-flake": "cachix-deploy-flake",
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_3",
"home-manager": "home-manager",
"hyprlock": "hyprlock",
"ironbar": "ironbar",
@@ -2176,9 +2158,10 @@
"neovim": "neovim",
"nix-darwin": "nix-darwin_2",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_9",
"nixpkgs": "nixpkgs_8",
"nixvim": "nixvim_2",
"nur": "nur",
"onepassword-shell-plugins": "onepassword-shell-plugins",
"openapi-tui": "openapi-tui",
"rust-overlay": "rust-overlay_6",
"subflakes": "subflakes",
@@ -2187,8 +2170,8 @@
},
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2"
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1716603336,
@@ -2206,8 +2189,8 @@
},
"rust-overlay_2": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_3"
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1708135817,
@@ -2225,7 +2208,7 @@
},
"rust-overlay_3": {
"inputs": {
"flake-utils": "flake-utils_5",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"ironbar",
"nixpkgs"
@@ -2497,21 +2480,6 @@
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -2526,6 +2494,21 @@
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,

View File

@@ -75,7 +75,11 @@
url = "github:cachix/cachix-deploy-flake";
inputs.home-manager.follows = "home-manager";
};
_1password-shell-plugins.url = "github:uttarayan21/shell-plugins";
# _1password-shell-plugins.url = "github:uttarayan21/shell-plugins";
onepassword-shell-plugins = {
url = "path:/home/servius/Projects/shell-plugins";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {

View File

@@ -134,10 +134,11 @@
];
exec-once = [
# "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"
"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
# "${pkgs.swayosd}/bin/swayosd-server"
"${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"
# "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
# "${pkgs.swww}/bin/swww init; swww img ~/.local/share/dotfiles/images/wallpaper.jpg"
"${pkgs.ironbar}/bin/ironbar"
# "${pkgs.swayosd}/bin/swayosd-server"
# "${pkgs.nextcloud-client}/bin/nextcloud --background"
];

View File

@@ -187,27 +187,27 @@ in rec {
end
end
'';
settings =
/*
lua
*/
''
function(project_root)
local ra = require('rustaceanvim.config.server')
return ra.load_rust_analyzer_settings(project_root, {
settings_file_pattern = 'rust-analyzer.json'
})
end
'';
cmd =
/*
lua
*/
''
function()
return { '${pkgs.ra-multiplex}/bin/ra-multiplex', 'client' }
end
'';
# settings =
# /*
# lua
# */
# ''
# function(project_root)
# local ra = require('rustaceanvim.config.server')
# return ra.load_rust_analyzer_settings(project_root, {
# settings_file_pattern = 'rust-analyzer.json'
# })
# end
# '';
#cmd =
# /*
# lua
# */
# ''
# function()
# return { '${pkgs.ra-multiplex}/bin/ra-multiplex', 'client' }
# end
# '';
};
dap = {
autoload_configurations = false;
@@ -246,7 +246,7 @@ in rec {
*/
''
if client.server_capabilities.inlayHintProvider then
vim.lsp.inlay_hint.enable(bufnr, true)
vim.lsp.inlay_hint.enable(true)
end
'';
};