Compare commits

...

4 Commits

Author SHA1 Message Date
Abhinav Sarkar 7814715c12 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/691cbcc03af6ad1b5384c0e0e0b5f2298f58c5ce' (2023-11-11)
  → 'github:nix-community/home-manager/e1f3b36ab01573fd35cae57d21f45d520433df61' (2023-11-24)
2023-11-24 21:38:22 +05:30
Abhinav Sarkar e9aa0b2378 Changes VSCode extension update script to use the flake's Nix packages 2023-11-24 21:12:04 +05:30
Abhinav Sarkar 8b569fd2c8 Removes unused aliases 2023-11-24 16:35:53 +05:30
Abhinav Sarkar 2a97110772 Fixes linter warnings 2023-11-24 16:35:04 +05:30
6 changed files with 111 additions and 118 deletions

View File

@ -71,11 +71,11 @@
]
},
"locked": {
"lastModified": 1699663185,
"narHash": "sha256-hI3CZPINBWstkMN+ptyzWibw5eRtFCiEvO7zR61bGBs=",
"lastModified": 1700814342,
"narHash": "sha256-orNc5wfsE7arQ9TWSTJwvk+utDvJrJ36V84N8o+VI/Y=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "691cbcc03af6ad1b5384c0e0e0b5f2298f58c5ce",
"rev": "e1f3b36ab01573fd35cae57d21f45d520433df61",
"type": "github"
},
"original": {
@ -86,17 +86,17 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1699343069,
"narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=",
"lastModified": 1700755841,
"narHash": "sha256-W3zJkGdMtQoGUJcqYnLIii/Zvv2Y3w6UGNbDtkP4vqc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
"rev": "e8b0430bc4c4235607ae102010dec2ba32e8c0ca",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
"rev": "e8b0430bc4c4235607ae102010dec2ba32e8c0ca",
"type": "github"
}
},

View File

@ -2,7 +2,7 @@
description = "Home Manager configuration of Abhinav Sarkar";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs?rev=ec750fd01963ab6b20ee1f0cb488754e8036d89d";
nixpkgs.url = "github:nixos/nixpkgs?rev=e8b0430bc4c4235607ae102010dec2ba32e8c0ca";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
@ -41,7 +41,8 @@
devShells.${system}.default = pkgs.mkShell {
buildInputs = with pkgs; [ (import home-manager { inherit pkgs; }).home-manager just ];
shellHook = ''
export NIXPKGS_PATH=${pkgs.path};
ln -s ${pkgs.path} .direnv/nixpkgs;
export NIX_PATH=`pwd`/.direnv;
'';
};
};

View File

