From ab60fb9fcbcb1614e12d8372d3e77947bf606a3f Mon Sep 17 00:00:00 2001 From: blahai Date: Wed, 1 Jan 2025 15:55:38 +0200 Subject: [PATCH] Fix packages & add ghostty --- flake.lock | 192 +++++++++++++++--- flake.nix | 9 +- hosts/nyx/configuration.nix | 13 +- hosts/nyx/home.nix | 8 + .../home-manager/cli/fastfetch/fastfetch.nix | 2 +- .../home-manager/hypr/hyprland/keybinds.nix | 1 + modules/nixos/games/default.nix | 3 +- modules/nixos/services/tailscale.nix | 1 - modules/nixos/virtualisation.nix | 2 +- 9 files changed, 185 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index c419705..021645f 100644 --- a/flake.lock +++ b/flake.lock @@ -211,20 +211,6 @@ } }, "flake-compat_2": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -240,7 +226,37 @@ "type": "github" } }, + "flake-compat_3": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, "flake-compat_4": { + "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-compat_5": { "flake": false, "locked": { "lastModified": 1733328505, @@ -336,11 +352,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -369,7 +385,25 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_8" }, "locked": { "lastModified": 1726560853, @@ -402,6 +436,27 @@ "type": "github" } }, + "ghostty": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig" + }, + "locked": { + "lastModified": 1735689283, + "narHash": "sha256-LOZRScnB8Q9ylmlXnt2j2v4Aj1b5JZTdSeKYaFL1RDw=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "60611b8a4a1d5b3c1097cce85eb0311de0696cfa", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -482,7 +537,7 @@ }, "haivim": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], @@ -695,7 +750,7 @@ "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_6", + "systems": "systems_7", "xdph": "xdph" }, "locked": { @@ -1036,6 +1091,22 @@ } }, "nixpkgs-stable_2": { + "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-stable_3": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -1051,6 +1122,22 @@ "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": 1735471104, @@ -1166,7 +1253,7 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "home-manager": "home-manager_3", @@ -1234,7 +1321,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "ixx": "ixx_2", "nixpkgs": [ "haivim", @@ -1258,13 +1345,13 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "gitignore": "gitignore_2", "nixpkgs": [ "hyprland", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1734797603, @@ -1287,6 +1374,7 @@ "chaotic": "chaotic", "deploy-rs": "deploy-rs", "disko": "disko", + "ghostty": "ghostty", "haivim": "haivim", "home-manager": "home-manager_4", "hyprland": "hyprland", @@ -1342,7 +1430,7 @@ }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "nixpkgs": [ "nixpkgs" ] @@ -1437,6 +1525,21 @@ } }, "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1451,7 +1554,7 @@ "type": "github" } }, - "systems_7": { + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1529,7 +1632,7 @@ }, "wezterm": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", @@ -1599,19 +1702,44 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1732835488, - "narHash": "sha256-r1nomBVEMO4I0y3pMfqLletQxKak5xfpk9DhlO1AsuI=", - "owner": "ch4og", + "lastModified": 1735694245, + "narHash": "sha256-+WyuI+ku5TJHeVQZJc7VgSZKhnKUH3wjpFGViovu6r8=", + "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d8fbf602685f5cf2a6475eaf20595a6dc6628891", + "rev": "dc799a467ed8f74c94aa30086742151032d4332a", "type": "github" }, "original": { - "owner": "ch4og", + "owner": "0xc000022070", "repo": "zen-browser-flake", "type": "github" } }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty" + ], + "flake-utils": "flake-utils_2", + "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" + } + }, "zlib": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index f2a293a..999e1fa 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ extra-substituters = [ "https://nix-community.cachix.org" "https://nixpkgs-unfree.cachix.org" - "https://hyprland.cachix.org/" + "https://hyprland.cachix.org" "https://anyrun.cachix.org" "https://wezterm.cachix.org" ]; @@ -63,11 +63,14 @@ wezterm.url = "github:wez/wezterm?dir=nix"; + ghostty = { + url = "github:ghostty-org/ghostty"; + }; + catppuccin = {url = "github:catppuccin/nix";}; hyprland.url = "github:hyprwm/Hyprland"; - - zen-browser.url = "github:ch4og/zen-browser-flake"; + zen-browser.url = "github:0xc000022070/zen-browser-flake"; }; outputs = { diff --git a/hosts/nyx/configuration.nix b/hosts/nyx/configuration.nix index 3d94ec2..4bb1fa0 100644 --- a/hosts/nyx/configuration.nix +++ b/hosts/nyx/configuration.nix @@ -184,7 +184,7 @@ substituters = [ "https://nix-community.cachix.org" "https://nixpkgs-unfree.cachix.org" - "https://hyprland.cachix.org/" + "https://hyprland.cachix.org" "https://anyrun.cachix.org" "https://wezterm.cachix.org" ]; @@ -211,7 +211,7 @@ nautilus diff-so-fancy eog - bottles + pkgs-smol.bottles ffmpeg-full gst_all_1.gstreamer gst_all_1.gst-libav @@ -223,13 +223,12 @@ age ssh-to-age sops - cloudflared - inputs.zen-browser.packages."${pkgs.system}".specific + inputs.zen-browser.packages."${pkgs.system}".default # cava socat btrfs-progs - btop-rocm - rocmPackages.rocm-smi + # pkgs-smol.btop-rocm + # pkgs-smol.rocmPackages.rocm-smi hyprcursor grimblast neovim @@ -252,6 +251,7 @@ nixd nix-output-monitor alejandra + comma zip nodejs typescript @@ -279,6 +279,7 @@ mission-center speedcrunch geogebra + inputs.ghostty.packages.x86_64-linux.default ]; fonts.packages = with pkgs; [ diff --git a/hosts/nyx/home.nix b/hosts/nyx/home.nix index c815e1f..e561138 100644 --- a/hosts/nyx/home.nix +++ b/hosts/nyx/home.nix @@ -75,10 +75,18 @@ home.packages = with pkgs; [ obsidian inputs.haivim.packages.${pkgs.system}.default + mold + clang ]; home.sessionVariables = {EDITOR = "nvim";}; + home.file.".cargo/config.toml".text = '' + [target.x86_64-unknown-linux-gnu] + linker = "clang" + rustflags = ["-C", "link-arg=-fuse-ld=${pkgs.mold}/bin/mold"] + ''; + # Let Home Manager install and manage itself. programs.home-manager.enable = true; } diff --git a/modules/home-manager/cli/fastfetch/fastfetch.nix b/modules/home-manager/cli/fastfetch/fastfetch.nix index bb84ea6..39ec9c9 100644 --- a/modules/home-manager/cli/fastfetch/fastfetch.nix +++ b/modules/home-manager/cli/fastfetch/fastfetch.nix @@ -9,7 +9,7 @@ enable = true; settings = { logo = { - type = "sixel"; + type = "kitty"; source = "~/Pictures/gay.png"; width = 32; }; diff --git a/modules/home-manager/hypr/hyprland/keybinds.nix b/modules/home-manager/hypr/hyprland/keybinds.nix index 0a5b3a5..10b70ec 100644 --- a/modules/home-manager/hypr/hyprland/keybinds.nix +++ b/modules/home-manager/hypr/hyprland/keybinds.nix @@ -33,6 +33,7 @@ "Super, R, exec, ${pkgs.anyrun}/bin/anyrun" "Super, W, exec, ${pkgs.floorp}/bin/floorp" "Super, Q, exec, wezterm" + "Super, Return, exec, ghostty" "Super, C, killactive" "Super, V, togglefloating" "Super, E, exec, ${pkgs.nautilus}/bin/nautilus -w" diff --git a/modules/nixos/games/default.nix b/modules/nixos/games/default.nix index 8d2298f..15802ac 100644 --- a/modules/nixos/games/default.nix +++ b/modules/nixos/games/default.nix @@ -42,7 +42,7 @@ }; hardware = { - amdgpu.opencl.enable = true; # For davinci-resolve + # amdgpu.opencl.enable = true; # For davinci-resolve opentabletdriver = { enable = true; # For osu! daemon.enable = true; @@ -56,7 +56,6 @@ extraPackages = with pkgs; [ mesa.drivers egl-wayland - rocmPackages.clr.icd amdvlk libva libva-utils diff --git a/modules/nixos/services/tailscale.nix b/modules/nixos/services/tailscale.nix index d8f4bad..3f82b86 100644 --- a/modules/nixos/services/tailscale.nix +++ b/modules/nixos/services/tailscale.nix @@ -4,6 +4,5 @@ useRoutingFeatures = "client"; }; environment.systemPackages = with pkgs; [ - trayscale ]; } diff --git a/modules/nixos/virtualisation.nix b/modules/nixos/virtualisation.nix index 28389e6..cb8284e 100644 --- a/modules/nixos/virtualisation.nix +++ b/modules/nixos/virtualisation.nix @@ -53,6 +53,6 @@ in { pciutils virt-manager moonlight-qt # for linux vms - looking-glass-client # for windows vms :husk: + # looking-glass-client # for windows vms :husk: ]; }