szymon/amazing-dotfiles
1
0
Fork 0
mirror of https://github.com/szymon-jozef/amazing-dotfiles.git synced 2026-09-07 12:10:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
Szymon P
2026-02-25 00:24:43 +01:00
parent cd8ef7e5db
commit a1952fa7a9
5 changed files with 48 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/cli/git.nix
View File

@@ -29,14 +29,9 @@
};
signing = {
<<<<<<< HEAD
key = email;
signByDefault = false;
=======
key = userConfig.signingKey;
signByDefault = true;
format = "ssh";
>>>>>>> c77553344515b404d765c04e1e472dac1cf4bb94
};
ignores = [

9
modules/hypr/hyprland.nix
View File

@@ -1,14 +1,9 @@
{
<<<<<<< HEAD
inputs,
pkgs,
isNixOS,
lib,
=======
isNixOS,
lib,
userConfig,
>>>>>>> c77553344515b404d765c04e1e472dac1cf4bb94
inputs,
pkgs,
...
}:

6
modules/xdg.nix
View File

@@ -15,7 +15,11 @@
defaultApplications = {
"application/pdf" = [ "org.pwmt.zathura.desktop" ];
"text/html" = [ "zen.desktop" ];
"text/html" = [
"zen-beta.desktop"
"zen.desktop"
"chromium.desktop"
];
"application/xhtml+xml" = [ "zen.desktop" ];
"x-scheme-handler/http" = [ "zen.desktop" ];
"x-scheme-handler/https" = [ "zen.desktop" ];