diff --git a/home/.config/gnome_settings_backup.dconf b/home/.config/gnome_settings_backup.dconf index efd1057..2a05a0a 100644 --- a/home/.config/gnome_settings_backup.dconf +++ b/home/.config/gnome_settings_backup.dconf @@ -42,7 +42,7 @@ font-antialiasing='grayscale' font-hinting='slight' font-name='JetBrains Mono 11' gtk-theme='Catppuccin-Macchiato-Standard-Teal-Dark' -icon-theme='Colloid-teal-dark' +icon-theme='Colloid-Teal-Dark' monospace-font-name='JetBrains Mono 11' [org/gnome/desktop/peripherals/touchpad] diff --git a/home/.config/wezterm/wezterm.lua b/home/.config/wezterm/wezterm.lua index bedbffc..98ef8be 100644 --- a/home/.config/wezterm/wezterm.lua +++ b/home/.config/wezterm/wezterm.lua @@ -1,8 +1,12 @@ local wezterm = require 'wezterm' local act = wezterm.action +local gpus = wezterm.gui.enumerate_gpus() return { - enable_wayland = true; + enable_wayland = true, + prefer_egl = true, + front_end = "WebGpu", + webgpu_preferred_adapter = gpus[2], color_scheme = 'Catppuccin Macchiato', enable_tab_bar = false, inactive_pane_hsb = { @@ -25,8 +29,8 @@ return { opacity = 0.05, vertical_align = "Middle", horizontal_align = "Center", - height = "1424", - width = "2024", + height = "1824", + width = "2724", repeat_y = "NoRepeat", repeat_x = "NoRepeat", }, diff --git a/home/projects/optimized-pre-config-rust/Cargo.toml b/home/projects/optimized-pre-config-rust/Cargo.toml index 241f051..3da14ab 100644 --- a/home/projects/optimized-pre-config-rust/Cargo.toml +++ b/home/projects/optimized-pre-config-rust/Cargo.toml @@ -7,6 +7,12 @@ cargo-features = [ "codegen-backend", "profile-rustflags" ] [profile.dev] opt-level = 1 codegen-backend = "cranelift" +rustflags = [ + "-Z", "threads=8", # Enable parallel frontend compiling + "-C", "linker=clang", # Use clang as the linker + "-C", "link-arg=-fuse-ld=mold", # Use mold as the linker backend + "-C", "link-arg=-static", +] [profile.dev.package."*"] opt-level = 3 codegen-backend = "cranelift" diff --git a/nixos/flake.lock b/nixos/flake.lock index cf252dc..cd26fa4 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -18,13 +18,64 @@ "type": "github" } }, + "freetype2": { + "flake": false, + "locked": { + "lastModified": 1687587065, + "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=", + "owner": "wez", + "repo": "freetype2", + "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "type": "github" + }, + "original": { + "owner": "wez", + "repo": "freetype2", + "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "type": "github" + } + }, + "harfbuzz": { + "flake": false, + "locked": { + "lastModified": 1711722720, + "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=", + "owner": "harfbuzz", + "repo": "harfbuzz", + "rev": "63973005bc07aba599b47fdd4cf788647b601ccd", + "type": "github" + }, + "original": { + "owner": "harfbuzz", + "ref": "8.4.0", + "repo": "harfbuzz", + "type": "github" + } + }, + "libpng": { + "flake": false, + "locked": { + "lastModified": 1549245649, + "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=", + "owner": "glennrp", + "repo": "libpng", + "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", + "type": "github" + }, + "original": { + "owner": "glennrp", + "repo": "libpng", + "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1701718080, - "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -36,11 +87,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1681358109, - "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", + "lastModified": 1718428119, + "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", + "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1726238386, + "narHash": "sha256-3//V84fYaGVncFImitM6lSAliRdrGayZLdxWlpcuGk0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "01f064c99c792715054dc7a70e4c1626dbbec0c3", "type": "github" }, "original": { @@ -53,20 +120,41 @@ "root": { "inputs": { "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay", + "wezterm": "wezterm" } }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1702001829, - "narHash": "sha256-6gEVidNVqzTb06zIy2Gxhz9m6/jXyAgViRxfgEpZkQ8=", + "lastModified": 1727577080, + "narHash": "sha256-2LPT76Acp6ebt7fCt90eq/M8T2+X09s/yTVgfVFrtno=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c2a1dd067a928624c1aab36f976758c0722c79bd", + "rev": "73a833855442ce8cee710cf4d8d054fea1c81196", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "wezterm", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726280639, + "narHash": "sha256-YfLRPlFZWrT2oRLNAoqf7G3+NnUTDdlIJk6tmBU7kXM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e9f8641c92f26fd1e076e705edb12147c384171d", "type": "github" }, "original": { @@ -89,8 +177,51 @@ "repo": "default", "type": "github" } + }, + "wezterm": { + "inputs": { + "flake-utils": "flake-utils", + "freetype2": "freetype2", + "harfbuzz": "harfbuzz", + "libpng": "libpng", + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay_2", + "zlib": "zlib" + }, + "locked": { + "dir": "nix", + "lastModified": 1726890735, + "narHash": "sha256-0qrs+abRPD8o9uLbwy187rqtxs5twcC1Iw9K59pjjWs=", + "owner": "wez", + "repo": "wezterm", + "rev": "6c1dbc0eb2f602a23e6d5f1479db218f8e705839", + "type": "github" + }, + "original": { + "dir": "nix", + "owner": "wez", + "repo": "wezterm", + "type": "github" + } + }, + "zlib": { + "flake": false, + "locked": { + "lastModified": 1484501380, + "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=", + "owner": "madler", + "repo": "zlib", + "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f", + "type": "github" + }, + "original": { + "owner": "madler", + "ref": "v1.2.11", + "repo": "zlib", + "type": "github" + } } }, "root": "root", "version": 7 -} +} \ No newline at end of file diff --git a/nixos/flake.nix b/nixos/flake.nix index a1b31bd..0b79e47 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; rust-overlay.url = "github:oxalica/rust-overlay"; + wezterm.url = "github:wez/wezterm?dir=nix"; }; outputs = { nixpkgs, ... } @ inputs: diff --git a/nixos/hyprland.nix b/nixos/hyprland.nix index 519d36e..6126e23 100644 --- a/nixos/hyprland.nix +++ b/nixos/hyprland.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ inputs, pkgs, ... }: { # Enable Hyprland @@ -14,7 +14,7 @@ hypridle hyprpaper - wezterm + inputs.wezterm.packages.${pkgs.system}.default cool-retro-term starship diff --git a/nixos/lsp.nix b/nixos/lsp.nix index cc84b07..ccfe218 100644 --- a/nixos/lsp.nix +++ b/nixos/lsp.nix @@ -9,13 +9,23 @@ nodePackages_latest.vscode-langservers-extracted nodePackages_latest.yaml-language-server nodePackages_latest.dockerfile-language-server-nodejs + nodePackages_latest.bash-language-server + nodePackages_latest.graphql-language-service-cli vue-language-server sumneko-lua-language-server marksman + markdown-oxide nil zls gopls delve emmet-language-server + buf-language-server + cmake-language-server + docker-compose-language-service + vscode-extensions.vadimcn.vscode-lldb + slint-lsp + terraform-ls + ansible-language-server ]; } diff --git a/nixos/rust-toolchain.toml b/nixos/rust-toolchain.toml index 2c331f7..028fdca 100644 --- a/nixos/rust-toolchain.toml +++ b/nixos/rust-toolchain.toml @@ -6,6 +6,7 @@ targets = [ "wasm32-wasi", "x86_64-pc-windows-gnu", "x86_64-unknown-linux-gnu", - "aarch64-unknown-linux-gnu" + "aarch64-unknown-linux-gnu", + "x86_64-unknown-linux-musl" ] profile = "default" diff --git a/nixos/rust.nix b/nixos/rust.nix index 927a445..3bfea88 100644 --- a/nixos/rust.nix +++ b/nixos/rust.nix @@ -8,7 +8,6 @@ environment.systemPackages = with pkgs; [ (rust-bin.fromRustupToolchainFile ./rust-toolchain.toml) - lldb_16 taplo #toml formatter & lsp cargo-watch cargo-deny diff --git a/nixos/security-services.nix b/nixos/security-services.nix index 3d6e233..4530d7f 100644 --- a/nixos/security-services.nix +++ b/nixos/security-services.nix @@ -95,5 +95,7 @@ passExtensions.pass-import passExtensions.pass-audit tomb + pwgen + pwgen-secure ]; } diff --git a/nixos/terminal-utils.nix b/nixos/terminal-utils.nix index 4934109..65a9578 100644 --- a/nixos/terminal-utils.nix +++ b/nixos/terminal-utils.nix @@ -8,6 +8,7 @@ license-generator git-ignore gitleaks + git-secrets pass-git-helper just xh diff --git a/nixos/utils.nix b/nixos/utils.nix index d775830..18694e0 100644 --- a/nixos/utils.nix +++ b/nixos/utils.nix @@ -3,7 +3,11 @@ { environment.systemPackages = with pkgs; [ mold - gcc13 + gcc + clang + lld + lldb + musl jdk11 dioxus-cli surrealdb