diff --git a/backgrounds/SupermassiveBinaryBlackHoles.png b/backgrounds/SupermassiveBinaryBlackHoles.png new file mode 100644 index 0000000..73300d9 Binary files /dev/null and b/backgrounds/SupermassiveBinaryBlackHoles.png differ diff --git a/flake.lock b/flake.lock index 299a5d4..56ed1f4 100644 --- a/flake.lock +++ b/flake.lock @@ -82,7 +82,41 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": [ "stylix", @@ -119,6 +153,27 @@ "type": "github" } }, + "ghostty": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig" + }, + "locked": { + "lastModified": 1736031329, + "narHash": "sha256-jKWHpdlWyN8fa/1MvSRX2qVf+ZBJLu8NsH7T9xK4WRo=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "0306c592a7dbaa394da481ab2219b3bcd2b8b48f", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -195,6 +250,38 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1733423277, + "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e36963a147267afc055f7cf65225958633e536bf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1733229606, + "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1731763621, @@ -229,6 +316,7 @@ }, "root": { "inputs": { + "ghostty": "ghostty", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "sops-nix": "sops-nix", @@ -259,12 +347,12 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_3", - "systems": "systems", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" @@ -299,6 +387,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -348,6 +451,31 @@ "repo": "tinted-tmux", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty" + ], + "flake-utils": "flake-utils", + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1717848532, + "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f6fdc0a..b153fc2 100644 --- a/flake.nix +++ b/flake.nix @@ -9,9 +9,10 @@ #nix-colors.url = "github:misterio77/nix-colors"; stylix.url = "github:danth/stylix/release-24.11"; sops-nix.url = "github:Mic92/sops-nix"; + ghostty.url = "github:ghostty-org/ghostty"; }; - outputs = { self, nixpkgs, home-manager, stylix, sops-nix, ... } @ inputs: let + outputs = { self, nixpkgs, home-manager, stylix, sops-nix, ghostty, ... } @ inputs: let inherit (self) outputs; username = "jared"; in { @@ -33,7 +34,7 @@ }; xps = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit inputs username stylix;}; + specialArgs = {inherit inputs username stylix ghostty ;}; modules = [ stylix.nixosModules.stylix sops-nix.nixosModules.sops diff --git a/hosts/xps/configuration.nix b/hosts/xps/configuration.nix index 6365fa8..f3c57b1 100644 --- a/hosts/xps/configuration.nix +++ b/hosts/xps/configuration.nix @@ -5,6 +5,7 @@ inputs, username, stylix, + ghostty, ... }: { imports = @@ -130,6 +131,7 @@ dconf2nix libation sops + ghostty.packages.x86_64-linux.default ]; environment.variables = { EDITOR = "nvim"; @@ -138,7 +140,7 @@ services.flatpak.enable = true; stylix.enable = true; stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/solarflare.yaml"; - stylix.image = /home/jared/Pictures/SupermassiveBinaryBlackHoles.png; + stylix.image = ../../backgrounds/SupermassiveBinaryBlackHoles.png; stylix.cursor.package = pkgs.vimix-cursor-theme; stylix.cursor.name = "Vimix-Cursors"; stylix.targets.gnome.enable = true;