Compare commits

..

No commits in common. "7f90b538916f2366d375c5e2f310117237ad8170" and "786d7d1b068fc2beebb41d153e9f6c1e29bb87c2" have entirely different histories.

3 changed files with 35 additions and 22 deletions

View File

@ -2,19 +2,17 @@
"nodes": { "nodes": {
"devshell": { "devshell": {
"inputs": { "inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1713532798, "lastModified": 1686680692,
"narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", "narHash": "sha256-SsLZz3TDleraAiJq4EkmdyewSyiv5g0LZYc6vaLZOMQ=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", "rev": "fd6223370774dd9c33354e87a007004b5fd36442",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -25,14 +23,14 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1685518550,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -48,11 +46,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712386041, "lastModified": 1710888565,
"narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -64,11 +62,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1713995372, "lastModified": 1711819797,
"narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -80,11 +78,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1713995654, "lastModified": 1696351516,
"narHash": "sha256-S+4C0H9w7H9tSv1RviD/otsTmf1ECuxJMJ/j1t9gjPE=", "narHash": "sha256-LieY/RHQXGha+MMShP5DGCdjghKpt6GB03v2GBkCHkw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ce6da85c2dc9e659bef799c2ed053771e1bb8ee3", "rev": "9c3f0aeb549393656cf9223c0e75e6bafa435c4e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -116,6 +114,21 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View File

@ -37,7 +37,6 @@ in {
g = "git"; g = "git";
cat = "bat"; cat = "bat";
ip = "ip --color=auto"; ip = "ip --color=auto";
ns = "nix shell nixpkgs#";
hmswitch = ''home-manager switch --flake ".#$(hostname -s)"''; hmswitch = ''home-manager switch --flake ".#$(hostname -s)"'';
nrswitch = "nixos-rebuild --use-remote-sudo switch --flake '.#'"; nrswitch = "nixos-rebuild --use-remote-sudo switch --flake '.#'";
da = "direnv allow ."; da = "direnv allow .";
@ -57,7 +56,7 @@ in {
envExtra = '' envExtra = ''
export FZF_DEFAULT_COMMAND='${pkgs.fd}/bin/fd --type f --strip-cwd-prefix' export FZF_DEFAULT_COMMAND='${pkgs.fd}/bin/fd --type f --strip-cwd-prefix'
''; '';
syntaxHighlighting.enable = true; enableSyntaxHighlighting = true;
plugins = [ plugins = [
{ {
name = "fzf-tab"; name = "fzf-tab";

View File

@ -3,6 +3,7 @@
{ {
pkgs, pkgs,
lib, lib,
strings,
... ...
}: { }: {
home.sessionVariables = lib.mkForce {"EDITOR" = "nvim";}; home.sessionVariables = lib.mkForce {"EDITOR" = "nvim";};