diff --git a/flake.lock b/flake.lock index d141d4d8..08c8dd8e 100644 --- a/flake.lock +++ b/flake.lock @@ -73,11 +73,11 @@ ] }, "locked": { - "lastModified": 1635839387, - "narHash": "sha256-2B6DqfTiwY5w2TljC4+AxEUuVYMTP5Fo2h5iGNIONvk=", + "lastModified": 1636520380, + "narHash": "sha256-gBiQ8+AQG6Dia34rqJDuqs6VFe/J1SjIhOZBeTXCKQI=", "owner": "nix-community", "repo": "home-manager", - "rev": "288faaa5a65e72e37e6027024829b15c8bb69286", + "rev": "1e5c8e9bff00d0844bc3d25d1a98eab5633e600b", "type": "github" }, "original": { @@ -110,11 +110,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1635449388, - "narHash": "sha256-i7hMiAgpRTGsMPTQKuNCDfW/ftQ+g9N6iaMj+RN6yws=", + "lastModified": 1636317251, + "narHash": "sha256-u1cWvvtGH5mfGkeIKrqw2usk4IL7wDiRcnJkUSiZq3Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "518b9c2159e7d4b7696ee18b8828f9086012923b", + "rev": "fd6f34afcf062761fb5035230f6297752bfedcba", "type": "github" }, "original": { @@ -139,11 +139,11 @@ }, "nixpkgs-nixos-unstable": { "locked": { - "lastModified": 1635844945, - "narHash": "sha256-tZcL307dj28jgEU1Wdn+zwG9neyW0H2+ZjdVhvJxh9g=", + "lastModified": 1636623366, + "narHash": "sha256-jOQMlv9qFSj0U66HB+ujZoapty0UbewmSNbX8+3ujUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b67e752c29f18a0ca5534a07661366d6a2c2e649", + "rev": "c5ed8beb478a8ca035f033f659b60c89500a3034", "type": "github" }, "original": { @@ -155,11 +155,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1635933255, - "narHash": "sha256-cR4jRaog5/o5U0No0wNVgokfJma9vuiZhtcu3CUcb1M=", + "lastModified": 1636552551, + "narHash": "sha256-k7Hq/bvUnRlAfFjPGuw3FsSqqspQdRHsCHpgadw6UkQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fd5c69fa6057870687a6589a8c95da955188f91", + "rev": "9e86f5f7a19db6da2445f07bafa6694b556f9c6d", "type": "github" }, "original": { @@ -187,11 +187,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1625223284, - "narHash": "sha256-jjLcDSU1rRiJb+n3uez23XAa7kbnPcGZTa6jIKh1GMQ=", + "lastModified": 1636228094, + "narHash": "sha256-CpOcIwHAn3yS0PeVmUICFrJ+gde2PiZp3XsnDP3LE9w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "357d2c8f6087685fe35cb1889a005a4dd4cce7b8", + "rev": "2606cb0fc24e65f489b7d9fdcbf219756e45db35", "type": "github" }, "original": { @@ -203,11 +203,11 @@ }, "nur": { "locked": { - "lastModified": 1636008211, - "narHash": "sha256-kNy2aQ9uhJ9sXkQn+G90DsmSGgfk22lfSpqlm+CRBKw=", + "lastModified": 1636746014, + "narHash": "sha256-6nhtR2uWfFaNmBqN82BYNi1zkB/i+01kMhzQc2gXBHc=", "owner": "nix-community", "repo": "NUR", - "rev": "eed6ce5dd4e60583c5c673771caffa3d5425bfa7", + "rev": "130560604a6757b440c09e012375d28e31121ab3", "type": "github" }, "original": { @@ -235,11 +235,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1633273832, - "narHash": "sha256-oOjpMVYpkIUpiML61PeqTk+sg4juRvF7P6jroI/YvTw=", + "lastModified": 1636497917, + "narHash": "sha256-8U0Tvot7U5KJ8vpn6xR611v7b441QdAQC04xhxjMHOc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2e86e1698d53e5bd71d9de5f8b7e8f2f5458633c", + "rev": "a8cbd0c796e4678f0fd2e59f274e49705ee523ed", "type": "github" }, "original": { diff --git a/nixos/home-manager/programs/zsh.nix b/nixos/home-manager/programs/zsh.nix index 0af928c9..b1346348 100644 --- a/nixos/home-manager/programs/zsh.nix +++ b/nixos/home-manager/programs/zsh.nix @@ -1,102 +1,101 @@ { config, pkgs, ... }: -{ - programs.zsh = { - enable = true; - history = { - size = 102400; - save = 102400; - ignoreDups = true; - expireDuplicatesFirst = true; - share = true; + { + programs.zsh = { + enable = true; + history = { + size = 102400; + save = 102400; + ignoreDups = true; + expireDuplicatesFirst = true; + share = true; }; - enableAutosuggestions = true; - enableCompletion = true; - oh-my-zsh = { - enable = true; - plugins = [ "vi-mode" "git" "python" "history-substring-search" "tmux" ]; - }; - initExtra = '' - ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=238' - setopt HIST_IGNORE_ALL_DUPS - ''; - profileExtra = '' - export PATH="$HOME/programs:$PATH"; - export PATH="$HOME/tools:$PATH"; - export PATH="$HOME/bin:$PATH"; - export PATH="$HOME/.local/bin:$PATH"; - export PATH="$GOPATH/bin:$PATH"; - export PATH="$HOME/.rvm/bin:$PATH"; - export PATH="$HOME/.cargo/bin:$PATH"; - export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"; - ''; - envExtra = '' - [ -s "/home/cyryl/.jabba/jabba.sh" ] && source "/home/cyryl/.jabba/jabba.sh" - tmux source-file ~/.config/tmux/tmux.conf - local nixos_version=`which nixos-version` - if [[ ! -x "$nixos_version" ]]; then - source /home/cyryl/.nix-profile/etc/profile.d/nix.sh - export NIX_PATH="$HOME/.nix-defexpr/channels:$NIX_PATH" - export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - echo "non-nixos patches loaded" - fi - ''; - sessionVariables = { - TERM="xterm-256color"; - EDITOR="vim"; - VISUAL="vim"; - PAGER="less"; - ZSH_TMUX_AUTOSTART=true; - GOPATH="$HOME/go"; - }; - shellAliases = { - tmate = "tmux detach-client -E 'tmate;tmux'"; - cat = "bat -p"; - rg = "rga"; - }; - }; - programs.direnv = { - enable = true; - enableZshIntegration = true; - nix-direnv = { - enable = true; - enableFlakes= true; - }; - }; +enableAutosuggestions = true; +enableCompletion = true; +oh-my-zsh = { +enable = true; +plugins = [ "vi-mode" "git" "python" "history-substring-search" "tmux" ]; +}; +initExtra = '' +ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=238' +setopt HIST_IGNORE_ALL_DUPS +''; +profileExtra = '' +export PATH="$HOME/programs:$PATH"; +export PATH="$HOME/tools:$PATH"; +export PATH="$HOME/bin:$PATH"; +export PATH="$HOME/.local/bin:$PATH"; +export PATH="$GOPATH/bin:$PATH"; +export PATH="$HOME/.rvm/bin:$PATH"; +export PATH="$HOME/.cargo/bin:$PATH"; +export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"; +''; +envExtra = '' +[ -s "/home/cyryl/.jabba/jabba.sh" ] && source "/home/cyryl/.jabba/jabba.sh" +tmux source-file ~/.config/tmux/tmux.conf +local nixos_version=`which nixos-version` +if [[ ! -x "$nixos_version" ]]; then + source /home/cyryl/.nix-profile/etc/profile.d/nix.sh + export NIX_PATH="$HOME/.nix-defexpr/channels:$NIX_PATH" + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + echo "non-nixos patches loaded" +fi +''; +sessionVariables = { +TERM="xterm-256color"; +EDITOR="vim"; +VISUAL="vim"; +PAGER="less"; +ZSH_TMUX_AUTOSTART=true; +GOPATH="$HOME/go"; +}; +shellAliases = { +tmate = "tmux detach-client -E 'tmate;tmux'"; +cat = "bat -p"; +rg = "rga"; +}; +}; +programs.direnv = { +enable = true; +enableZshIntegration = true; +nix-direnv = { +enable = true; +}; +}; - home.file.".config/starship.toml".text ='' - [aws] - disabled = true +home.file.".config/starship.toml".text ='' +[aws] +disabled = true - [battery] - full_symbol = "" - charging_symbol = "" - discharging_symbol = "" +[battery] +full_symbol = "" +charging_symbol = "" +discharging_symbol = "" - [[battery.display]] - threshold = 10 - style = "bold red" +[[battery.display]] +threshold = 10 +style = "bold red" - [[battery.display]] - threshold = 30 - style = "bold yellow" +[[battery.display]] +threshold = 30 +style = "bold yellow" - [memory_usage] - disabled = false +[memory_usage] +disabled = false - [git_branch] - symbol = "git " +[git_branch] +symbol = "git " - [hg_branch] - symbol = "hg " +[hg_branch] +symbol = "hg " - [nix_shell] - symbol = "nix-shell " - ''; +[nix_shell] +symbol = "nix-shell " +''; - programs.starship = { - enable = true; - enableZshIntegration = true; - }; +programs.starship = { +enable = true; +enableZshIntegration = true; +}; }