@ -3,42 +3,32 @@
{
imports = [ ./programs ./scripts ./launchd.nix ./nix.nix ];
home.username = "abhinav";
home.homeDirectory = "/Users/abhinav";
home.stateVersion = "22.05";
home.enableNixpkgsReleaseCheck = true;
home = {
username = "abhinav";
homeDirectory = "/Users/abhinav";
stateVersion = "22.05";
enableNixpkgsReleaseCheck = true;
home.shellAliases =
let
projectsDir = "${config.home.homeDirectory}/Projects";
mm = "${projectsDir}/nix-managed-macbook";
nv = "${projectsDir}/nixed-DO-VPS";
in {
g = "${pkgs.git}/bin/git";
j = "${pkgs.just}/bin/just";
l = "${pkgs.bat}/bin/bat";
m = "${pkgs.micro}/bin/micro";
shellAliases = {
g = "${pkgs.git}/bin/git";
j = "${pkgs.just}/bin/just";
l = "${pkgs.bat}/bin/bat";
m = "${pkgs.micro}/bin/micro";
br = "${pkgs.broot}/bin/broot";
du = "${pkgs.dua}/bin/dua interactive";
tf = "${pkgs.coreutils-full}/bin/tail -f";
cat = "${pkgs.bat}/bin/bat";
home-manager-switch = "just ${mm}/switch";
home-manager-update = "just ${mm}/update";
home-manager-clean = "just ${mm}/clean";
vps-connect = "just ${nv}/connect";
vps-upgrade = "just ${nv}/upgrade";
deploy-website = "just ${nv}/run-service abhinavsarkar.net";
};
home.sessionVariables = { EDITOR = "micro"; };
home.file."Applications/Home Manager Apps".source = let
apps = pkgs.buildEnv {
name = "home-manager-applications";
paths = config.home.packages;
pathsToLink = "/Applications";
br = "${pkgs.broot}/bin/broot";
du = "${pkgs.dua}/bin/dua interactive";
tf = "${pkgs.coreutils-full}/bin/tail -f";
cat = "${pkgs.bat}/bin/bat";
};
in "${apps}/Applications";
sessionVariables = { EDITOR = "micro"; };
file."Applications/Home Manager Apps".source = let
apps = pkgs.buildEnv {
name = "home-manager-applications";
paths = config.home.packages;
pathsToLink = "/Applications";
};
in "${apps}/Applications";
};
}

View File

@ -31,7 +31,7 @@ _switch:
switch: (_run "_switch")
_update-vscode-extensions:
$NIXPKGS_PATH/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh > \
$NIX_PATH/nixpkgs/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh > \
{{ root_dir }}/programs/vscode/extensions.nix
_update: _update-vscode-extensions && _switch

View File

@ -63,69 +63,71 @@ in {
home.packages = nixPackages ++ networkingPackages ++ cmdLineUtilPackages ++ miscPackages ++ fonts;
programs.htop = {
enable = true;
settings = {
hide_kernel_threads = true;
hide_threads = true;
hide_userland_threads = true;
highlight_base_name = true;
show_program_path = false;
sort_direction = false;
sort_key = "PERCENT_CPU";
tree_view = true;
programs = {
htop = {
enable = true;
settings = {
hide_kernel_threads = true;
hide_threads = true;
hide_userland_threads = true;
highlight_base_name = true;
show_program_path = false;
sort_direction = false;
sort_key = "PERCENT_CPU";
tree_view = true;
};
};
};
programs.eza = {
enable = true;
enableAliases = true;
};
programs.direnv = {
enable = true;
nix-direnv = { enable = true; };
};
programs.nix-index = {
enable = true;
enableFishIntegration = true;
};
programs.bat = {
enable = true;
config = {
italic-text = "always";
paging = "always";
tabs = "2";
theme = "DarkNeon";
eza = {
enable = true;
enableAliases = true;
};
};
programs.fzf = {
enable = true;
enableFishIntegration = true;
fileWidgetCommand = "fd --type f --no-ignore";
historyWidgetOptions = [ "--reverse" "--sort" "--exact" ];
};
programs.micro = {
enable = true;
settings = {
autoindent = true;
colorcolumn = 100;
colorscheme = "gruvbox";
diffgutter = true;
hlsearch = true;
mkparents = true;
savecursor = true;
softwrap = true;
tabsize = 2;
tabstospaces = true;
# plugins
manipulator = true;
direnv = {
enable = true;
nix-direnv = { enable = true; };
};
};
programs.zoxide.enable = true;
nix-index = {
enable = true;
enableFishIntegration = true;
};
bat = {
enable = true;
config = {
italic-text = "always";
paging = "always";
tabs = "2";
theme = "DarkNeon";
};
};
fzf = {
enable = true;
enableFishIntegration = true;
fileWidgetCommand = "fd --type f --no-ignore";
historyWidgetOptions = [ "--reverse" "--sort" "--exact" ];
};
micro = {
enable = true;
settings = {
autoindent = true;
colorcolumn = 100;
colorscheme = "gruvbox";
diffgutter = true;
hlsearch = true;
mkparents = true;
savecursor = true;
softwrap = true;
tabsize = 2;
tabstospaces = true;
# plugins
manipulator = true;
};
};
zoxide.enable = true;
};
}

View File

@ -44,20 +44,20 @@
{
name = "copilot";
publisher = "GitHub";
version = "1.135.544";
sha256 = "0zw9iy169hkg8axzfp3jh65b8v39l87i10yvy3p0fh0v8jgbbq9r";
version = "1.138.566";
sha256 = "0anhwjj4pbc1pw3hjzhb2wb5s4g3vd6k206h47cgd3gnl1pjq9m7";
}
{
name = "copilot-chat";
publisher = "GitHub";
version = "0.11.2023111001";
sha256 = "0s6nffvx361ari6kh8himprmvm93bynind9gr4civldamjmfy45h";
version = "0.11.2023112401";
sha256 = "1xbv5imhxxf1cnqpp2m4b2wm753yjhx0vw3mydhs08cghz26zckw";
}
{
name = "go";
publisher = "golang";
version = "0.39.1";
sha256 = "0kj8s71sfi1bjirdxv4wicwbmrdryll1sfnlfqwz7j2zc05961l0";
version = "0.40.0";
sha256 = "1k2zv49pam436cgvb970dc9n4xpdkd07lp8jllrsx5vnx7m2ml52";
}
{
name = "haskell";
@ -110,20 +110,20 @@
{
name = "black-formatter";
publisher = "ms-python";
version = "2023.7.13121006";
sha256 = "1i2sssknyad73i5mbaisymqfx0z70crxcsdr4yjawcpcf36lajvx";
version = "2023.7.13171007";
sha256 = "0kqwbv0v550icz6dvfxp19bk0yj017wyh4n6l7x27src9lkff833";
}
{
name = "python";
publisher = "ms-python";
version = "2023.21.13141007";
sha256 = "1ba1r8hmpqahcafky5scnc2clyc1ja0g8xkhvmi295gc28s53rda";
version = "2023.21.13261010";
sha256 = "0bhn5jqr54nvkf7hb25x2g4wigbx7rf9a2fcg6frspgd6jl8lkj8";
}
{
name = "vscode-pylance";
publisher = "ms-python";
version = "2023.11.12";
sha256 = "1sz5jdnc52h8vskcb1v8dk1w8hx3l8lfj8fd4428xc23g8z5rxz3";
version = "2023.11.13";
sha256 = "1ayy4pp983j8fwgjffv0cy39anhl2ai1n4a4c84ngj0si18y7k0a";
}
{
name = "vscode-cljfmt";
@ -134,8 +134,8 @@
{
name = "rust-analyzer";
publisher = "rust-lang";
version = "0.4.1727";
sha256 = "0li6xjil5s1kamgvah6381hap322521gkc6ia8bhhvvwmydmni24";
version = "0.4.1744";
sha256 = "0a23w8jszsiw135znl9dh1pn5vjb3mbnc5h8n77w1vmmim2cy0sb";
}
{
name = "just";