some nix update idk
This commit is contained in:
24
flake.lock
generated
24
flake.lock
generated
@@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740250266,
|
"lastModified": 1740494361,
|
||||||
"narHash": "sha256-fbB/I4bCsJ++BhRzDaeQmzw/Gt5Lrt1csJ8D2IkQANA=",
|
"narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "61d8fc9af0f8568ffaff93e4001cb607f88790f9",
|
"rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -27,11 +27,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739933872,
|
"lastModified": 1740452771,
|
||||||
"narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=",
|
"narHash": "sha256-/tI1vFJ7/dXJqUmI+s0EV1F0DPe6dZvT444mrLUkrlU=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53",
|
"rev": "42be12b510253d750138ec90c66decc282298b44",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -42,11 +42,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740019556,
|
"lastModified": 1740396192,
|
||||||
"narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=",
|
"narHash": "sha256-ATMHHrg3sG1KgpQA5x8I+zcYpp5Sf17FaFj/fN+8OoQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dad564433178067be1fbdfcce23b546254b6d641",
|
"rev": "d9b69c3ec2a2e2e971c534065bdd53374bd68b97",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -58,11 +58,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740243248,
|
"lastModified": 1740567784,
|
||||||
"narHash": "sha256-GJ/fV5AE+4i38/eXmAgBZs4lKYXfScpxPYviUV8ujlk=",
|
"narHash": "sha256-vtNes0DPo720tDDVTKrvLBhW/kY0EMHB1ik1Bw4bWZI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a6c4bfe37c51686c042b4bdb4e650a9414e96680",
|
"rev": "8c97496b319743c0ac82205fc6ba2197bf7db9a7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -25,7 +25,6 @@
|
|||||||
email = "kulvir@duck.com";
|
email = "kulvir@duck.com";
|
||||||
|
|
||||||
system = "aarch64-darwin"; # apple
|
system = "aarch64-darwin"; # apple
|
||||||
x86 = "x86_64-linux";
|
|
||||||
forAllSystems = nixpkgs.lib.genAttrs [
|
forAllSystems = nixpkgs.lib.genAttrs [
|
||||||
"aarch64-darwin"
|
"aarch64-darwin"
|
||||||
];
|
];
|
||||||
@@ -43,14 +42,6 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# darwin-rebuild switch --flake .#vps
|
|
||||||
nixosConfigurations."vps" = nixpkgs.lib.nixosSystem {
|
|
||||||
specialArgs = {inherit inputs username email outputs;};
|
|
||||||
modules = [
|
|
||||||
./hosts/vps
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
|
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
security.pam.enableSudoTouchIdAuth = true;
|
security.pam.services.sudo_local.touchIdAuth = true;
|
||||||
|
|
||||||
# Set Git commit hash for darwin-version.
|
# Set Git commit hash for darwin-version.
|
||||||
system.configurationRevision = inputs.self.rev or inputs.self.dirtyRev or null;
|
system.configurationRevision = inputs.self.rev or inputs.self.dirtyRev or null;
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
../../modules/shell.nix
|
../../modules/shell.nix
|
||||||
../../modules/starship.nix
|
../../modules/starship.nix
|
||||||
../../modules/tmux.nix
|
../../modules/tmux.nix
|
||||||
../../modules/zed.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
@@ -22,12 +21,10 @@
|
|||||||
pkgs.bun
|
pkgs.bun
|
||||||
pkgs.go
|
pkgs.go
|
||||||
pkgs.nodejs_23
|
pkgs.nodejs_23
|
||||||
# pkgs.python314 # coz awsebcli requires python in $PATH
|
|
||||||
pkgs.pnpm
|
pkgs.pnpm
|
||||||
|
|
||||||
pkgs.discord # nigga ain't working properly
|
pkgs.discord # nigga ain't working properly
|
||||||
pkgs.redis
|
pkgs.redis
|
||||||
pkgs.zed-editor
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
|||||||
@@ -13,14 +13,4 @@
|
|||||||
nix.settings.experimental-features = "nix-command flakes";
|
nix.settings.experimental-features = "nix-command flakes";
|
||||||
|
|
||||||
nixpkgs.hostPlatform = "${system}";
|
nixpkgs.hostPlatform = "${system}";
|
||||||
|
|
||||||
nix.gc = {
|
|
||||||
automatic = lib.mkDefault true;
|
|
||||||
options = lib.mkDefault "--delete-older-than 5d";
|
|
||||||
};
|
|
||||||
|
|
||||||
# https://github.com/NixOS/nix/issues/7273
|
|
||||||
nix.settings = {
|
|
||||||
auto-optimise-store = false;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,10 +9,7 @@
|
|||||||
userName = "Kulvir Singh";
|
userName = "Kulvir Singh";
|
||||||
userEmail = "kulvirs734@gmail.com";
|
userEmail = "kulvirs734@gmail.com";
|
||||||
|
|
||||||
aliases = {
|
aliases = {};
|
||||||
cm = "commit -m";
|
|
||||||
amend = "commit --amend";
|
|
||||||
};
|
|
||||||
|
|
||||||
ignores = [
|
ignores = [
|
||||||
".DS_Store"
|
".DS_Store"
|
||||||
|
|||||||
@@ -2,13 +2,10 @@
|
|||||||
programs = {
|
programs = {
|
||||||
zsh = {
|
zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
envExtra = ''
|
envExtra = ''
|
||||||
eval "$(/opt/homebrew/bin/brew shellenv)"
|
eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||||
export PATH="/opt/homebrew/bin:$PATH"
|
export PATH="/opt/homebrew/bin:$PATH"
|
||||||
|
'';
|
||||||
# export BUN_INSTALL="$HOME/.bun"
|
|
||||||
# export PATH="$BUN_INSTALL/bin:$PATH"
|
|
||||||
'';
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
ls = "lsd";
|
ls = "lsd";
|
||||||
lg = "lazygit";
|
lg = "lazygit";
|
||||||
|
|||||||
@@ -18,20 +18,20 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
set-option -sa terminal-overrides ",xterm*:Tc"
|
set-option -sa terminal-overrides ",xterm*:Tc"
|
||||||
|
|
||||||
set -s escape-time 0
|
set -s escape-time 0
|
||||||
|
|
||||||
# split panes using | and -
|
# split panes using | and -
|
||||||
unbind '"'
|
unbind '"'
|
||||||
unbind %
|
unbind %
|
||||||
bind - split-window -v -c "#{pane_current_path}"
|
bind - split-window -v -c "#{pane_current_path}"
|
||||||
bind _ split-window -h -c "#{pane_current_path}"
|
bind _ split-window -h -c "#{pane_current_path}"
|
||||||
|
|
||||||
bind -r k select-pane -U
|
bind -r k select-pane -U
|
||||||
bind -r j select-pane -D
|
bind -r j select-pane -D
|
||||||
bind -r h select-pane -L
|
bind -r h select-pane -L
|
||||||
bind -r l select-pane -R
|
bind -r l select-pane -R
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user