Thanks to visit codestin.com
Credit goes to github.com

Skip to content

git #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
towry merged 5 commits into from
Apr 7, 2025
Merged

git #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2353f10
git
towry Apr 1, 2025
da24690
disable atuin
towry Apr 1, 2025
31cee52
update dep
towry Apr 6, 2025
76e324b
disable mcp config
towry Apr 6, 2025
0750a40
update, migrate jj conf
towry Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ This configuration includes setup for:
- **Fzf** - Fuzzy finder
- **Eza** - Modern replacement for ls
- **Zoxide** - Smarter cd command
- **Atuin** - Shell history with search
- **Yazi** - Terminal file manager
- **Bottom** - System monitor
- **Cachix** - Binary cache for Nix
Expand Down
128 changes: 49 additions & 79 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
description = "Towry de dotfiles";

inputs = {
nixpkgs-edge.url = "github:nixos/nixpkgs/master";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.11";
home-manager = {
Expand All @@ -25,7 +26,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
zls = {
url = "github:zigtools/zls?ref=refs/tags/0.13.0";
url = "github:zigtools/zls?ref=refs/tags/0.14.0";
inputs.nixpkgs.follows = "nixpkgs";
};
gitu = {
Expand All @@ -43,6 +44,7 @@
self,
nixpkgs,
nixpkgs-stable,
nixpkgs-edge,
darwin,
home-manager,
mac-app-util,
Expand All @@ -63,6 +65,11 @@
config.allowUnfree = true;
config.allowUnfreePredicate = true;
};
pkgs-edge = import nixpkgs-edge {
inherit system;
config.allowUnfree = true;
config.allowUnfreePredicate = true;
};
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
Expand All @@ -87,14 +94,15 @@
system,
}:
let
inherit (mkSystemConfig system) pkgs pkgs-stable;
inherit (mkSystemConfig system) pkgs pkgs-stable pkgs-edge;
in
home-manager.lib.homeManagerConfiguration {
extraSpecialArgs = {
inherit inputs outputs;
system = system;
username = username;
pkgs-stable = pkgs-stable;
pkgs-edge = pkgs-edge;

theme = pkgs.callPackage ./nix/lib/theme.nix { theme = "kanagawa"; };
};
Expand Down Expand Up @@ -125,6 +133,7 @@
inputs
nixpkgs
nixpkgs-stable
nixpkgs-edge
home-manager
mac-app-util
darwin
Expand Down
4 changes: 3 additions & 1 deletion nix/darwin/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let
modules ? [ ],
}:
let
inherit (mkSystemConfig system) pkgs pkgs-stable;
inherit (mkSystemConfig system) pkgs pkgs-stable pkgs-edge;
in
darwin.lib.darwinSystem {
inherit system;
Expand All @@ -24,6 +24,7 @@ let
system
pkgs
pkgs-stable
pkgs-edge
username
;
};
Expand All @@ -46,6 +47,7 @@ let
system
pkgs
pkgs-stable
pkgs-edge
username
;
useGlobalPkgs = true;
Expand Down
6 changes: 3 additions & 3 deletions nix/hm/editor.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ in
dap_firefox_debug_adapter_path = "${pkgs.vscode-extensions.firefox-devtools.vscode-firefox-debug}/share/vscode/extensions/firefox-devtools.vscode-firefox-debug/dist/adapter.bundle.js"
}
'';
home.file.".cursor/mcp.json" = {
source = ../../conf/cursor/mcp.json;
};
# home.file.".cursor/mcp.json" = {
# source = ../../conf/cursor/mcp.json;
# };
}
Loading