diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc index bade451..f6c088c 100644 --- a/config/dunst/dunstrc +++ b/config/dunst/dunstrc @@ -39,7 +39,7 @@ ### Text ### - font = Geist 10 + font = SF Pro Display 11 line_height = 0 markup = full diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc index b7f127b..0a9022e 100644 --- a/config/fastfetch/config.jsonc +++ b/config/fastfetch/config.jsonc @@ -21,7 +21,7 @@ "format": "{pretty-name}" }, "kernel", - "packages", + // "packages", "break", diff --git a/config/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini index 2e39e31..27e10c9 100644 --- a/config/gtk-3.0/settings.ini +++ b/config/gtk-3.0/settings.ini @@ -1,7 +1,7 @@ [Settings] gtk-theme-name=catppuccin-mocha-blue-standard+default gtk-icon-theme-name=Adwaita -gtk-font-name=Cantarell 11 +gtk-font-name=Adwaita Sans 11 gtk-cursor-theme-name=catppuccin-mocha-blue-cursors gtk-cursor-theme-size=24 gtk-toolbar-style=GTK_TOOLBAR_ICONS @@ -9,9 +9,9 @@ gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=0 gtk-menu-images=0 gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 +gtk-enable-input-feedback-sounds=0 gtk-xft-antialias=1 gtk-xft-hinting=1 gtk-xft-hintstyle=hintslight gtk-xft-rgba=rgb -gtk-application-prefer-dark-theme=1 +gtk-application-prefer-dark-theme=0 diff --git a/config/hypr/config/display.conf b/config/hypr/config/display.conf index 2e0f3e5..79f2f25 100644 --- a/config/hypr/config/display.conf +++ b/config/hypr/config/display.conf @@ -1,5 +1,5 @@ # Monitor ( https://wiki.hyprland.org/Configuring/Monitors ) -# monitor=,1920x1080@240,auto,1 +monitor=,1920x1080@240,auto,1 # monitor=Unknown-1,disabled # General Configuration @@ -67,7 +67,7 @@ render { } windowrule = tag +game, class:org.vinegarhq.Sober -windowrule = tag +game, class:com.mojang.minecraft.JavaEdition +windowrule = tag +game, class:com.mojang.minecraft.java-edition windowrule = tag +code, class:code windowrule = tag +music, class:Cider @@ -95,7 +95,7 @@ misc { initial_workspace_tracking = 0 new_window_takes_over_fullscreen = 1 disable_splash_rendering = false - font_family = Geist + font_family = "SF Pro Display" } # Layer Rules diff --git a/config/qt5ct/qt5ct.conf b/config/qt5ct/qt5ct.conf index af35c1a..e681332 100644 --- a/config/qt5ct/qt5ct.conf +++ b/config/qt5ct/qt5ct.conf @@ -25,7 +25,7 @@ underline_shortcut=1 wheel_scroll_lines=3 [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x4\x46\0\0\x2\xfb\0\0\0\0\0\0\0\0\0\0\x3\xbf\0\0\x4\x18\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x4\x46\0\0\x2\xfb) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\aS\0\0\x3\xec\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x37\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\aS\0\0\x3\xec) [Troubleshooting] force_raster_widgets=1 diff --git a/config/waybar/style.css b/config/waybar/style.css index 47ee9b1..e9fc572 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,5 +1,5 @@ * { - font-family: 'Symbols Nerd Font', 'Geist'; + font-family: 'Symbols Nerd Font', 'SF Pro Display'; border: none; font-size: 15px; min-height: 10px; @@ -22,7 +22,7 @@ window#waybar { } #clock { - font-family: "Geist Mono"; + font-family: "SF Pro Display"; } #traygroup, #mpris, #window, #workspaces, #custom-regretevator_state { diff --git a/flake.lock b/flake.lock index 87ceaad..4e4316c 100644 --- a/flake.lock +++ b/flake.lock @@ -33,6 +33,60 @@ "type": "github" } }, + "blueprint": { + "inputs": { + "nixpkgs": [ + "tuxstrap", + "bun2nix", + "nixpkgs" + ], + "systems": [ + "tuxstrap", + "bun2nix", + "systems" + ] + }, + "locked": { + "lastModified": 1744632722, + "narHash": "sha256-0chvqUV1Kzf8BMQ7MsH3CeicJEb2HeCpwliS77FGyfc=", + "owner": "numtide", + "repo": "blueprint", + "rev": "49bbd5d072b577072f4a1d07d4b0621ecce768af", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "blueprint", + "type": "github" + } + }, + "bun2nix": { + "inputs": { + "blueprint": "blueprint", + "nixpkgs": [ + "tuxstrap", + "nixpkgs" + ], + "systems": [ + "tuxstrap", + "systems" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1750682174, + "narHash": "sha256-rUpcATQ0LiY8IYRndqTlPUhF4YGJH3lM2aMOs5vBDGM=", + "owner": "baileyluTCD", + "repo": "bun2nix", + "rev": "85d692d68a5345d868d3bb1158b953d2996d70f7", + "type": "github" + }, + "original": { + "owner": "baileyluTCD", + "repo": "bun2nix", + "type": "github" + } + }, "catppuccin": { "inputs": { "nixpkgs": "nixpkgs" @@ -904,6 +958,22 @@ } }, "nixpkgs_8": { + "locked": { + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { "locked": { "lastModified": 1743448293, "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", @@ -976,6 +1046,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_6", "nvf": "nvf", + "tuxstrap": "tuxstrap", "zen-browser": "zen-browser" } }, @@ -1054,6 +1125,64 @@ "type": "github" } }, + "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" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "tuxstrap", + "bun2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "tuxstrap": { + "inputs": { + "bun2nix": "bun2nix", + "nixpkgs": "nixpkgs_8", + "systems": "systems_6" + }, + "locked": { + "lastModified": 1755071109, + "narHash": "sha256-8pJ7o9rmCQNZeZNK2TxRt8SzmtiXlSKi1Go6FJ/fvJs=", + "owner": "ocbwoy3", + "repo": "tuxstrap", + "rev": "fdd354cb2034d7cb0a17180f300c0d2612ccaf99", + "type": "github" + }, + "original": { + "owner": "ocbwoy3", + "ref": "v2", + "repo": "tuxstrap", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1098,7 +1227,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1752716941, diff --git a/flake.nix b/flake.nix index 055eb44..d4d8f84 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,11 @@ # inputs.nixpkgs.follows = "nixpkgs"; }; + tuxstrap = { + url = "github:ocbwoy3/tuxstrap/v2"; + # inputs.nixpkgs.follows = "nixpkgs"; + }; + nvf.url = "github:notashelf/nvf"; # quickshell = { diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix index 00ff4cf..2273f8d 100644 --- a/hosts/default/packages.nix +++ b/hosts/default/packages.nix @@ -32,6 +32,9 @@ inputs.hyprlock.packages.${pkgs.stdenv.hostPlatform.system}.hyprlock inputs.hyprsysteminfo.packages.${pkgs.stdenv.hostPlatform.system}.hyprsysteminfo + # roblox + inputs.tuxstrap.packages.${pkgs.stdenv.hostPlatform.system}.default + # minecraft qemu (writeShellScriptBin "qemu-system-x86_64-uefi" '' @@ -58,6 +61,7 @@ libxkbcommon ffmpeg-full gnupg + code-cursor nix-direnv htop nixpkgs-fmt diff --git a/modules/nixos/nixpkgs.nix b/modules/nixos/nixpkgs.nix index be237c0..6cd9c81 100644 --- a/modules/nixos/nixpkgs.nix +++ b/modules/nixos/nixpkgs.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, builtins, ... }: { @@ -6,14 +6,13 @@ nixpkgs.config.packageOverrides = pkgs: { vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; }; - + nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings = { substituters = [ "https://hyprland.cachix.org" "https://ghostty.cachix.org" - "https://hyprpanel.cachix.org" "https://wrangler.cachix.org" ]; trusted-substituters = [ @@ -23,7 +22,6 @@ trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns=" - "hyprpanel.cachix.org-1:tYDZEqAUAqgIz+zYwJ5+v5J62AnYqA/WEXv4VHA/XRs=" "wrangler.cachix.org-1:N/FIcG2qBQcolSpklb2IMDbsfjZKWg+ctxx0mSMXdSs=" ]; }; diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index 96bb989..f60a903 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { @@ -48,7 +48,7 @@ modesetting.enable = true; powerManagement.enable = false; powerManagement.finegrained = false; - open = false; + open = true; nvidiaSettings = true; package = config.boot.kernelPackages.nvidiaPackages.beta; }; diff --git a/modules/nixos/programs.nix b/modules/nixos/programs.nix index 27e14a2..262b5c0 100644 --- a/modules/nixos/programs.nix +++ b/modules/nixos/programs.nix @@ -11,12 +11,14 @@ # package = pkgs.kdePackages.sddm; # }; - services.displayManager.autoLogin = { - enable = true; - user = "ocbwoy3"; - }; + # services.displayManager.autoLogin = { + # enable = true; + # user = "ocbwoy3"; + # }; - services.displayManager.defaultSession = "hyprland"; + # services.displayManager.defaultSession = "hyprland"; + + services.displayManager.gdm.enable = true; programs.zsh.enable = true; @@ -44,6 +46,7 @@ security.sudo.enable = true; security.sudo.configFile = '' %wheel ALL=(ALL) ALL + Defaults pwfeedback ''; services.dbus = {