From cd6e8147ab45196d969d5ea862bb02e2482670f6 Mon Sep 17 00:00:00 2001 From: notgne2 Date: Wed, 2 Nov 2022 20:36:45 -0700 Subject: [PATCH] switch to starfish prompt --- flake.lock | 77 +++++++++++++++++++------------- flake.nix | 10 ++--- home-manager/common.nix | 15 +++---- home-manager/modules/ezpcusr.nix | 12 +++-- home-manager/users/notgne2.nix | 32 ++++++------- 5 files changed, 81 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index ac35f60..f3957a1 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ "base16-kitty": { "flake": false, "locked": { - "lastModified": 1589263869, - "narHash": "sha256-+pdXnjuYl7E++QvKOrdSokBc32mkYf3e4Gmnn0xS2iQ=", + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", "owner": "kdrag0n", "repo": "base16-kitty", - "rev": "fe5862cec41bfd0b46a1ac3d7565a50680051226", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", "type": "github" }, "original": { @@ -51,15 +51,15 @@ "base16-rofi": { "flake": false, "locked": { - "lastModified": 1641693146, - "narHash": "sha256-rqHqb5NYycK0roqfsZXZ+9eSsq5763p+C5zRPp1GBpE=", - "owner": "0xdec", + "lastModified": 1666937130, + "narHash": "sha256-21G6lHjPO4M91HJE8cjSm7sj84iUH4AnzhI9wvcIPlQ=", + "owner": "tinted-theming", "repo": "base16-rofi", - "rev": "fbe876f7f75c25f27b6bc5b0572414827ee106b5", + "rev": "7b651f86714134e9770f8965342120f3f763be34", "type": "github" }, "original": { - "owner": "0xdec", + "owner": "tinted-theming", "repo": "base16-rofi", "type": "github" } @@ -96,19 +96,35 @@ "type": "github" } }, - "bobthefish": { + "bemoji": { "flake": false, "locked": { - "lastModified": 1640699193, - "narHash": "sha256-/x1NlbhxRZjrsk4C0mkSQi4zzpOaxL1O1vvzDHhGQk0=", - "owner": "oh-my-fish", - "repo": "theme-bobthefish", - "rev": "e69150081b0e576ebb382487c1ff2cb35e78bb35", + "lastModified": 1664305304, + "narHash": "sha256-yis9SPtMtKxmoAniwwEYt5hCroRvpGkkl4s3yX/580A=", + "owner": "marty-oehme", + "repo": "bemoji", + "rev": "d03068dba7a1c5708c2779921d7a945eb55377b4", "type": "github" }, "original": { - "owner": "oh-my-fish", - "repo": "theme-bobthefish", + "owner": "marty-oehme", + "repo": "bemoji", + "type": "github" + } + }, + "bwmenu": { + "flake": false, + "locked": { + "lastModified": 1651475624, + "narHash": "sha256-AHoKU1J43K41eYeHopdMi6p4cro3f6I7TUrX2xjPbHc=", + "owner": "mattydebie", + "repo": "bitwarden-rofi", + "rev": "732aa060ca04442cc16de43a7144ba817cda7f95", + "type": "github" + }, + "original": { + "owner": "mattydebie", + "repo": "bitwarden-rofi", "type": "github" } }, @@ -131,11 +147,11 @@ "firenvim": { "flake": false, "locked": { - "lastModified": 1642010719, - "narHash": "sha256-FL5Kz+e/iWVG7P1nfMo3Cn/kDmhdNJA4QjHucTrJ+AU=", + "lastModified": 1667394363, + "narHash": "sha256-RdrBb4U0GjUdNj+HSPx+CV5lUmqFxLlEcKbirdBOVw8=", "owner": "glacambre", "repo": "firenvim", - "rev": "a52a325120d357cf767137114bdab37044c11acd", + "rev": "eeaddd0b503f841fa24f60cebd14fa93d2b33f77", "type": "github" }, "original": { @@ -192,7 +208,7 @@ "locked": { "lastModified": 1641922242, "narHash": "sha256-eZ83Fsgmjt4FejQErEyJSAskq9wmxlFriH0QPecqOKU=", - "ref": "master", + "ref": "refs/heads/master", "rev": "841b934fe3666edbede6a548ec8d4ac57b8f5430", "revCount": 20, "type": "git", @@ -205,11 +221,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1641887635, - "narHash": "sha256-kDGpufwzVaiGe5e1sBUBPo9f1YN+nYHJlYqCaVpZTQQ=", + "lastModified": 1667231093, + "narHash": "sha256-RERXruzBEBuf0c7OfZeX1hxEKB+PTCUNxWeB6C1jd8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2737d4980a17cc2b7d600d7d0b32fd7333aca88", + "rev": "d40fea9aeb8840fea0d377baa4b38e39b9582458", "type": "github" }, "original": { @@ -253,11 +269,11 @@ "npmlock2nix": { "flake": false, "locked": { - "lastModified": 1654775747, - "narHash": "sha256-9pXHDpIjmsK5390wmpGHu9aA4QOPpegPBvThHeBlef4=", + "lastModified": 1666460237, + "narHash": "sha256-HME6rnysvCwUVtH+BDWDGahmweMaLgD2wqHeRuGp6QI=", "owner": "nix-community", "repo": "npmlock2nix", - "rev": "5c4f247688fc91d665df65f71c81e0726621aaa8", + "rev": "eeed152290ec2425f96c5e74e469c40b621e1468", "type": "github" }, "original": { @@ -293,7 +309,8 @@ "base16-rofi": "base16-rofi", "base16-vim": "base16-vim", "base16-vscode": "base16-vscode", - "bobthefish": "bobthefish", + "bemoji": "bemoji", + "bwmenu": "bwmenu", "done": "done", "firenvim": "firenvim", "mudl": "mudl", @@ -307,11 +324,11 @@ "rycee": { "flake": false, "locked": { - "lastModified": 1641937762, - "narHash": "sha256-VvCD2K/B0Cl3/xPi0+wn3YyuKe6J1DX0bUpw0mF1O+M=", + "lastModified": 1667361759, + "narHash": "sha256-PSrfcBDZpvVUr7A2JMrXUI8cnxl1/SC5uCvs3HBhrI8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "3126aacd425d4e1f0e12365f5fc3257a94497551", + "rev": "6315cb4c514b07e8b66ad79f2f1f9a349408953c", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index 0d91b59..772c55b 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,6 @@ url = "github:glacambre/firenvim"; flake = false; }; - bobthefish = { - url = "github:oh-my-fish/theme-bobthefish"; - flake = false; - }; done = { url = "github:franciscolourenco/done"; flake = false; @@ -79,9 +75,9 @@ fuckingprint = import ./modules/fuckingprint.nix; workstation = import ./modules/workstation.nix; ezpw = import ./modules/ezpw.nix; - de2 = import ./home-manager/modules/de2.nix; - de3 = import ./home-manager/modules/de3.nix; - ezpc = import ./home-manager/modules/ezpc.nix; + de2 = import ./modules/de2.nix; + de3 = import ./modules/de3.nix; + ezpc = import ./modules/ezpc.nix; all = import ./modules/default.nix; }; diff --git a/home-manager/common.nix b/home-manager/common.nix index 3e3debb..3630281 100644 --- a/home-manager/common.nix +++ b/home-manager/common.nix @@ -57,7 +57,12 @@ inputs: { notify-desktop ]; - home.sessionVariables = {TERM = "xterm-256color";}; + programs.starship = { + enable = true; + settings = { + line_break.disabled = true; + }; + }; programs.fish = { enable = true; @@ -73,10 +78,6 @@ inputs: { name = "done"; src = inputs.done; } - { - name = "bobthefish"; - src = inputs.bobthefish; - } ]; shellInit = '' if not set -q NIX_PATH @@ -86,13 +87,9 @@ inputs: { end ''; interactiveShellInit = '' - set TERM xterm-256color - set -U __done_min_cmd_duration 2000 set -U fish_key_bindings fish_default_key_bindings - set -g theme_nerd_fonts yes - set -g theme_display_date no eval (${pkgs.direnv}/bin/direnv hook fish) ''; diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix index 740fa19..ef28d7a 100644 --- a/home-manager/modules/ezpcusr.nix +++ b/home-manager/modules/ezpcusr.nix @@ -181,8 +181,14 @@ in { enable = true; events = [ - { event = "before-sleep"; command = "${lockCommand}"; } - { event = "lock"; command = "${lockCommand}"; } + { + event = "before-sleep"; + command = "${lockCommand}"; + } + { + event = "lock"; + command = "${lockCommand}"; + } ]; timeouts = [ @@ -217,7 +223,7 @@ in { keybindings = let modifier = config.wayland.windowManager.sway.config.modifier; - alphabet = ["Ctrl" "Alt" "Ctrl+Alt" ]; + alphabet = ["Ctrl" "Alt" "Ctrl+Alt"]; genKeyAttrs = move: lib.listToAttrs ( map diff --git a/home-manager/users/notgne2.nix b/home-manager/users/notgne2.nix index 81abc09..5122514 100644 --- a/home-manager/users/notgne2.nix +++ b/home-manager/users/notgne2.nix @@ -226,22 +226,22 @@ in { }; ezcolors.baseColors = { - base00 = "22273b"; - base01 = "414f60"; - base02 = "5a8380"; - base03 = "6e6f72"; - base04 = "87888b"; - base05 = "a4a6a9"; - base06 = "c7c9cd"; - base07 = "8dbdaa"; - base08 = "777abc"; - base09 = "94929e"; - base0A = "4f9062"; - base0B = "6562a8"; - base0C = "226f68"; - base0D = "4d6bb6"; - base0E = "716cae"; - base0F = "8c70a7"; + base00 = "0b1c2c"; + base01 = "223b54"; + base02 = "405c79"; + base03 = "627e99"; + base04 = "aabcce"; + base05 = "cbd6e2"; + base06 = "e5ebf1"; + base07 = "f7f9fb"; + base08 = "bf8b56"; + base09 = "bfbf56"; + base0A = "8bbf56"; + base0B = "56bf8b"; + base0C = "568bbf"; + base0D = "8b56bf"; + base0E = "bf568b"; + base0F = "bf5656"; }; home.sessionVariables = {