diff options
| -rw-r--r-- | config/zsh/config.zsh | 8 | ||||
| m--------- | extras/notes | 0 | ||||
| -rw-r--r-- | modules/calendar.home/default.nix | 4 | ||||
| -rw-r--r-- | modules/calendar.home/orgmode-notifier.module.nix | 5 | ||||
| -rw-r--r-- | modules/calendar.home/remind-agenda.nix | 33 | ||||
| -rw-r--r-- | modules/email.home/aerc.conf | 2 | ||||
| -rw-r--r-- | modules/git.home.nix | 103 | ||||
| -rw-r--r-- | modules/login.nix | 15 | ||||
| -rw-r--r-- | modules/xresources.home.nix | 4 | ||||
| -rwxr-xr-x | packages/dwm/autostart.sh | 8 |
10 files changed, 117 insertions, 65 deletions
diff --git a/config/zsh/config.zsh b/config/zsh/config.zsh index 2b3b1e9..dd29833 100644 --- a/config/zsh/config.zsh +++ b/config/zsh/config.zsh @@ -6,7 +6,13 @@ export PRIVATE_BROWSER="$BROWSER ':open -p'"; export READER="zathura" export FILE="daffm" -export FZF_DEFAULT_OPTS="--layout=reverse --height 40%" +export FZF_DEFAULT_OPTS=" + --color=fg:-1,fg+:#d0d0d0,bg:-1,bg+:#262626 + --color=hl:#007070,hl+:#007070,info:#007070,marker:#007070 + --color=prompt:#007070,spinner:#007070,pointer:#007070,header:#07afaf + --color=border:#262626,label:#aeaeae,query:#d9d9d9 + --preview-window='sharp' --prompt=': ' --marker='>' --gutter=' ' --pointer=' ' + --layout=reverse --height 40% --info='right' --separator='-' --scrollbar=' '" export HISTCONTROL=ignoreboth diff --git a/extras/notes b/extras/notes -Subproject c8796f683ae0d373d159a1b378395c793c45c3b +Subproject aa0771f0a9f37c26500daa611b5c5d27649ae99 diff --git a/modules/calendar.home/default.nix b/modules/calendar.home/default.nix index 06ea982..6f9aa23 100644 --- a/modules/calendar.home/default.nix +++ b/modules/calendar.home/default.nix @@ -9,7 +9,7 @@ in ]; services.ical2org = { - enable = true; + enable = false; icalLink = private.icalLink; outputPath = "${config.home.homeDirectory}/nixos/extras/notes/calendar-sync.autogen.org"; syncFrequency = "*:0/10"; # Every 10 minutes @@ -25,7 +25,7 @@ in }; services.orgmode-notifier = { - enable = true; + enable = false; pollFrequency = "*:0/1"; # Every minute }; } diff --git a/modules/calendar.home/orgmode-notifier.module.nix b/modules/calendar.home/orgmode-notifier.module.nix index b33c2fe..1d6fd90 100644 --- a/modules/calendar.home/orgmode-notifier.module.nix +++ b/modules/calendar.home/orgmode-notifier.module.nix @@ -8,7 +8,10 @@ let Type = "oneshot"; ExecStart = "${config.xdg.configHome}/nvim/orgmode_notifier.sh"; WorkingDirectory = config.home.homeDirectory; - Environment = "PATH=${pkgs.neovim}/bin:${pkgs.libnotify}/bin:/usr/bin:/bin"; + Environment = [ + # NOTE: Bug in orgmode-notifier (pkgs.neovim doesnt build correctly) + "PATH=${pkgs.neovim}/bin:${pkgs.libnotify}/bin:/usr/bin:/bin" + ]; }; }; diff --git a/modules/calendar.home/remind-agenda.nix b/modules/calendar.home/remind-agenda.nix new file mode 100644 index 0000000..8c2871a --- /dev/null +++ b/modules/calendar.home/remind-agenda.nix @@ -0,0 +1,33 @@ +{ pkgs ? import <nixpkgs> {} }: +with pkgs.lib; +let + python = (pkgs.python3.withPackages (python-pkgs: with python-pkgs; [ + colorama + termcolor + datetime + ])); +in pkgs.stdenv.mkDerivation { + pname = "remind-agenda"; + version = "0.0.0"; + + src = pkgs.fetchgit { + url = "https://gitlab.com/dkabus/remind-agenda.git"; + rev = "cf4cd6f79aabb16317fc6008588536af5d2e4d9a"; + hash = "sha256-f8Tmgz9Tw6gQjqtWhvteajOYieAu8OZy/+FHWC9885U="; + }; + + buildInputs = with pkgs; [ ]; + + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + + buildPhase = '' + cp $src/remind-agenda . + sed -i 's|/bin/python3|${python}/bin/python3|' ./remind-agenda + ''; + + installPhase = '' + mkdir -p $out/bin; + cp ./remind-agenda $out/bin; + ''; +} + diff --git a/modules/email.home/aerc.conf b/modules/email.home/aerc.conf index 656d4a1..bc32f17 100644 --- a/modules/email.home/aerc.conf +++ b/modules/email.home/aerc.conf @@ -28,4 +28,4 @@ application/pdf=zathura {} [templates] new-message = empty quoted-reply = empty -forwards = empty +forwards = empty
\ No newline at end of file diff --git a/modules/git.home.nix b/modules/git.home.nix index 602e745..37dc7af 100644 --- a/modules/git.home.nix +++ b/modules/git.home.nix @@ -3,10 +3,9 @@ programs.gh = { enable = true; extensions = with pkgs; [ - gh-copilot gh-poi - # gh-dash gh-notify + # gh-dash ]; settings = { aliases = { @@ -17,33 +16,25 @@ }; }; - # programs.gh-dash = { - # enable = true; - # settings = { - # defaults = { - # preview = { - # open = true; - # width = 80; - # }; - # }; - # pager = { diff = "delta"; }; - # keybindings = { - # prs = [ - # { key = "m"; command = "echo accident"; } - # { key = "x"; command = "echo accident"; } - # { key = "a"; command = "echo accident"; } - # { key = "A"; command = "echo accident"; } - # { key = "W"; command = "echo accident"; } - # { key = "X"; command = "echo accident"; } - # ]; - # }; - # }; - # }; + programs.delta = { + enable = true; + enableGitIntegration = true; + options = { + navigate = true; + dark = true; + side-by-side = true; + line-numbers = true; + hyperlinks = true; + paging = "always"; + diff-so-fancy = true; + file-decoration-style = "brightcyan bold ol ul"; + file-style = "brightcyan"; + hunk-header-decoration-style = "white ul"; + }; + }; programs.git = { enable = true; - userEmail = "phenax5@gmail.com"; - userName = "Akshay Nair"; ignores = [ "tags" ".vim.session" @@ -54,29 +45,14 @@ ".local.lua" ".nvim.lua" ]; - aliases = { - ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi"; - dshow = "-c diff.external='difft --display side-by-side-show-both' show --ext-diff"; - ddiff = "-c diff.external='difft --display side-by-side-show-both' diff"; - }; - delta = { - enable = true; - # package = pkgs.delta; - options = { - navigate = true; - side-by-side = true; - line-numbers = true; - hyperlinks = true; - paging = "always"; + settings = { + user.email = "phenax5@gmail.com"; + user.name = "Akshay Nair"; + alias = { + ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi"; + dshow = "-c diff.external='difft --display side-by-side-show-both' show --ext-diff"; + ddiff = "-c diff.external='difft --display side-by-side-show-both' diff"; }; - }; - # difftastic = { - # enable = true; - # display = "side-by-side"; - # color = "auto"; - # background = "dark"; - # }; - extraConfig = { color = { ui = true; }; @@ -99,15 +75,36 @@ }; pull.rebase = true; rebase.autosquash = true; - # pager = { - # diff = "${pkgs.delta}/bin/delta --color-only"; - # }; - diff.tool = "nvimdiff"; - merge.tool = "nvimdiff"; + # diff.tool = "nvimdiff"; + # merge.tool = "nvimdiff"; + merge.conflictStyle = "zdiff3"; difftool.prompt = false; mergetool.prompt = false; }; signing.key = "AAAB13AE8B82A5267C1A35D7E1B701723EA37849"; signing.signByDefault = true; }; + + # programs.gh-dash = { + # enable = true; + # settings = { + # defaults = { + # preview = { + # open = true; + # width = 80; + # }; + # }; + # pager = { diff = "delta"; }; + # keybindings = { + # prs = [ + # { key = "m"; command = "echo accident"; } + # { key = "x"; command = "echo accident"; } + # { key = "a"; command = "echo accident"; } + # { key = "A"; command = "echo accident"; } + # { key = "W"; command = "echo accident"; } + # { key = "X"; command = "echo accident"; } + # ]; + # }; + # }; + # }; } diff --git a/modules/login.nix b/modules/login.nix index e4c24a0..390cd0c 100644 --- a/modules/login.nix +++ b/modules/login.nix @@ -48,9 +48,6 @@ in ]; shell = pkgs.zsh; }; - #security.sudo.configFile = '' - # %wheel ALL=(ALL) NOPASSWD: /sbin/poweroff, /sbin/reboot, /sbin/shutdown - #''; # Global environment.variables = let @@ -66,6 +63,15 @@ in XDG_BIN_HOME = "$HOME/.local/bin"; PATH = [ "$HOME/scripts/bin" XDG_BIN_HOME ]; LS_COLORS = "di=96:ln=36:or=31:mi=31:ex=32"; + XDG_SESSION_TYPE = "x11"; + FZF_DEFAULT_OPTS='' + --color=fg:-1,fg+:#d0d0d0,bg:-1,bg+:#262626 + --color=hl:#007070,hl+:#007070,info:#007070,marker:#007070 + --color=prompt:#007070,spinner:#007070,pointer:#007070,header:#07afaf + --color=border:#262626,label:#aeaeae,query:#d9d9d9 + --preview-window='sharp' --prompt=': ' --marker='>' --gutter=' ' --pointer=' ' + --layout=reverse --height 40% --info='right' --separator='-' --scrollbar=' ' + ''; }; environment.shells = with pkgs; [ zsh bashInteractive ]; programs.zsh = { @@ -78,6 +84,8 @@ in histSize = 50000; interactiveShellInit = ''source ~/.config/zsh/zshrc''; promptInit = ""; + enableLsColors = false; + vteIntegration = true; loginShellInit = with builtins; let cases = map ( @@ -97,6 +105,7 @@ in esac; ''; }; + services = { getty = { autologinUser = "imsohexy"; diff --git a/modules/xresources.home.nix b/modules/xresources.home.nix index 9c99896..ca226b8 100644 --- a/modules/xresources.home.nix +++ b/modules/xresources.home.nix @@ -49,7 +49,7 @@ "dwm.normfgcolor" = theme.foreground; "dwm.selbordercolor" = theme.accent; - "dwm.selbgcolor" = theme.accent; - "dwm.selfgcolor" = theme.foreground; + "dwm.selbgcolor" = theme.background; + "dwm.selfgcolor" = "#2dd4bf"; }; } diff --git a/packages/dwm/autostart.sh b/packages/dwm/autostart.sh index 9e88422..854f312 100755 --- a/packages/dwm/autostart.sh +++ b/packages/dwm/autostart.sh @@ -46,7 +46,7 @@ spew "shotkey" shotkey; # Wallpaper # run "" ~/.fehbg; -hsetroot -solid "#101414" +# hsetroot -solid "#101414" # Notification daemon spew "dunst" dunst -config ~/.config/dunst/dunstrc; @@ -64,6 +64,10 @@ run "" ~/scripts/battery-watch.sh start; # run "" kdeconnect-cli --refresh; once "easyeffects" easyeffects --gapplication-service; + +# Configure primary screen +xrandr --output eDP-1 --gamma 1.0:0.9:0.76 --brightness 1 || true; + # }}} @@ -75,7 +79,7 @@ applications() { run "dwmblocks" dwmblocks; - on_startup sidekick; + # on_startup sidekick; # spew "thunderbird" thunderbird; #focus_tag 9; |