From 3681b0ce1d841e120a7af15ea998b0509669c993 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Tue, 28 Dec 2021 18:31:28 -0400 Subject: feat(wpcarro/marcus): Support home-manager For now: - git confg - picom: X compositor - dunst: system notifications (not working for quassel) I still need to port various configs and ensure I support both gLinux and NixOS machines. Change-Id: I31a635eaacac25ef6219e079fc968d2ece026a5f Reviewed-on: https://cl.tvl.fyi/c/depot/+/4736 Reviewed-by: wpcarro Autosubmit: wpcarro Tested-by: BuildkiteCI --- users/wpcarro/dotfiles/default.nix | 5 ++++ users/wpcarro/dotfiles/dunstrc | 53 ++++++++++++++++++++++++++++++++++ users/wpcarro/nixos/marcus/default.nix | 29 +++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 users/wpcarro/dotfiles/default.nix create mode 100644 users/wpcarro/dotfiles/dunstrc diff --git a/users/wpcarro/dotfiles/default.nix b/users/wpcarro/dotfiles/default.nix new file mode 100644 index 000000000000..8150f5370699 --- /dev/null +++ b/users/wpcarro/dotfiles/default.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + dunstrc = ./dunstrc; +} diff --git a/users/wpcarro/dotfiles/dunstrc b/users/wpcarro/dotfiles/dunstrc new file mode 100644 index 000000000000..a17533f07330 --- /dev/null +++ b/users/wpcarro/dotfiles/dunstrc @@ -0,0 +1,53 @@ +[global] +font = JetBrains Mono +origin = top-right +markup = yes +plain_text = no +format = "%s\n%b" +sort = no +indicate_hidden = yes +alignment = center +bounce_freq = 0 +show_age_threshold = -1 +word_wrap = yes +ignore_newline = no +stack_duplicates = yes +hide_duplicate_count = yes +geometry = "300x50-15+49" +shrink = no +transparency = 5 +idle_threshold = 0 +monitor = 0 +follow = keyboard +sticky_history = yes +history_length = 15 +show_indicators = no +line_height = 3 +separator_height = 2 +padding = 6 +horizontal_padding = 6 +separator_color = frame +startup_notification = false +browser = xdg-open +icon_position = off +max_icon_size = 80 +frame_width = 3 +frame_color = "#8EC07C" + +[urgency_low] +frame_color = "#3B7C87" +foreground = "#3B7C87" +background = "#191311" +timeout = 4 + +[urgency_normal] +frame_color = "#5B8234" +foreground = "#5B8234" +background = "#191311" +timeout = 6 + +[urgency_critical] +frame_color = "#B7472A" +foreground = "#B7472A" +background = "#191311" +timeout = 8 \ No newline at end of file diff --git a/users/wpcarro/nixos/marcus/default.nix b/users/wpcarro/nixos/marcus/default.nix index f2be266c8fcd..fb4442c6ccd9 100644 --- a/users/wpcarro/nixos/marcus/default.nix +++ b/users/wpcarro/nixos/marcus/default.nix @@ -13,6 +13,7 @@ let in { imports = [ (depot.path + "/users/wpcarro/nixos/marcus/hardware.nix") + "${pkgs.home-manager.src}/nixos" ]; # Use the TVL binary cache @@ -102,6 +103,34 @@ in { VISUAL = "emacsclient"; }; + home-manager.useGlobalPkgs = true; + home-manager.users.wpcarro = { config, lib, ... }: { + programs.git = { + enable = true; + userName = "William Carroll"; + userEmail = "wpcarro@gmail.com"; + extraConfig = { + pull.rebase = true; + }; + }; + + services.picom = { + enable = true; + vSync = true; + backend = "glx"; + }; + + services.dunst.enable = true; + xdg.configFile."dunst/dunstrc" = { + source = wpcarro.dotfiles.dunstrc; + onChange = '' + ${pkgs.procps}/bin/pkill -u "$USER" ''${VERBOSE+-e} dunst || true + ''; + }; + + systemd.user.startServices = true; + }; + environment.systemPackages = wpcarro.common.shell-utils ++ (with pkgs; [ -- cgit 1.4.1