From c04feaaba0576508dcd8188e5c325c9ec0829530 Mon Sep 17 00:00:00 2001 From: Joshua Elmasri Date: Fri, 24 Oct 2025 20:16:50 -0500 Subject: [PATCH] changes --- flake.lock | 66 ++++++++++----------- flake.nix | 2 +- hosts/mac-laptop/hardware-configuration.nix | 7 ++- hosts/mac-laptop/home.nix | 2 +- modules/starship/default.nix | 8 +++ modules/stylix.nix | 2 +- 6 files changed, 48 insertions(+), 39 deletions(-) create mode 100644 modules/starship/default.nix diff --git a/flake.lock b/flake.lock index b521600..e336f5f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1760047618, - "narHash": "sha256-vMhDAwwSrwMd5xWcTiA56fsk7LRz4tHOsKhrt2hXi48=", + "lastModified": 1761246688, + "narHash": "sha256-U2r3/DKgr9Fq1yqWLCbKMSqRf8a1JctD0kj/ftBClsg=", "owner": "aylur", "repo": "astal", - "rev": "71b008e5fb59e0a992724db78d54a5ddcf234515", + "rev": "189bf73016c26d7d32729a913d6436cd7b1a0885", "type": "github" }, "original": { @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1760500983, - "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", + "lastModified": 1761316995, + "narHash": "sha256-BAAjCpjTnfaxtc9NCkbUl9MUv5JmAG5qU7/G8TTHmb4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", + "rev": "82b58f38202540bce4e5e00759d115c5a43cab85", "type": "github" }, "original": { @@ -262,16 +262,16 @@ }, "master": { "locked": { - "lastModified": 1760455212, - "narHash": "sha256-VUHdp3PXvaUQPrdzZkNNp+S6Db1Q6HnNAnocqvmzJ4w=", - "owner": "LunNova", + "lastModified": 1761323738, + "narHash": "sha256-4wAJWLQq2gdkFzp72sSnNtzZb8H7yKEqlf+ABZfEibk=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfd0d13dc984b8f6fcedccd2c26f1a2c7b5e3261", + "rev": "385f0a2ebbff162a2ba67c72e6ab2f21f5a2f006", "type": "github" }, "original": { - "owner": "LunNova", - "ref": "push-nmzswnymunon", + "owner": "NixOS", + "ref": "master", "repo": "nixpkgs", "type": "github" } @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1759818599, - "narHash": "sha256-4Go3gVl3E+geWMcFQ+06qlkO/lJlSvS9dyhYiXLWYq0=", + "lastModified": 1761319449, + "narHash": "sha256-6mYaajlXqx0ihAIROsIn5UZgKrpjd53sgou25p19i5o=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "24ab28e47b586f741910b3a2f0428f3523a0fff3", + "rev": "cff3fa31234c130b115d06fb5080f6d05cd69700", "type": "github" }, "original": { @@ -299,11 +299,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -322,11 +322,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1760538614, - "narHash": "sha256-RSim5VyR6tqq3tJImSNYIXIjdA6k+0BWz6JFgQTkQiQ=", + "lastModified": 1761309195, + "narHash": "sha256-DUtt6LE+9TC0/HTg+sQb0uWuw7uSDhqYmKesGEy3Shk=", "owner": "nix-community", "repo": "nixvim", - "rev": "d60696f62d0f9265dd9eff8e54ce2cd4b20c92e1", + "rev": "fa8240195abc88a1a161e8d3e2a5b42a5d54b5df", "type": "github" }, "original": { @@ -370,11 +370,11 @@ ] }, "locked": { - "lastModified": 1758662783, - "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=", + "lastModified": 1760652422, + "narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=", "owner": "NuschtOS", "repo": "search", - "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4", + "rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726", "type": "github" }, "original": { @@ -416,11 +416,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1760472212, - "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=", + "lastModified": 1761028816, + "narHash": "sha256-s1XiIeJHpODVWfzsPaK9e21iz1dQSCU3H4/1OxOsyps=", "owner": "danth", "repo": "stylix", - "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db", + "rev": "b81dc0a385443099e7d231fe6275189e32c3b760", "type": "github" }, "original": { @@ -565,11 +565,11 @@ ] }, "locked": { - "lastModified": 1760581975, - "narHash": "sha256-iAIGFKM6CHrCU7Aoe/6RRV4ALDc3zph+sN2nPNAKym4=", + "lastModified": 1761269012, + "narHash": "sha256-/naxU8jbaoZM3CQCjJiI6Z5+vsv+zA7eZdhFY1tbzsM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "2455291102af7efe99db2432f3f526f2d17525e6", + "rev": "c7f5f0122cf8c4bfd9ef3b138eb615f0e54f1459", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7417fdc..36eb9e3 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; - master.url = "github:LunNova/nixpkgs/push-nmzswnymunon"; + master.url = "github:NixOS/nixpkgs/master"; home-manager.url = "github:nix-community/home-manager"; nixvim = { url = "github:nix-community/nixvim"; diff --git a/hosts/mac-laptop/hardware-configuration.nix b/hosts/mac-laptop/hardware-configuration.nix index 3c151cf..30a0c1c 100644 --- a/hosts/mac-laptop/hardware-configuration.nix +++ b/hosts/mac-laptop/hardware-configuration.nix @@ -8,18 +8,18 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "usb_storage" ]; + boot.initrd.availableKernelModules = [ "usbhid" "usb_storage" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/089c3a91-0f69-4a24-8ca0-e7a4a817be07"; + { device = "/dev/disk/by-uuid/b80e3211-820e-48b1-9c64-97c275b26de2"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/4267-12F5"; + { device = "/dev/disk/by-uuid/60EA-1224"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; @@ -31,6 +31,7 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enu1u4c2.useDHCP = lib.mkDefault true; # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; diff --git a/hosts/mac-laptop/home.nix b/hosts/mac-laptop/home.nix index 8fb284d..1dd24ae 100644 --- a/hosts/mac-laptop/home.nix +++ b/hosts/mac-laptop/home.nix @@ -6,7 +6,7 @@ home.username = "joshuaelm"; home.homeDirectory = "/home/joshuaelm"; - imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_laptop.nix ../../modules/waybar/waybar.nix ../../modules/ashell ../../modules/zen ../../modules/rofi ../../modules/kitty ]; + imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_laptop.nix ../../modules/waybar/waybar.nix ../../modules/ashell ../../modules/zen ../../modules/rofi ../../modules/kitty ../../modules/starship ]; home.packages = [ diff --git a/modules/starship/default.nix b/modules/starship/default.nix new file mode 100644 index 0000000..c60466c --- /dev/null +++ b/modules/starship/default.nix @@ -0,0 +1,8 @@ +{pkgs,...}: + +{ + programs.starship = { + enable = true; + enableFishIntegration = true; + }; +} diff --git a/modules/stylix.nix b/modules/stylix.nix index fb5e3ec..95fc112 100644 --- a/modules/stylix.nix +++ b/modules/stylix.nix @@ -5,7 +5,7 @@ #stylix.targets.plymouth.enable = false; stylix.targets.kitty.enable = true; stylix.targets.hyprpaper.enable = true; - stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"; + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml"; stylix.targets.zen-browser.profileNames = [ "default" ]; stylix.targets.zen-browser.enable = true; # blue aura house