summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Schanzenbacher <ryan@rschanz.org>2025-01-29 12:30:37 -0500
committerRyan Schanzenbacher <ryan@rschanz.org>2025-01-29 12:30:37 -0500
commit6b3c30c700976b22d978fe6247682d6d183260af (patch)
treec57813f415025354a4098a3cedb32ad6ffe0f638
parentcd99ce84467b2d6140cf6805f80669d274d12274 (diff)
Added chromium, delta is git pager, updated hyprland and friends
-rw-r--r--home-config/gitconfig9
-rw-r--r--home-config/nix-home-manager/flake.nix6
-rw-r--r--home-config/nix-home-manager/home.nix3
3 files changed, 15 insertions, 3 deletions
diff --git a/home-config/gitconfig b/home-config/gitconfig
index 6fa1c67..7b9df6a 100644
--- a/home-config/gitconfig
+++ b/home-config/gitconfig
@@ -8,6 +8,15 @@
8 smudge = git-lfs smudge -- %f 8 smudge = git-lfs smudge -- %f
9 process = git-lfs filter-process 9 process = git-lfs filter-process
10 required = true 10 required = true
11[core]
12 pager = delta
13[interactive]
14 diffFilter = delta --color-only
15[delta]
16 navigate = true
17 side-by-side = true
18[merge]
19 conflictStyle = zdiff3
11[color] 20[color]
12 ui = auto 21 ui = auto
13[init] 22[init]
diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix
index f600506..60a9c5a 100644
--- a/home-config/nix-home-manager/flake.nix
+++ b/home-config/nix-home-manager/flake.nix
@@ -17,16 +17,16 @@
17 inputs.nixpkgs.follows = "nixpkgs"; 17 inputs.nixpkgs.follows = "nixpkgs";
18 }; 18 };
19 hyprland = { 19 hyprland = {
20 url = "github:hyprwm/hyprland/0dc7367a7006cc3cc877d52bf34c4998144bff84"; 20 url = "github:hyprwm/hyprland/v0.47.0";
21 inputs.nixpkgs.follows = "nixpkgs"; 21 inputs.nixpkgs.follows = "nixpkgs";
22 inputs.aquamarine.url = "github:hyprwm/aquamarine/7fe006981fae53e931f513026fc754e322f13145"; 22 inputs.aquamarine.url = "github:hyprwm/aquamarine/v0.7.2";
23 }; 23 };
24 nixgl = { 24 nixgl = {
25 url = "github:ryan77627/nixGL/3865170cbc23b32ec7cc8df1ec811fd44b6c2a58"; 25 url = "github:ryan77627/nixGL/3865170cbc23b32ec7cc8df1ec811fd44b6c2a58";
26 inputs.nixpkgs.follows = "nixpkgs"; 26 inputs.nixpkgs.follows = "nixpkgs";
27 }; 27 };
28 wpaperd = { 28 wpaperd = {
29 url = "github:danyspin97/wpaperd/7865433233ff58f33ca4af94fd5031e26f409f52"; 29 url = "github:danyspin97/wpaperd/b0b7e66fd32dca36c431a174784a2e87af7edb77";
30 inputs.nixpkgs.follows = "nixpkgs"; 30 inputs.nixpkgs.follows = "nixpkgs";
31 }; 31 };
32 #mozff.url = "github:mozilla/nixpkgs-mozilla"; 32 #mozff.url = "github:mozilla/nixpkgs-mozilla";
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index cf1b56e..bdb3b08 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -400,6 +400,9 @@
400 taskwarrior3 400 taskwarrior3
401 delta 401 delta
402 402
403 # Here until i can fix firefox's stupid devtools issue
404 chromium
405
403 # Wrapped programs for some env variables 406 # Wrapped programs for some env variables
404 (pkgs.writeScriptBin "hyprlock" '' 407 (pkgs.writeScriptBin "hyprlock" ''
405 #! ${pkgs.bash}/bin/bash 408 #! ${pkgs.bash}/bin/bash