From 00d0681a9930a9188712bfce289edd1274c5ccc4 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 1 Jan 2022 16:36:15 +0100 Subject: [PATCH 01/16] git: mkDefault gitFull --- home-manager/profiles/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/profiles/git.nix b/home-manager/profiles/git.nix index a8a2bcc..403acc8 100644 --- a/home-manager/profiles/git.nix +++ b/home-manager/profiles/git.nix @@ -8,7 +8,7 @@ home.packages = [ programs.git = { enable = true; ignores = [ "*~" "*.swp" ]; - package = pkgs.gitFull; + package = lib.mkDefault pkgs.gitFull; aliases = { a = "add"; authors = "shortlog -s -n"; -- 2.47.0 From 6025478b0ce969d31ab6aa9dcd2781076f49c697 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sun, 2 Jan 2022 06:17:36 +0100 Subject: [PATCH 02/16] carotte: disable gpg because pinentry misses libassuan --- homes/julm/hosts/carotte.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/homes/julm/hosts/carotte.nix b/homes/julm/hosts/carotte.nix index 5a5e4c7..c98d305 100644 --- a/homes/julm/hosts/carotte.nix +++ b/homes/julm/hosts/carotte.nix @@ -4,6 +4,8 @@ imports = [ #../../../home-manager/profiles/graphical.nix #../../../home-manager/profiles/networking.nix ]; +services.gpg-agent.enable = lib.mkForce false; +services.gpg.enable = lib.mkForce false; services.gpg-agent.pinentryFlavor = lib.mkForce "curses"; # Does not cross-compile: # xsltproc: cannot execute binary file: Exec format error -- 2.47.0 From 2a386f30db3444fe5de3bdd38557155c4569f153 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 22 Jan 2022 05:40:09 +0100 Subject: [PATCH 03/16] dconf: gnome alias no longer exists --- nixos/profiles/graphical.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/profiles/graphical.nix b/nixos/profiles/graphical.nix index 790cdd3..d6252ce 100644 --- a/nixos/profiles/graphical.nix +++ b/nixos/profiles/graphical.nix @@ -13,7 +13,7 @@ networking.networkmanager = { }; }; -services.dbus.packages = [ pkgs.gnome3.dconf ]; +services.dbus.packages = [ pkgs.dconf ]; services.gvfs.enable = lib.mkDefault true; -- 2.47.0 From e2c96ef338285cfda1a0280ca647d6ef5c7638a4 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Thu, 27 Jan 2022 06:48:14 +0100 Subject: [PATCH 04/16] nix: update inputs --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index c6bb486..0e879a0 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "doom-emacs": { "flake": false, "locked": { - "lastModified": 1634812062, - "narHash": "sha256-LL6aP+Y/L4TPfYzO2v1WCeRY6v9MW9vX7kC6sxgWah0=", + "lastModified": 1643252771, + "narHash": "sha256-T1H4uXm0dwDBxa+3aYE+xl/6hiW4VXX0ax6DEGvy25Y=", "owner": "hlissner", "repo": "doom-emacs", - "rev": "0869d28483b5d81b818b110af351fd5c4dc04dd9", + "rev": "ff4609835a4c47312b3d685e09330034d6f4c8a4", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1635303073, - "narHash": "sha256-teBg+mOuj5NEburUcOlydHU79uc/I/JTeQCEHH6YY+Y=", + "lastModified": 1643252190, + "narHash": "sha256-V774e49jTUgdsHRfkPDNsH4BHT4hxbhCYkayLEwOHdM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c0f8d5f9d851d87cb37e2a0de883f4bee6c8b411", + "rev": "8e5d094f0a82b37c24e77577c46f1787887f5af8", "type": "github" }, "original": { @@ -147,11 +147,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", "owner": "numtide", "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "type": "github" }, "original": { @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1638150501, - "narHash": "sha256-aWH3MRmjUtx8ciSGLegBJC5mhymsuroHPs74ZldrNTU=", + "lastModified": 1643240026, + "narHash": "sha256-aBx8Ot/XgO7dlRUdWbG57z7rW3+ak1ZNBt2A0aWtmqU=", "owner": "nix-community", "repo": "home-manager", - "rev": "9de77227d7780518cfeaee5a917970247f3ecc56", + "rev": "24ed6e6d4d8df7045b1fe38dedc3db179321eaa3", "type": "github" }, "original": { -- 2.47.0 From c59eb9923ef6766051e5e925f75b57b22367ad55 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Mon, 31 Jan 2022 15:30:22 +0100 Subject: [PATCH 05/16] nix: update inputs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0e879a0..a727fa8 100644 --- a/flake.lock +++ b/flake.lock @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1643240026, - "narHash": "sha256-aBx8Ot/XgO7dlRUdWbG57z7rW3+ak1ZNBt2A0aWtmqU=", + "lastModified": 1643567433, + "narHash": "sha256-tyFgodcZRlt0ZshbgyLf4m/Sd/ys9p0AHfeVZQ50WKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "24ed6e6d4d8df7045b1fe38dedc3db179321eaa3", + "rev": "95d39e13a4a7a818c87f2701b59820d3ac0e674c", "type": "github" }, "original": { -- 2.47.0 From b0f78a556f02d8c29e7f927596eb7269fa548b97 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Mon, 31 Jan 2022 15:31:54 +0100 Subject: [PATCH 06/16] gpg: fix --- home-manager/profiles/developing.nix | 1 + home-manager/profiles/essential.nix | 3 +-- home-manager/profiles/git.nix | 2 +- homes/julm/hosts/carotte.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/profiles/developing.nix b/home-manager/profiles/developing.nix index a20fb3b..a12a6c7 100644 --- a/home-manager/profiles/developing.nix +++ b/home-manager/profiles/developing.nix @@ -4,6 +4,7 @@ imports = [ ./git.nix ]; manual.manpages.enable = lib.mkDefault true; +programs.git.package = pkgs.gitFull; programs.man.enable = lib.mkDefault true; home.packages = [ pkgs.binwalk diff --git a/home-manager/profiles/essential.nix b/home-manager/profiles/essential.nix index eb3064a..ec5c885 100644 --- a/home-manager/profiles/essential.nix +++ b/home-manager/profiles/essential.nix @@ -4,14 +4,13 @@ imports = [ ./bash.nix ./direnv.nix ./git.nix - ./gnupg.nix + #./gnupg.nix ./htop.nix ./lf.nix ./ssh.nix ./tmux.nix ]; programs.bat.enable = lib.mkDefault true; -programs.git.package = lib.mkDefault pkgs.gitMinimal; programs.home-manager.enable = true; home.packages = [ nixosConfig.boot.kernelPackages.cpupower diff --git a/home-manager/profiles/git.nix b/home-manager/profiles/git.nix index 403acc8..aa21a40 100644 --- a/home-manager/profiles/git.nix +++ b/home-manager/profiles/git.nix @@ -8,7 +8,7 @@ home.packages = [ programs.git = { enable = true; ignores = [ "*~" "*.swp" ]; - package = lib.mkDefault pkgs.gitFull; + package = lib.mkDefault pkgs.gitMinimal; aliases = { a = "add"; authors = "shortlog -s -n"; diff --git a/homes/julm/hosts/carotte.nix b/homes/julm/hosts/carotte.nix index c98d305..41559bf 100644 --- a/homes/julm/hosts/carotte.nix +++ b/homes/julm/hosts/carotte.nix @@ -5,7 +5,7 @@ imports = [ #../../../home-manager/profiles/networking.nix ]; services.gpg-agent.enable = lib.mkForce false; -services.gpg.enable = lib.mkForce false; +programs.gpg.enable = lib.mkForce false; services.gpg-agent.pinentryFlavor = lib.mkForce "curses"; # Does not cross-compile: # xsltproc: cannot execute binary file: Exec format error -- 2.47.0 From d13c9ff2944b2ae0e91c21502365e3f42e0a916d Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Mon, 31 Jan 2022 15:42:07 +0100 Subject: [PATCH 07/16] home-manager: pin working version --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index a09d535..8a11c11 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs.nixpkgs.url = "github:NixOS/nixpkgs/eac07edbd20ed4908b98790ba299250b5527ecdf"; inputs.flake-utils.url = "github:numtide/flake-utils"; -inputs.home-manager.url = "github:nix-community/home-manager"; +inputs.home-manager.url = "github:nix-community/home-manager/3d46c011d2cc2c9ca24d9b803e9daf156d9429ea"; inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs"; inputs.doom-emacs.url = "github:hlissner/doom-emacs"; inputs.doom-emacs.flake = false; -- 2.47.0 From d31c136f6d8bb8cd904ea41098f956af87edd287 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Fri, 4 Feb 2022 17:54:49 +0100 Subject: [PATCH 08/16] build: add script --- build | 6 ++++++ install | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100755 build diff --git a/build b/build new file mode 100755 index 0000000..09d11a6 --- /dev/null +++ b/build @@ -0,0 +1,6 @@ +#!/bin/sh -eux +cd "${0%/*}" +chmod -R g-rwx,o-rwx "$PWD/private/root" +trap 'git reset private/root' EXIT +git rm -rf --cached --ignore-unmatch private/root # prevent copying to /nix/store +time nix -L build .\#nixosConfigurations."$1".config.system.build.toplevel diff --git a/install b/install index fa3c41c..dc6b752 100755 --- a/install +++ b/install @@ -7,6 +7,6 @@ else ln -sfn "$PWD/private/root" /root/private trap 'git reset private/root' EXIT git rm -rf --cached --ignore-unmatch private/root # prevent copying to /nix/store - nixos-rebuild switch --flake . "$@" + time nixos-rebuild switch --flake . "$@" nix-env --delete-generations +9 --profile /nix/var/nix/profiles/system fi -- 2.47.0 From 24ef37ae57c4dcc3a98a0ae815a68594f1df6f6b Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Fri, 4 Feb 2022 17:55:13 +0100 Subject: [PATCH 09/16] nix: update inputs --- flake.lock | 15 ++++++++------- flake.nix | 2 +- home-manager/profiles/xfce.nix | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index a727fa8..0d25d31 100644 --- a/flake.lock +++ b/flake.lock @@ -167,16 +167,17 @@ ] }, "locked": { - "lastModified": 1643567433, - "narHash": "sha256-tyFgodcZRlt0ZshbgyLf4m/Sd/ys9p0AHfeVZQ50WKU=", + "lastModified": 1639329010, + "narHash": "sha256-k9OXwR06419/s0FAnRalUs24+8EI6GepGaatAXhBc+0=", "owner": "nix-community", "repo": "home-manager", - "rev": "95d39e13a4a7a818c87f2701b59820d3ac0e674c", + "rev": "3d46c011d2cc2c9ca24d9b803e9daf156d9429ea", "type": "github" }, "original": { "owner": "nix-community", "repo": "home-manager", + "rev": "3d46c011d2cc2c9ca24d9b803e9daf156d9429ea", "type": "github" } }, @@ -241,17 +242,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1640319671, - "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=", + "lastModified": 1643221379, + "narHash": "sha256-ctMJZA++yYzbRCEHFb5ydukKdPgaGY0vCZSlbkFCW6o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf", + "rev": "ad79594d1e2fea66bf7d5faeec6ef35319596031", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf", + "rev": "ad79594d1e2fea66bf7d5faeec6ef35319596031", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 8a11c11..dfbff20 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { -inputs.nixpkgs.url = "github:NixOS/nixpkgs/eac07edbd20ed4908b98790ba299250b5527ecdf"; +inputs.nixpkgs.url = "github:NixOS/nixpkgs/ad79594d1e2fea66bf7d5faeec6ef35319596031"; inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.home-manager.url = "github:nix-community/home-manager/3d46c011d2cc2c9ca24d9b803e9daf156d9429ea"; inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/profiles/xfce.nix b/home-manager/profiles/xfce.nix index 7f87b07..2ef8df1 100644 --- a/home-manager/profiles/xfce.nix +++ b/home-manager/profiles/xfce.nix @@ -9,7 +9,7 @@ home.file.".profile".text = '' home.packages = [ pkgs.mate.caja-with-extensions # Thunar does not map user_id over sftp:// pkgs.elementary-xfce-icon-theme - pkgs.gnome3.defaultIconTheme + pkgs.gnome3.adwaita-icon-theme pkgs.gnome3.file-roller pkgs.gnome3.gnome-calculator pkgs.gnome3.gnome-keyring -- 2.47.0 From 97d048765f90acbadd41027dfe278fa6db2ae136 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Tue, 8 Feb 2022 17:44:15 +0100 Subject: [PATCH 10/16] irssi: add #bluehats --- homes/julm/irssi/config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/homes/julm/irssi/config b/homes/julm/irssi/config index 63a9692..e24f495 100644 --- a/homes/julm/irssi/config +++ b/homes/julm/irssi/config @@ -136,6 +136,7 @@ channels = ( { chatnet = "GeekNode"; name = "markas"; autojoin = "yes"; }, { chatnet = "GeekNode"; name = "rezine"; autojoin = "yes"; }, { chatnet = "GeekNode"; name = "sourcephile"; autojoin = "yes"; }, + { chatnet = "Libera"; name = "bluehats"; autojoin = "yes"; }, { chatnet = "Libera"; name = "conservancy"; autojoin = "yes"; }, { chatnet = "Libera"; name = "haskell-beginners"; autojoin = "yes"; }, { chatnet = "Libera"; name = "haskell-docs"; autojoin = "no"; }, @@ -296,6 +297,7 @@ ignores = ( { level = "JOINS PARTS QUITS NICKS"; channels = ( + "#bluehats", "#conservancy", "#ghc", "#grenode", @@ -340,7 +342,7 @@ windows = { 1 = { immortal = "yes"; name = "(status)"; level = "ALL"; }; 2 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#stupidities"; tag = "Libera"; }); }; 3 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#haskell-fr"; tag = "Libera"; }); }; - 4 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#conservancy"; tag = "Libera"; }); }; + 4 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#bluehats"; tag = "Libera"; }); }; 5 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#grenode"; tag = "GeekNode"; }); }; 6 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#gresille"; tag = "GeekNode"; }); }; 7 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#haskell"; tag = "OFTC"; }); }; @@ -372,5 +374,6 @@ windows = { 33 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#zfs"; tag = "OFTC"; }); }; 34 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#zfs-fr"; tag = "Libera"; }); }; 35 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#zfs-fr"; tag = "OFTC"; }); }; + 36 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#conservancy"; tag = "Libera"; }); }; }; -- 2.47.0 From fb2833d5eb22a5958f1be3fc31bf28a1722d2bdf Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Thu, 10 Feb 2022 07:35:57 +0100 Subject: [PATCH 11/16] coredump: disable by default --- nixos/profiles/security.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/profiles/security.nix b/nixos/profiles/security.nix index 4b11c49..2f9ae3e 100644 --- a/nixos/profiles/security.nix +++ b/nixos/profiles/security.nix @@ -140,6 +140,14 @@ services.journald.extraConfig = '' Storage=persistent SystemMaxUse=100M ''; +systemd.coredump = { + enable = lib.mkDefault false; + extraConfig = '' + Compress=true + MaxUse=1024M + Storage=external + ''; +}; services.openssh = { openFirewall = lib.mkDefault false; passwordAuthentication = false; -- 2.47.0 From 7022f805ed4926c640e44e529c25b3f8f497f5d4 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Thu, 10 Feb 2022 22:07:55 +0100 Subject: [PATCH 12/16] mastodon-archive: install on losurdo --- home-manager/profiles/social.nix | 9 +++++++++ homes/julm/hosts/losurdo.nix | 1 + 2 files changed, 10 insertions(+) create mode 100644 home-manager/profiles/social.nix diff --git a/home-manager/profiles/social.nix b/home-manager/profiles/social.nix new file mode 100644 index 0000000..88f9aff --- /dev/null +++ b/home-manager/profiles/social.nix @@ -0,0 +1,9 @@ +{ pkgs, lib, config, nixosConfig, ... }: +{ +imports = [ +]; +home.packages = [ + pkgs.mastodon-archive +] ++ lib.optionals nixosConfig.services.xserver.enable [ +]; +} diff --git a/homes/julm/hosts/losurdo.nix b/homes/julm/hosts/losurdo.nix index b7b2641..4c2ab24 100644 --- a/homes/julm/hosts/losurdo.nix +++ b/homes/julm/hosts/losurdo.nix @@ -15,6 +15,7 @@ imports = [ services.gpg-agent.pinentryFlavor = lib.mkForce "curses"; home.packages = [ pkgs.evince + pkgs.mastodon-archive #pkgs.blender #pkgs.freecad #pkgs.sweethome3d.application -- 2.47.0 From c061c9ccfdabc08461367538ed2ce01702269b2f Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Wed, 16 Feb 2022 06:59:30 +0100 Subject: [PATCH 13/16] git: add aliases --- home-manager/profiles/git.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/home-manager/profiles/git.nix b/home-manager/profiles/git.nix index aa21a40..a44122e 100644 --- a/home-manager/profiles/git.nix +++ b/home-manager/profiles/git.nix @@ -15,7 +15,8 @@ programs.git = { bl = "git log -p -M --follow --stat --"; b = "branch"; c = "commit"; - ca = "commit --amend -C@"; + ca = "commit --amend"; + caa = "commit --amend -C@"; cf = "commit --fixup"; co = "checkout"; d = "diff"; @@ -23,8 +24,15 @@ programs.git = { dh = "diff --histogram"; dp = "diff --patience"; ign = "ls-files -o -i --exclude-standard"; + l = "log"; ll = "log --graph --decorate --pretty=oneline --abbrev-commit"; lp = "log -p --pretty=fuller"; + lpg = "log -p --pretty=fuller -g"; + p = "push -v"; + pf = "push -vf"; + pu = "pull"; + r = "reset"; + rh = "reset --hard"; s = "status"; spull = "!git-svn fetch && git-svn rebase"; spush = "!git-svn dcommit"; -- 2.47.0 From 5f3ece8f859991fa6c1d6366f52aa318cb072077 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sun, 20 Feb 2022 03:33:46 +0100 Subject: [PATCH 14/16] xmonad: use pactl instead of amixer (which no longer works) --- home-manager/profiles/xmonad/xmonad.hs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/home-manager/profiles/xmonad/xmonad.hs b/home-manager/profiles/xmonad/xmonad.hs index 83e87da..3e1e7c9 100644 --- a/home-manager/profiles/xmonad/xmonad.hs +++ b/home-manager/profiles/xmonad/xmonad.hs @@ -69,12 +69,9 @@ myKeys , ((modMask, xK_Print), spawn "select-screenshot") -- Volume control - , ((0, 0x1008FF12), spawn "amixer -q set Master toggle") -- XF88AudioMute - , ((0, 0x1008FF11), spawn "amixer -q set Master 5%-") -- XF86AudioLowerVolume - , ((0, 0x1008FF13), spawn "amixer -q set Master 5%+") -- XF86AudioRaiseVolume - , ((shiftMask, 0x1008FF12), spawn "amixer -q set PCM toggle") -- XF88AudioMute - , ((shiftMask, 0x1008FF11), spawn "amixer -q set PCM 5%-") -- XF86AudioLowerVolume - , ((shiftMask, 0x1008FF13), spawn "amixer -q set PCM 5%+") -- XF86AudioRaiseVolume + , ((0, 0x1008FF12), spawn "pactl -- set-sink-mute 0 toggle") -- XF88AudioMute + , ((0, 0x1008FF11), spawn "pactl -- set-sink-volume 0 -5%") -- XF86AudioLowerVolume + , ((0, 0x1008FF13), spawn "pactl -- set-sink-volume 0 +5%") -- XF86AudioRaiseVolume -- Audio previous -- , ((0, 0x1008FF16), spawn "") -- Play/pause -- 2.47.0 From 6357725685832dd6fb11f2b8a8e34f2fb37079b7 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Mon, 21 Feb 2022 00:14:08 +0100 Subject: [PATCH 15/16] bash: tweak history settings --- home-manager/profiles/bash.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/profiles/bash.nix b/home-manager/profiles/bash.nix index d9f84a1..ccc2e34 100644 --- a/home-manager/profiles/bash.nix +++ b/home-manager/profiles/bash.nix @@ -34,6 +34,8 @@ programs.bash = { }; initExtra = '' shopt -s globstar + shopt -s histreedit + shopt -s histverify # Disable ctrl-s/ctrl-q flow control stty -ixon -- 2.47.0 From 35ba057fad6451d2c5412fd88bdbfa559182a6b2 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Mon, 21 Feb 2022 00:14:20 +0100 Subject: [PATCH 16/16] broot: uninstall --- home-manager/profiles/bash.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/profiles/bash.nix b/home-manager/profiles/bash.nix index ccc2e34..c4f46c3 100644 --- a/home-manager/profiles/bash.nix +++ b/home-manager/profiles/bash.nix @@ -106,7 +106,7 @@ programs.bash = { ''; }; programs.direnv.enableBashIntegration = true; -programs.broot.enableBashIntegration = true; +#programs.broot.enableBashIntegration = true; home.sessionVariables = { PS1 = ''\[\033[1;32m\]\[\e]0;\u@\h: \w\a\]\W\[\033[0m\] \$(e=\$?; if [ \$e != 0 ]; then echo '\[\e[0;91m\]'\$e'\[\e[0m\]'; fi)\$ ''; }; -- 2.47.0