diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index 9a80770..8518473 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1749744770, - "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=", + "lastModified": 1757432263, + "narHash": "sha256-qHn+/0+IOz5cG68BZUwL9BV3EO/e9eNKCjH3+N7wMdI=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb", + "rev": "1fef4404de4d1596aa5ab2bd68078370e1b9dcdb", "type": "github" }, "original": { @@ -34,12 +34,12 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1756351134, - "narHash": "sha256-7vs0lRl37XFpKLBM1ZNA5qzmFgsI1pdJuGrjDOdM/YU=", - "rev": "909d38cfc44f6cb0a891729c15c6176a124455a3", - "revCount": 289, + "lastModified": 1757033802, + "narHash": "sha256-BLUHtWWoHFR6UJJJwkmivSv7RTjo92wlT0Y7kbCd2MY=", + "rev": "e154f8433851f8f2509490f33680e3285d553df4", + "revCount": 301, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.9.1/0198eeb2-9af3-7183-bab5-8e82a80b71a7/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.11.1/01991762-b4e5-7a3b-8bfc-5d0f1ed4965e/source.tar.gz" }, "original": { "type": "tarball", @@ -49,37 +49,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-Ew9wiXpMh4l/H1GdBPr/nIwoZD9SRB1M7ZpyvwxvIAg=", + "narHash": "sha256-Dym4kTLMTxAxNyZcrHRKRVMBINQPA7qgr+7dHozNrps=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.9.1/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.9.1/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-MRueeyC63X21j6i8Vrfbf6MKI4mjTskoFrn60ouDYHg=", + "narHash": "sha256-eYVSpk+ly2YRSYvgT47ABmFRwG0DliNO/8ntBkoRmjI=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.9.1/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.9.1/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-ZS+n2k/bVOZAD+attTlqp9ygxVfVVDGW1dY1vtrbuJ0=", + "narHash": "sha256-ZvRoKG/v0WS2XrDgkV+/hq3ARGokGisyelncKwlefvk=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.9.1/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.9.1/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/x86_64-linux" } }, "flake-compat": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1756734952, - "narHash": "sha256-H6jmduj4QIncLPAPODPSG/8ry9lpr1kRq6fYytU52qU=", + "lastModified": 1757529548, + "narHash": "sha256-If5AT3dPXH0BM+q+pwyZvtWLTmlqJmGW6IDZ2MqlGRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "29ab63bbb3d9eee4a491f7ce701b189becd34068", + "rev": "e0154ae41614e32a443c43ee51eee9eed3ad9a48", "type": "github" }, "original": { @@ -175,11 +175,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1756732319, - "narHash": "sha256-w7pNSuw1hPRfFwKbV40/ZTK62FX4ZpqUQxCh9vIhD7Y=", + "lastModified": 1757437545, + "narHash": "sha256-7ssbrFnmSrqtCtOySiu5ncyOBxPrR6p2nhNHrg6D+fo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2437b6b1f98cd3161ccc96750eed927ab38c1913", + "rev": "ef694b996daeeb8684c0adfaa9b7067a6e709054", "type": "github" }, "original": { @@ -208,11 +208,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756728273, - "narHash": "sha256-7tYNlNO/qVRA6shdWxNuBMYOE+pGgxqE0f54S4Wr9PE=", + "lastModified": 1757358784, + "narHash": "sha256-UNeUJW3c10z0aMJ87QKS85C/JgK9ng6pdRS0EwY6OLg=", "owner": "YaLTeR", "repo": "niri", - "rev": "77465e11fe36fdd9bc0a304b96bb2558116568af", + "rev": "bdee1a657699a77bc4cdb050f7355f37f64c45a6", "type": "github" }, "original": { @@ -230,12 +230,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1756349316, - "narHash": "sha256-yfywKd4PG1VnnKqcRXIz90PbuWHnFaFcuZj+BU6rDJ4=", - "rev": "28b2472fa27cef3a2adc3daf2f891b39b56d9f9f", - "revCount": 21690, + "lastModified": 1757029043, + "narHash": "sha256-/XtKs/hpYXJPeT3WppFVFZH1WvPDmeTt11hMWt/Bwas=", + "rev": "7143558a0989008c8e08cc27c3cb6a031f30b356", + "revCount": 22309, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.9.1/0198eeac-a258-7efc-9860-5cad46fd5349/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.11.1/01991737-661d-7932-b7c9-d3a0499b4c3f/source.tar.gz" }, "original": { "type": "tarball", @@ -244,16 +244,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", - "revCount": 799423, + "lastModified": 1755922037, + "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", + "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", + "revCount": 808723, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.799423%2Brev-adaa24fbf46737f3f1b5497bf64bae750f82942e/0196d1c3-1974-7bf1-bcf6-06620ac40c8c/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.808723%2Brev-b1b3291469652d5a2edb0becc4ef0246fff97a7c/0198daf7-011a-7703-95d7-57146e794342/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/%3D0.1.799423" + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2505" } }, "nixpkgs-23-11": { @@ -290,11 +290,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1756617294, - "narHash": "sha256-aGnd4AHIYCWQKChAkHPpX+YYCt7pA6y2LFFA/s8q0wQ=", + "lastModified": 1757408970, + "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b4c2c57c31e68544982226d07e4719a2d86302a8", + "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", "type": "github" }, "original": { @@ -306,11 +306,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1757347588, + "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe", "type": "github" }, "original": { @@ -322,12 +322,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756128520, - "narHash": "sha256-R94HxJBi+RK1iCm8Y4Q9pdrHZl0GZoDPIaYwjxRNPh4=", - "rev": "c53baa6685261e5253a1c355a1b322f82674a824", - "revCount": 851377, + "lastModified": 1756696532, + "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=", + "rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f", + "revCount": 854745, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.851377%2Brev-c53baa6685261e5253a1c355a1b322f82674a824/0198e4e2-01b1-7863-9802-c21a619ebe72/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.854745%2Brev-58dcbf1ec551914c3756c267b8b9c8c86baa1b2f/019908ed-e731-796e-b7c5-ea173f5d3b8d/source.tar.gz" }, "original": { "type": "tarball", @@ -336,11 +336,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1757347588, + "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe", "type": "github" }, "original": { @@ -352,11 +352,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1756617294, - "narHash": "sha256-aGnd4AHIYCWQKChAkHPpX+YYCt7pA6y2LFFA/s8q0wQ=", + "lastModified": 1757408970, + "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b4c2c57c31e68544982226d07e4719a2d86302a8", + "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", "type": "github" }, "original": { @@ -375,11 +375,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1756836584, - "narHash": "sha256-c2wgK1EWyHnN5SSZEUj3+YTXYYMI3YBNAhX7URStzEM=", + "lastModified": 1757545804, + "narHash": "sha256-9O0Jj5zi5cUFHdnbKnvPCO0H9JajuJ18SOs09no1BQU=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "ac65d1980996ecbd054c545fda24dd60b06392a8", + "rev": "be0b568f1f6b6909c142f55ccd629827230160a6", "type": "github" }, "original": { @@ -417,11 +417,11 @@ ] }, "locked": { - "lastModified": 1756352679, - "narHash": "sha256-UkKaPXTPzT7HAcBOV4NlWx2GAEJaTf0eb5OX6Q6jPqg=", + "lastModified": 1756981260, + "narHash": "sha256-GhuD9QVimjynHI0OOyZsqJsnlXr2orowh9H+HYz4YMs=", "owner": "outfoxxed", "repo": "quickshell", - "rev": "f7597cdae2d537c5b12843599955856090dc49d5", + "rev": "6eb12551baf924f8fdecdd04113863a754259c34", "type": "github" }, "original": { @@ -477,11 +477,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1756679414, - "narHash": "sha256-yQGJ/n6mRwoIQnaL5oV2TGOHg4SEHpINTaoHrvkjr1Q=", + "lastModified": 1757179758, + "narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "c0497c990d46fcc012d9deff885bbe533e91e044", + "rev": "970728d0d9d1eada342bb8860af214b601139e58", "type": "github" }, "original": { diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index f5f2eda..06acb73 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -2,6 +2,7 @@ description = "Home manager flake"; inputs = { + # System configuration nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; @@ -9,6 +10,17 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + + darwin = { + url = "github:nix-darwin/nix-darwin/nix-darwin-25.05"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + # Software + helix = { + url = "github:helix-editor/helix/209558645a0a00660e74b0e14e6ec0a0b1fac590"; + }; + niri = { url = "github:sodiboo/niri-flake"; }; @@ -22,11 +34,6 @@ url = "github:outfoxxed/quickshell"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - - darwin = { - url = "github:nix-darwin/nix-darwin/nix-darwin-25.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -35,10 +42,11 @@ nixpkgs-unstable, determinate, home-manager, + darwin, + helix, niri, noctalia, quickshell, - darwin, ... } @ inputs: let inherit (self) outputs; @@ -51,6 +59,10 @@ forAllSystems = nixpkgs.lib.genAttrs systems; allPkgs = forAllSystems (system: import nixpkgs {inherit system;}); + + nixosModules = ./modules/nixos; + homeModules = ./modules/home; + darwinModules = ./modules/darwin; in { overlays = import ./overlays {inherit inputs;}; @@ -69,7 +81,7 @@ home-manager.useUserPackages = true; # home-manager.backupFileExtension = "bak"; - home-manager.extraSpecialArgs = {inherit inputs outputs;}; + home-manager.extraSpecialArgs = {inherit inputs outputs nixosModules homeModules darwinModules;}; home-manager.users.tyler = import ./machines/mal/home.nix; } ]; @@ -87,7 +99,7 @@ home-manager.useUserPackages = true; # home-manager.backupFileExtension = "bak"; - home-manager.extraSpecialArgs = {inherit inputs outputs;}; + home-manager.extraSpecialArgs = {inherit inputs outputs nixosModules homeModules darwinModules;}; home-manager.users.tyler = import ./machines/wash/home.nix; } ]; @@ -107,7 +119,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = {inherit inputs outputs;}; + home-manager.extraSpecialArgs = {inherit inputs outputs nixosModules homeModules darwinModules;}; home-manager.users."tyler.mayoff" = import ./machines/hinge/home.nix; users.users."tyler.mayoff".home = "/Users/tyler.mayoff"; } diff --git a/dot_config/flake/home/guidebolt/guidebolt.nix b/dot_config/flake/home/guidebolt/guidebolt.nix deleted file mode 100644 index fe600f7..0000000 --- a/dot_config/flake/home/guidebolt/guidebolt.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { - imports = [../common.nix]; - - home = { - username = "tyler"; - homeDirectory = "/home/tyler"; - - packages = with pkgs; [ - # clang_17 - # clang-tools - just - ]; - }; -} diff --git a/dot_config/flake/home/helix.nix b/dot_config/flake/home/helix.nix index 705c862..051cb80 100644 --- a/dot_config/flake/home/helix.nix +++ b/dot_config/flake/home/helix.nix @@ -1,9 +1,13 @@ {pkgs, ...}: { programs.helix = { enable = true; - package = pkgs.unstable.helix; + package = pkgs.mods.helix; settings = { - theme = "base16_default"; + theme = { + dark = "rose_pine"; + light = "rose_pine_dawn"; + }; + editor = { auto-format = false; end-of-line-diagnostics = "warning"; diff --git a/dot_config/flake/home/niri.nix b/dot_config/flake/home/niri.nix index 17e21e1..381aa90 100644 --- a/dot_config/flake/home/niri.nix +++ b/dot_config/flake/home/niri.nix @@ -18,10 +18,14 @@ in { xdg-desktop-portal-gnome gnome-keyring - xwayland-satellite + mods.xwayland-satellite wlsunset ]; + home.shellAliases = { + restart-shell = "${noctalia} kill && niri msg action spawn -- \"${noctalia}\""; + }; + programs.niri.settings = { cursor = { size = 12; diff --git a/dot_config/flake/machines/hinge/home.nix b/dot_config/flake/machines/hinge/home.nix index bfaf606..0d0b0a4 100644 --- a/dot_config/flake/machines/hinge/home.nix +++ b/dot_config/flake/machines/hinge/home.nix @@ -1,9 +1,7 @@ {pkgs, ...}: { imports = [ ../../home/common.nix - ../../home/helide - ../../home/ghostty.nix ]; diff --git a/dot_config/flake/machines/wash/home.nix b/dot_config/flake/machines/wash/home.nix index 3021594..d63df79 100644 --- a/dot_config/flake/machines/wash/home.nix +++ b/dot_config/flake/machines/wash/home.nix @@ -1,4 +1,4 @@ -{...}: { +{pkgs, ...}: { imports = [ ../../home/common.nix @@ -17,7 +17,8 @@ username = "tyler"; homeDirectory = "/home/tyler"; - packages = [ + packages = with pkgs; [ + godot ]; stateVersion = "23.11"; diff --git a/dot_config/flake/overlays/default.nix b/dot_config/flake/overlays/default.nix index bddc121..b543683 100644 --- a/dot_config/flake/overlays/default.nix +++ b/dot_config/flake/overlays/default.nix @@ -3,6 +3,40 @@ modifications = final: prev: { mods = { + helix = (inputs.helix.overlays.default final prev).helix; + # helix = inputs.helix.packages.${final.system}.helix.overrideAttrs (finalAttrs: oldAttrs: { + # patches = + # oldAttrs.patches + # ++ [ + # # dark / light mode + # (prev.fetchpatch { + # url = "https://github.com/helix-editor/helix/pull/14356.patch"; + # hash = "sha256-VeV+LIUgvBjviwxdiWLTYh38FeMaW54pAz+t3lXzB0M="; + # excludes = ["book/src/themes.md"]; + # }) + # ]; + + # cargoHash = "sha256-j3TRLqL1wjia9lgvlnJ1qDA8MBCqwCv5eF8kxqfYIlE="; + # cargoDeps = prev.rustPlatform.fetchCargoVendor { + # inherit (finalAttrs) src; + # hash = finalAttrs.cargoHash; + # }; + # }); + + xwayland-satellite = prev.xwayland-satellite.overrideAttrs (finalAttrs: old: { + src = prev.fetchFromGitHub { + owner = "Supreeeme"; + repo = "xwayland-satellite"; + rev = "41e865c8d35468c67b991ef5a245a98b3e44108c"; + hash = "sha256-SGcqX3amLH4xiA+dwF2Fu2mt1O8zHc60v0+NEZGDJhw="; + }; + + cargoHash = "sha256-BL2JaO/NGYhXtXtbVlsTxkO6SMO5D8aDSaPf7oV2TVE="; + cargoDeps = prev.rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname src version; + hash = finalAttrs.cargoHash; + }; + }); }; };