Compare commits

...

3 Commits

8 changed files with 35 additions and 22 deletions

20
flake.lock generated
View File

@@ -968,22 +968,6 @@
"type": "github" "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": { "noctalia": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -1261,7 +1245,9 @@
}, },
"treefmt": { "treefmt": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1766000401, "lastModified": 1766000401,

View File

@@ -85,7 +85,10 @@
# keep-sorted end # keep-sorted end
# Misc # Misc
treefmt.url = "github:numtide/treefmt-nix"; treefmt = {
url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
plant = { plant = {
url = "git+ssh://git@git.imxyy.top:2222/imxyy1soope1/HF-plant.git?rev=08dc0b3889797eb3618c7475c3c367ec0e5fdf40"; url = "git+ssh://git@git.imxyy.top:2222/imxyy1soope1/HF-plant.git?rev=08dc0b3889797eb3618c7475c3c367ec0e5fdf40";
flake = false; flake = false;

View File

@@ -69,7 +69,10 @@ in
]; ];
programs.tmux = { programs.tmux = {
enable = true; 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 = [ plugins = [
(pkgs.tmuxPlugins.mkTmuxPlugin { (pkgs.tmuxPlugins.mkTmuxPlugin {
pluginName = "tokyo-night-tmux"; pluginName = "tokyo-night-tmux";

View File

@@ -49,7 +49,6 @@ in
ls = "lsd"; ls = "lsd";
svim = "doasedit"; svim = "doasedit";
nf = "fastfetch"; nf = "fastfetch";
tmux = "tmux -T RGB,focus,overline,mouse,clipboard,usstyle";
}; };
interactiveShellInit = lib.mkBefore '' interactiveShellInit = lib.mkBefore ''
fish_vi_key_bindings fish_vi_key_bindings

View File

@@ -54,7 +54,6 @@ in
ls = "lsd"; ls = "lsd";
svim = "doasedit"; svim = "doasedit";
nf = "fastfetch"; nf = "fastfetch";
tmux = "tmux -T RGB,focus,overline,mouse,clipboard,usstyle";
}; };
}; };
}; };

View File

@@ -16,9 +16,9 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
my.hm.programs.jujutsu.enable = true;
my.hm = { my.hm = {
programs.jujutsu = { programs.jujutsu = {
enable = true;
settings = { settings = {
user = { user = {
name = "${userfullname}"; name = "${userfullname}";
@@ -48,6 +48,8 @@ in
jj = { jj = {
ignore_timeout = true; ignore_timeout = true;
description = "The current jj status"; description = "The current jj status";
# when = "${lib.getExe pkgs.jj-starship} detect";
# command = "${lib.getExe pkgs.jj-starship}";
when = true; when = true;
command = '' command = ''
jj log --revisions @ --no-graph --ignore-working-copy --color always --limit 1 --template ' jj log --revisions @ --no-graph --ignore-working-copy --color always --limit 1 --template '

View File

@@ -46,10 +46,13 @@
final: prev: final: prev:
let let
paths = [ paths = [
# keep-sorted start
./fcitx5-lightly ./fcitx5-lightly
./jj-starship.nix
./mono-gtk-theme.nix ./mono-gtk-theme.nix
./ttf-wps-fonts.nix ./ttf-wps-fonts.nix
./wps-office-fonts.nix ./wps-office-fonts.nix
# keep-sorted end
]; ];
in in
builtins.listToAttrs ( builtins.listToAttrs (

18
pkgs/jj-starship.nix Normal file
View 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";
};
})