From c65ded42de9b1c6588ac94faad41cbb7e669b6e9 Mon Sep 17 00:00:00 2001 From: OCbwoy3 Date: Sat, 4 Oct 2025 23:14:36 +0300 Subject: [PATCH 1/3] triple boot --- README.md | 2 +- config/ghostty/config | 2 +- config/gtk-3.0/settings.ini | 2 +- config/hypr/config/display.conf | 17 ++- config/hypr/config/keybindings/default.conf | 8 +- config/qt5ct/qt5ct.conf | 8 +- config/waybar/modules.json | 10 +- config/wlogout/style.css | 2 + config/wofi/style.css | 2 + flake.lock | 130 ++++++++++---------- hosts/default/configuration.nix | 20 ++- hosts/default/packages.nix | 2 +- modules/forceMainPC.nix | 26 ++++ modules/nixos/bootloader.nix | 1 + modules/nixos/nixpkgs.nix | 3 + modules/stuff/zsh.nix | 3 +- scripts/bin/handleScreenshot.ts | 18 ++- 17 files changed, 159 insertions(+), 97 deletions(-) create mode 100644 modules/forceMainPC.nix diff --git a/README.md b/README.md index d805b12..e78b4aa 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ nix-shell -p git ```bash git clone git@tangled.sh:ocbwoy3.dev/nix cd config -sudo nixos-rebuild switch --flake .#default --impure --cores 4 +sudo nixos-rebuild switch --flake .#default --impure --cores 20 ``` 1. Reboot, run this in your terminal: diff --git a/config/ghostty/config b/config/ghostty/config index 194b12e..30d99ef 100644 --- a/config/ghostty/config +++ b/config/ghostty/config @@ -1,4 +1,4 @@ -font-family = "GeistMono NF" +font-family = "SF Mono" theme = catppuccin-mocha background-opacity = 0.7 window-padding-x = 16 diff --git a/config/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini index 55491d3..a932027 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 gtk-icon-theme-name=Adwaita -gtk-font-name=Adwaita Sans 11 +gtk-font-name=SF Pro Display gtk-cursor-theme-name=RalseiCursors gtk-cursor-theme-size=24 gtk-toolbar-style=GTK_TOOLBAR_ICONS diff --git a/config/hypr/config/display.conf b/config/hypr/config/display.conf index 32635d3..462014f 100644 --- a/config/hypr/config/display.conf +++ b/config/hypr/config/display.conf @@ -51,23 +51,34 @@ animations { bezier = myBezier, 0.05, 0.9, 0.1, 1.05 bezier = main, 0.445, 0.05, 0.55, 0.95 + bezier = monitorBez, 0, 1, 1, 1 animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% + animation = windowsOut, 1, 7, default animation = border, 1, 10, default animation = borderangle, 1, 8, default animation = fade, 1, 7, default animation = workspaces, 1, 6, default, slide animation = specialWorkspace, 1, 6, myBezier, slide + + animation = monitorAdded, 1, 30, monitorBez + } render { - # direct_scanout = true + # new_render_scheduling = true +} + +cursor { + use_cpu_buffer = 2 + enable_hyprcursor = true + invisible = false } windowrule = tag +game, class:org.vinegarhq.Sober windowrule = tag +game, class:com.mojang.minecraft.java-edition +windowrule = tag +discord, class:equibop windowrule = tag +code, class:code windowrule = tag +music, class:Cider @@ -76,6 +87,7 @@ windowrule = tag +music, class:Cider windowrulev2 = renderunfocused, tag:music windowrulev2 = renderunfocused, tag:game +windowrulev2 = renderunfocused, tag:discord # Dwindle layout dwindle { @@ -96,6 +108,7 @@ misc { new_window_takes_over_fullscreen = 1 disable_splash_rendering = false font_family = "SF Pro Display" + render_unfocused_fps = 240 } # Layer Rules diff --git a/config/hypr/config/keybindings/default.conf b/config/hypr/config/keybindings/default.conf index 959fb86..40cb34c 100644 --- a/config/hypr/config/keybindings/default.conf +++ b/config/hypr/config/keybindings/default.conf @@ -67,10 +67,10 @@ bindl = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%- bindl = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ bindl = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- bindl = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle -bindl = , XF86AudioPlay, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone play-pause -bindl = , XF86AudioPause, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone pause -bindl = , XF86AudioNext, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone next -bindl = , XF86AudioPrev, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone previous +bindl = , XF86AudioPlay, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus play-pause +bindl = , XF86AudioPause, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus pause +bindl = , XF86AudioNext, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus next +bindl = , XF86AudioPrev, exec, playerctl -p cider,OCbwoy3_s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus previous bindl = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle bindl = , XF86Lock, exec, pkill -USR1 hyprlock || hyprlock diff --git a/config/qt5ct/qt5ct.conf b/config/qt5ct/qt5ct.conf index f2a2de8..7781825 100644 --- a/config/qt5ct/qt5ct.conf +++ b/config/qt5ct/qt5ct.conf @@ -1,9 +1,9 @@ [Appearance] color_scheme_path=/home/ocbwoy3/.config/qt5ct/colors/catppuccin-mocha-blue.conf -custom_palette=true +custom_palette=false icon_theme=arashi -standard_dialogs=default -style=Darkly +standard_dialogs=xdgdesktopportal +style=Fusion [Fonts] fixed="Geist Mono,9,-1,5,50,0,0,0,0,0" @@ -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\xee\0\0\x3q\0\0\0\0\0\0\0\0\0\0\x3\xbf\0\0\x4\x1a\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x4\xee\0\0\x3q) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\aS\0\0\x3\xee\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\xee) [Troubleshooting] force_raster_widgets=1 diff --git a/config/waybar/modules.json b/config/waybar/modules.json index f53c47a..c78dd7f 100644 --- a/config/waybar/modules.json +++ b/config/waybar/modules.json @@ -17,11 +17,11 @@ "mpris": { "players": ["cider", "OCbwoy3_s_iPhone"], "interval": 1, - "on-scroll-up": "playerctl -p cider,OCbwoy3_s_iPhone volume 0.05+", - "on-scroll-down": "playerctl -p cider,OCbwoy3_s_iPhone volume 0.05-", - "on-click": "playerctl -p cider,OCbwoy3_s_iPhone play-pause", - "on-click-right": "playerctl -p cider,OCbwoy3_s_iPhone next", - "on-click-middle": "playerctl -p cider,OCbwoy3_s_iPhone previous", + "on-scroll-up": "playerctl -p cider,OCbwoy3_s_iPhone,cmus volume 0.05+", + "on-scroll-down": "playerctl -p cider,OCbwoy3_s_iPhone,cmus volume 0.05-", + "on-click": "playerctl -p cider,OCbwoy3_s_iPhone,cmus play-pause", + "on-click-right": "playerctl -p cider,OCbwoy3_s_iPhone,cmus next", + "on-click-middle": "playerctl -p cider,OCbwoy3_s_iPhone,cmus previous", "format": " {artist} — {title}", "tooltip-format": "{album}", "tooltip-format-stopped": "", diff --git a/config/wlogout/style.css b/config/wlogout/style.css index cf22cf3..82a3440 100644 --- a/config/wlogout/style.css +++ b/config/wlogout/style.css @@ -1,6 +1,8 @@ * { background-image: none; box-shadow: none; + font-family: 'SF Pro Display', 'Symbols Nerd Font'; + font-size: 18px; } window { diff --git a/config/wofi/style.css b/config/wofi/style.css index 84f53d0..33c4d96 100644 --- a/config/wofi/style.css +++ b/config/wofi/style.css @@ -3,6 +3,8 @@ window { border: 1px solid #89b4fa; border-radius: 12px; padding: 8px; + font-family: "SF Pro Display", "Symbols Nerd Font", sans-serif; + font-size: 18px; } #entry { diff --git a/flake.lock b/flake.lock index fd3d8a1..03697da 100644 --- a/flake.lock +++ b/flake.lock @@ -114,11 +114,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1756606761, - "narHash": "sha256-lcHMwq0LVcS1mP9o0pq00Von8PsXMsFPPo3ZXGWa7DU=", + "lastModified": 1757267471, + "narHash": "sha256-ThyzQzi0uQn5Ui8jFRcjpWOWpjX00utBegHhMfBKyZE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "9e9e58125b4ba190658235106858f9733b25a1b4", + "rev": "08bff060191426d82e0cb95fc6a328e632087744", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -274,11 +274,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1757170704, - "narHash": "sha256-faELbx7wEAzsG/w7OS+iIkc691EOBNPqLQ1Cpu/eBdQ=", + "lastModified": 1757259260, + "narHash": "sha256-M8Hm05lw9qlP+zLcHxgCnHkHEGuUdNQ6zWNRWbyDAqw=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "26e9b0a0f3b07149c7fd7474519eba6b21f8c5fd", + "rev": "e1627a80e952afce5144d1f826e2ef35cd224cc3", "type": "github" }, "original": { @@ -339,11 +339,11 @@ ] }, "locked": { - "lastModified": 1756261190, - "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", + "lastModified": 1757075491, + "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "77f348da3176dc68b20a73dab94852a417daf361", + "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf", "type": "github" }, "original": { @@ -357,11 +357,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1756788591, - "narHash": "sha256-LOrOfPWpJU/ADWDyVwPv9XNuYPq5KJtmAmSzplpccmE=", + "lastModified": 1757256385, + "narHash": "sha256-WK7tOhWwr15mipcckhDg2no/eSpM1nIh4C9le8HgHhk=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3d3b4592a73fb64b5423234c01985ea73976596", + "rev": "f35703b412c67b48e97beb6e27a6ab96a084cd37", "type": "github" }, "original": { @@ -460,11 +460,11 @@ ] }, "locked": { - "lastModified": 1755678602, - "narHash": "sha256-uEC5O/NIUNs1zmc1aH1+G3GRACbODjk2iS0ET5hXtuk=", + "lastModified": 1756891319, + "narHash": "sha256-/e6OXxzbAj/o97Z1dZgHre4bNaVjapDGscAujSCQSbI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "157cc52065a104fc3b8fa542ae648b992421d1c7", + "rev": "621e2e00f1736aa18c68f7dfbf2b9cff94b8cc4d", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1756811803, - "narHash": "sha256-03zmDvAU+VLPWHv5uxfGVR6bs/SnCYeZ8hbedK/Eb/M=", + "lastModified": 1757508065, + "narHash": "sha256-JkUkn8p/sHqjmykejd9ZMUlYyaXA+Ve9IPA71ybqloY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "127aab815908ecbd3db4d23f127d2e96b79855f9", + "rev": "46174f78b374b6cea669c48880877a8bdcf7802f", "type": "github" }, "original": { @@ -668,11 +668,11 @@ ] }, "locked": { - "lastModified": 1753622892, - "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", + "lastModified": 1756810301, + "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", + "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", "type": "github" }, "original": { @@ -748,11 +748,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1756305651, - "narHash": "sha256-KttBtdPHDCuD+BT0da8DmBarv6k+9GA9INpeDLLgpc8=", + "lastModified": 1756969494, + "narHash": "sha256-gpTDaJT8CSTqumMdENIw4x+mmbeoP1D3ywuAaOaRfac=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "8d0e56998e299ae42f3fd8ede5bb5c396193cdbc", + "rev": "04cfdc4e5bb0e53036e70cc20922ab346ce165cd", "type": "github" }, "original": { @@ -987,11 +987,11 @@ ] }, "locked": { - "lastModified": 1756201372, - "narHash": "sha256-bK5j5cwJgO5AZXlDl5AgISzpOv9YV1Fcv2nDr9RW/5o=", + "lastModified": 1757052778, + "narHash": "sha256-rYszJwY0EArAqK6q0i5bB1zxNCNRk6gVmD9SIvnoXW8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9f6745bd704ab7f2617d41c2b02f4fd5f9ed0e89", + "rev": "ceaa413a68f28bbf6731464594fdb2c3513e9110", "type": "github" }, "original": { @@ -1015,11 +1015,11 @@ }, "mnw": { "locked": { - "lastModified": 1756580127, - "narHash": "sha256-XK+ZQWjnd96Uko73jY1dc23ksnuWnF/Myc4rT/LQOmc=", + "lastModified": 1756659871, + "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=", "owner": "Gerg-L", "repo": "mnw", - "rev": "ecdb5ba1b08ac198d9e9bfbf9de3b234fb1eb252", + "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16", "type": "github" }, "original": { @@ -1069,11 +1069,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756750488, - "narHash": "sha256-e4ZAu2sjOtGpvbdS5zo+Va5FUUkAnizl4wb0/JlIL2I=", + "lastModified": 1757103352, + "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "47eb4856cfd01eaeaa7bb5944a0f27db8fb9b94a", + "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "type": "github" }, "original": { @@ -1163,11 +1163,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", - "owner": "NixOS", + "lastModified": 1757238739, + "narHash": "sha256-ovEq9v+Xc+oQH1zvQo28rT/YVqMQK2TRgUcNanvo2Zk=", + "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "6d8fca2c92488ff860524dd3400aa90a3310123e", "type": "github" }, "original": { @@ -1205,11 +1205,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { @@ -1253,11 +1253,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { @@ -1269,11 +1269,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1756536218, - "narHash": "sha256-ynQxPVN2FIPheUgTFhv01gYLbaiSOS7NgWJPm9LF9D0=", + "lastModified": 1756696532, + "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a918bb3594dd243c2f8534b3be01b3cb4ed35fd1", + "rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f", "type": "github" }, "original": { @@ -1292,11 +1292,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1756668885, - "narHash": "sha256-K2B+szngrw1tfzkrAs49HGkK5hlUGIKV0+2Z9ndnAuA=", + "lastModified": 1757095994, + "narHash": "sha256-AXwM6/7CuQ39iwBqmc6ZNkVcCdFiK4MFRIGQgU6Mkyk=", "owner": "notashelf", "repo": "nvf", - "rev": "bf485ab9b6db5610ee93b90c94f1fd2afb4eb582", + "rev": "fb31022b366ad21951f0352f0cc282cc6a8e9e6f", "type": "github" }, "original": { @@ -1315,11 +1315,11 @@ ] }, "locked": { - "lastModified": 1755960406, - "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", + "lastModified": 1757239681, + "narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", + "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d", "type": "github" }, "original": { @@ -1355,11 +1355,11 @@ ] }, "locked": { - "lastModified": 1756434910, - "narHash": "sha256-5UJRyxZ8QCm+pgh5pNHXFJMmopMqHVraUhRA1g2AmA0=", + "lastModified": 1757125853, + "narHash": "sha256-noKkYHKpT5lpvNSYrlH56d8cedthZfs010Uv6vTqLT4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "86e5140961c91a9ee1dde1c17d18a787d44ceef8", + "rev": "8b70793a6be183536a5d562056dac10b7b36820d", "type": "github" }, "original": { @@ -1514,11 +1514,11 @@ "sqlite-lib-src": "sqlite-lib-src" }, "locked": { - "lastModified": 1756753599, - "narHash": "sha256-yD8PMlRjUI2sN5PvkDJRfGz96zCp4gejaguDVmZ4utg=", + "lastModified": 1757261479, + "narHash": "sha256-4tAkFymrv+tvWXE6Vi9wFQoOQvxTHi47vptPE+yos0Y=", "ref": "refs/heads/master", - "rev": "da3540c0c134331c10f1a8d124ee0925e57f8112", - "revCount": 1279, + "rev": "1ec70a31f26321b67ee3cdc0746950f8139d134f", + "revCount": 1326, "type": "git", "url": "https://tangled.sh/@tangled.sh/core" }, @@ -1635,11 +1635,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1756787024, - "narHash": "sha256-JD5d6OistrDvXx1qF6/+0blIRo5pdjnk1y+L7Nd+aiA=", + "lastModified": 1757268762, + "narHash": "sha256-bFYLIRYIrttO/LHEE2Z99IeMGS6gwnMJy0w0fHyH9r8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0443e4c6977c542b1ad06dfc29cf9b89b4373664", + "rev": "741c3a1587c2af4530f7604dcf20352e0b3572a8", "type": "github" }, "original": { diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 557d497..b416ae2 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -3,7 +3,7 @@ { imports = [ - ../../modules/force.nix + ../../modules/forceMainPC.nix ../../modules/nixos/main-user.nix ../../modules/home-manager/main.nix ./packages.nix @@ -167,7 +167,7 @@ # home-manager.services.mpris-proxy.enable = true; - home-manager.backupFileExtension = "home-manager-backup"; + home-manager.backupFileExtension = "hmbackup"; catppuccin = { enable = true; @@ -184,16 +184,24 @@ gtk = { enable = true; - cursorTheme.name = lib.mkDefault "RalseiCursors"; - cursorTheme.package = lib.mkDefault (pkgs.callPackage ./packages/ralsei-cursors/default.nix {}); - iconTheme.name = lib.mkDefault "Arashi"; - iconTheme.package = lib.mkDefault (pkgs.callPackage ./packages/arashi-icons.nix {}); + + cursorTheme = { + name = "RalseiCursors"; + package = pkgs.callPackage ./packages/ralsei-cursors/default.nix {}; + }; + + iconTheme = { + name = "Arashi"; + package = pkgs.callPackage ./packages/arashi-icons.nix {}; + }; }; catppuccin = { enable = true; flavor = "mocha"; accent = "blue"; + # we're already using arashi + gtk.icon.enable = false; }; programs.zen-browser = { diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix index 1e22736..5b22873 100644 --- a/hosts/default/packages.nix +++ b/hosts/default/packages.nix @@ -148,7 +148,7 @@ kdePackages.kdialog (writeShellScriptBin "roblox-studio-patcher" ''${pkgs.bun}/bin/bun run /home/ocbwoy3/config/scripts/bin/patchInternalRobloxStudio.ts'') - firefox-devedition + # firefox-devedition ]; diff --git a/modules/forceMainPC.nix b/modules/forceMainPC.nix new file mode 100644 index 0000000..18ca505 --- /dev/null +++ b/modules/forceMainPC.nix @@ -0,0 +1,26 @@ +{ config, pkgs, lib, ... }: + +{ + imports = [ + ./force.nix + ]; + + # because i love cuda + nixpkgs.config.cudaSupport = lib.warn "you're going to fucking hell if you aren't using a binary cache" true; + + services.desktopManager.plasma6.enable = lib.mkDefault false; + + environment.systemPackages = with pkgs; [ + kdePackages.kclock + kdePackages.kcolorchooser + kdePackages.ksystemlog + # kdePackages.sddm-kcm + + hardinfo2 + vlc + wayland-utils + wl-clipboard + ]; + + +} diff --git a/modules/nixos/bootloader.nix b/modules/nixos/bootloader.nix index 4d5d19a..4645377 100644 --- a/modules/nixos/bootloader.nix +++ b/modules/nixos/bootloader.nix @@ -34,6 +34,7 @@ efiSupport = true; device = "nodev"; efiInstallAsRemovable = true; + # will kill pc if triplebooting w*ndows, nixos and cachyos useOSProber = true; gfxmodeEfi = "1920x1080"; }; diff --git a/modules/nixos/nixpkgs.nix b/modules/nixos/nixpkgs.nix index 4479c26..7e47cbc 100644 --- a/modules/nixos/nixpkgs.nix +++ b/modules/nixos/nixpkgs.nix @@ -14,15 +14,18 @@ "https://hyprland.cachix.org" "https://ghostty.cachix.org" "https://wrangler.cachix.org" + "https://nix-community.cachix.org" ]; trusted-substituters = [ "https://hyprland.cachix.org" "https://ghostty.cachix.org" + "https://nix-community.cachix.org" ]; trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns=" "wrangler.cachix.org-1:N/FIcG2qBQcolSpklb2IMDbsfjZKWg+ctxx0mSMXdSs=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; }; diff --git a/modules/stuff/zsh.nix b/modules/stuff/zsh.nix index 487c3bc..c8380d8 100644 --- a/modules/stuff/zsh.nix +++ b/modules/stuff/zsh.nix @@ -18,7 +18,8 @@ theme = "robbyrussell"; }; shellAliases = { - nixrebuild = "sudo nixos-rebuild switch --flake .#default --impure --cores 4 -L --upgrade"; + # ultimate cpu killer 3000 + nixrebuild = "sudo nixos-rebuild switch --flake .#default --impure --cores 20 -L --upgrade"; dangerous-nixrebuild-server = "sudo nixos-rebuild switch --flake .#server --impure --cores 4 -L --upgrade"; neofetch = "fastfetch"; }; diff --git a/scripts/bin/handleScreenshot.ts b/scripts/bin/handleScreenshot.ts index 0691024..c92b97c 100755 --- a/scripts/bin/handleScreenshot.ts +++ b/scripts/bin/handleScreenshot.ts @@ -53,11 +53,15 @@ const windowcClassFriendyName: {[windowClass: string]: string} = { "steam_app_1690940": "Deltarune" } -async function getFilename(): Promise { - const _d = new Date(); +async function getWMClass(): Promise { const windowClass = await $`hyprctl activewindow -j`.json(); - let ic = (windowClass.initialClass && windowcClassFriendyName[windowClass.initialClass]) || windowClass.windowClass || "Hyprland"; - const isRoblox = windowClass.initialClass === "org.vinegarhq.Sober"; + return windowClass.initialClass +} + +async function getFilename(wmClass?: string): Promise { + const _d = new Date(); + let ic = (wmClass && windowcClassFriendyName[wmClass]) || wmClass || "Hyprland"; + const isRoblox = wmClass === "org.vinegarhq.Sober"; if (isRoblox) {ic = "Roblox"; }; const regretevatorState = isRoblox ? getRegretevatorState() : null; if (!!regretevatorState) {ic = "Regretevator";}; @@ -118,6 +122,7 @@ async function transformImage(b: Buffer): Promise { .command("selection") .description("Takes a screenshot from selection") .action(async () => { + const _C = await getWMClass(); const selection = await $`slurp -w 0 -d -b "#cdd6f444"` .nothrow() .quiet(); @@ -133,7 +138,7 @@ async function transformImage(b: Buffer): Promise { .trim()} -`.arrayBuffer(); let BUF = Buffer.from(_BUF) as Buffer; - const FILENAME = `${SCREENSHOT_PATH}/${await getFilename()}.png`; + const FILENAME = `${SCREENSHOT_PATH}/${await getFilename(_C)}.png`; // BUF = await transformImage(BUF); writeFileSync(FILENAME, BUF); @@ -151,11 +156,12 @@ async function transformImage(b: Buffer): Promise { .nothrow() .text(); + const _C = await getWMClass(); const _BUF = await $`grim -c -t png -l 0 -o ${selection.trim()} -`.arrayBuffer(); let BUF = Buffer.from(_BUF) as Buffer; - const FILENAME = `${SCREENSHOT_PATH}/${await getFilename()}.png`; + const FILENAME = `${SCREENSHOT_PATH}/${await getFilename(_C)}.png`; // BUF = await transformImage(BUF); writeFileSync(FILENAME, BUF); From b741ce009ae8d5dce0373ad1f7fac0c095a54315 Mon Sep 17 00:00:00 2001 From: OCbwoy3 Date: Sat, 4 Oct 2025 23:18:32 +0300 Subject: [PATCH 2/3] tripleboot mb --- hosts/default/packages/arashi-icons.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hosts/default/packages/arashi-icons.nix b/hosts/default/packages/arashi-icons.nix index 7f8b5c9..27662a1 100644 --- a/hosts/default/packages/arashi-icons.nix +++ b/hosts/default/packages/arashi-icons.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - pname = "arashi-icons"; + pname = "Arashi-icons"; version = "1.0.0"; src = fetchFromGitHub { @@ -15,16 +15,16 @@ stdenv.mkDerivation rec { buildInputs = [ ]; installPhase = '' - mkdir -p $out/share/icons/arashi/scalable/apps - mkdir -p $out/share/icons/arashi/scalable/places - cp $src/index.theme $out/share/icons/arashi/ - cp -r $src/scalable/apps/*.svg $out/share/icons/arashi/scalable/apps/ - cp -r $src/scalable/places/*.svg $out/share/icons/arashi/scalable/places/ + mkdir -p $out/share/icons/Arashi/scalable/apps + mkdir -p $out/share/icons/Arashi/scalable/places + cp $src/index.theme $out/share/icons/Arashi/ + cp -r $src/scalable/apps/*.svg $out/share/icons/Arashi/scalable/apps/ + cp -r $src/scalable/places/*.svg $out/share/icons/Arashi/scalable/places/ - cp $out/share/icons/arashi/scalable/apps/utilities-terminal.svg $out/share/icons/arashi/scalable/apps/com.mitchellh.ghostty.svg - cp $out/share/icons/arashi/scalable/apps/systemsettings.svg $out/share/icons/arashi/scalable/apps/pavucontrol.svg - cp $out/share/icons/arashi/scalable/apps/dev.vencord.Vesktop.svg $out/share/icons/arashi/scalable/apps/equibop.svg - cp $out/share/icons/arashi/scalable/apps/org.vinegarhq.Sober.svg $out/share/icons/arashi/scalable/apps/tuxstrap.svg + cp $out/share/icons/Arashi/scalable/apps/utilities-terminal.svg $out/share/icons/Arashi/scalable/apps/com.mitchellh.ghostty.svg + cp $out/share/icons/Arashi/scalable/apps/systemsettings.svg $out/share/icons/Arashi/scalable/apps/pavucontrol.svg + cp $out/share/icons/Arashi/scalable/apps/dev.vencord.Vesktop.svg $out/share/icons/Arashi/scalable/apps/equibop.svg + cp $out/share/icons/Arashi/scalable/apps/org.vinegarhq.Sober.svg $out/share/icons/Arashi/scalable/apps/tuxstrap.svg ''; meta = with lib; { From 6c588648986045dd13aa32e5e1225700a36681bf Mon Sep 17 00:00:00 2001 From: OCbwoy3 Date: Sun, 5 Oct 2025 00:53:35 +0300 Subject: [PATCH 3/3] 1000hz --- flake.lock | 40 ++++++++++++++++----------------- hosts/default/configuration.nix | 13 ++++++++++- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 5b33045..6492bad 100644 --- a/flake.lock +++ b/flake.lock @@ -288,11 +288,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1757259260, - "narHash": "sha256-M8Hm05lw9qlP+zLcHxgCnHkHEGuUdNQ6zWNRWbyDAqw=", + "lastModified": 1759587530, + "narHash": "sha256-GNjj1mobxlBWNBw1XM/YniVd03IsNPMVHrBbXJBcLWg=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "e1627a80e952afce5144d1f826e2ef35cd224cc3", + "rev": "18eee610bc715e181fcbf96a438b48edb0673090", "type": "github" }, "original": { @@ -1193,28 +1193,28 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748189127, - "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", + "lastModified": 315532800, + "narHash": "sha256-YwoXN6fthkakCFD7nXPcUK+rkNr6ZTNTuF8zdGaxZo0=", + "rev": "dc704e6102e76aad573f63b74c742cd96f8f1e6c", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre870318.dc704e6102e7/nixexprs.tar.xz" }, "original": { "type": "tarball", - "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz" + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, "nixpkgs_4": { "locked": { - "lastModified": 1755972213, - "narHash": "sha256-VYK7aDAv8H1enXn1ECRHmGbeY6RqLnNwUJkOwloIsko=", - "rev": "73e96df7cff5783f45e21342a75a1540c4eddce4", + "lastModified": 1758360447, + "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre850642.73e96df7cff5/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz" }, "original": { "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable-small/nixexprs.tar.xz" + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, "nixpkgs_5": { @@ -1679,11 +1679,11 @@ ] }, "locked": { - "lastModified": 1748261582, - "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=", + "lastModified": 1759192380, + "narHash": "sha256-0BWJgt4OSzxCESij5oo8WLWrPZ+1qLp8KUQe32QeV4Q=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "aafb1b093fb838f7a02613b719e85ec912914221", + "rev": "0bcd1401ed43d10f10cbded49624206553e92f57", "type": "github" }, "original": { @@ -1697,17 +1697,17 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1757167408, - "narHash": "sha256-4XyJ6fmKd9wgJ7vHUQuULYy5ps2gUgkkDk/PrJb2OPY=", + "lastModified": 1758405547, + "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=", "owner": "jcollie", "repo": "zon2nix", - "rev": "dc78177e2ad28d5a407c9e783ee781bd559d7dd5", + "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", "type": "github" }, "original": { "owner": "jcollie", "repo": "zon2nix", - "rev": "dc78177e2ad28d5a407c9e783ee781bd559d7dd5", + "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", "type": "github" } } diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index ba50a6c..a3a4625 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -14,7 +14,18 @@ services.displayManager.gdm.enable = true; - boot.kernelPackages = pkgs.linuxPackages_cachyos-lto; # some guy in roblox told me to do this + boot.kernelPackages = (pkgs.linuxPackages_cachyos-lto.override { + ticksHz = 1000; + useLTO = "full"; + # extraMakeFlags = ["-O3"]; + withoutDebug = true; + }); + + services.scx.enable = true; + services.scx.scheduler = "scx_bpfland"; + services.scx.extraArgs = [ + "-m performance" + ]; programs.steam = { enable = true;