diff --git a/flake.nix b/flake.nix index d2b929f..2557216 100644 --- a/flake.nix +++ b/flake.nix @@ -129,6 +129,7 @@ rofi.enable = true; apps.enable = true; zsh.enable = true; + git.enable = true; }; }; }; diff --git a/modules/home/apps/default.nix b/modules/home/apps/default.nix index 7375e04..b6cfe7a 100644 --- a/modules/home/apps/default.nix +++ b/modules/home/apps/default.nix @@ -23,6 +23,7 @@ in { firefox mpv xdg-utils + discord ]; home.sessionVariables = { EDITOR = "nvim"; @@ -30,6 +31,7 @@ in { TERMINAL = "kitty"; BROWSER = "google-chrome-stable"; }; + xdg.enable = true; xdg.mimeApps = { enable = false; defaultApplications = { @@ -107,6 +109,14 @@ in { xdg.userDirs = { enable = true; download = "${config.home.homeDirectory}/downloads"; + desktop = config.home.homeDirectory; + + documents = "${config.home.homeDirectory}/stuff"; + music = "${config.home.homeDirectory}/stuff"; + templates = "${config.home.homeDirectory}/stuff"; + videos = "${config.home.homeDirectory}/stuff"; + pictures = "${config.home.homeDirectory}/stuff"; + publicShare = "${config.home.homeDirectory}/stuff"; }; }; } diff --git a/modules/home/default.nix b/modules/home/default.nix index 24d28a4..e11787b 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -5,6 +5,7 @@ ./rofi ./apps ./zsh + ./git ]; home.stateVersion = "22.11"; diff --git a/modules/home/eww/default.nix b/modules/home/eww/default.nix index 99d8b37..38aabcf 100644 --- a/modules/home/eww/default.nix +++ b/modules/home/eww/default.nix @@ -1,5 +1,4 @@ { - inputs, lib, config, pkgs, @@ -32,6 +31,7 @@ in { wireplumber wlogout bc + jq tiramisu fusuma ]; diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix new file mode 100644 index 0000000..39f5899 --- /dev/null +++ b/modules/home/git/default.nix @@ -0,0 +1,32 @@ +{ + lib, + config, + pkgs, + ... +}: +with lib; let + cfg = config.modules.git; +in { + options.modules.git = {enable = mkEnableOption "git";}; + + config = mkIf cfg.enable { + programs.git = { + enable = true; + difftastic = { + enable = true; + #display = "inline"; + }; + signing = { + signByDefault = true; + key = "~/.ssh/id_rsa.pub"; + }; + extraConfig = { + gpg.format = "ssh"; + gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers"; + }; + + userEmail = "zoe.roux@zoriya.dev"; + userName = "Zoe Roux"; + }; + }; +} diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index 22601b7..e072cf5 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -14,6 +14,8 @@ in { home.packages = with pkgs; [ nur.repos.ocfox.swww xorg.xprop + discord + kitty ]; wayland.windowManager.hyprland = { enable = true;