Compare commits
3 Commits
4c63836d35
...
5bfd7bf857
| Author | SHA1 | Date | |
|---|---|---|---|
|
5bfd7bf857
|
|||
|
7a8e7ca9d7
|
|||
|
91c539ad99
|
20
flake.lock
generated
20
flake.lock
generated
@@ -968,22 +968,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1761236834,
|
||||
"narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"noctalia": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -1261,7 +1245,9 @@
|
||||
},
|
||||
"treefmt": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1766000401,
|
||||
|
||||
@@ -85,7 +85,10 @@
|
||||
# keep-sorted end
|
||||
|
||||
# Misc
|
||||
treefmt.url = "github:numtide/treefmt-nix";
|
||||
treefmt = {
|
||||
url = "github:numtide/treefmt-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
plant = {
|
||||
url = "git+ssh://git@git.imxyy.top:2222/imxyy1soope1/HF-plant.git?rev=08dc0b3889797eb3618c7475c3c367ec0e5fdf40";
|
||||
flake = false;
|
||||
|
||||
@@ -69,7 +69,10 @@ in
|
||||
];
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
extraConfig = "set-option -g mouse on";
|
||||
extraConfig = ''
|
||||
set-option -g mouse on
|
||||
set-option -a terminal-features ",xterm-256color:RGB,focus,clipboard,usstyle"
|
||||
'';
|
||||
plugins = [
|
||||
(pkgs.tmuxPlugins.mkTmuxPlugin {
|
||||
pluginName = "tokyo-night-tmux";
|
||||
|
||||
@@ -49,7 +49,6 @@ in
|
||||
ls = "lsd";
|
||||
svim = "doasedit";
|
||||
nf = "fastfetch";
|
||||
tmux = "tmux -T RGB,focus,overline,mouse,clipboard,usstyle";
|
||||
};
|
||||
interactiveShellInit = lib.mkBefore ''
|
||||
fish_vi_key_bindings
|
||||
|
||||
@@ -54,7 +54,6 @@ in
|
||||
ls = "lsd";
|
||||
svim = "doasedit";
|
||||
nf = "fastfetch";
|
||||
tmux = "tmux -T RGB,focus,overline,mouse,clipboard,usstyle";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -16,9 +16,9 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
my.hm.programs.jujutsu.enable = true;
|
||||
my.hm = {
|
||||
programs.jujutsu = {
|
||||
enable = true;
|
||||
settings = {
|
||||
user = {
|
||||
name = "${userfullname}";
|
||||
@@ -48,6 +48,8 @@ in
|
||||
jj = {
|
||||
ignore_timeout = true;
|
||||
description = "The current jj status";
|
||||
# when = "${lib.getExe pkgs.jj-starship} detect";
|
||||
# command = "${lib.getExe pkgs.jj-starship}";
|
||||
when = true;
|
||||
command = ''
|
||||
jj log --revisions @ --no-graph --ignore-working-copy --color always --limit 1 --template '
|
||||
|
||||
@@ -46,10 +46,13 @@
|
||||
final: prev:
|
||||
let
|
||||
paths = [
|
||||
# keep-sorted start
|
||||
./fcitx5-lightly
|
||||
./jj-starship.nix
|
||||
./mono-gtk-theme.nix
|
||||
./ttf-wps-fonts.nix
|
||||
./wps-office-fonts.nix
|
||||
# keep-sorted end
|
||||
];
|
||||
in
|
||||
builtins.listToAttrs (
|
||||
|
||||
18
pkgs/jj-starship.nix
Normal file
18
pkgs/jj-starship.nix
Normal file
@@ -0,0 +1,18 @@
|
||||
{ fetchFromGitHub, rustPlatform }:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "jj-starship";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmmulroy";
|
||||
repo = finalAttrs.pname;
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wmQn1qw+jfxH9xBS7bdgWiK369bCeGV9klZzlFHrGOw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dGutKgOG0gPDYcTODrBUmmJBl2k437E5/lz+9cFzgs4=";
|
||||
|
||||
meta = {
|
||||
mainProgram = "jj-starship";
|
||||
};
|
||||
})
|
||||
Reference in New Issue
Block a user