diff --git a/flake.lock b/flake.lock index 7de54ac..8298204 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1740250266, - "narHash": "sha256-fbB/I4bCsJ++BhRzDaeQmzw/Gt5Lrt1csJ8D2IkQANA=", + "lastModified": 1740494361, + "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=", "owner": "nix-community", "repo": "home-manager", - "rev": "61d8fc9af0f8568ffaff93e4001cb607f88790f9", + "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1739933872, - "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=", + "lastModified": 1740452771, + "narHash": "sha256-/tI1vFJ7/dXJqUmI+s0EV1F0DPe6dZvT444mrLUkrlU=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53", + "rev": "42be12b510253d750138ec90c66decc282298b44", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740019556, - "narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=", + "lastModified": 1740396192, + "narHash": "sha256-ATMHHrg3sG1KgpQA5x8I+zcYpp5Sf17FaFj/fN+8OoQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dad564433178067be1fbdfcce23b546254b6d641", + "rev": "d9b69c3ec2a2e2e971c534065bdd53374bd68b97", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1740243248, - "narHash": "sha256-GJ/fV5AE+4i38/eXmAgBZs4lKYXfScpxPYviUV8ujlk=", + "lastModified": 1740567784, + "narHash": "sha256-vtNes0DPo720tDDVTKrvLBhW/kY0EMHB1ik1Bw4bWZI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a6c4bfe37c51686c042b4bdb4e650a9414e96680", + "rev": "8c97496b319743c0ac82205fc6ba2197bf7db9a7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 730bbe7..95a6ff6 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,6 @@ email = "kulvir@duck.com"; system = "aarch64-darwin"; # apple - x86 = "x86_64-linux"; forAllSystems = nixpkgs.lib.genAttrs [ "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); }; } diff --git a/hosts/mba/configuration.nix b/hosts/mba/configuration.nix index 13d2e0b..3f4f2fc 100644 --- a/hosts/mba/configuration.nix +++ b/hosts/mba/configuration.nix @@ -3,7 +3,7 @@ inputs, ... }: { - security.pam.enableSudoTouchIdAuth = true; + security.pam.services.sudo_local.touchIdAuth = true; # Set Git commit hash for darwin-version. system.configurationRevision = inputs.self.rev or inputs.self.dirtyRev or null; diff --git a/hosts/mba/home.nix b/hosts/mba/home.nix index 936c99a..6ccf296 100644 --- a/hosts/mba/home.nix +++ b/hosts/mba/home.nix @@ -14,7 +14,6 @@ ../../modules/shell.nix ../../modules/starship.nix ../../modules/tmux.nix - ../../modules/zed.nix ]; home.packages = [ @@ -22,12 +21,10 @@ pkgs.bun pkgs.go pkgs.nodejs_23 - # pkgs.python314 # coz awsebcli requires python in $PATH pkgs.pnpm pkgs.discord # nigga ain't working properly pkgs.redis - pkgs.zed-editor ]; nixpkgs = { diff --git a/hosts/mba/nix.nix b/hosts/mba/nix.nix index d459025..1c27925 100644 --- a/hosts/mba/nix.nix +++ b/hosts/mba/nix.nix @@ -13,14 +13,4 @@ nix.settings.experimental-features = "nix-command flakes"; 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; - }; } diff --git a/modules/git.nix b/modules/git.nix index c9f06fe..06a1ef9 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -9,10 +9,7 @@ userName = "Kulvir Singh"; userEmail = "kulvirs734@gmail.com"; - aliases = { - cm = "commit -m"; - amend = "commit --amend"; - }; + aliases = {}; ignores = [ ".DS_Store" diff --git a/modules/shell.nix b/modules/shell.nix index 74c1161..c2b4474 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -2,13 +2,10 @@ programs = { zsh = { enable = true; - envExtra = '' - eval "$(/opt/homebrew/bin/brew shellenv)" - export PATH="/opt/homebrew/bin:$PATH" - - # export BUN_INSTALL="$HOME/.bun" - # export PATH="$BUN_INSTALL/bin:$PATH" - ''; + envExtra = '' + eval "$(/opt/homebrew/bin/brew shellenv)" + export PATH="/opt/homebrew/bin:$PATH" + ''; shellAliases = { ls = "lsd"; lg = "lazygit"; diff --git a/modules/tmux.nix b/modules/tmux.nix index 4b1d499..836b854 100644 --- a/modules/tmux.nix +++ b/modules/tmux.nix @@ -18,20 +18,20 @@ ]; 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 - - unbind '"' - unbind % - bind - split-window -v -c "#{pane_current_path}" - bind _ split-window -h -c "#{pane_current_path}" + # split panes using | and - + unbind '"' + unbind % + bind - split-window -v -c "#{pane_current_path}" + bind _ split-window -h -c "#{pane_current_path}" - bind -r k select-pane -U - bind -r j select-pane -D - bind -r h select-pane -L - bind -r l select-pane -R - ''; + bind -r k select-pane -U + bind -r j select-pane -D + bind -r h select-pane -L + bind -r l select-pane -R + ''; }; }