Compare commits
No commits in common. "b8c21378644e574755313dd617438592cc9c4b3d" and "994470d0b4e38d4e7bcb22013ba9283fc748203f" have entirely different histories.
b8c2137864
...
994470d0b4
4 changed files with 77 additions and 149 deletions
163
flake.lock
generated
163
flake.lock
generated
|
|
@ -187,28 +187,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"starship-jj",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755412999,
|
||||
"narHash": "sha256-qD+X0KuAp0iiqElrlouXM43fmW7VCg7fGQzr6oal318=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "fe8535d8c9afe780d5344d28db7fe1de3df736a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -416,27 +394,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_6": {
|
||||
"inputs": {
|
||||
"systems": [
|
||||
"starship-jj",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fromYaml": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -674,7 +631,7 @@
|
|||
"nix-options-doc": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -692,6 +649,24 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-06cb-009a-fingerprint-sensor": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1734692513,
|
||||
"narHash": "sha256-3QEzFFrkXLj/JgZGoLaxq/pPkflSXfBOP10bXL8/Niw=",
|
||||
"owner": "ahbnr",
|
||||
"repo": "nixos-06cb-009a-fingerprint-sensor",
|
||||
"rev": "3678b193efa1e06aab86058aecee18ddaa8878d2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ahbnr",
|
||||
"repo": "nixos-06cb-009a-fingerprint-sensor",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1748162331,
|
||||
|
|
@ -784,6 +759,21 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1734323986,
|
||||
"narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "394571358ce82dff7411395829aa6a3aad45b907",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-24.11",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1759735786,
|
||||
"narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=",
|
||||
|
|
@ -799,7 +789,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1721924956,
|
||||
"narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
|
||||
|
|
@ -815,7 +805,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1740695751,
|
||||
"narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=",
|
||||
|
|
@ -831,7 +821,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1759070547,
|
||||
"narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=",
|
||||
|
|
@ -847,26 +837,10 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1755186698,
|
||||
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixvim": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixvim": "nixvim_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -965,7 +939,7 @@
|
|||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"nix-options-doc": "nix-options-doc",
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1759503843,
|
||||
|
|
@ -1030,33 +1004,16 @@
|
|||
"home-manager": "home-manager",
|
||||
"mms": "mms",
|
||||
"nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixos-06cb-009a-fingerprint-sensor": "nixos-06cb-009a-fingerprint-sensor",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nixvim": "nixvim",
|
||||
"optnix": "optnix",
|
||||
"other-transcode": "other-transcode",
|
||||
"river-shifttags": "river-shifttags",
|
||||
"starship-jj": "starship-jj",
|
||||
"stylix": "stylix"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1755004716,
|
||||
"narHash": "sha256-TbhPR5Fqw5LjAeI3/FOPhNNFQCF3cieKCJWWupeZmiA=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "b2a58b8c6eff3c3a2c8b5c70dbf69ead78284194",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-lang",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -1079,27 +1036,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"starship-jj": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"flake-utils": "flake-utils_6",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"systems": "systems_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1757479801,
|
||||
"narHash": "sha256-HTkDZQJnlbv2LlBybpBTNh1Y3/M8RNeQuiked3JaLgI=",
|
||||
"owner": "lanastara_foss",
|
||||
"repo": "starship-jj",
|
||||
"rev": "04557921210b770faefb9ea7ee60152d61b03755",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lanastara_foss",
|
||||
"repo": "starship-jj",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"stylix": {
|
||||
"inputs": {
|
||||
"base16": "base16",
|
||||
|
|
@ -1113,7 +1049,7 @@
|
|||
"nixpkgs"
|
||||
],
|
||||
"nur": "nur",
|
||||
"systems": "systems_6",
|
||||
"systems": "systems_5",
|
||||
"tinted-foot": "tinted-foot",
|
||||
"tinted-kitty": "tinted-kitty",
|
||||
"tinted-schemes": "tinted-schemes",
|
||||
|
|
@ -1210,21 +1146,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_6": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tinted-foot": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
|
|||
12
flake.nix
12
flake.nix
|
|
@ -42,13 +42,15 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nixos-06cb-009a-fingerprint-sensor = {
|
||||
url = "github:ahbnr/nixos-06cb-009a-fingerprint-sensor";
|
||||
};
|
||||
|
||||
mms.url = "github:mkaito/nixos-modded-minecraft-servers";
|
||||
|
||||
copyparty.url = "github:9001/copyparty";
|
||||
|
||||
optnix.url = "github:water-sucks/optnix";
|
||||
|
||||
starship-jj.url = "gitlab:lanastara_foss/starship-jj";
|
||||
};
|
||||
outputs = {
|
||||
nixpkgs,
|
||||
|
|
@ -60,10 +62,11 @@
|
|||
breezex-cursor,
|
||||
other-transcode,
|
||||
nix-doom-emacs-unstraightened,
|
||||
nixos-06cb-009a-fingerprint-sensor,
|
||||
cassowary,
|
||||
mms,
|
||||
copyparty,
|
||||
optnix,
|
||||
starship-jj,
|
||||
...
|
||||
}: let
|
||||
system = "x86_64-linux";
|
||||
|
|
@ -76,7 +79,6 @@
|
|||
nix-doom-emacs-unstraightened = nix-doom-emacs-unstraightened.hmModule;
|
||||
cassowary = cassowary.packages.${system}.default;
|
||||
pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
|
||||
starship-jj = starship-jj.packages.${system}.default;
|
||||
};
|
||||
in {
|
||||
nixosConfigurations.void = nixpkgs.lib.nixosSystem {
|
||||
|
|
@ -126,6 +128,8 @@
|
|||
|
||||
stylix.nixosModules.stylix
|
||||
./stylix.nix
|
||||
|
||||
nixos-06cb-009a-fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor"
|
||||
];
|
||||
specialArgs = {
|
||||
pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
|
||||
|
|
|
|||
45
home.nix
45
home.nix
|
|
@ -8,7 +8,6 @@
|
|||
kitty-unstable,
|
||||
nix-doom-emacs-unstraightened,
|
||||
cassowary,
|
||||
starship-jj,
|
||||
...
|
||||
}: let
|
||||
username = "khais";
|
||||
|
|
@ -40,8 +39,6 @@ in {
|
|||
fd
|
||||
file
|
||||
rclone
|
||||
# jj info in shell prompt
|
||||
starship-jj
|
||||
# used for yazi epub previews
|
||||
epub-thumbnailer
|
||||
# remote working
|
||||
|
|
@ -99,7 +96,6 @@ in {
|
|||
nh
|
||||
nix-output-monitor
|
||||
alejandra
|
||||
nix-index
|
||||
# archiving
|
||||
archivebox
|
||||
# games
|
||||
|
|
@ -481,15 +477,6 @@ in {
|
|||
end-of-line-diagnostics = "hint";
|
||||
};
|
||||
};
|
||||
languages = {
|
||||
language = [
|
||||
{
|
||||
name = "nix";
|
||||
auto-format = true;
|
||||
formatter = {command = "alejandra";};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
programs.bat = {
|
||||
|
|
@ -510,21 +497,31 @@ in {
|
|||
settings = {
|
||||
# short prompt timeout
|
||||
command_timeout = 30;
|
||||
|
||||
# custom.jj = {
|
||||
# command = ''
|
||||
# jj log -r@ -n1 --ignore-working-copy --no-graph --color always -T '
|
||||
# separate(" ",
|
||||
# bookmarks.map(|x| truncate_end(10, x.name(), "…")).join(" "),
|
||||
# tags.map(|x| truncate_end(10, x.name(), "…")).join(" "),
|
||||
# surround("\"", "\"", truncate_end(24, description.first_line(), "…")),
|
||||
# if(conflict, "conflict"),
|
||||
# if(divergent, "divergent"),
|
||||
# if(hidden, "hidden"), )
|
||||
# '
|
||||
# '';
|
||||
# when = "jj root --ignore-working-copy";
|
||||
# symbol = "jj";
|
||||
# };
|
||||
# custom.jjstate = {
|
||||
# command = ''
|
||||
# jj log -r@ -n1 --ignore-working-copy --no-graph --stat | tail -n1 | ${pkgs.sd}/bin/sd "(\d+) files? changed, (\d+) insertions?\(\+\), (\d+) deletions?\(-\)" ' ''${1}m ''${2}+ ''${3}-' | ${pkgs.sd}/bin/sd " 0." ""
|
||||
# '';
|
||||
# when = "jj root";
|
||||
# };
|
||||
git_state.disabled = true;
|
||||
git_status.disabled = true;
|
||||
git_commit.disabled = true;
|
||||
git_metrics.disabled = true;
|
||||
git_branch.disabled = true;
|
||||
|
||||
custom.jj = {
|
||||
command = "prompt";
|
||||
format = "$output";
|
||||
ignore_timeout = true;
|
||||
shell = ["starship-jj" "--ignore-working-copy" "starship"];
|
||||
use_stdin = false;
|
||||
when = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
6
t470.nix
6
t470.nix
|
|
@ -75,4 +75,10 @@
|
|||
};
|
||||
wantedBy = ["multi-user.target"];
|
||||
};
|
||||
|
||||
# fingerprint sensor setup
|
||||
services."06cb-009a-fingerprint-sensor" = {
|
||||
enable = true;
|
||||
backend = "python-validity";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue