mirror of
https://git.in.rschanz.org/ryan77627/guix-config.git
synced 2025-02-11 15:31:17 -05:00
Added chromium, delta is git pager, updated hyprland and friends
This commit is contained in:
parent
cd99ce8446
commit
6b3c30c700
3 changed files with 15 additions and 3 deletions
|
@ -8,6 +8,15 @@
|
||||||
smudge = git-lfs smudge -- %f
|
smudge = git-lfs smudge -- %f
|
||||||
process = git-lfs filter-process
|
process = git-lfs filter-process
|
||||||
required = true
|
required = true
|
||||||
|
[core]
|
||||||
|
pager = delta
|
||||||
|
[interactive]
|
||||||
|
diffFilter = delta --color-only
|
||||||
|
[delta]
|
||||||
|
navigate = true
|
||||||
|
side-by-side = true
|
||||||
|
[merge]
|
||||||
|
conflictStyle = zdiff3
|
||||||
[color]
|
[color]
|
||||||
ui = auto
|
ui = auto
|
||||||
[init]
|
[init]
|
||||||
|
|
|
@ -17,16 +17,16 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
hyprland = {
|
hyprland = {
|
||||||
url = "github:hyprwm/hyprland/0dc7367a7006cc3cc877d52bf34c4998144bff84";
|
url = "github:hyprwm/hyprland/v0.47.0";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.aquamarine.url = "github:hyprwm/aquamarine/7fe006981fae53e931f513026fc754e322f13145";
|
inputs.aquamarine.url = "github:hyprwm/aquamarine/v0.7.2";
|
||||||
};
|
};
|
||||||
nixgl = {
|
nixgl = {
|
||||||
url = "github:ryan77627/nixGL/3865170cbc23b32ec7cc8df1ec811fd44b6c2a58";
|
url = "github:ryan77627/nixGL/3865170cbc23b32ec7cc8df1ec811fd44b6c2a58";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
wpaperd = {
|
wpaperd = {
|
||||||
url = "github:danyspin97/wpaperd/7865433233ff58f33ca4af94fd5031e26f409f52";
|
url = "github:danyspin97/wpaperd/b0b7e66fd32dca36c431a174784a2e87af7edb77";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
#mozff.url = "github:mozilla/nixpkgs-mozilla";
|
#mozff.url = "github:mozilla/nixpkgs-mozilla";
|
||||||
|
|
|
@ -400,6 +400,9 @@
|
||||||
taskwarrior3
|
taskwarrior3
|
||||||
delta
|
delta
|
||||||
|
|
||||||
|
# Here until i can fix firefox's stupid devtools issue
|
||||||
|
chromium
|
||||||
|
|
||||||
# Wrapped programs for some env variables
|
# Wrapped programs for some env variables
|
||||||
(pkgs.writeScriptBin "hyprlock" ''
|
(pkgs.writeScriptBin "hyprlock" ''
|
||||||
#! ${pkgs.bash}/bin/bash
|
#! ${pkgs.bash}/bin/bash
|
||||||
|
|
Loading…
Reference in a new issue