From 72d7379ec54a5795a5bb64e82965a8d901e1f47d Mon Sep 17 00:00:00 2001 From: Nathan Braswell Date: Wed, 8 Jul 2026 00:05:10 -0400 Subject: [PATCH] nushell as default --- flake.lock | 105 ++++++++++++++++++++++++------------------ flake.nix | 5 +- home-manager/home.nix | 41 +++++++++++------ 3 files changed, 90 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index c7495cf..e14e33a 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1779666993, - "narHash": "sha256-W0yA7Y37oj5BBzl4ojO8dtv9MuOvdrIZDxtRjs7kpdg=", + "lastModified": 1781655108, + "narHash": "sha256-Fg7jz+6l17qnNT9FsLwexBEdixZuEp+2CDE3JRCGyFo=", "ref": "refs/heads/main", - "rev": "9b7f47f7f394dce0a17a7b161e0d2fe391ce72b3", - "revCount": 1366, + "rev": "064e48aa7be551a9d29d7db0287f086a40903bde", + "revCount": 1372, "type": "git", "url": "https://codeberg.org/LGFae/awww" }, @@ -222,11 +222,11 @@ ] }, "locked": { - "lastModified": 1779726696, - "narHash": "sha256-/p37CB5n6Wpw250b0Lq0CYwNq2D8uGKzDoBulyLcQqA=", + "lastModified": 1782749631, + "narHash": "sha256-slFTUgDy0KTPA4LBAmC/9SngDq8GCPdX+ZR0yQHHN1E=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a95e2efb477959b70b4a14c51035975c0481df6", + "rev": "5d72a29fc36ac21adae6ae35568fe5ee6700850f", "type": "github" }, "original": { @@ -247,11 +247,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1779748545, - "narHash": "sha256-AbRQrrpcNTBUoIf7Kc1qsdhsRLtZ0DDw+udm+8NWlJk=", + "lastModified": 1782765817, + "narHash": "sha256-RsObTWb8IfWFUHPUIrN681QCsBAgKyuJPliijjgeZwU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3754a033e05c750ef46fe4f078d79b826c4f9287", + "rev": "aea1aaeffbf135445f76112f345b7185c27432fd", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1779374863, - "narHash": "sha256-qKWgJ2MUODpg+b8tOwWMdMKREvs8TdGBz63SHaQZCeA=", + "lastModified": 1781781064, + "narHash": "sha256-Ii/koEm/sRyg65qbAQWqEgboSEIhdH0EL4KglAc14p0=", "owner": "YaLTeR", "repo": "niri", - "rev": "4294948cf1c70c50e938383c2c865d7ca455ac7e", + "rev": "49fc6117fd6c043adaa2ead316b82db5ed735d36", "type": "github" }, "original": { @@ -294,12 +294,15 @@ } }, "nixos-hardware": { + "inputs": { + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1779826373, - "narHash": "sha256-3sRzgLX86qV5NlhWUAufLmHwkyP03tmL3VdZIM13dEo=", + "lastModified": 1782562157, + "narHash": "sha256-a7+T6QSeowynwZ1ZJJbP8T8ntAytvrui8kFGJmIZt2c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ef4efb84766a166c906bd55759574676bf91267c", + "rev": "a9cf7546a938c737b079e738de73934a13de9784", "type": "github" }, "original": { @@ -311,26 +314,24 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", - "type": "github" + "lastModified": 1767892417, + "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" }, "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1779467186, - "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", + "lastModified": 1782651437, + "narHash": "sha256-10srBgrJz7JOWzS1KG5BhrwHCUPTcPqZgwNKo5N9YE4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", + "rev": "0a47451dbe2082a660b88a79a83efdc8d85de445", "type": "github" }, "original": { @@ -340,6 +341,20 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1782467914, + "narHash": "sha256-inDx/w70OSJoJPqtKh0BrzAsbZZhpya7YgS43jHnhwg=", + "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1022855.e73de5be04e0/nixexprs.tar.xz" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "nur": { "inputs": { "flake-parts": "flake-parts", @@ -348,11 +363,11 @@ ] }, "locked": { - "lastModified": 1779838643, - "narHash": "sha256-U/g0sIgvIlc1u3pxjXK+lcaJUlP4Dj8OaoE9C/OpAJ4=", + "lastModified": 1782790977, + "narHash": "sha256-ttI+I1YOaGd3QDOZmhyY0RCXp+vtkLCKhL1IYlBpaRU=", "owner": "nix-community", "repo": "NUR", - "rev": "ad930400ca1de33daf9eb9bdcbc480eb4b1b220c", + "rev": "dbfe58817fbf4591aaa68022e2c76fe0943d98bd", "type": "github" }, "original": { @@ -373,11 +388,11 @@ ] }, "locked": { - "lastModified": 1779766384, - "narHash": "sha256-P7Ohnlq8b8b2fU+Sgkrej7LBTM60LBTkHleLuYzmLmU=", + "lastModified": 1780281641, + "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", "owner": "nix-community", "repo": "NUR", - "rev": "57800b7ab648725ccd33551d01484ee14952ad3f", + "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", "type": "github" }, "original": { @@ -392,7 +407,7 @@ "home-manager": "home-manager", "niri": "niri", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nur": "nur", "stylix": "stylix", "tachikoma": "tachikoma" @@ -439,11 +454,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1779835981, - "narHash": "sha256-3VQklog/kSD9dw6uj6ElSfq3qwEHQWHCThR/cGcJ5Dc=", + "lastModified": 1782771270, + "narHash": "sha256-1W5Oga37XF1fzjpUut98j32NS9XcLQ5HmZDuOqSSrrY=", "owner": "danth", "repo": "stylix", - "rev": "d7ba76c960a84333a7a1fc62ccf84a266086903a", + "rev": "47571deb317bb1e53fbbe9c3cbf2a941cd94f794", "type": "github" }, "original": { @@ -490,11 +505,11 @@ ] }, "locked": { - "lastModified": 1781884897, - "narHash": "sha256-2J3z0t6X5dd6mjBDeYxiSRB1JB0nQX+ftiJtcM5SfDI=", + "lastModified": 1781895204, + "narHash": "sha256-ABzdazJNFxMLM5bJDsXZnHbpJZ83CUy0TUo/yj/CUJA=", "ref": "refs/heads/main", - "rev": "3a5c68b63e91cdbabce2180ddecacf8f9f566538", - "revCount": 189, + "rev": "6650ee26bbfb684b4a9cab55d2d7ebb9afd2ed8c", + "revCount": 191, "type": "git", "url": "https://forge.room409.xyz/miloignis/tachikoma.git" }, @@ -587,11 +602,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1779745227, - "narHash": "sha256-yqY7RtEJGJiENzR0GwL6q69tSAy6xAAmAcLuIhLjPf8=", + "lastModified": 1781226823, + "narHash": "sha256-28696iIw8uE0ZUyFTtzhEM8xMh85clCYypMxkvUi+sc=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "5d1efbc9dc3ab1c10160b656e0247f3325daf0f2", + "rev": "8575d0ef55d70f9b4c46b6bffb3accf912217e1e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index abf29d4..c81c5ec 100644 --- a/flake.nix +++ b/flake.nix @@ -78,7 +78,8 @@ extraGroups = [ "wheel" "disk" "audio" "video" "networkmanager" "systemd-journal" "networkmanager" "sway" "plugdev" "adbusers"]; createHome = true; home = "/home/nathan"; - shell = "/run/current-system/sw/bin/bash"; + # shell = "/run/current-system/sw/bin/bash"; + shell = pkgs.nushell; }; #fonts.fonts = with pkgs; [ fira-code jetbrains-mono iosevka ]; @@ -163,7 +164,7 @@ tmux vim wget curl git w3m iftop iotop killall file unzip zip p7zip ripgrep imv killall btop htop python3 waypipe firefox chromium chawan cmatrix nautilus - vlc mpv wayfarer libreoffice calibre foliate epr #transmission-gtk mupdf + vlc mpv wayfarer libreoffice calibre foliate epr lue #transmission-gtk mupdf gimp pavucontrol pywal sway wayland glib dracula-theme adwaita-icon-theme swaylock swayidle wl-clipboard diff --git a/home-manager/home.nix b/home-manager/home.nix index bc2a82b..b31d28c 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -11,7 +11,6 @@ home.username = username; home.homeDirectory = homeDirectory; - gtk.gtk4.theme = null; fonts.fontconfig.enable = true; home.packages = with pkgs; [ fira-code jetbrains-mono iosevka monoid recursive inter @@ -97,11 +96,11 @@ programs.niri.settings = { prefer-no-csd = true; # TV at 1080 instead of 4k - #outputs."DP-4".mode = { - # width = 1920; - # height = 1080; - # refresh = 60.000; - #}; + # outputs."DP-4".mode = { + # width = 1920; + # height = 1080; + # refresh = 60.000; + # }; ## LG Ultrawide #outputs."DP-4".mode = { # width = 1920; @@ -376,7 +375,8 @@ }; programs.starship = { enable = true; - enableBashIntegration = true; + enableNushellIntegration = true; + # enableBashIntegration = true; settings = { add_newline = false; format = lib.concatStrings [ @@ -398,16 +398,29 @@ }; }; }; - programs.bash = { + # programs.bash = { + # enable = true; + # sessionVariables = { + # EDITOR = "hx"; + # }; + # profileExtra = '' + # if [ -e /home/nathan/.nix-profile/etc/profile.d/nix.sh ]; then . /home/nathan/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer + # . "$HOME/.cargo/env" + # export PATH="/run/system-manager/sw/bin/:/home/nbraswell6/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH" + # ''; + # shellAliases = { + # ng ="nmcli c up NETGEAR97"; + # ng24="nmcli c up NETGEAR97_24_2Ghz"; + # ng58="nmcli c up NETGEAR97_28_5Ghz"; + # ng5c="nmcli c up NETGEAR97_2C_5Ghz"; + # }; + # }; + programs.nushell = { enable = true; - sessionVariables = { + settings.show_banner = false; + environmentVariables = { EDITOR = "hx"; }; - profileExtra = '' - if [ -e /home/nathan/.nix-profile/etc/profile.d/nix.sh ]; then . /home/nathan/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer - . "$HOME/.cargo/env" - export PATH="/run/system-manager/sw/bin/:/home/nbraswell6/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH" - ''; shellAliases = { ng ="nmcli c up NETGEAR97"; ng24="nmcli c up NETGEAR97_24_2Ghz";