From 01072668d86d1cef3b38a60471672053fedce920 Mon Sep 17 00:00:00 2001 From: OCbwoy3 Date: Fri, 25 Jul 2025 21:57:25 +0300 Subject: [PATCH] prep for new pc --- .gitignore | 1 + config/ghostty/config | 8 +- config/hypr/config/display.conf | 15 +- config/hypr/config/permissions.conf | 5 + flake.lock | 423 ++++++++++++++++------------ flake.nix | 23 +- hosts/default/configuration.nix | 9 +- hosts/default/other/activate.nix | 23 -- hosts/default/packages.nix | 19 +- modules/nixos/hardware.nix | 12 +- modules/nixos/network.nix | 2 +- scripts/bin/handleScreenshot.ts | 5 +- scripts/screenshot-fullscreen.sh | 2 +- scripts/screenshot-selection.sh | 2 +- 14 files changed, 304 insertions(+), 245 deletions(-) diff --git a/.gitignore b/.gitignore index 5bec5f4..a43bce1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ node_modules .hyprfail.conf DotfilesFont.afm private_assets +temporary diff --git a/config/ghostty/config b/config/ghostty/config index 8f96cd9..194b12e 100644 --- a/config/ghostty/config +++ b/config/ghostty/config @@ -1,13 +1,11 @@ -font-family = GeistMono NF -font-family-bold = GeistMono NF Bold -font-family-italic = GeistMono NF -font-family-bold-italic = GeistMono NF Bold +font-family = "GeistMono NF" theme = catppuccin-mocha -background-opacity = 0.5 +background-opacity = 0.7 window-padding-x = 16 window-padding-y = 16 font-feature = -calt font-feature = -liga font-feature = -dlig gtk-single-instance = true +window-decoration = none diff --git a/config/hypr/config/display.conf b/config/hypr/config/display.conf index c730bd4..2eaec3b 100644 --- a/config/hypr/config/display.conf +++ b/config/hypr/config/display.conf @@ -66,7 +66,16 @@ render { # direct_scanout = true } -# windowrule = tag +game, class:sober +windowrule = tag +game, class:org.vinegarhq.Sober +windowrule = tag +game, class:com.mojang.minecraft.JavaEdition + +windowrule = tag +code, class:code +windowrule = tag +music, class:Cider + +# windowrule = opacity 0.7, tag:music + +windowrulev2 = renderunfocused, tag:music +windowrulev2 = renderunfocused, tag:game # Dwindle layout dwindle { @@ -115,7 +124,9 @@ windowrulev2 = float,class:^(nm-connection-editor)$ windowrulev2 = size 900 500,class:^(nm-connection-editor)$ windowrulev2 = center,class:^(nm-connection-editor)$ -windowrule = maximize, class:steam_proton,title:^(Roblox Studio)$ +windowrulev2 = allowsinput,class:^(steam_proton)$ + +windowrulev2 = renderunfocused, class:^(equibop)$ # dotfille settings windowrulev2 = float,class:io.Astal.ocbwoy3-settings diff --git a/config/hypr/config/permissions.conf b/config/hypr/config/permissions.conf index ea8b2bd..6ced441 100644 --- a/config/hypr/config/permissions.conf +++ b/config/hypr/config/permissions.conf @@ -9,3 +9,8 @@ permission = /nix/store/[A-Za-z0-9]+\-(wrapped-)?(grim|hyprlock|xdg-desktop-port source = ~/config/.hyprfail.conf # hyprland noerror false + + +# windowrulev2 = noscreenshare, class:^(equibop)$ + +windowrulev2 = noscreenshare,title:.*(Swedbank|Checkout|Billing).* diff --git a/flake.lock b/flake.lock index 822016b..87ceaad 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1750153510, - "narHash": "sha256-NYHXXJZ9m4fJpKk9tKn/EExX87SqcBcRINOGF7hKRLI=", + "lastModified": 1752490162, + "narHash": "sha256-CFOuAHbc9PTt9HhjGQFf07bUCZKOahQ+vLt30J6u5fw=", "owner": "catppuccin", "repo": "nix", - "rev": "4e95eaf8a351956d75cc400318579967ca2b6d0f", + "rev": "7dc907c010e1612729c5d76cf614b5f7811bfe23", "type": "github" }, "original": { @@ -54,11 +54,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -85,14 +85,17 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "nvf", + "nixpkgs" + ] }, "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -121,7 +124,10 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": [ + "nvf", + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -141,17 +147,16 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs": "nixpkgs_2", "zig": "zig", "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1745271588, - "narHash": "sha256-SFLX31xOna07vZKEu2VtJ/5PmtYi1VOzHEjP4Xvn7eE=", + "lastModified": 1752694137, + "narHash": "sha256-hgoWB/7xSLthEvAn+VDf03SLE3bKvZb2kdzG4ySkweI=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "7ef9c24e3f200342b13be777718f1cf278dca1eb", + "rev": "015efcf9e562ac89da49d50ba8b2b2612ef13d2a", "type": "github" }, "original": { @@ -184,16 +189,14 @@ }, "home-manager": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1744172174, - "narHash": "sha256-Ud0ClYf8YHhbYmg1piPJx2iuYOh62HQiRzDObD2gzsk=", + "lastModified": 1752603129, + "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", "owner": "nix-community", "repo": "home-manager", - "rev": "4040c5779ce56d36805bc7a83e072f0f894eae7d", + "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", "type": "github" }, "original": { @@ -281,6 +284,35 @@ "type": "github" } }, + "hyprgraphics_2": { + "inputs": { + "hyprutils": [ + "hyprlock", + "hyprutils" + ], + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": [ + "hyprlock", + "systems" + ] + }, + "locked": { + "lastModified": 1750621377, + "narHash": "sha256-8u6b5oAdX0rCuoR8wFenajBRmI+mzbpNig6hSCuWUzE=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "b3d628d01693fb9bb0a6690cd4e7b80abda04310", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", @@ -291,22 +323,23 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1746735318, - "narHash": "sha256-iN0Ge4LaVT7rATqzIrAZFSdfYuIXbe4/HGcXle7qK1g=", + "lastModified": 1752698382, + "narHash": "sha256-fxax8Xpn59Uqwj753Cp1KAtI09Wd7zbgTZNxtFKzhJk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "9958d297641b5c84dcff93f9039d80a5ad37ab00", + "rev": "49d73d1893168f493b41ac9873f6022d79e75c83", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.49.0", "repo": "Hyprland", "type": "github" } @@ -370,7 +403,7 @@ }, "hyprland-qt-support_2": { "inputs": { - "hyprlang": "hyprlang_2", + "hyprlang": "hyprlang_3", "nixpkgs": [ "hyprsysteminfo", "nixpkgs" @@ -461,7 +494,36 @@ }, "hyprlang_2": { "inputs": { - "hyprutils": "hyprutils_2", + "hyprutils": [ + "hyprlock", + "hyprutils" + ], + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": [ + "hyprlock", + "systems" + ] + }, + "locked": { + "lastModified": 1750371198, + "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_3": { + "inputs": { + "hyprutils": "hyprutils_3", "nixpkgs": [ "hyprsysteminfo", "hyprland-qt-support", @@ -487,12 +549,35 @@ "type": "github" } }, + "hyprlock": { + "inputs": { + "hyprgraphics": "hyprgraphics_2", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": "nixpkgs_4", + "systems": "systems_3" + }, + "locked": { + "lastModified": 1752743158, + "narHash": "sha256-YndFlXC9ZM7uiC75MfnYFk4S9s1Xqq3GTnW0xMBlG7g=", + "owner": "hyprwm", + "repo": "hyprlock", + "rev": "31297a871b7b1aea35dcf8627c6bfecf33fe03db", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlock", + "type": "github" + } + }, "hyprsysteminfo": { "inputs": { "hyprland-qt-support": "hyprland-qt-support_2", - "hyprutils": "hyprutils_3", - "nixpkgs": "nixpkgs_3", - "systems": "systems_3" + "hyprutils": "hyprutils_4", + "nixpkgs": "nixpkgs_5", + "systems": "systems_4" }, "locked": { "lastModified": 1750372066, @@ -534,6 +619,31 @@ } }, "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": [ + "hyprlock", + "systems" + ] + }, + "locked": { + "lastModified": 1751061882, + "narHash": "sha256-g9n8Vrbx+2JYM170P9BbvGHN39Wlkr4U+V2WLHQsXL8=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "4737241eaf8a1e51671a2a088518071f9a265cf4", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprsysteminfo", @@ -562,7 +672,7 @@ "type": "github" } }, - "hyprutils_3": { + "hyprutils_4": { "inputs": { "nixpkgs": [ "hyprsysteminfo", @@ -612,6 +722,31 @@ "type": "github" } }, + "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": [ + "hyprlock", + "systems" + ] + }, + "locked": { + "lastModified": 1750371869, + "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "mnw": { "locked": { "lastModified": 1748710831, @@ -627,32 +762,6 @@ "type": "github" } }, - "nil": { - "inputs": { - "flake-utils": [ - "nvf", - "flake-utils" - ], - "nixpkgs": [ - "nvf", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1741118843, - "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", - "owner": "oxalica", - "repo": "nil", - "rev": "577d160da311cc7f5042038456a0713e9863d09e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, "nix-flatpak": { "locked": { "lastModified": 1711997201, @@ -671,11 +780,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743420942, - "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", + "lastModified": 1752666637, + "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", + "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", "type": "github" }, "original": { @@ -687,11 +796,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -701,54 +810,20 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1741992157, - "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "da4b122f63095ca1199bd4d526f9e26426697689", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1741865919, - "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { + "locked": { + "lastModified": 1748189127, + "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1751792365, "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", @@ -764,7 +839,23 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { + "locked": { + "lastModified": 1751011381, + "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1737469691, "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", @@ -780,13 +871,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { - "lastModified": 1744098102, - "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -796,13 +887,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { - "lastModified": 1749174413, - "narHash": "sha256-urN9UMK5cd1dzhR+Lx0xHeTgBp2MatA5+6g9JaxjuQs=", + "lastModified": 1750215678, + "narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6ad174a6dc07c7742fc64005265addf87ad08615", + "rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192", "type": "github" }, "original": { @@ -812,7 +903,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1743448293, "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", @@ -833,16 +924,15 @@ "flake-parts": "flake-parts", "flake-utils": "flake-utils_2", "mnw": "mnw", - "nil": "nil", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "systems": "systems_5" }, "locked": { - "lastModified": 1749631819, - "narHash": "sha256-iy7UuA2I0DaKEUMncTQNFg0bYDX7sa5WCRQTrIWqmEU=", + "lastModified": 1752687459, + "narHash": "sha256-XcTP16Yg2CcyBB6FE9OrxVXCWkAcKprS+nMvbZ8nYCc=", "owner": "notashelf", "repo": "nvf", - "rev": "2a2b5e2790b41eadc42758fd6c4d62b7af64f17c", + "rev": "fe874acd37f55dd5043a06fd2284300133782cfa", "type": "github" }, "original": { @@ -874,63 +964,21 @@ "type": "github" } }, - "quickshell": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1749533342, - "narHash": "sha256-cQzKzqsPQmDBRDjcX4UFEQKNeAyibLIKkF+BBhE2JnI=", - "ref": "refs/heads/master", - "rev": "2b01a75679a03bd6557cf11c20b1588f436d6b94", - "revCount": 571, - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" - }, - "original": { - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" - } - }, "root": { "inputs": { "catppuccin": "catppuccin", "ghostty": "ghostty", "home-manager": "home-manager", "hyprland": "hyprland", + "hyprlock": "hyprlock", "hyprsysteminfo": "hyprsysteminfo", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "nvf": "nvf", - "quickshell": "quickshell", "zen-browser": "zen-browser" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nvf", - "nil", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741055476, - "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "aefb7017d710f150970299685e8d8b549d653649", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -978,16 +1026,16 @@ }, "systems_4": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1050,14 +1098,14 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1750152169, - "narHash": "sha256-XN5OBCCXKmPBL+UXyyScI5HGgs4U8OFGQTnKuxurBFI=", + "lastModified": 1752716941, + "narHash": "sha256-U6uNz1Ns7/aKGJqCteaHfM2BLpzLMvw3sQu2rsl4ot4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ed811ab0d0b407b59cda1023820e9986fd28c8c3", + "rev": "9a3d6e9f5e52421663f90460cd1c8f4eb34b3af0", "type": "github" }, "original": { @@ -1069,7 +1117,8 @@ "zig": { "inputs": { "flake-compat": [ - "ghostty" + "ghostty", + "flake-compat" ], "flake-utils": [ "ghostty", @@ -1077,15 +1126,15 @@ ], "nixpkgs": [ "ghostty", - "nixpkgs-stable" + "nixpkgs" ] }, "locked": { - "lastModified": 1741825901, - "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=", + "lastModified": 1748261582, + "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "0b14285e283f5a747f372fb2931835dd937c4383", + "rev": "aafb1b093fb838f7a02613b719e85ec912914221", "type": "github" }, "original": { @@ -1102,7 +1151,7 @@ ], "nixpkgs": [ "ghostty", - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { @@ -1115,8 +1164,8 @@ }, "original": { "owner": "jcollie", - "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613", "repo": "zon2nix", + "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", "type": "github" } } diff --git a/flake.nix b/flake.nix index a0eadf8..c15950d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,17 @@ { - description = "OCbwoy3's Dotfiles"; + description = "I use Nix BTW... I'm Hyprlanding it!!"; + # I use Nix BTW -> @iUseNixBTW (https://roblox.com/users/1083030325) + # totally not a flex btw inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; catppuccin.url = "github:catppuccin/nix"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; - hyprland.url = "github:hyprwm/Hyprland/?ref=v0.49.0"; + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hyprlock.url = "github:hyprwm/hyprlock"; hyprsysteminfo.url = "github:hyprwm/hyprsysteminfo"; ghostty.url = "github:ghostty-org/ghostty"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; @@ -13,16 +19,17 @@ home-manager = { url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - quickshell = { - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; nvf.url = "github:notashelf/nvf"; + # quickshell = { + # url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + # # inputs.nixpkgs.follows = "nixpkgs"; + # }; + + }; # Required by NixOS: diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index bfb3cd2..ebbaf50 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -111,6 +111,7 @@ programs.hyprland = { enable = true; xwayland.enable = true; + # package = (pkgs.callPackage ./packages/hyprland/package.nix {}); package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; }; @@ -122,7 +123,7 @@ syntaxHighlighting.enable = true; ohMyZsh = { enable = true; - plugins = [ "git" "direnv" "thefuck" ]; + plugins = [ "git" "direnv" ]; theme = "robbyrussell"; }; shellAliases = { @@ -135,7 +136,11 @@ main-user.packages = with pkgs; [ # warp-terminal - prismlauncher + (prismlauncher.override { + jdks = [ + pkgs.jdk21 + ]; + }) # vesktop # legcord equibop diff --git a/hosts/default/other/activate.nix b/hosts/default/other/activate.nix index 0402bf5..658cc64 100644 --- a/hosts/default/other/activate.nix +++ b/hosts/default/other/activate.nix @@ -16,29 +16,6 @@ system.nixos.label = "ocbwoy3-config-main"; boot.loader.grub.configurationName = lib.mkDefault "ocbwoy3/config:main"; - system.activationScripts.installRoblox = { - text = '' - # install roblox manually from flathub 😍 - if [ ! -d "/home/ocbwoy3/.var/app/org.vinegarhq.Sober" ]; then - echo "Please Install Roblox" - # echo "flathub.org/apps/org.vinegarhq.Sober" - echo "$ flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo" - echo "$ flatpak install --user flathub org.vinegarhq.Sober" - fi - ''; - }; - - system.activationScripts.grantGlatpakOverrides = { - text = '' - ${pkgs.flatpak}/bin/flatpak override --filesystem=$HOME/.themes - ${pkgs.flatpak}/bin/flatpak override --filesystem=$HOME/.icons - USER=ocbwoy3 ${pkgs.flatpak}/bin/flatpak override --user --filesystem=xdg-config/gtk-4.0 - ${pkgs.flatpak}/bin/flatpak override --filesystem=xdg-config/gtk-4.0 - USER=ocbwoy3 ${pkgs.flatpak}/bin/flatpak override --user --filesystem=xdg-config/gtk-3.0 - ${pkgs.flatpak}/bin/flatpak override --filesystem=xdg-config/gtk-3.0 - ''; - }; - system.activationScripts.reloadFonts = { text = '' trap "${pkgs.fontconfig}/bin/fc-cache" EXIT diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix index 330f2a0..00ff4cf 100644 --- a/hosts/default/packages.nix +++ b/hosts/default/packages.nix @@ -1,4 +1,4 @@ -{ inputs, config, pkgs, ... }: +{ inputs, config, pkgs, lib, ... }: { @@ -17,7 +17,7 @@ programs.seahorse.enable = true; - environment.variables.LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib"; + environment.sessionVariables.LD_LIBRARY_PATH = "${pkgs.gcc15}/lib"; # surely they should add programs.discord!! environment.systemPackages = with pkgs; [ @@ -28,7 +28,10 @@ # disableBreakingUpdates = true; }) + # hyprland stuff + inputs.hyprlock.packages.${pkgs.stdenv.hostPlatform.system}.hyprlock inputs.hyprsysteminfo.packages.${pkgs.stdenv.hostPlatform.system}.hyprsysteminfo + # minecraft qemu (writeShellScriptBin "qemu-system-x86_64-uefi" '' @@ -37,13 +40,15 @@ "$@" '') (writeShellScriptBin "regretevator" ''xdg-open roblox://placeId=4972273297'') - + (writeShellScriptBin "kaijuparadise" ''xdg-open roblox://placeId=6456351776'') + (writeShellScriptBin "sewh" ''xdg-open roblox://placeId=16991287194'') + (writeShellScriptBin "fix-gtk" ''${inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland}/bin/hyprctl dispatch exec "${pkgs.xdg-desktop-portal-gtk}/libexec/xdg-desktop-portal-gtk -r"'') (callPackage ./apps/wl-shimeji.nix {}) (writeShellScriptBin "stop-shimejis" ''${inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland}/bin/hyprctl dispatch exec "shimejictl stop"'') # (writeShellScriptBin "partynoob" ''shimejictl summon PartyNoob'') - inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default + # inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default kdePackages.qtdeclarative catppuccin-gtk catppuccin @@ -83,7 +88,6 @@ pygobject3 ])) # wrangler - thefuck fontforge xclip gamescope @@ -94,7 +98,6 @@ waybar hyprpaper dunst - hyprlock swww swappy slurp @@ -118,7 +121,7 @@ github-cli file nwg-look - rhythmbox + # rhythmbox hyprpolkitagent # important @@ -127,7 +130,7 @@ nss glibc # C LIBRARY DO NOT REMOVE VERY IMPORTANT gobject-introspection - gimp + gimp3 mpv nixfmt-rfc-style diff --git a/modules/nixos/hardware.nix b/modules/nixos/hardware.nix index 091a8de..c517326 100644 --- a/modules/nixos/hardware.nix +++ b/modules/nixos/hardware.nix @@ -38,12 +38,12 @@ }; # services.getty.enable = false; - systemd.services."getty@tty1".enable = false; - systemd.services."getty@tty2".enable = false; - systemd.services."getty@tty3".enable = false; - systemd.services."getty@tty4".enable = false; - systemd.services."getty@tty5".enable = false; - systemd.services."getty@tty6".enable = false; + # systemd.services."getty@tty1".enable = false; + # systemd.services."getty@tty2".enable = false; + # systemd.services."getty@tty3".enable = false; + # systemd.services."getty@tty4".enable = false; + # systemd.services."getty@tty5".enable = false; + # systemd.services."getty@tty6".enable = false; system.stateVersion = "24.11"; diff --git a/modules/nixos/network.nix b/modules/nixos/network.nix index ea8516d..7150531 100644 --- a/modules/nixos/network.nix +++ b/modules/nixos/network.nix @@ -2,7 +2,7 @@ { - # using cloudflare dns instead of apollo.lv (which might be spying) + #! Disable default nameservers to prevent ISP espionage networking.nameservers = [ "1.1.1.1" "1.0.0.1" ]; networking.hostName = "ocbwoy3-pc"; diff --git a/scripts/bin/handleScreenshot.ts b/scripts/bin/handleScreenshot.ts index ea373bc..c5e1e34 100755 --- a/scripts/bin/handleScreenshot.ts +++ b/scripts/bin/handleScreenshot.ts @@ -1,6 +1,6 @@ import { $ } from "bun"; import { Command } from "commander"; -import sharp from "sharp"; +// import sharp from "sharp"; import { writeFileSync } from "fs"; import { getRegretevatorState } from "../lib/RegretevatorUtil"; @@ -74,6 +74,7 @@ const SCREENSHOT_PATH = `/home/ocbwoy3/Pictures/Screenshots`; // useless async function transformImage(b: Buffer): Promise { + /* const image = sharp(b).ensureAlpha(); const { width, height } = await image.metadata(); @@ -103,6 +104,8 @@ async function transformImage(b: Buffer): Promise { .ensureAlpha(); return (await maskedImage.png().toBuffer()) as Buffer; + */ + return b } (() => { diff --git a/scripts/screenshot-fullscreen.sh b/scripts/screenshot-fullscreen.sh index 93793de..d117283 100755 --- a/scripts/screenshot-fullscreen.sh +++ b/scripts/screenshot-fullscreen.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # do NOT use $PATH for this!! SS_PATH=$(timeout 30s bun run ~/config/scripts/bin/handleScreenshot.ts fullscreen) diff --git a/scripts/screenshot-selection.sh b/scripts/screenshot-selection.sh index b9d2fbf..a578207 100755 --- a/scripts/screenshot-selection.sh +++ b/scripts/screenshot-selection.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # do NOT use $PATH for this!! SS_PATH=$(timeout 30s bun run ~/config/scripts/bin/handleScreenshot.ts selection)