dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit af4669b1872d373ce3a9e86fe7a0c0766e2c9b93 parent 262622a4398f3e1ae9ec2e342f9d77629a7b2176 Author: maydayv7 <maydayv7@gmail.com> Date: Sun, 7 Dec 2025 17:38:52 +0530 feat!: Update to NixOS 25.11 (Xantusia) • Updated input 'boot': 'github:nix-community/lanzaboote/a65905a09e2c43ff63be8c0e86a93712361f871e?narHash=sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU%3D' (2025-01-23) → 'github:nix-community/lanzaboote/88b8a563ff5704f4e8d8e5118fb911fa2110ca05?narHash=sha256-If6vQ%2BKvtKs3ARBO9G3l%2B4wFSCYtRBrwX1z%2BI%2BB61wQ%3D' (2025-11-03) • Updated input 'boot/crane': 'github:ipetkov/crane/ef80ead953c1b28316cc3f8613904edc2eb90c28?narHash=sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp%2B4cAgkut%2BNNE%3D' (2024-11-08) → 'github:ipetkov/crane/444e81206df3f7d92780680e45858e31d2f07a08?narHash=sha256-0tcS8FHd4QjbCVoxN9jI%2BPjHgA4vc/IjkUSp%2BN3zy0U%3D' (2025-08-04) • Updated input 'boot/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04) → 'github:edolstra/flake-compat/9100a0f413b0c601e0533d1d94ffd501ce2e7885?narHash=sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX%2BfjA8Xf8PUmqCY%3D' (2025-05-12) • Updated input 'boot/pre-commit-hooks-nix': 'github:cachix/pre-commit-hooks.nix/cd1af27aa85026ac759d5d3fccf650abe7e1bbf0?narHash=sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf%2BInnSMT4jlMU%3D' (2024-11-11) → 'github:cachix/pre-commit-hooks.nix/16ec914f6fb6f599ce988427d9d94efddf25fe6d?narHash=sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg%3D' (2025-06-24) • Removed input 'boot/pre-commit-hooks-nix/nixpkgs-stable' • Updated input 'boot/rust-overlay': 'github:oxalica/rust-overlay/0be641045af6d8666c11c2c40e45ffc9667839b5?narHash=sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE%3D' (2024-11-18) → 'github:oxalica/rust-overlay/59c45eb69d9222a4362673141e00ff77842cd219?narHash=sha256-myRIDh%2BPxaREz%2Bz9LzbqBJF%2BSnTFJwkthKDX9zMyddY%3D' (2025-10-30) • Updated input 'catppuccin': 'github:catppuccin/nix/e339d6d822fa81c39d1ab89694b4ee2cfc830c9a?narHash=sha256-DT8CQoqV2haX%2BFo16WXAt9gKCSXOZH9ZfnV%2B%2BBr%2BqcM%3D' (2025-08-09) → 'github:catppuccin/nix/95042630028d613080393e0f03c694b77883c7db?narHash=sha256-P6UHmw6enwxmP5wP4Lv722%2Btgpq1PFDAPAdtj7l/16U%3D' (2025-12-04) • Updated input 'formatter': 'github:numtide/treefmt-nix/97a30861b13c3731a84e09405414398fbf3e109f?narHash=sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g%2BmjR/p5TEg%3D' (2025-11-06) → 'github:numtide/treefmt-nix/5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4?narHash=sha256-AlEObg0syDl%2BSpi4LsZIBrjw%2BsnSVU4T8MOeuZJUJjM%3D' (2025-11-12) • Updated input 'framework': 'github:hercules-ci/flake-parts/26d05891e14c88eb4a5d5bee659c0db5afb609d8?narHash=sha256-xxdepIcb39UJ94%2BYydGP221rjnpkDZUlykKuF54PsqI%3D' (2025-11-06) → 'github:hercules-ci/flake-parts/2cccadc7357c0ba201788ae99c4dfa90728ef5e0?narHash=sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q%3D' (2025-11-21) • Updated input 'gaming': 'github:fufexan/nix-gaming/9bb3ba9d192aeebc18a14c4c29140a78f0b28a7f?narHash=sha256-gIPh4l5MBs0/ETmF8ep7b6u6c2y2wyBBcD9Vk4l4p/Y%3D' (2025-11-08) → 'github:fufexan/nix-gaming/00e02d9896160f4ab9d9a2fe0ec7c009952d67ba?narHash=sha256-g0T9Jo24QTSdwSqxSCQcy0rpU6TujJsZdWrIeOOevYA%3D' (2025-12-06) • Updated input 'gaming/nixpkgs': 'github:NixOS/nixpkgs/a7fc11be66bdfb5cdde611ee5ce381c183da8386?narHash=sha256-QoJjGd4NstnyOG4mm4KXF%2BweBzA2AH/7gn1Pmpfcb0A%3D' (2025-10-31) → 'github:NixOS/nixpkgs/59b6c96beacc898566c9be1052ae806f3835f87d?narHash=sha256-UoliURDJFaOolycBZYrjzd9Cc66zULEyHqGFH3QHEq0%3D' (2025-11-29) • Updated input 'hardware': 'github:NixOS/nixos-hardware/52113c4f5cfd1e823001310e56d9c8d0699a6226?narHash=sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7%2B/YE%3D' (2025-11-06) → 'github:NixOS/nixos-hardware/9154f4569b6cdfd3c595851a6ba51bfaa472d9f3?narHash=sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x%2B6XUJ4YdFRjtO4%3D' (2025-11-29) • Updated input 'home': 'github:nix-community/home-manager/3b955f5f0a942f9f60cdc9cacb7844335d0f21c3?narHash=sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA%3D' (2025-09-21) → 'github:nix-community/home-manager/f63d0fe9d81d36e5fc95497217a72e02b8b7bcab?narHash=sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM%3D' (2025-12-04) • Removed input 'hyprcursors' • Removed input 'hyprcursors/hyprland' • Removed input 'hyprcursors/nixpkgs' • Removed input 'hyprland' • Removed input 'hyprland/aquamarine' • Removed input 'hyprland/aquamarine/hyprutils' • Removed input 'hyprland/aquamarine/hyprwayland-scanner' • Removed input 'hyprland/aquamarine/nixpkgs' • Removed input 'hyprland/aquamarine/systems' • Removed input 'hyprland/hyprcursor' • Removed input 'hyprland/hyprcursor/hyprlang' • Removed input 'hyprland/hyprcursor/nixpkgs' • Removed input 'hyprland/hyprcursor/systems' • Removed input 'hyprland/hyprgraphics' • Removed input 'hyprland/hyprgraphics/hyprutils' • Removed input 'hyprland/hyprgraphics/nixpkgs' • Removed input 'hyprland/hyprgraphics/systems' • Removed input 'hyprland/hyprland-guiutils' • Removed input 'hyprland/hyprland-guiutils/aquamarine' • Removed input 'hyprland/hyprland-guiutils/hyprgraphics' • Removed input 'hyprland/hyprland-guiutils/hyprlang' • Removed input 'hyprland/hyprland-guiutils/hyprtoolkit' • Removed input 'hyprland/hyprland-guiutils/hyprtoolkit/aquamarine' • Removed input 'hyprland/hyprland-guiutils/hyprtoolkit/hyprgraphics' • Removed input 'hyprland/hyprland-guiutils/hyprtoolkit/hyprlang' • Removed input 'hyprland/hyprland-guiutils/hyprtoolkit/hyprutils' • Removed input 'hyprland/hyprland-guiutils/hyprtoolkit/hyprwayland-scanner' • Removed input 'hyprland/hyprland-guiutils/hyprtoolkit/nixpkgs' • Removed input 'hyprland/hyprland-guiutils/hyprtoolkit/systems' • Removed input 'hyprland/hyprland-guiutils/hyprutils' • Removed input 'hyprland/hyprland-guiutils/hyprwayland-scanner' • Removed input 'hyprland/hyprland-guiutils/nixpkgs' • Removed input 'hyprland/hyprland-guiutils/systems' • Removed input 'hyprland/hyprland-protocols' • Removed input 'hyprland/hyprland-protocols/nixpkgs' • Removed input 'hyprland/hyprland-protocols/systems' • Removed input 'hyprland/hyprlang' • Removed input 'hyprland/hyprlang/hyprutils' • Removed input 'hyprland/hyprlang/nixpkgs' • Removed input 'hyprland/hyprlang/systems' • Removed input 'hyprland/hyprutils' • Removed input 'hyprland/hyprutils/nixpkgs' • Removed input 'hyprland/hyprutils/systems' • Removed input 'hyprland/hyprwayland-scanner' • Removed input 'hyprland/hyprwayland-scanner/nixpkgs' • Removed input 'hyprland/hyprwayland-scanner/systems' • Removed input 'hyprland/nixpkgs' • Removed input 'hyprland/pre-commit-hooks' • Removed input 'hyprland/pre-commit-hooks/flake-compat' • Removed input 'hyprland/pre-commit-hooks/gitignore' • Removed input 'hyprland/pre-commit-hooks/gitignore/nixpkgs' • Removed input 'hyprland/pre-commit-hooks/nixpkgs' • Removed input 'hyprland/systems' • Removed input 'hyprland/xdph' • Removed input 'hyprland/xdph/hyprland-protocols' • Removed input 'hyprland/xdph/hyprlang' • Removed input 'hyprland/xdph/hyprutils' • Removed input 'hyprland/xdph/hyprwayland-scanner' • Removed input 'hyprland/xdph/nixpkgs' • Removed input 'hyprland/xdph/systems' • Removed input 'hyprplugins' • Removed input 'hyprplugins/hyprland' • Removed input 'hyprplugins/nixpkgs' • Removed input 'hyprplugins/systems' • Removed input 'hyprshell' • Removed input 'hyprshell/crane' • Removed input 'hyprshell/flake-parts' • Removed input 'hyprshell/home-manager' • Removed input 'hyprshell/hyprland' • Removed input 'hyprshell/nixpkgs' • Removed input 'hyprsplit' • Removed input 'hyprsplit/hyprland' • Updated input 'index': 'github:Mic92/nix-index-database/359ff6333a7b0b60819d4c20ed05a3a1f726771f?narHash=sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo%3D' (2025-11-02) → 'github:Mic92/nix-index-database/5a3ff8c1a09003f399f43d5742d893c0b1ab8af0?narHash=sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI%3D' (2025-11-30) • Updated input 'niri': 'github:sodiboo/niri-flake/75bacb66302bca38fa6e0c180f1e5369a8115454?narHash=sha256-AZ/xrJ5JXvpRQYyiVf8Hx4lzFBQAaH9l0utOfvAA28I%3D' (2025-11-07) → 'github:sodiboo/niri-flake/935080f54490e3e7b1eda731cbe1478744546ea8?narHash=sha256-7w2Sn3Bgk91Ly%2B5XJ/OYvTqNVa%2B8%2B4Rqma05YM7xnVU%3D' (2025-12-06) • Updated input 'niri/niri-unstable': 'github:YaLTeR/niri/2144f9a6ae7b675213f9bd86d0989c334baa1c00?narHash=sha256-cjXYF5%2BgGaapr6d1Jz70GZQVzK4qzwDUwU86p9%2BH2mM%3D' (2025-11-07) → 'github:YaLTeR/niri/ba29735fbbd8cf8319c71ccb55b54a0580007c80?narHash=sha256-nC0Fsu4zSdabdR4tHHMCrTgqLms612eEDy5VCdQVZFk%3D' (2025-12-05) • Updated input 'niri/nixpkgs': 'github:NixOS/nixpkgs/ae814fd3904b621d8ab97418f1d0f2eb0d3716f4?narHash=sha256-YRqMDEtSMbitIMj%2BJLpheSz0pwEr0Rmy5mC7myl17xs%3D' (2025-11-05) → 'github:NixOS/nixpkgs/f61125a668a320878494449750330ca58b78c557?narHash=sha256-BmPWzogsG2GsXZtlT%2BMTcAWeDK5hkbGRZTeZNW42fwA%3D' (2025-12-05) • Updated input 'niri/nixpkgs-stable': 'github:NixOS/nixpkgs/6faeb062ee4cf4f105989d490831713cc5a43ee1?narHash=sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy%2BOAeBcGeA5okdYDc%3D' (2025-11-07) → 'github:NixOS/nixpkgs/c97c47f2bac4fa59e2cbdeba289686ae615f8ed4?narHash=sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA%3D' (2025-12-04) • Updated input 'niri/xwayland-satellite-unstable': 'github:Supreeeme/xwayland-satellite/3cd3edffe1be197326e9314816b16bb4e3d685b1?narHash=sha256-pD8YqwP0/irHWzJtVElnVljR%2BOaJPAVbJBwqix%2BuB5A%3D' (2025-11-07) → 'github:Supreeeme/xwayland-satellite/1b918e29b419e89910014054e8b71d54c9235ea5?narHash=sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0%3D' (2025-12-03) • Updated input 'nixcord': 'github:kaylorben/nixcord/26aa9c7966eea82e524215ed5e2e8b7cf370931b?narHash=sha256-2BPBalMQdW5ht6b%2Borcbdw59v5Wg7KpOO2zc/RaW6zE%3D' (2025-11-08) → 'github:kaylorben/nixcord/8ebddd43d3972178b13c080e7d7e7264dfbaf4c1?narHash=sha256-l4R5m/BtLB3pc/Bcqytdp7VNJDVzW%2BFniv/YvRXP4qU%3D' (2025-12-06) • Updated input 'sops': 'github:Mic92/sops-nix/5a7d18b5c55642df5c432aadb757140edfeb70b3?narHash=sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY%3D' (2025-10-20) → 'github:Mic92/sops-nix/5aca6ff67264321d47856a2ed183729271107c9c?narHash=sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4%3D' (2025-11-30) • Updated input 'spotify': 'github:Gerg-L/spicetify-nix/ab2ce95bc1f04ed5cee010fc6ad393da8084faaa?narHash=sha256-5/9c68yg6ouVpH0FGsVlJWTxrzslttY4VJh8CgcDuns%3D' (2025-11-07) → 'github:Gerg-L/spicetify-nix/1da6ebbbcf0301ff773e9c43bdd4c051af9523f7?narHash=sha256-4f0y9Fo3AChngd/qRQ7wbcy6FH33NFZbyFXn7IeUI14%3D' (2025-12-02) • Updated input 'stable': 'github:NixOS/nixpkgs/6faeb062ee4cf4f105989d490831713cc5a43ee1?narHash=sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy%2BOAeBcGeA5okdYDc%3D' (2025-11-07) → 'github:NixOS/nixpkgs/c97c47f2bac4fa59e2cbdeba289686ae615f8ed4?narHash=sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA%3D' (2025-12-04) • Updated input 'stylix': 'github:nix-community/stylix/91b9a270523361268ba6a8772152fde31103869f?narHash=sha256-5z5cGrp9F8g8iyQrM8WkB6pAwP4AaicljKZ15gx%2BX9Y%3D' (2025-11-04) → 'github:nix-community/stylix/b1c99fd9525bae86f20018e96d68176002ad18b0?narHash=sha256-LqCQL0BVLQYtOIBfWSHkNbRoQ%2BnCeCdfj7/Ggmb4x3w%3D' (2025-12-06) • Updated input 'stylix/base16': 'github:SenchoPens/base16.nix/806a1777a5db2a1ef9d5d6f493ef2381047f2b89?narHash=sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI%3D' (2025-05-06) → 'github:SenchoPens/base16.nix/75ed5e5e3fce37df22e49125181fa37899c3ccd6?narHash=sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo%3D' (2025-08-21) • Updated input 'stylix/base16-helix': 'github:tinted-theming/base16-helix/6c711ab1a9db6f51e2f6887cc3345530b33e152e?narHash=sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm%2Bg%3D' (2025-05-28) → 'github:tinted-theming/base16-helix/d646af9b7d14bff08824538164af99d0c521b185?narHash=sha256-m82fGUYns4uHd%2BZTdoLX2vlHikzwzdu2s2rYM2bNwzw%3D' (2025-10-17) • Updated input 'stylix/firefox-gnome-theme': 'github:rafaelmardojai/firefox-gnome-theme/4eb2714fbed2b80e234312611a947d6cb7d70caf?narHash=sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA%3D' (2025-05-27) → 'github:rafaelmardojai/firefox-gnome-theme/66b7c635763d8e6eb86bd766de5a1e1fbfcc1047?narHash=sha256-OkFLrD3pFR952TrjQi1%2BVdj604KLcMnkpa7lkW7XskI%3D' (2025-12-03) • Updated input 'stylix/gnome-shell': 'github:GNOME/gnome-shell/52c517c8f6c199a1d6f5118fae500ef69ea845ae?narHash=sha256-0RJ4mJzf%2BklKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew%3D' (2025-04-13) → 'gitlab:GNOME/gnome-shell/c0e1ad9f0f703fd0519033b8f46c3267aab51a22?narHash=sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk%3D' (2025-11-30) • Updated input 'stylix/nur': 'github:nix-community/NUR/cbde1735782f9c2bb2c63d5e05fba171a14a4670?narHash=sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz%2B0%3D' (2025-06-30) → 'github:nix-community/NUR/1d9616689e98beded059ad0384b9951e967a17fa?narHash=sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU%3D' (2025-12-03) • Removed input 'stylix/nur/treefmt-nix' • Removed input 'stylix/nur/treefmt-nix/nixpkgs' • Updated input 'stylix/tinted-schemes': 'github:tinted-theming/schemes/5a775c6ffd6e6125947b393872cde95867d85a2a?narHash=sha256-LI%2BBnRoFNRa2ffbe3dcuIRYAUcGklBx0%2BEcFxlHj0SY%3D' (2025-06-24) → 'github:tinted-theming/schemes/0f6be815d258e435c9b137befe5ef4ff24bea32c?narHash=sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw%3D' (2025-11-23) • Updated input 'stylix/tinted-tmux': 'github:tinted-theming/tinted-tmux/bded5e24407cec9d01bd47a317d15b9223a1546c?narHash=sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE%3D' (2025-06-29) → 'github:tinted-theming/tinted-tmux/edf89a780e239263cc691a987721f786ddc4f6aa?narHash=sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE%3D' (2025-11-30) • Updated input 'stylix/tinted-zed': 'github:tinted-theming/base16-zed/86a470d94204f7652b906ab0d378e4231a5b3384?narHash=sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR%2BC98jX8%3D' (2025-06-29) → 'github:tinted-theming/base16-zed/907dbba5fb8cf69ebfd90b00813418a412d0a29a?narHash=sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg%3D' (2025-11-30) • Updated input 'unstable': 'github:NixOS/nixpkgs/ae814fd3904b621d8ab97418f1d0f2eb0d3716f4?narHash=sha256-YRqMDEtSMbitIMj%2BJLpheSz0pwEr0Rmy5mC7myl17xs%3D' (2025-11-05) → 'github:NixOS/nixpkgs/f61125a668a320878494449750330ca58b78c557?narHash=sha256-BmPWzogsG2GsXZtlT%2BMTcAWeDK5hkbGRZTeZNW42fwA%3D' (2025-12-05) • Updated input 'vscode': 'github:nix-community/nix-vscode-extensions/6cd71b8ef07afd3daa390cce9b3d3338490a292e?narHash=sha256-PzQ2XPqvndUjmuBG9AIz8SyvYf%2BbkhMfvxt9Go1Qj9A%3D' (2025-11-08) → 'github:nix-community/nix-vscode-extensions/999eed994566bdeffdbb1c9d4920530767e8c93e?narHash=sha256-eLl4%2Bj7Tm37XJJhYD2bTgb3x7HDfwWAr/kayb/j0TAg%3D' (2025-12-06) • Removed input 'waybar' • Updated input 'windows': 'github:emmanuelrosa/erosanix/9075dff5685d3e7269284e53ca496da0beb24596?narHash=sha256-YR7vqk%2BXEvFUQ/miuBAD3%2Bp%2B97QUN86ya9Aw0K5feJE%3D' (2025-11-05) → 'github:emmanuelrosa/erosanix/172661ccc78b1529a294eee5e99ca1616c934f37?narHash=sha256-S4fY3fytcqXBuOSbQjEVke2eqK9/e/6Jy3jp0JGM2X4%3D' (2025-12-03) • Added input 'stremio': 'gitlab:fazzi/nixohess/dfd7b38a5bea820e0e71ff8b52ea79d4c37627cc?narHash=sha256-bbVoU6qos%2BUTWBOTanYRbEOlHrujviBs8ix8jZVCNpg%3D' (2025-12-06)
Diffstat:
| M | CHANGELOG.md | | | 4 | ++++ |
| M | README.md | | | 7 | ++++++- |
| M | devices/valkyrie/default.nix | | | 1 | - |
| M | files/flake.nix | | | 14 | -------------- |
| M | flake.lock | | | 768 | +++++++++++++++++++++++++++++++++++++++++++++---------------------------------- |
| M | flake.nix | | | 80 | +++++++++++++++++++++---------------------------------------------------------- |
| M | modules/apps/discord.nix | | | 7 | +++---- |
| M | modules/apps/games/default.nix | | | 4 | ++-- |
| M | modules/apps/git/default.nix | | | 130 | ++++++++++++++++++++++++++++++++++++++++---------------------------------------- |
| M | modules/apps/git/user.nix | | | 9 | ++++++--- |
| M | modules/apps/media.nix | | | 6 | +++--- |
| M | modules/apps/office.nix | | | 8 | ++++---- |
| M | modules/apps/spotify.nix | | | 2 | +- |
| D | modules/apps/vscode.nix | | | 101 | ------------------------------------------------------------------------------- |
| A | modules/apps/vscode/default.nix | | | 95 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | modules/apps/vscode/mutable.nix | | | 37 | +++++++++++++++++++++++++++++++++++++ |
| M | modules/apps/wine.nix | | | 2 | +- |
| M | modules/gui/desktop/_shared/login.nix | | | 2 | +- |
| M | modules/gui/desktop/_shared/panel.nix | | | 2 | +- |
| M | modules/gui/desktop/_shared/security.nix | | | 2 | +- |
| M | modules/gui/desktop/gnome/common.nix | | | 10 | +++++----- |
| M | modules/gui/desktop/hyprland/apps/launcher.nix | | | 9 | ++------- |
| M | modules/gui/desktop/hyprland/apps/utilities.nix | | | 31 | ++++++++++--------------------- |
| M | modules/gui/desktop/hyprland/default.nix | | | 4 | ++-- |
| M | modules/gui/desktop/hyprland/settings/plugins.nix | | | 2 | +- |
| M | modules/gui/desktop/install.nix | | | 2 | +- |
| M | modules/gui/desktop/pantheon/default.nix | | | 6 | +++--- |
| M | modules/gui/fonts.nix | | | 2 | +- |
| M | modules/hardware/laptop.nix | | | 12 | ++++++------ |
| M | modules/hardware/virtualisation/default.nix | | | 4 | ---- |
| M | modules/shell/default.nix | | | 91 | +++++++++++++++++++++++++++++++++---------------------------------------------- |
| M | modules/user/default.nix | | | 9 | +++++++-- |
| M | modules/user/home.nix | | | 16 | ++-------------- |
| A | modules/user/mutable.nix | | | 106 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| M | packages/flake.nix | | | 7 | ------- |
| D | packages/patches/gscan2pdf.patch | | | 107 | ------------------------------------------------------------------------------- |
| A | packages/patches/hyprshell.patch | | | 42 | ++++++++++++++++++++++++++++++++++++++++++ |
| M | scripts/hyprutils.nix | | | 3 | +-- |
| M | shells/android.nix | | | 7 | ++----- |
39 files changed, 921 insertions(+), 830 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 2025 +### December + +- Update to NixOS 25.11 (Xantusia) + ### November - Add Android development shell diff --git a/README.md b/README.md @@ -498,10 +498,15 @@ _Thanks a lot! ;)_ ### To Do - VFIO Support via GPU Hotplug instead of restart +- Investigate `system` -> `stdenv.hostPlatform.system` +- Inputs: + - Update `minecraft` after [merge](https://github.com/Infinidoge/nix-minecraft/pull/161) + - Update `catppuccin` after release branch-off + - Remove `stremio` once [issue](https://github.com/nixos/nixpkgs/issues/437992) is fixed </details> -> Last Updated: **November** 2025 +> Last Updated: **December** 2025 If you like this project, consider leaving a [star](https://github.com/maydayv7/dotfiles) diff --git a/devices/valkyrie/default.nix b/devices/valkyrie/default.nix @@ -48,7 +48,6 @@ list = [ "discord" "firefox" - "flatpak" "games" "git" "media" diff --git a/files/flake.nix b/files/flake.nix @@ -106,20 +106,6 @@ prefs = readFile ./logseq/preferences.json; }; - # Configuration Mutability - mutability = rec { - src = "https://gist.githubusercontent.com/piousdeer/b29c272eaeba398b864da6abf6cb5daa/raw/41e569ba110eb6ebbb463a6b1f5d9fe4f9e82375"; - module = { - url = src + "/mutability.nix"; - sha256 = "4b5ca670c1ac865927e98ac5bf5c131eca46cc20abf0bd0612db955bfc979de8"; - }; - - vscode = { - url = src + "/vscode.nix"; - sha256 = "fed877fa1eefd94bc4806641cea87138df78a47af89c7818ac5e76ebacbd025f"; - }; - }; - # Nano Text Editor nano = readFile ./nanorc; diff --git a/flake.lock b/flake.lock @@ -3,28 +3,32 @@ "aquamarine": { "inputs": { "hyprutils": [ + "stremio", "hyprland", "hyprutils" ], "hyprwayland-scanner": [ + "stremio", "hyprland", "hyprwayland-scanner" ], "nixpkgs": [ + "stremio", "hyprland", "nixpkgs" ], "systems": [ + "stremio", "hyprland", "systems" ] }, "locked": { - "lastModified": 1762356719, - "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", + "lastModified": 1764370710, + "narHash": "sha256-7iZklFmziy6Vn5ZFy9mvTSuFopp3kJNuPxL5QAvtmFQ=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", + "rev": "561ae7fbe1ca15dfd908262ec815bf21a13eef63", "type": "github" }, "original": { @@ -38,11 +42,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -71,11 +75,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1748408240, - "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -115,16 +119,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "lastModified": 1762205063, + "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.2", + "ref": "v0.4.3", "repo": "lanzaboote", "type": "github" } @@ -136,27 +140,26 @@ ] }, "locked": { - "lastModified": 1754766435, - "narHash": "sha256-DT8CQoqV2haX+Fo16WXAt9gKCSXOZH9ZfnV++Br+qcM=", + "lastModified": 1764885363, + "narHash": "sha256-P6UHmw6enwxmP5wP4Lv722+tgpq1PFDAPAdtj7l/16U=", "owner": "catppuccin", "repo": "nix", - "rev": "e339d6d822fa81c39d1ab89694b4ee2cfc830c9a", + "rev": "95042630028d613080393e0f03c694b77883c7db", "type": "github" }, "original": { "owner": "catppuccin", - "ref": "release-25.05", "repo": "nix", "type": "github" } }, "crane": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", "type": "github" }, "original": { @@ -167,11 +170,11 @@ }, "crane_2": { "locked": { - "lastModified": 1762538466, - "narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=", + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", "owner": "ipetkov", "repo": "crane", - "rev": "0cea393fffb39575c46b7a0318386467272182fe", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", "type": "github" }, "original": { @@ -198,11 +201,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -214,22 +217,6 @@ "flake-compat": { "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_2": { - "flake": false, - "locked": { "lastModified": 1747046372, "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", @@ -243,7 +230,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1747046372, @@ -259,7 +246,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -273,14 +260,14 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -289,6 +276,22 @@ "type": "github" } }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1751685974, + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", + "ref": "refs/heads/main", + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", + "revCount": 92, + "type": "git", + "url": "https://git.lix.systems/lix-project/flake-compat.git" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/flake-compat.git" + } + }, "flake-compat_6": { "flake": false, "locked": { @@ -305,6 +308,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "stremio", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flatpak": { "locked": { "lastModified": 1739444422, @@ -328,11 +352,11 @@ ] }, "locked": { - "lastModified": 1762410071, - "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=", + "lastModified": 1762938485, + "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "97a30861b13c3731a84e09405414398fbf3e109f", + "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", "type": "github" }, "original": { @@ -348,11 +372,11 @@ ] }, "locked": { - "lastModified": 1762440070, - "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -385,11 +409,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1762566515, - "narHash": "sha256-gIPh4l5MBs0/ETmF8ep7b6u6c2y2wyBBcD9Vk4l4p/Y=", + "lastModified": 1764986018, + "narHash": "sha256-g0T9Jo24QTSdwSqxSCQcy0rpU6TujJsZdWrIeOOevYA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "9bb3ba9d192aeebc18a14c4c29140a78f0b28a7f", + "rev": "00e02d9896160f4ab9d9a2fe0ec7c009952d67ba", "type": "github" }, "original": { @@ -423,6 +447,7 @@ "gitignore_2": { "inputs": { "nixpkgs": [ + "stremio", "hyprland", "pre-commit-hooks", "nixpkgs" @@ -445,27 +470,29 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1744584021, - "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", + "host": "gitlab.gnome.org", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", - "type": "github" + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.1", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "hardware": { "locked": { - "lastModified": 1762463231, - "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -474,6 +501,28 @@ "type": "github" } }, + "hjem": { + "inputs": { + "nixpkgs": [ + "stremio", + "nixpkgs" + ], + "smfh": "smfh" + }, + "locked": { + "lastModified": 1763948417, + "narHash": "sha256-m8qpVI1l6nO9n+Djl2PY33esza0tBZDQ/yyAAlfHD0o=", + "owner": "feel-co", + "repo": "hjem", + "rev": "4e9e23500bff48b750793e98afdbceda199a354a", + "type": "github" + }, + "original": { + "owner": "feel-co", + "repo": "hjem", + "type": "github" + } + }, "home": { "inputs": { "nixpkgs": [ @@ -481,16 +530,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -498,14 +547,17 @@ "hyprcursor": { "inputs": { "hyprlang": [ + "stremio", "hyprland", "hyprlang" ], "nixpkgs": [ + "stremio", "hyprland", "nixpkgs" ], "systems": [ + "stremio", "hyprland", "systems" ] @@ -524,50 +576,30 @@ "type": "github" } }, - "hyprcursors": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761258142, - "narHash": "sha256-ZaiEZnsm7LlpDL/C/D4vO5QHgv9GdFrO9Fd2qlyvVRc=", - "owner": "VirtCode", - "repo": "hypr-dynamic-cursors", - "rev": "7336d7a7cf81422d0d8a574e9e9ba6fe8eab8dfc", - "type": "github" - }, - "original": { - "owner": "VirtCode", - "repo": "hypr-dynamic-cursors", - "type": "github" - } - }, "hyprgraphics": { "inputs": { "hyprutils": [ + "stremio", "hyprland", "hyprutils" ], "nixpkgs": [ + "stremio", "hyprland", "nixpkgs" ], "systems": [ + "stremio", "hyprland", "systems" ] }, "locked": { - "lastModified": 1762462052, - "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", + "lastModified": 1763733840, + "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", + "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", "type": "github" }, "original": { @@ -587,66 +619,76 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ - "unstable" + "stremio", + "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", "systems": [ + "stremio", "systems" ], "xdph": "xdph" }, "locked": { - "lastModified": 1762755326, - "narHash": "sha256-YYTzQUQDnVdtN3k40sC5kq6yL70riU8bM8cQLz38jzk=", + "lastModified": 1764801806, + "narHash": "sha256-AlEo8j1V9S20PJd23DXqR/tjwtUjxMcn87Euei9zFeA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0b1d690676589503f0addece30e936a240733699", + "rev": "9b1891e4765e2c5b84c8c61725e3973ca9940e05", "type": "github" }, "original": { "owner": "hyprwm", "repo": "Hyprland", + "rev": "9b1891e4765e2c5b84c8c61725e3973ca9940e05", "type": "github" } }, "hyprland-guiutils": { "inputs": { "aquamarine": [ + "stremio", "hyprland", "aquamarine" ], "hyprgraphics": [ + "stremio", "hyprland", "hyprgraphics" ], "hyprlang": [ + "stremio", "hyprland", "hyprlang" ], "hyprtoolkit": "hyprtoolkit", "hyprutils": [ + "stremio", "hyprland", "hyprutils" ], "hyprwayland-scanner": [ + "stremio", "hyprland", "hyprwayland-scanner" ], "nixpkgs": [ + "stremio", "hyprland", "nixpkgs" ], "systems": [ + "stremio", "hyprland", "systems" ] }, "locked": { - "lastModified": 1762755186, - "narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=", + "lastModified": 1764616927, + "narHash": "sha256-wRT0MKkpPo11ijSX3KeMN+EQWnpSeUlRtyF3pFLtlRU=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "66356e20a8ed348aa49c1b9ceace786e224225b3", + "rev": "25cedbfdc5b3ea391d8307c9a5bea315e5df3c52", "type": "github" }, "original": { @@ -658,10 +700,12 @@ "hyprland-protocols": { "inputs": { "nixpkgs": [ + "stremio", "hyprland", "nixpkgs" ], "systems": [ + "stremio", "hyprland", "systems" ] @@ -683,24 +727,27 @@ "hyprlang": { "inputs": { "hyprutils": [ + "stremio", "hyprland", "hyprutils" ], "nixpkgs": [ + "stremio", "hyprland", "nixpkgs" ], "systems": [ + "stremio", "hyprland", "systems" ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -709,130 +756,57 @@ "type": "github" } }, - "hyprplugins": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nixpkgs": [ - "hyprplugins", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprplugins", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1762115485, - "narHash": "sha256-hr53AWO96ooLCwS1a2v416eT1/aWQZmuQV0ULqhaBTY=", - "owner": "hyprwm", - "repo": "hyprland-plugins", - "rev": "bbb8d2cb0eb667f2911103eadb3d1e8176f4462c", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-plugins", - "type": "github" - } - }, - "hyprshell": { - "inputs": { - "crane": "crane_2", - "flake-parts": [ - "framework" - ], - "home-manager": [ - "home" - ], - "hyprland": [ - "hyprland" - ], - "nixpkgs": [ - "unstable" - ] - }, - "locked": { - "lastModified": 1763389720, - "narHash": "sha256-NsFOXepWzgbopnoqwg8EekDLbj01jr8vjaEz/F3QFKU=", - "owner": "H3rmt", - "repo": "hyprshell", - "rev": "4567017e5dc0ed03b9762fb0736e877917884d40", - "type": "github" - }, - "original": { - "owner": "H3rmt", - "repo": "hyprshell", - "type": "github" - } - }, - "hyprsplit": { - "inputs": { - "hyprland": [ - "hyprland" - ] - }, - "locked": { - "lastModified": 1762633264, - "narHash": "sha256-XlOZr7BKii0ch24ZtOqjeVl1+uGewW5XQTSteKxXg9c=", - "owner": "shezdy", - "repo": "hyprsplit", - "rev": "9ffbec966a37a08a009565864d7eec7732bd1019", - "type": "github" - }, - "original": { - "owner": "shezdy", - "repo": "hyprsplit", - "type": "github" - } - }, "hyprtoolkit": { "inputs": { "aquamarine": [ + "stremio", "hyprland", "hyprland-guiutils", "aquamarine" ], "hyprgraphics": [ + "stremio", "hyprland", "hyprland-guiutils", "hyprgraphics" ], "hyprlang": [ + "stremio", "hyprland", "hyprland-guiutils", "hyprlang" ], "hyprutils": [ + "stremio", "hyprland", "hyprland-guiutils", "hyprutils" ], "hyprwayland-scanner": [ + "stremio", "hyprland", "hyprland-guiutils", "hyprwayland-scanner" ], "nixpkgs": [ + "stremio", "hyprland", "hyprland-guiutils", "nixpkgs" ], "systems": [ + "stremio", "hyprland", "hyprland-guiutils", "systems" ] }, "locked": { - "lastModified": 1762463729, - "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", "type": "github" }, "original": { @@ -844,20 +818,22 @@ "hyprutils": { "inputs": { "nixpkgs": [ + "stremio", "hyprland", "nixpkgs" ], "systems": [ + "stremio", "hyprland", "systems" ] }, "locked": { - "lastModified": 1762387740, - "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=", + "lastModified": 1764637132, + "narHash": "sha256-vSyiKCzSY48kA3v39GFu6qgRfigjKCU/9k1KTK475gg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7", + "rev": "2f2413801beee37303913fc3c964bbe92252a963", "type": "github" }, "original": { @@ -869,20 +845,22 @@ "hyprwayland-scanner": { "inputs": { "nixpkgs": [ + "stremio", "hyprland", "nixpkgs" ], "systems": [ + "stremio", "hyprland", "systems" ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1763640274, + "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", "type": "github" }, "original": { @@ -913,11 +891,11 @@ ] }, "locked": { - "lastModified": 1762055842, - "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=", + "lastModified": 1764475780, + "narHash": "sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f", + "rev": "5a3ff8c1a09003f399f43d5742d893c0b1ab8af0", "type": "github" }, "original": { @@ -928,7 +906,7 @@ }, "minecraft": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": [ "utils" ], @@ -950,21 +928,36 @@ "type": "github" } }, + "mnw": { + "locked": { + "lastModified": 1758834834, + "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", + "owner": "Gerg-L", + "repo": "mnw", + "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", + "type": "github" + }, + "original": { + "owner": "Gerg-L", + "repo": "mnw", + "type": "github" + } + }, "niri": { "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762540449, - "narHash": "sha256-AZ/xrJ5JXvpRQYyiVf8Hx4lzFBQAaH9l0utOfvAA28I=", + "lastModified": 1765008770, + "narHash": "sha256-7w2Sn3Bgk91Ly+5XJ/OYvTqNVa+8+4Rqma05YM7xnVU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "75bacb66302bca38fa6e0c180f1e5369a8115454", + "rev": "935080f54490e3e7b1eda731cbe1478744546ea8", "type": "github" }, "original": { @@ -993,11 +986,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1762492604, - "narHash": "sha256-cjXYF5+gGaapr6d1Jz70GZQVzK4qzwDUwU86p9+H2mM=", + "lastModified": 1764966114, + "narHash": "sha256-nC0Fsu4zSdabdR4tHHMCrTgqLms612eEDy5VCdQVZFk=", "owner": "YaLTeR", "repo": "niri", - "rev": "2144f9a6ae7b675213f9bd86d0989c334baa1c00", + "rev": "ba29735fbbd8cf8319c71ccb55b54a0580007c80", "type": "github" }, "original": { @@ -1008,7 +1001,7 @@ }, "nixcord": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-parts": [ "framework" ], @@ -1017,11 +1010,11 @@ ] }, "locked": { - "lastModified": 1762564817, - "narHash": "sha256-2BPBalMQdW5ht6b+orcbdw59v5Wg7KpOO2zc/RaW6zE=", + "lastModified": 1765037054, + "narHash": "sha256-l4R5m/BtLB3pc/Bcqytdp7VNJDVzW+Fniv/YvRXP4qU=", "owner": "kaylorben", "repo": "nixcord", - "rev": "26aa9c7966eea82e524215ed5e2e8b7cf370931b", + "rev": "8ebddd43d3972178b13c080e7d7e7264dfbaf4c1", "type": "github" }, "original": { @@ -1032,11 +1025,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761880412, - "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", + "lastModified": 1764384123, + "narHash": "sha256-UoliURDJFaOolycBZYrjzd9Cc66zULEyHqGFH3QHEq0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", + "rev": "59b6c96beacc898566c9be1052ae806f3835f87d", "type": "github" }, "original": { @@ -1048,43 +1041,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1762498405, - "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -1103,15 +1080,14 @@ "nixpkgs": [ "stylix", "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" + ] }, "locked": { - "lastModified": 1751320053, - "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -1120,21 +1096,54 @@ "type": "github" } }, + "nvf": { + "inputs": { + "flake-compat": "flake-compat_5", + "flake-parts": [ + "stremio", + "flake-parts" + ], + "mnw": "mnw", + "nixpkgs": [ + "stremio", + "nixpkgs" + ], + "systems": [ + "stremio", + "systems" + ] + }, + "locked": { + "lastModified": 1764871278, + "narHash": "sha256-ezKJwZeAtZSO9EA3aLl5bmjjAVUoLE69IC+yX/KSqDM=", + "owner": "NotAShelf", + "repo": "nvf", + "rev": "43b48909a3d0c96f5c3d9a9e50d6faabbeccc9dd", + "type": "github" + }, + "original": { + "owner": "NotAShelf", + "ref": "v0.8", + "repo": "nvf", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_4", "gitignore": "gitignore_2", "nixpkgs": [ + "stremio", "hyprland", "nixpkgs" ] }, "locked": { - "lastModified": 1762441963, - "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -1153,15 +1162,14 @@ "nixpkgs": [ "boot", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -1202,11 +1210,6 @@ "gaming": "gaming", "hardware": "hardware", "home": "home", - "hyprcursors": "hyprcursors", - "hyprland": "hyprland", - "hyprplugins": "hyprplugins", - "hyprshell": "hyprshell", - "hyprsplit": "hyprsplit", "impermanence": "impermanence", "index": "index", "minecraft": "minecraft", @@ -1219,12 +1222,12 @@ "sops": "sops", "spotify": "spotify", "stable": "stable", + "stremio": "stremio", "stylix": "stylix", - "systems": "systems_2", + "systems": "systems_4", "unstable": "unstable", "utils": "utils_2", "vscode": "vscode", - "waybar": "waybar", "windows": "windows" } }, @@ -1236,11 +1239,11 @@ ] }, "locked": { - "lastModified": 1731897198, - "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -1249,6 +1252,53 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "stremio", + "hjem", + "smfh", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1759113356, + "narHash": "sha256-xm4kEUcV2jk6u15aHazFP4YsMwhq+PczA+Ul/4FDKWI=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "be3b8843a2be2411500f6c052876119485e957a2", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "smfh": { + "inputs": { + "nixpkgs": [ + "stremio", + "hjem", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2", + "systems": "systems_2" + }, + "locked": { + "lastModified": 1760525934, + "narHash": "sha256-1HtxuA45R/jExzE9iuimuECHWbV2c+CBdJmr/RtluaI=", + "owner": "feel-co", + "repo": "smfh", + "rev": "7123a00cc3c3e90ba703a37ca8d997be95c62d99", + "type": "github" + }, + "original": { + "owner": "feel-co", + "repo": "smfh", + "type": "github" + } + }, "sops": { "inputs": { "nixpkgs": [ @@ -1256,11 +1306,11 @@ ] }, "locked": { - "lastModified": 1760998189, - "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", + "lastModified": 1764483358, + "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", + "rev": "5aca6ff67264321d47856a2ed183729271107c9c", "type": "github" }, "original": { @@ -1279,11 +1329,11 @@ ] }, "locked": { - "lastModified": 1762484805, - "narHash": "sha256-5/9c68yg6ouVpH0FGsVlJWTxrzslttY4VJh8CgcDuns=", + "lastModified": 1764698597, + "narHash": "sha256-4f0y9Fo3AChngd/qRQ7wbcy6FH33NFZbyFXn7IeUI14=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "ab2ce95bc1f04ed5cee010fc6ad393da8084faaa", + "rev": "1da6ebbbcf0301ff773e9c43bdd4c051af9523f7", "type": "github" }, "original": { @@ -1294,20 +1344,69 @@ }, "stable": { "locked": { - "lastModified": 1762498405, - "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, + "stash": { + "inputs": { + "crane": "crane_2", + "nixpkgs": [ + "stremio", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1764054504, + "narHash": "sha256-I4nXo/MQXbHg4S00RZZVwaldO/AfhchBFcDlmt4xcaQ=", + "owner": "NotAShelf", + "repo": "stash", + "rev": "f83836531405a42b5d3ad341811736e84275c90f", + "type": "github" + }, + "original": { + "owner": "NotAShelf", + "repo": "stash", + "type": "github" + } + }, + "stremio": { + "inputs": { + "flake-parts": "flake-parts", + "hjem": "hjem", + "hyprland": "hyprland", + "nixpkgs": [ + "nixpkgs" + ], + "nvf": "nvf", + "stash": "stash", + "systems": "systems_3", + "watt": "watt" + }, + "locked": { + "lastModified": 1765062048, + "narHash": "sha256-bbVoU6qos+UTWBOTanYRbEOlHrujviBs8ix8jZVCNpg=", + "owner": "fazzi", + "repo": "nixohess", + "rev": "dfd7b38a5bea820e0e71ff8b52ea79d4c37627cc", + "type": "gitlab" + }, + "original": { + "owner": "fazzi", + "repo": "nixohess", + "type": "gitlab" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -1333,16 +1432,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1762295027, - "narHash": "sha256-5z5cGrp9F8g8iyQrM8WkB6pAwP4AaicljKZ15gx+X9Y=", + "lastModified": 1764982414, + "narHash": "sha256-LqCQL0BVLQYtOIBfWSHkNbRoQ+nCeCdfj7/Ggmb4x3w=", "owner": "nix-community", "repo": "stylix", - "rev": "91b9a270523361268ba6a8772152fde31103869f", + "rev": "b1c99fd9525bae86f20018e96d68176002ad18b0", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "stylix", "type": "github" } @@ -1363,6 +1462,36 @@ } }, "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1680978846, + "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", + "owner": "nix-systems", + "repo": "x86_64-linux", + "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "x86_64-linux", + "type": "github" + } + }, + "systems_4": { "flake": false, "locked": { "lastModified": 1707463813, @@ -1415,11 +1544,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -1431,11 +1560,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -1447,11 +1576,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -1460,35 +1589,13 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "stylix", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "unstable": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -1543,11 +1650,11 @@ ] }, "locked": { - "lastModified": 1762566579, - "narHash": "sha256-PzQ2XPqvndUjmuBG9AIz8SyvYf+bkhMfvxt9Go1Qj9A=", + "lastModified": 1764986069, + "narHash": "sha256-eLl4+j7Tm37XJJhYD2bTgb3x7HDfwWAr/kayb/j0TAg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6cd71b8ef07afd3daa390cce9b3d3338490a292e", + "rev": "999eed994566bdeffdbb1c9d4920530767e8c93e", "type": "github" }, "original": { @@ -1556,24 +1663,25 @@ "type": "github" } }, - "waybar": { + "watt": { "inputs": { - "flake-compat": "flake-compat_5", "nixpkgs": [ - "unstable" + "stremio", + "nixpkgs" ] }, "locked": { - "lastModified": 1761204979, - "narHash": "sha256-QWS3FCd6sTbr1runpZPdpVrhqFu8E5fNOpfp0r9ifLk=", - "owner": "Alexays", - "repo": "Waybar", - "rev": "161367d9617673a4ef9caf8299411dc5153464d1", + "lastModified": 1764956445, + "narHash": "sha256-ORcrHG39emERbAM99pv1Prmfm9TNqSwW9uyibrcj5Js=", + "owner": "NotAShelf", + "repo": "watt", + "rev": "ae310b5ef2d39bec9a48b8833c48ea948b3bcb7f", "type": "github" }, "original": { - "owner": "Alexays", - "repo": "Waybar", + "owner": "NotAShelf", + "ref": "v1-dev", + "repo": "watt", "type": "github" } }, @@ -1585,11 +1693,11 @@ ] }, "locked": { - "lastModified": 1762360792, - "narHash": "sha256-YR7vqk+XEvFUQ/miuBAD3+p+97QUN86ya9Aw0K5feJE=", + "lastModified": 1764775116, + "narHash": "sha256-S4fY3fytcqXBuOSbQjEVke2eqK9/e/6Jy3jp0JGM2X4=", "owner": "emmanuelrosa", "repo": "erosanix", - "rev": "9075dff5685d3e7269284e53ca496da0beb24596", + "rev": "172661ccc78b1529a294eee5e99ca1616c934f37", "type": "github" }, "original": { @@ -1601,26 +1709,32 @@ "xdph": { "inputs": { "hyprland-protocols": [ + "stremio", "hyprland", "hyprland-protocols" ], "hyprlang": [ + "stremio", "hyprland", "hyprlang" ], "hyprutils": [ + "stremio", "hyprland", "hyprutils" ], "hyprwayland-scanner": [ + "stremio", "hyprland", "hyprwayland-scanner" ], "nixpkgs": [ + "stremio", "hyprland", "nixpkgs" ], "systems": [ + "stremio", "hyprland", "systems" ] @@ -1659,11 +1773,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762488100, - "narHash": "sha256-pD8YqwP0/irHWzJtVElnVljR+OaJPAVbJBwqix+uB5A=", + "lastModified": 1764721075, + "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3cd3edffe1be197326e9314816b16bb4e3d685b1", + "rev": "1b918e29b419e89910014054e8b71d54c9235ea5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix @@ -36,7 +36,7 @@ ## Package Repositories ## # NixOS Packages Repository nixpkgs.follows = "stable"; - stable.url = "github:NixOS/nixpkgs?ref=nixos-25.05"; + stable.url = "github:NixOS/nixpkgs?ref=nixos-25.11"; # Unstable Packages Repository unstable.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; @@ -85,7 +85,7 @@ ## Feature Modules # User Home Manager home = { - url = "github:nix-community/home-manager?ref=release-25.05"; + url = "github:nix-community/home-manager?ref=release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -94,7 +94,7 @@ # Secure Boot boot = { - url = "github:nix-community/lanzaboote/v0.4.2"; + url = "github:nix-community/lanzaboote/v0.4.3"; inputs = { nixpkgs.follows = "nixpkgs"; flake-parts.follows = "framework"; @@ -134,12 +134,6 @@ }; }; - # Windows Apps Wrapper - windows = { - url = "github:emmanuelrosa/erosanix"; - inputs.nixpkgs.follows = "unstable"; - }; - # Minecraft Server minecraft = { url = "github:Infinidoge/nix-minecraft"; @@ -149,10 +143,22 @@ }; }; + # Windows Apps Wrapper + windows = { + url = "github:emmanuelrosa/erosanix"; + inputs.nixpkgs.follows = "unstable"; + }; + + # Stremio Package + stremio = { + url = "gitlab:fazzi/nixohess"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + ## Theming # Base16 Theming Module stylix = { - url = "github:nix-community/stylix?ref=release-25.05"; + url = "github:nix-community/stylix?ref=release-25.11"; inputs = { nixpkgs.follows = "nixpkgs"; systems.follows = "systems"; @@ -171,56 +177,10 @@ # Catppuccin Theme catppuccin = { - url = "github:catppuccin/nix?ref=release-25.05"; + url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - # Waybar Panel - waybar = { - url = "github:Alexays/Waybar"; - inputs.nixpkgs.follows = "unstable"; - }; - - ## Hyprland - # Core - hyprland = { - url = "github:hyprwm/Hyprland"; - inputs = { - nixpkgs.follows = "unstable"; - systems.follows = "systems"; - }; - }; - - # Plugins - hyprplugins = { - url = "github:hyprwm/hyprland-plugins"; - inputs.hyprland.follows = "hyprland"; - }; - - hyprsplit = { - url = "github:shezdy/hyprsplit"; - inputs.hyprland.follows = "hyprland"; - }; - - hyprcursors = { - url = "github:VirtCode/hypr-dynamic-cursors"; - inputs = { - hyprland.follows = "hyprland"; - nixpkgs.follows = "nixpkgs"; - }; - }; - - # Launcher - hyprshell = { - url = "github:H3rmt/hyprshell"; - inputs = { - nixpkgs.follows = "unstable"; - flake-parts.follows = "framework"; - home-manager.follows = "home"; - hyprland.follows = "hyprland"; - }; - }; - ## Niri niri.url = "github:sodiboo/niri-flake"; }; @@ -277,9 +237,10 @@ "https://cache.nixos.org" "https://nixpkgs-unfree.cachix.org" "https://nix-community.cachix.org" + "https://cache.nixos-cuda.org" + "https://cache.flox.dev" "https://nix-gaming.cachix.org" "https://hyprland.cachix.org" - "https://hyprshell.cachix.org" "https://niri.cachix.org" "https://catppuccin.cachix.org" ]; @@ -290,9 +251,10 @@ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" + "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs=" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "hyprshell.cachix.org-1:seKSn/sAyobGjsRqe6deRKP/VZcsTorGt5/QqCeQrvU=" "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" "catppuccin.cachix.org-1:noG/4HkbhJb+lUAdKrph6LaozJvAeEEZj4N732IysmU=" ]; diff --git a/modules/apps/discord.nix b/modules/apps/discord.nix @@ -35,7 +35,7 @@ in plugins = { betterFolders = { enable = true; - showFolderIcon = "moreThanOne"; + showFolderIcon = 2; closeAllHomeButton = true; }; betterGifAltText.enable = true; @@ -44,10 +44,10 @@ in betterSessions.enable = true; betterSettings.enable = true; biggerStreamPreview.enable = true; - blurNSFW.enable = true; + blurNsfw.enable = true; copyEmojiMarkdown.enable = true; copyFileContents.enable = true; - copyUserURLs.enable = true; + copyUserUrLs.enable = true; crashHandler.enable = true; decor.enable = true; expressionCloner.enable = true; @@ -62,7 +62,6 @@ in mentionAvatars.enable = true; messageClickActions.enable = true; messageLinkEmbeds.enable = true; - moreKaomoji.enable = true; pinDMs.enable = true; platformIndicators.enable = true; previewMessage.enable = true; diff --git a/modules/apps/games/default.nix b/modules/apps/games/default.nix @@ -16,7 +16,7 @@ let inherit (util.map) modules; enable = builtins.elem "games" config.apps.list; wine = builtins.elem "wine" config.apps.list; - wine' = pkgs.gaming.wine-tkg; + wine' = pkgs.gaming.wine-ge; in { imports = modules.list ./.; @@ -62,7 +62,7 @@ in user = { # Runner - homeConfig.xdg.dataFile."lutris/runners/wine/wine-tkg".source = wine'; + homeConfig.xdg.dataFile."lutris/runners/wine/wine-system".source = wine'; # Directories persist.directories = [ diff --git a/modules/apps/git/default.nix b/modules/apps/git/default.nix @@ -63,21 +63,22 @@ }; }; + # Pager + delta = { + enable = true; + enableGitIntegration = true; + options = { + line-numbers = true; + theme = "Monokai Extended"; + conflictstyle = "diff3"; + }; + }; + # 'git' Settings git = { enable = true; lfs.enable = true; - # Pager - delta = { - enable = true; - options = { - line-numbers = true; - theme = "Monokai Extended"; - conflictstyle = "diff3"; - }; - }; - # Globally Ignored Files ignores = [ "*~*" @@ -89,8 +90,7 @@ "tags.*" ]; - # Additional Parameters - extraConfig = { + settings = { color.ui = "auto"; core.hooksPath = "~/.git-hooks"; credential.helper = "libsecret"; @@ -98,60 +98,60 @@ init.defaultBranch = "main"; pull.rebase = "true"; safe.directory = files.path.system; - }; - # Command Aliases - aliases = rec { - a = "add"; - ad = "${a} -A ."; - ai = "${a} -i"; - ap = "${a} -p"; - b = "branch"; - bc = "${b} --show-current"; - bd = "${b} -D"; - backup = ''!sh -c 'CURRENT=$(git ${bc}) && git ${st} && git ${co} -B backup && git ${st} apply && git ${ad} && git ${cam} "backup" && git ${pf} $1 && git ${co} $CURRENT && git ${stp} && git ${bd} backup' -''; - cfg = "config"; - ci = "commit -v"; - cam = "${ci} -am"; - cia = "${ci} -a"; - cmx = ''!sh -c 'msg=$(cat ./.git/COMMIT_EDITMSG); echo "''${msg%%#*}"' -''; - co = "checkout"; - cp = "cherry-pick"; - cpp = "!sh -c 'CURRENT=$(git ${bc}) && git ${st} && git ${co} -B $2 $3 && git ${cp} $1 && git ${pf} $4 && git ${co} $CURRENT && git ${stp}' -"; - d = "diff"; - df = "${d} HEAD"; - dx = "${d} --color-words"; - dc = "${d} --cached"; - dcx = "${dc} --color-words"; - l = "log --graph --decorate --abbrev-commit"; - l1 = "${l} --pretty=oneline --all"; - lf = "log -p --follow"; - lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset%n' --abbrev-commit --date=relative --branches"; - ll = "${l} -p"; - m = "merge"; - ms = "${m} --squash"; - p = "push"; - pf = "${p} --force"; - pl = "!sh -c 'git pull && git fetch -p' -"; - pt = "${p} --tag"; - pu = "${p} --set-upstream"; - rb = "rebase"; - record = "!sh -c '(git ${a} -p -- $@ && git ${ci}) || git ${r}' --"; - ro = "restore"; - r = "reset"; - rs = "${r} --soft"; - rh = "${r} --hard"; - rsh = "${rs} HEAD^"; - s = "!git --no-pager status"; - sm = "submodule"; - st = "stash"; - std = "${st} drop"; - sti = "${st} --keep-index"; - stp = "${st} pop"; - sync = "${pf} --mirror"; - t = "tag"; - td = "!sh -c 'git ${t} -d $1 && git ${p} origin :$1' -"; - tl = "${t} -l"; + # Command Aliases + alias = rec { + a = "add"; + ad = "${a} -A ."; + ai = "${a} -i"; + ap = "${a} -p"; + b = "branch"; + bc = "${b} --show-current"; + bd = "${b} -D"; + backup = ''!sh -c 'CURRENT=$(git ${bc}) && git ${st} && git ${co} -B backup && git ${st} apply && git ${ad} && git ${cam} "backup" && git ${pf} $1 && git ${co} $CURRENT && git ${stp} && git ${bd} backup' -''; + cfg = "config"; + ci = "commit -v"; + cam = "${ci} -am"; + cia = "${ci} -a"; + cmx = ''!sh -c 'msg=$(cat ./.git/COMMIT_EDITMSG); echo "''${msg%%#*}"' -''; + co = "checkout"; + cp = "cherry-pick"; + cpp = "!sh -c 'CURRENT=$(git ${bc}) && git ${st} && git ${co} -B $2 $3 && git ${cp} $1 && git ${pf} $4 && git ${co} $CURRENT && git ${stp}' -"; + d = "diff"; + df = "${d} HEAD"; + dx = "${d} --color-words"; + dc = "${d} --cached"; + dcx = "${dc} --color-words"; + l = "log --graph --decorate --abbrev-commit"; + l1 = "${l} --pretty=oneline --all"; + lf = "log -p --follow"; + lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset%n' --abbrev-commit --date=relative --branches"; + ll = "${l} -p"; + m = "merge"; + ms = "${m} --squash"; + p = "push"; + pf = "${p} --force"; + pl = "!sh -c 'git pull && git fetch -p' -"; + pt = "${p} --tag"; + pu = "${p} --set-upstream"; + rb = "rebase"; + record = "!sh -c '(git ${a} -p -- $@ && git ${ci}) || git ${r}' --"; + ro = "restore"; + r = "reset"; + rs = "${r} --soft"; + rh = "${r} --hard"; + rsh = "${rs} HEAD^"; + s = "!git --no-pager status"; + sm = "submodule"; + st = "stash"; + std = "${st} drop"; + sti = "${st} --keep-index"; + stp = "${st} pop"; + sync = "${pf} --mirror"; + t = "tag"; + td = "!sh -c 'git ${t} -d $1 && git ${p} origin :$1' -"; + tl = "${t} -l"; + }; }; }; }; diff --git a/modules/apps/git/user.nix b/modules/apps/git/user.nix @@ -19,9 +19,12 @@ in ]; programs.git = { - userName = cfg.name; - userEmail = cfg.mail; - extraConfig.github.user = cfg.name; + settings = { + user.name = cfg.name; + user.email = cfg.mail; + github.user = cfg.name; + }; + signing = { signByDefault = lib.mkIf (cfg.key != "") true; key = lib.mkIf (cfg.key != "") (builtins.substring 24 30 cfg.key); diff --git a/modules/apps/media.nix b/modules/apps/media.nix @@ -1,6 +1,7 @@ { config, lib, + inputs, pkgs, ... }: @@ -14,7 +15,7 @@ in pitivi pwvucontrol qpwgraph - stremio + inputs.stremio.packages.${pkgs.stdenv.system}.stremio-linux-shell ]; user = { @@ -23,8 +24,7 @@ in directories = [ ".config/pitivi" ".stremio-server" - ".cache/Smart Code ltd" - ".local/share/Smart Code ltd" + ".local/share/stremio" ]; }; diff --git a/modules/apps/office.nix b/modules/apps/office.nix @@ -59,7 +59,7 @@ in openfortivpn teams-for-linux thunderbird - whatsapp-for-linux + wasistlos zoom-us # Utilities @@ -98,14 +98,14 @@ in ".config/libreoffice" ".config/obs-studio" ".config/onlyoffice" - ".config/whatsapp-for-linux" + ".config/wasistlos" ".local/share/data" ".local/share/onlyoffice" - ".local/share/whatsapp-for-linux" + ".local/share/wasistlos" ".cache/BraveSoftware" ".cache/gimp" ".cache/thunderbird" - ".cache/whatsapp-for-linux" + ".cache/wasistlos" ".cache/zoom" ]; diff --git a/modules/apps/spotify.nix b/modules/apps/spotify.nix @@ -7,7 +7,7 @@ }: let enable = builtins.elem "spotify" config.apps.list; - spice = inputs.spotify.legacyPackages.${pkgs.system}; + spice = inputs.spotify.legacyPackages.${pkgs.stdenv.system}; in { ## Spotify Configuration ## diff --git a/modules/apps/vscode.nix b/modules/apps/vscode.nix @@ -1,101 +0,0 @@ -{ - config, - lib, - util, - pkgs, - files, - ... -}: -let - inherit (builtins) elem head; - enable = elem "vscode" config.apps.list; - font = head config.fonts.fontconfig.defaultFonts.monospace; - package = pkgs.vscode; -in -{ - ## Visual Studio Code Editor Configuration ## - config = lib.mkIf enable { - environment.systemPackages = [ - package - pkgs.nil - ]; - - user = { - persist.directories = [ - ".config/Code" - ".vscode" - ]; - - homeConfig = { - # Mutable Configuration File - imports = [ - ( - { config, ... }: - (import (builtins.fetchurl { - inherit (files.mutability.vscode) url sha256; - }) { inherit config lib pkgs; }) - ) - ]; - - # Environment - xdg.mimeApps.defaultApplications = util.build.mime { - markdown = [ "code.desktop" ]; - text = [ "code.desktop" ]; - }; - - programs.vscode = { - enable = true; - inherit package; - profiles.default = with files.vscode; { - # Keyboard Shortcuts - inherit keybindings; - - # Settings - userSettings = settings // { - "editor.fontFamily" = "'${font}', 'monospace', monospace"; - }; - - ## Editor Extensions - extensions = - with pkgs.vscode-extensions; - [ - aaron-bond.better-comments # Annotations - editorconfig.editorconfig # .editorconfig - esbenp.prettier-vscode # Formatter - file-icons.file-icons # File Icons - naumovs.color-highlight # Color Viewer - johnpapa.vscode-peacock # Workspace Color - - # Git - eamodio.gitlens - github.vscode-pull-request-github - - dart-code.flutter # Flutter - divyanshuagrawal.competitive-programming-helper # CP - jnoortheen.nix-ide # Nix - ms-python.python # Python - ms-vscode.cpptools # C/C++ - redhat.java # Java - rust-lang.rust-analyzer # Rust - tomoki1207.pdf # PDF Viewer - yzhang.markdown-all-in-one # Markdown - - # HTML+CSS+XML - ecmel.vscode-html-css - formulahendry.auto-rename-tag - redhat.vscode-xml - - # JS - dbaeumer.vscode-eslint - ritwickdey.liveserver - ] - ++ (with pkgs.code.vscode-marketplace; [ - kisstkondoros.vscode-gutter-preview # Image Preview - fwcd.kotlin # Kotlin - ]); - }; - }; - }; - }; - }; -} diff --git a/modules/apps/vscode/default.nix b/modules/apps/vscode/default.nix @@ -0,0 +1,95 @@ +{ + config, + lib, + util, + pkgs, + files, + ... +}: +let + inherit (builtins) elem head; + enable = elem "vscode" config.apps.list; + font = head config.fonts.fontconfig.defaultFonts.monospace; + package = pkgs.vscode; +in +{ + ## Visual Studio Code Editor Configuration ## + config = lib.mkIf enable { + environment.systemPackages = [ + package + pkgs.nil + ]; + + user = { + persist.directories = [ + ".config/Code" + ".vscode" + ]; + + homeConfig = { + # Mutable Configuration File + imports = [ ./mutable.nix ]; + + # Environment + xdg.mimeApps.defaultApplications = util.build.mime { + markdown = [ "code.desktop" ]; + text = [ "code.desktop" ]; + }; + + programs.vscode = { + enable = true; + inherit package; + profiles.default = with files.vscode; { + # Keyboard Shortcuts + inherit keybindings; + + # Settings + userSettings = settings // { + "editor.fontFamily" = "'${font}', 'monospace', monospace"; + }; + + ## Editor Extensions + extensions = + with pkgs.vscode-extensions; + [ + aaron-bond.better-comments # Annotations + editorconfig.editorconfig # .editorconfig + esbenp.prettier-vscode # Formatter + file-icons.file-icons # File Icons + naumovs.color-highlight # Color Viewer + johnpapa.vscode-peacock # Workspace Color + + # Git + eamodio.gitlens + github.vscode-pull-request-github + + github.copilot # Copilot AI + dart-code.flutter # Flutter + divyanshuagrawal.competitive-programming-helper # CP + jnoortheen.nix-ide # Nix + ms-python.python # Python + ms-vscode.cpptools # C/C++ + redhat.java # Java + rust-lang.rust-analyzer # Rust + tomoki1207.pdf # PDF Viewer + yzhang.markdown-all-in-one # Markdown + + # HTML+CSS+XML + ecmel.vscode-html-css + formulahendry.auto-rename-tag + redhat.vscode-xml + + # JS + dbaeumer.vscode-eslint + ritwickdey.liveserver + ] + ++ (with pkgs.code.vscode-marketplace; [ + kisstkondoros.vscode-gutter-preview # Image Preview + fwcd.kotlin # Kotlin + ]); + }; + }; + }; + }; + }; +} diff --git a/modules/apps/vscode/mutable.nix b/modules/apps/vscode/mutable.nix @@ -0,0 +1,37 @@ +# https://gist.github.com/piousdeer/b29c272eaeba398b864da6abf6cb5daa +{ + config, + lib, + ... +}: +let + # Path logic from nix-community/home-manager/modules/programs/vscode.nix + configDir = + { + "vscode" = "Code"; + "vscode-insiders" = "Code - Insiders"; + "vscodium" = "VSCodium"; + } + .${config.programs.vscode.package.pname}; + userDir = "${config.xdg.configHome}/${configDir}/User"; + + configFilePath = "${userDir}/settings.json"; + tasksFilePath = "${userDir}/tasks.json"; + keybindingsFilePath = "${userDir}/keybindings.json"; + snippetDir = "${userDir}/snippets"; + + cfg = config.programs.vscode.profiles.default; + pathsToMakeWritable = lib.flatten [ + (lib.optional (cfg.userTasks != { }) tasksFilePath) + (lib.optional (cfg.userSettings != { }) configFilePath) + (lib.optional (cfg.keybindings != [ ]) keybindingsFilePath) + (lib.optional (cfg.globalSnippets != { }) "${snippetDir}/global.code-snippets") + (lib.mapAttrsToList (language: _: "${snippetDir}/${language}.json") cfg.languageSnippets) + ]; +in +{ + home.file = lib.genAttrs pathsToMakeWritable (_: { + force = true; + mutable = true; + }); +} diff --git a/modules/apps/wine.nix b/modules/apps/wine.nix @@ -66,7 +66,7 @@ in callPackage name { inherit lib pkgs; wine = cfg.package; - build = inputs.windows.lib."${pkgs.system}"; + build = inputs.windows.lib."${pkgs.stdenv.system}"; } ) ) diff --git a/modules/gui/desktop/_shared/login.nix b/modules/gui/desktop/_shared/login.nix @@ -15,7 +15,7 @@ in environment.persist.directories = [ "/var/lib/regreet" ]; programs.regreet = { enable = true; - package = pkgs.greetd.regreet; + package = pkgs.regreet; settings.commands = { reboot = [ "systemctl" diff --git a/modules/gui/desktop/_shared/panel.nix b/modules/gui/desktop/_shared/panel.nix @@ -31,7 +31,7 @@ in programs.waybar = { enable = true; systemd.enable = true; - package = pkgs.waypkgs.waybar; + package = pkgs.waybar; }; }; diff --git a/modules/gui/desktop/_shared/security.nix b/modules/gui/desktop/_shared/security.nix @@ -50,7 +50,7 @@ in # Locker stylix.targets.swaylock = { enable = true; - useImage = true; + useWallpaper = true; }; programs.swaylock = { diff --git a/modules/gui/desktop/gnome/common.nix b/modules/gui/desktop/gnome/common.nix @@ -11,12 +11,12 @@ let ; in { - # Session services = { - displayManager.defaultSession = "gnome"; - xserver = { - desktopManager.gnome.enable = true; - displayManager.gdm.enable = true; + # Session + desktopManager.gnome.enable = true; + displayManager = { + defaultSession = "gnome"; + gdm.enable = true; }; # Initial Setup diff --git a/modules/gui/desktop/hyprland/apps/launcher.nix b/modules/gui/desktop/hyprland/apps/launcher.nix @@ -1,7 +1,6 @@ { config, util, - inputs, files, ... }: @@ -14,22 +13,19 @@ ]; homeConfig = { - imports = [ inputs.hyprshell.homeModules.hyprshell ]; - programs.hyprshell = { + services.hyprshell = { enable = true; systemd.enable = true; - styleFile = util.build.theme { + style = util.build.theme { inherit (config.lib.stylix) colors; file = files.hyprland.hyprshell; }; settings.windows = { - enable = true; scale = 9.0; items_per_row = 3; overview = { - enable = true; modifier = "super"; key = "tab"; @@ -62,7 +58,6 @@ }; switch = { - enable = true; modifier = "alt"; filter_by = [ "current_workspace" ]; }; diff --git a/modules/gui/desktop/hyprland/apps/utilities.nix b/modules/gui/desktop/hyprland/apps/utilities.nix @@ -45,27 +45,16 @@ in hyprsunset = { enable = true; extraArgs = [ "--identity" ]; - transitions = { - sunrise = { - calendar = "*-*-* 07:00:00"; - requests = [ - [ - "temperature" - "6000" - ] - [ "identity" ] - ]; - }; - sunset = { - calendar = "*-*-* 19:00:00"; - requests = [ - [ - "temperature" - "4000" - ] - ]; - }; - }; + settings.profile = [ + { + time = "7:00"; + temperature = 6000; + } + { + time = "19:00"; + temperature = 4000; + } + ]; }; }; diff --git a/modules/gui/desktop/hyprland/default.nix b/modules/gui/desktop/hyprland/default.nix @@ -30,8 +30,8 @@ in enable = true; withUWSM = true; xwayland.enable = true; - package = pkgs.waypkgs.hyprland; - portalPackage = pkgs.waypkgs.xdg-desktop-portal-hyprland; + package = pkgs.hyprland; + portalPackage = pkgs.xdg-desktop-portal-hyprland; }; services = { diff --git a/modules/gui/desktop/hyprland/settings/plugins.nix b/modules/gui/desktop/hyprland/settings/plugins.nix @@ -7,7 +7,7 @@ { ## Plugin Settings wayland.windowManager.hyprland = { - plugins = with pkgs.waypkgs; [ + plugins = with pkgs.hyprlandPlugins; [ hyprsplit hypr-dynamic-cursors hyprexpo diff --git a/modules/gui/desktop/install.nix b/modules/gui/desktop/install.nix @@ -17,7 +17,7 @@ in (import ./gnome/common.nix args) { - services.xserver = { + services = { displayManager.gdm = { banner = "Install Media"; autoSuspend = false; diff --git a/modules/gui/desktop/pantheon/default.nix b/modules/gui/desktop/pantheon/default.nix @@ -20,8 +20,8 @@ in config = mkIf (desktop == "pantheon") (mkMerge [ { # Session - services.xserver = { - enable = true; + services = { + xserver.enable = true; desktopManager.pantheon.enable = true; }; @@ -56,7 +56,7 @@ in # Panel Indicators environment.pathsToLink = [ "/libexec" ]; - services.xserver.desktopManager.pantheon.extraWingpanelIndicators = with pkgs; [ + services.desktopManager.pantheon.extraWingpanelIndicators = with pkgs; [ monitor wingpanel-indicator-ayatana ]; diff --git a/modules/gui/fonts.nix b/modules/gui/fonts.nix @@ -86,7 +86,7 @@ roboto-mono roboto-slab source-code-pro - ubuntu_font_family + ubuntu-classic ]; }; } diff --git a/modules/hardware/laptop.nix b/modules/hardware/laptop.nix @@ -11,16 +11,16 @@ in { ## Laptop Configuration ## config = lib.mkIf enable { - services.logind = { - killUserProcesses = true; + services.logind.settings.Login = { + KillUserProcesses = true; # Power Button - powerKey = "poweroff"; - powerKeyLongPress = "reboot"; + HandlePowerKey = "poweroff"; + HandlePowerKeyLongPress = "reboot"; # Lid - lidSwitch = "lock"; - lidSwitchDocked = "ignore"; + HandleLidSwitch = "lock"; + HandleLidSwitchDocked = "ignore"; }; # Audio diff --git a/modules/hardware/virtualisation/default.nix b/modules/hardware/virtualisation/default.nix @@ -52,10 +52,6 @@ in package = pkgs.qemu_kvm; runAsRoot = false; swtpm.enable = true; - ovmf = { - enable = true; - packages = [ pkgs.OVMFFull.fd ]; - }; }; }; }; diff --git a/modules/shell/default.nix b/modules/shell/default.nix @@ -8,17 +8,11 @@ }: let inherit (util.map) modules; - inherit (builtins) listToAttrs map; inherit (lib) - getExe' mkEnableOption - mkBefore mkIf mkMerge - nameValuePair ; - - shells = lib.remove "prompt" (modules.name ./.); in { ## SHELL Configuration ## @@ -89,59 +83,50 @@ in ## Program Configuration services.lorri.enable = true; # Faster 'nix shell' - programs = - listToAttrs ( - map ( - shell: - nameValuePair shell { - promptInit = mkBefore ''eval $(${getExe' pkgs.thefuck "thefuck"} --alias "fix")''; - } - ) shells - ) - // { - command-not-found.enable = true; # Command Not Found Search - yazi.enable = true; # File Browser - - # Command Correction Helper - thefuck = { - enable = true; - alias = "fix"; # Use 'fix' to correct previous command - }; + programs = { + command-not-found.enable = true; # Command Not Found Search + yazi.enable = true; # File Browser - # DirENV Support - direnv = { - enable = true; # Load Shell Variables from '.envrc' - nix-direnv.enable = true; - }; + # Command Correction Helper + pay-respects = { + enable = true; + alias = "fix"; # Use 'fix' to correct previous command + }; - # Bat Configuration - bat = { - enable = true; - settings = { - style = "full"; - italic-text = "always"; - map-syntax = [ ".ignore:Git Ignore" ]; - }; - }; + # DirENV Support + direnv = { + enable = true; # Load Shell Variables from '.envrc' + nix-direnv.enable = true; + }; - # Terminal Multiplexer - tmux = with config.lib.stylix.colors; { - plugins = with pkgs.unstable.tmuxPlugins; [ - open - yank - minimal-tmux-status - ]; - - extraConfigBeforePlugins = '' - set -g @minimal-tmux-bg "#${base02}" - set -g @minimal-tmux-fg "#${base05}" - set -g @minimal-tmux-use-arrow true - set -g @minimal-tmux-right-arrow "" - set -g @minimal-tmux-left-arrow "" - ''; + # Bat Configuration + bat = { + enable = true; + settings = { + style = "full"; + italic-text = "always"; + map-syntax = [ ".ignore:Git Ignore" ]; }; }; + # Terminal Multiplexer + tmux = with config.lib.stylix.colors; { + plugins = with pkgs.tmuxPlugins; [ + open + yank + minimal-tmux-status + ]; + + extraConfigBeforePlugins = '' + set -g @minimal-tmux-bg "#${base02}" + set -g @minimal-tmux-fg "#${base05}" + set -g @minimal-tmux-use-arrow true + set -g @minimal-tmux-right-arrow "" + set -g @minimal-tmux-left-arrow "" + ''; + }; + }; + user = { persist = { files = [ ".hstr_favorites" ]; diff --git a/modules/user/default.nix b/modules/user/default.nix @@ -25,6 +25,7 @@ let mkOption mkOptionType optionals + remove types ; @@ -39,7 +40,11 @@ let in { ## USER Configuration ## - imports = modules.list ./. ++ [ inputs.home.nixosModules.home-manager ]; + imports = [ + inputs.home.nixosModules.home-manager + ./home.nix + ./security.nix + ]; options = { # Global Home Manager Configuration @@ -92,7 +97,7 @@ in }; shells = mkOption { description = "List of Additional Supported Shells"; - type = listOf (enum (modules.name ../shell)); + type = listOf (enum (remove "prompt" (modules.name ../shell))); default = [ "bash" ]; }; homeConfig = mkOption { diff --git a/modules/user/home.nix b/modules/user/home.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - files, - ... -}: +{ config, ... }: { ## User Home Configuration ## config = { @@ -18,14 +13,7 @@ user.homeConfig = { imports = [ ../../users - - # Mutable Configuration Files - ( - { config, ... }: - (import (builtins.fetchurl { - inherit (files.mutability.module) url sha256; - }) { inherit config lib; }) - ) + ./mutable.nix ]; # SystemD User Services diff --git a/modules/user/mutable.nix b/modules/user/mutable.nix @@ -0,0 +1,106 @@ +# https://gist.github.com/piousdeer/b29c272eaeba398b864da6abf6cb5daa +{ config, lib, ... }: +let + inherit (builtins) + attrValues + concatLists + filter + foldl' + map + ; + + inherit (lib) + assertMsg + concatLines + escapeShellArg + getAttrFromPath + hm + mkOption + recursiveUpdate + setAttrByPath + types + ; + + fileOptionAttrPaths = [ + [ + "home" + "file" + ] + [ + "xdg" + "configFile" + ] + [ + "xdg" + "dataFile" + ] + ]; +in +{ + options = + let + mergeAttrsList = foldl' (recursiveUpdate) { }; + fileAttrsType = types.attrsOf ( + types.submodule ( + { config, ... }: + { + options.mutable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to copy the file without the read-only attribute instead of + symlinking. If you set this to `true`, you must also set `force` to + `true`. Mutable files are not removed when you remove them from your + configuration. + This option is useful for programs that don't have a very good + support for read-only configurations. + ''; + }; + } + ) + ); + in + mergeAttrsList ( + map ( + attrPath: + setAttrByPath attrPath (mkOption { + type = fileAttrsType; + }) + ) fileOptionAttrPaths + ); + + config = { + home.activation.mutableFileGeneration = + let + allFiles = ( + concatLists (map (attrPath: attrValues (getAttrFromPath attrPath config)) fileOptionAttrPaths) + ); + + filterMutableFiles = filter ( + file: + (file.mutable or false) + && assertMsg file.force "if you specify `mutable` to `true` on a file, you must also set `force` to `true`" + ); + + mutableFiles = filterMutableFiles allFiles; + + toCommand = ( + file: + let + source = escapeShellArg file.source; + target = escapeShellArg file.target; + in + '' + $VERBOSE_ECHO "${source} -> ${target}" + $DRY_RUN_CMD cp --remove-destination --no-preserve=mode ${source} ${target} + '' + ); + + command = '' + echo "Copying mutable home files for $HOME" + '' + + concatLines (map toCommand mutableFiles); + in + (hm.dag.entryAfter [ "linkGeneration" ] command); + }; +} diff --git a/packages/flake.nix b/packages/flake.nix @@ -40,13 +40,6 @@ in gaming = gaming.packages."${system}"; code = vscode.extensions."${system}"; wine = windows.packages."${system}"; - waypkgs = - waybar.packages."${system}" - // niri.packages."${system}" - // hyprland.packages."${system}" - // hyprplugins.packages."${system}" - // hyprsplit.packages."${system}" - // hyprcursors.packages."${system}"; }) minecraft.overlay niri.overlays.niri diff --git a/packages/patches/gscan2pdf.patch b/packages/patches/gscan2pdf.patch @@ -1,107 +0,0 @@ -From 5ea380bca358203a7397a0fa87c56239e31bd4c8 Mon Sep 17 00:00:00 2001 -From: euxane <euxane.trangirard@euxane.eu> -Date: Tue, 4 Nov 2025 03:39:47 +0100 -Subject: [PATCH] gscan2pdf: 2.13.4 -> 2.13.5 (and fix build) - -This release fixes issues with imagemagick 7. - -This change also re-enables two disabled tests which are now passing. -The font init has been fixed upstream. -The Tesseract input is aligned to the currently supported version. ---- - pkgs/by-name/gs/gscan2pdf/package.nix | 47 ++++++--------------------- - 1 file changed, 10 insertions(+), 37 deletions(-) - -diff --git a/pkgs/by-name/gs/gscan2pdf/package.nix b/pkgs/by-name/gs/gscan2pdf/package.nix -index c0ac37768c9d6..3091f396e1b08 100644 ---- a/pkgs/by-name/gs/gscan2pdf/package.nix -+++ b/pkgs/by-name/gs/gscan2pdf/package.nix -@@ -1,6 +1,7 @@ - { - lib, - fetchurl, -+ fetchpatch, - perlPackages, - wrapGAppsHook3, - # libs -@@ -17,18 +18,17 @@ - pdftk, - # test dependencies - xvfb-run, -- liberation_ttf, - file, -- tesseract3, -+ tesseract, - }: - - perlPackages.buildPerlPackage rec { - pname = "gscan2pdf"; -- version = "2.13.4"; -+ version = "2.13.5"; - - src = fetchurl { - url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; -- hash = "sha256-4HcTkVJBscBb8AxeN6orMQFVR0w4hFfkGhxQOzP3mWk="; -+ hash = "sha256-DUME9nI9B2+Gj+sBPj176SXfuxDc3CMXfby/Zga31fo="; - }; - - patches = [ -@@ -74,18 +74,11 @@ perlPackages.buildPerlPackage rec { - SubOverride - ]); - -- postPatch = -- let -- fontSubstitute = "${liberation_ttf}/share/fonts/truetype/LiberationSans-Regular.ttf"; -- in -- '' -- # Required for the program to properly load its SVG assets -- substituteInPlace bin/gscan2pdf \ -- --replace "/usr/share" "$out/share" -- -- # Substitute the non-free Helvetica font in the tests -- sed -i 's|-pointsize|-font ${fontSubstitute} -pointsize|g' t/*.t -- ''; -+ # Required for the program to properly load its SVG assets -+ postPatch = '' -+ substituteInPlace bin/gscan2pdf \ -+ --replace-fail "/usr/share" "$out/share" -+ ''; - - postInstall = '' - # Remove impurity -@@ -123,33 +116,13 @@ perlPackages.buildPerlPackage rec { - - xvfb-run - file -- tesseract3 # tests are expecting tesseract 3.x precisely -+ tesseract - ] - ++ (with perlPackages; [ - TestPod - ]); - - checkPhase = '' -- # Temporarily disable a dubiously failing test: -- # t/169_import_scan.t ........................... 1/1 -- # # Failed test 'variable-height scan imported with expected size' -- # # at t/169_import_scan.t line 50. -- # # got: '179' -- # # expected: '296' -- # # Looks like you failed 1 test of 1. -- # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) -- rm t/169_import_scan.t -- -- # Disable a test failing because of a warning interfering with the pinned output -- # t/3722_user_defined.t ......................... 1/2 -- # Failed test 'user_defined caught error injected in queue' -- # at t/3722_user_defined.t line 41. -- # got: 'error -- # WARNING: The convert command is deprecated in IMv7, use "magick" instead of "convert" or "magick convert"' -- # expected: 'error' -- # Looks like you failed 1 test of 2. -- rm t/3722_user_defined.t -- - export XDG_CACHE_HOME="$(mktemp -d)" - xvfb-run -s '-screen 0 800x600x24' \ - make test diff --git a/packages/patches/hyprshell.patch b/packages/patches/hyprshell.patch @@ -0,0 +1,42 @@ +diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix +index 6b305826956fd..12ad67d1497bc 100644 +--- a/pkgs/by-name/hy/hyprshell/package.nix ++++ b/pkgs/by-name/hy/hyprshell/package.nix +@@ -4,25 +4,25 @@ + fetchFromGitHub, + pkg-config, + wrapGAppsHook4, +- gtk4, + gtk4-layer-shell, + hyprland, + gcc, + pixman, ++ libadwaita, + }: + + rustPlatform.buildRustPackage (finalAttrs: { + pname = "hyprshell"; +- version = "4.7.2"; ++ version = "4.8.1"; + + src = fetchFromGitHub { + owner = "H3rmt"; + repo = "hyprshell"; + tag = "v${finalAttrs.version}"; +- hash = "sha256-6WC7vcPdtKR4iw5VHF88i/NQ+EBfvGxex8AvJONnG5w="; ++ hash = "sha256-NsFOXepWzgbopnoqwg8EekDLbj01jr8vjaEz/F3QFKU="; + }; + +- cargoHash = "sha256-g23W5cgGxWNyJ4uew2x12vgF5Bvaid1+phV2fxyHbas="; ++ cargoHash = "sha256-/4mC1cgQKOSOME8WT61hggyHPALj0knVPtGZTa7lO1w="; + + nativeBuildInputs = [ + wrapGAppsHook4 +@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { + ]; + + buildInputs = [ +- gtk4 ++ libadwaita + gtk4-layer-shell + ]; diff --git a/scripts/hyprutils.nix b/scripts/hyprutils.nix @@ -109,8 +109,7 @@ recursiveUpdate temperature_notification ;; "reset") - hyprctl hyprsunset temperature 6000 - hyprctl hyprsunset identity + hyprctl hyprsunset reset temperature notify temperature -i "display" "🌡 Reset" ;; "") fail "Expected an Option" ;; diff --git a/shells/android.nix b/shells/android.nix @@ -5,16 +5,13 @@ let licenseAccepted = true; }; - buildTools = "34.0.0"; + buildTools = "35.0.0"; inherit (androidEnv.composeAndroidPackages { cmdLineToolsVersion = "8.0"; toolsVersion = "26.1.1"; platformToolsVersion = "34.0.5"; - buildToolsVersions = [ - buildTools - "33.0.2" - ]; + buildToolsVersions = [ buildTools ]; includeEmulator = false; platformVersions = [ "33"