diff --git a/home/default.nix b/home/default.nix index 4e2af180..d5dcb6ed 100644 --- a/home/default.nix +++ b/home/default.nix @@ -4,9 +4,16 @@ ./clipman.nix ./common.nix ./direnv.nix + ./dunst.nix + ./fzf.nix + ./git.nix + ./gpg.nix + ./helix.nix ./packages.nix - # ./persist.nix + ./persist.nix ./playerctld.nix + ./rofi.nix + ./sops.nix ./stylix.nix ]; } diff --git a/home/helix.nix b/home/helix.nix new file mode 100644 index 00000000..3750a604 --- /dev/null +++ b/home/helix.nix @@ -0,0 +1,55 @@ +{ + pkgs, + helix, + ... +}: { + programs.helix = { + enable = true; + package = helix.packages.${pkgs.system}.default; + settings = { + theme = "gruvbox_dark_hard"; + editor = { + line-number = "relative"; + mouse = false; + cursorline = true; + cursor-shape = { + insert = "bar"; + normal = "block"; + select = "underline"; + }; + file-picker = {hidden = false;}; + statusline = { + left = ["mode" "spinner"]; + center = ["file-name" "read-only-indicator" "file-modification-indicator"]; + right = [ + "version-control" + "diagnostics" + "selections" + "register" + "position" + "position-percentage" + "file-encoding" + "file-line-ending" + "file-type" + ]; + separator = "|"; + }; + lsp = { + display-messages = true; + display-inlay-hints = true; + }; + indent-guides = {render = true;}; + idle-timeout = 0; + bufferline = "always"; + soft-wrap = { + enable = true; + }; + }; + keys = { + insert = { + "C-space" = "completion"; + }; + }; + }; + }; +} diff --git a/home/rofi.nix b/home/rofi.nix new file mode 100644 index 00000000..7cb68358 --- /dev/null +++ b/home/rofi.nix @@ -0,0 +1,6 @@ +{pkgs, ...}: { + programs.rofi = { + enable = true; + package = pkgs.rofi-wayland; + }; +} diff --git a/home/sops.nix b/home/sops.nix new file mode 100644 index 00000000..a0683c4d --- /dev/null +++ b/home/sops.nix @@ -0,0 +1,10 @@ +{ + conf, + sops-nix, + ... +}: { + imports = [sops-nix.homeManagerModules.sops]; + sops = { + age.keyFile = "/persist/data${conf.home}/.config/sops/age/keys.txt"; + }; +} diff --git a/system/users.nix b/system/users.nix index 98814ee9..257ce954 100644 --- a/system/users.nix +++ b/system/users.nix @@ -2,7 +2,7 @@ conf, config, ... -}: { +} @ inputs: { users.mutableUsers = false; users.users = { ${conf.user} = { @@ -13,6 +13,12 @@ }; }; + home-manager = { + extraSpecialArgs = inputs // {system-config = config;}; + useGlobalPkgs = true; + useUserPackages = true; + }; + home-manager.users = let hm = import ../home; in {