holm/zaneyos
1
0
Fork 0
forked from extern/zaneyos
Code Pull Requests Activity

Fix Merge Error

Browse Source
This commit is contained in:
Tyler Kelley 2024-01-16 14:18:37 -06:00
parent 39df388cb9
commit 51a483ed15
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
home.nix
View File

@ -61,11 +61,7 @@
gimp obs-studio blender kdenlive meson hugo gnumake ninja go gimp obs-studio blender kdenlive meson hugo gnumake ninja go
nodejs godot_4 rustup pavucontrol audacity zeroad xonotic nodejs godot_4 rustup pavucontrol audacity zeroad xonotic
openra font-awesome symbola noto-fonts-color-emoji material-icons openra font-awesome symbola noto-fonts-color-emoji material-icons
<<<<<<< HEAD
spotify brightnessctl swayidle spotify brightnessctl swayidle
=======
spotify brightnessctl
>>>>>>> 55c48b883f8ed62ad7b0cf3fbeb9820e3ba19786
# Import Scripts # Import Scripts
(import ./config/scripts/emopicker9000.nix { inherit pkgs; }) (import ./config/scripts/emopicker9000.nix { inherit pkgs; })
(import ./config/scripts/task-waybar.nix { inherit pkgs; }) (import ./config/scripts/task-waybar.nix { inherit pkgs; })