dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit 264e5420b1d0bc9a1eda72af712d8c07ce3e4198 parent 4cd9f479ae4885fadb49da41044cc8265d623b87 Author: maydayv7 <maydayv7@gmail.com> Date: Tue, 25 Mar 2025 23:25:34 +0530 feat: Use NixOS Unstable channel + Update Hyprland to v0.48.0
Diffstat:
39 files changed, 974 insertions(+), 817 deletions(-)
diff --git a/README.md b/README.md @@ -510,7 +510,7 @@ You can navigate to the `README`s present in the various directories to know mor ### v25.5 - Remove package `channels` -- Update Hyprland to v0.47.1 +- Update Hyprland to v0.48.0 - Use `hyprswitch` to switch between windows - Use `pcmanfm-qt` to render desktop icons diff --git a/checks/flake.nix b/checks/flake.nix @@ -6,17 +6,10 @@ ## Configuration Checks ## imports = [inputs.formatter.flakeModule]; - perSystem = { - system, - pkgs, - ... - }: { + perSystem = {system, ...}: { ## Code Formatter - treefmt.config = rec { - package = pkgs.treefmt1; #!# Currently broken - - projectRoot = ../.; - projectRootFile = "${projectRoot}/flake.nix"; + treefmt.config = { + projectRootFile = "flake.nix"; settings.global.excludes = [ "_*" "result/**" @@ -32,6 +25,7 @@ enable = true; no-lambda-arg = true; }; + prettier = { enable = true; settings.bracketSameLine = true; diff --git a/devices/valkyrie/drivers.nix b/devices/valkyrie/drivers.nix @@ -50,8 +50,8 @@ in { services.asusd = { enable = true; enableUserService = true; - asusdConfig = builtins.readFile ./settings/asusd.ron; - auraConfig = builtins.readFile ./settings/aura.ron; + asusdConfig.text = builtins.readFile ./settings/asusd.ron; + auraConfigs."19b6".text = builtins.readFile ./settings/aura.ron; }; user.homeConfig = { diff --git a/files/flake.nix b/files/flake.nix @@ -72,13 +72,6 @@ # Pyprland pypr = readFile ./hyprland/pypr.toml; - # Clipboard Manager - clipse = map.files { - directory = ./hyprland/clipse; - apply = readFile; - extension = ".json"; - }; - # Keybinds Viewer kebihelp = readFile ./hyprland/kebihelp.json; diff --git a/files/hyprland/clipse/config.json b/files/hyprland/clipse/config.json @@ -1,35 +0,0 @@ -{ - "themeFile": "theme.json", - "tempDir": "$XDG_DATA_HOME/clipboard/temp", - "logFile": "$XDG_DATA_HOME/clipboard/clipse.log", - "historyFile": "$XDG_DATA_HOME/clipboard/history.json", - "maxHistory": 150, - "imageDisplay": { - "type": "kitty", - "scaleX": 9, - "scaleY": 9, - "heightCut": 2 - }, - "allowDuplicates": false, - "keyBindings": { - "choose": "enter", - "clearSelected": "S", - "down": "down", - "end": "end", - "filter": "/", - "home": "home", - "more": "?", - "nextPage": "right", - "prevPage": "left", - "preview": "t", - "quit": "q", - "remove": "x", - "selectDown": "ctrl+down", - "selectSingle": "s", - "selectUp": "ctrl+up", - "togglePin": "p", - "togglePinned": "tab", - "up": "up", - "yankFilter": "ctrl+s" - } -} diff --git a/files/hyprland/clipse/theme.json b/files/hyprland/clipse/theme.json @@ -1,16 +0,0 @@ -{ - "useCustomTheme": true, - "DimmedDesc": "#@base07", - "DimmedTitle": "#@base07", - "FilteredMatch": "#@base08", - "NormalTitle": "#base08", - "NormalDesc": "#@base0B", - "SelectedDesc": "#@accent", - "SelectedTitle": "#@accent", - "SelectedBorder": "#@accent", - "SelectedDescBorder": "#@accent", - "TitleFore": "#@base05", - "Titleback": "#@base01", - "StatusMsg": "#@base0E", - "PinIndicatorColor": "#@base0F" -} diff --git a/files/hyprland/kebihelp.json b/files/hyprland/kebihelp.json @@ -126,6 +126,10 @@ "label": "Toggle application grouping" }, { + "value": "$mod CTRL <ARROW>", + "label": "Move window into desired group" + }, + { "value": "$mod ; or :", "label": "Toggle window float for one/all window(s)" }, @@ -327,8 +331,8 @@ "label": "Window resize" }, { - "value": "$mod SHIFT L'", - "label": "Move window into application group" + "value": "$mod Scroll", + "label": "Move across workspaces" }, { "value": "", diff --git a/flake.lock b/flake.lock @@ -1,38 +1,5 @@ { "nodes": { - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737636397, - "narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "7fe006981fae53e931f513026fc754e322f13145", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -196,22 +163,6 @@ "flake-compat_2": { "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_3": { - "flake": false, - "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", @@ -225,14 +176,14 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -241,19 +192,25 @@ "type": "github" } }, - "flake-compat_5": { - "flake": false, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nur", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, @@ -397,7 +354,7 @@ "stylix", "flake-compat" ], - "gitignore": "gitignore_3", + "gitignore": "gitignore_2", "nixpkgs": [ "stylix", "nixpkgs" @@ -442,28 +399,6 @@ "gitignore_2": { "inputs": { "nixpkgs": [ - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_3": { - "inputs": { - "nixpkgs": [ "stylix", "git-hooks", "nixpkgs" @@ -522,411 +457,19 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1742871411, + "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737634937, - "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprdark": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nix-filter": [ - "filters" - ] - }, - "locked": { - "lastModified": 1739382478, - "narHash": "sha256-3wnGd/nCrxrjQmvU3GOBBjZl2Ot80P885yjxpPiv/zw=", - "owner": "micha4w", - "repo": "Hypr-DarkWindow", - "rev": "ae5725442267ae7ae417ca2b27840b0f84edcf78", - "type": "github" - }, - "original": { - "owner": "micha4w", - "ref": "v0.47.1", - "repo": "Hypr-DarkWindow", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737634889, - "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks", - "systems": [ - "systems" - ], - "xdph": "xdph" - }, - "locked": { - "lastModified": 1738192779, - "narHash": "sha256-NBOE/3axYuIDLPF0rI+yd006kKBQl+ItcK/4aBGw1Og=", - "owner": "hyprwm", - "repo": "hyprland", - "rev": "75dff7205f6d2bd437abfb4196f700abee92581a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "ref": "v0.47.1", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-plugins": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nixpkgs": [ - "hyprland-plugins", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland-plugins", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1738457635, - "narHash": "sha256-zys4H2zSSIw54ecnYnBh2NUKZQraWD4B7qftuClrXho=", - "owner": "hyprwm", - "repo": "hyprland-plugins", - "rev": "1c4b446cea46088c6c79e5c66ea5ae28b48c2701", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "ref": "v0.47.0", - "repo": "hyprland-plugins", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737556638, - "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": "hyprlang", - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737811848, - "narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": "hyprutils", - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "systems" - ] - }, - "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprsplit": { - "inputs": { - "hyprland": [ - "hyprland" - ] - }, - "locked": { - "lastModified": 1738615843, - "narHash": "sha256-g3yq1TNLc3HIMXqs2wY9kUgDYsN8GHhc77wIOXjyn6E=", - "owner": "shezdy", - "repo": "hyprsplit", - "rev": "622fbb49e4caeec8c4196e9f8be8489b00263a83", - "type": "github" - }, - "original": { - "owner": "shezdy", - "ref": "v0.47.1", - "repo": "hyprsplit", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "hyprlang", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "hyprlang", - "systems" - ] - }, - "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737725508, - "narHash": "sha256-jGmcPc6y/prg/4A8KGYqJ27nSPaProCMiFadaxNAKvA=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "fb0c2d1de3d1ef7396d19c18ac09e12bd956929e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "impermanence": { "locked": { "lastModified": 1737831083, @@ -949,11 +492,11 @@ ] }, "locked": { - "lastModified": 1740281615, - "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", + "lastModified": 1742701275, + "narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", + "rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6", "type": "github" }, "original": { @@ -1026,26 +569,26 @@ "type": "github" } }, - "pre-commit-hooks": { + "nur": { "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore_2", + "flake-parts": "flake-parts", "nixpkgs": [ - "hyprland", + "stylix", "nixpkgs" - ] + ], + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "lastModified": 1742908997, + "narHash": "sha256-OwKdt9gJOkcDnKWrN8rxKUWAeT7eH/p8pRV6MUM4a9M=", + "owner": "nix-community", + "repo": "NUR", + "rev": "865ceec61c4e4fcff93e287b2349f39f25b162d4", "type": "github" }, "original": { - "owner": "cachix", - "repo": "git-hooks.nix", + "owner": "nix-community", + "repo": "NUR", "type": "github" } }, @@ -1108,14 +651,10 @@ "generators": "generators", "hardware": "hardware", "home-manager": "home-manager", - "hyprdark": "hyprdark", - "hyprland": "hyprland", - "hyprland-plugins": "hyprland-plugins", - "hyprsplit": "hyprsplit", "impermanence": "impermanence", "index": "index", "nixpkgs": [ - "stable" + "unstable" ], "proprietary": "proprietary", "sops": "sops", @@ -1218,7 +757,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": [ "utils" ], @@ -1230,24 +769,26 @@ "nixpkgs": [ "nixpkgs" ], + "nur": "nur", "systems": [ "systems" ], "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1740520580, - "narHash": "sha256-QRlcA8rtfNdyKpBE+ptjiB9717Tzum4/sKBSbsyqL6k=", + "lastModified": 1742856759, + "narHash": "sha256-IiHFsSC2xXD/RT4CW5ThaBybFQ+xha7HOTGbdD+TiXQ=", "owner": "danth", "repo": "stylix", - "rev": "aaa2eb8956770c096f9c46fb163bb26602e20e56", + "rev": "b4feb69fd2c1b6ef02a6a81761a62af62ac7bf1b", "type": "github" }, "original": { "owner": "danth", - "ref": "release-24.11", "repo": "stylix", "type": "github" } @@ -1333,6 +874,22 @@ "type": "github" } }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1742851696, + "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, "tinted-tmux": { "flake": false, "locked": { @@ -1349,6 +906,44 @@ "type": "github" } }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "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": 1742669843, @@ -1405,7 +1000,6 @@ }, "vscode": { "inputs": { - "flake-compat": "flake-compat_4", "flake-utils": [ "utils" ], @@ -1414,11 +1008,11 @@ ] }, "locked": { - "lastModified": 1740776157, - "narHash": "sha256-yG3OmzxR+iQcuX/dw/qU9CNbi74yuhoupw4zMi5XAg0=", + "lastModified": 1742867685, + "narHash": "sha256-JfJRD3eOlNndfyzjFN8PRSHXH8O80+ABgFzm/WGABK8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "17fc25cb8bb7042aedff00a017f552b5d6ac4ca1", + "rev": "02d54a24976e5acccd25bacae916725500fd39f9", "type": "github" }, "original": { @@ -1432,11 +1026,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1739527968, - "narHash": "sha256-4ApAOtFIbqhtHpC59nEC1SdNX75D1dipDiB6rUhyqTY=", + "lastModified": 1742659101, + "narHash": "sha256-eGQYBQujuLskplnAHaLOfD37ct8Idc6jrR4E57cQY2o=", "owner": "catppuccin", "repo": "vscode", - "rev": "b8e5951a8ad03268854ef29780ce93fe9ea14294", + "rev": "9bcff9eba7ab54a842e60ab7b68f3ee6f5bae34c", "type": "github" }, "original": { @@ -1447,7 +1041,7 @@ }, "windows": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_3", "nixpkgs": [ "unstable" ] @@ -1465,47 +1059,6 @@ "repo": "erosanix", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix @@ -38,7 +38,7 @@ inputs = { ## Package Repositories ## # NixOS Packages Repository - nixpkgs.follows = "stable"; + nixpkgs.follows = "unstable"; stable.url = "github:NixOS/nixpkgs?ref=nixos-24.11"; # Unstable Packages Repository @@ -88,7 +88,7 @@ ## Feature Modules # User Home Manager home-manager = { - url = "github:nix-community/home-manager?ref=release-24.11"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -130,7 +130,7 @@ # Base16 Theming stylix = { - url = "github:danth/stylix?ref=release-24.11"; + url = "github:danth/stylix"; inputs = { nixpkgs.follows = "nixpkgs"; systems.follows = "systems"; @@ -166,35 +166,6 @@ url = "github:emmanuelrosa/erosanix"; inputs.nixpkgs.follows = "unstable"; }; - - ## Hyprland - # Core - hyprland = { - url = "github:hyprwm/Hyprland?ref=v0.47.1"; - inputs = { - nixpkgs.follows = "nixpkgs"; - systems.follows = "systems"; - }; - }; - - # Plugins - hyprland-plugins = { - url = "github:hyprwm/hyprland-plugins?ref=v0.47.0"; - inputs.hyprland.follows = "hyprland"; - }; - - hyprdark = { - url = "github:micha4w/Hypr-DarkWindow?ref=v0.47.1"; - inputs = { - hyprland.follows = "hyprland"; - nix-filter.follows = "filters"; - }; - }; - - hyprsplit = { - url = "github:shezdy/hyprsplit?ref=v0.47.1"; - inputs.hyprland.follows = "hyprland"; - }; }; ## Configuration ## diff --git a/modules/apps/vscode.nix b/modules/apps/vscode.nix @@ -32,40 +32,41 @@ in { programs.vscode = { enable = true; package = pkgs.vscode; + profiles.default = { + # Keyboard Shortcuts + inherit keybindings; - # Keyboard Shortcuts - inherit keybindings; + # Settings + userSettings = + settings // {"editor.fontFamily" = "'${font}', 'monospace', monospace";}; - # Settings - userSettings = - settings // {"editor.fontFamily" = "'${font}', 'monospace', monospace";}; - - # Useful Extensions - extensions = with pkgs.vscode-extensions; - [ - aaron-bond.better-comments - divyanshuagrawal.competitive-programming-helper - dotjoshjohnson.xml - eamodio.gitlens - ecmel.vscode-html-css - editorconfig.editorconfig - esbenp.prettier-vscode - file-icons.file-icons - github.vscode-pull-request-github - jnoortheen.nix-ide - kamadorueda.alejandra - ms-python.python - ms-vscode-remote.remote-ssh - ms-vscode.cpptools - naumovs.color-highlight - redhat.java - ritwickdey.liveserver - yzhang.markdown-all-in-one - ] - ++ (with pkgs.code.vscode-marketplace; [ - kisstkondoros.vscode-gutter-preview - wayou.vscode-todo-highlight - ]); + # Useful Extensions + extensions = with pkgs.vscode-extensions; + [ + aaron-bond.better-comments + divyanshuagrawal.competitive-programming-helper + dotjoshjohnson.xml + eamodio.gitlens + ecmel.vscode-html-css + editorconfig.editorconfig + esbenp.prettier-vscode + file-icons.file-icons + github.vscode-pull-request-github + jnoortheen.nix-ide + kamadorueda.alejandra + ms-python.python + ms-vscode-remote.remote-ssh + ms-vscode.cpptools + naumovs.color-highlight + redhat.java + ritwickdey.liveserver + yzhang.markdown-all-in-one + ] + ++ (with pkgs.code.vscode-marketplace; [ + kisstkondoros.vscode-gutter-preview + wayou.vscode-todo-highlight + ]); + }; }; }; }; diff --git a/modules/apps/wine.nix b/modules/apps/wine.nix @@ -26,7 +26,7 @@ in { # Firmware services.samba.enable = true; hardware.xpadneo.enable = true; - hardware.opengl.driSupport32Bit = true; + hardware.graphics.enable32Bit = true; # Utilities user.persist.directories = diff --git a/modules/base/firmware.nix b/modules/base/firmware.nix @@ -3,7 +3,9 @@ inputs, pkgs, ... -}: { +}: let + inherit (lib) getExe' mkForce; +in { imports = [inputs.gaming.nixosModules.pipewireLowLatency]; ## Device Firmware ## @@ -12,10 +14,10 @@ hardware = { graphics.enable = true; enableRedistributableFirmware = true; - pulseaudio.enable = lib.mkForce false; }; # Audio + services.pulseaudio.enable = mkForce false; services.pipewire = { enable = true; alsa.enable = true; @@ -32,7 +34,7 @@ hardware.alsa.enablePersistence = true; services.actkbd = let step = "1%"; - mixer = lib.getExe' pkgs.alsa-utils "amixer"; + mixer = getExe' pkgs.alsa-utils "amixer"; in { enable = true; bindings = [ @@ -107,7 +109,7 @@ enable = true; settings = { PasswordAuthentication = true; - PermitRootLogin = lib.mkForce "no"; + PermitRootLogin = mkForce "no"; }; hostKeys = [ diff --git a/modules/gui/desktop/gnome/default.nix b/modules/gui/desktop/gnome/default.nix @@ -265,7 +265,7 @@ in { }; # Code Editor - programs.vscode = mkIf (exists "vscode") { + programs.vscode.profiles.default = mkIf (exists "vscode") { extensions = [pkgs.vscode-extensions.piousdeer.adwaita-theme]; userSettings = { "workbench.colorTheme" = "Adwaita Dark"; diff --git a/modules/gui/desktop/hyprland/apps/misc.nix b/modules/gui/desktop/hyprland/apps/misc.nix @@ -11,7 +11,7 @@ in { ## 3rd Party Apps Configuration user.homeConfig = { # Code Editor - programs.vscode = lib.mkIf (exists "vscode") { + programs.vscode.profiles.default = lib.mkIf (exists "vscode") { extensions = with pkgs; [ vscode-extensions.catppuccin.catppuccin-vsc-icons (catppuccin-vsc.override { diff --git a/modules/gui/desktop/hyprland/apps/notify.nix b/modules/gui/desktop/hyprland/apps/notify.nix @@ -1,6 +1,5 @@ { config, - lib, theme, ... }: { @@ -61,13 +60,5 @@ utility = {appname = "utility";} // ignore; }; }; - - # nix-community/home-manager/pull/5785 - systemd.user.services = { - kdeconnect.Unit.After = lib.mkForce ["graphical-session.target"]; - kdeconnect-indicator.Unit.After = lib.mkForce ["graphical-session.target"]; - poweralertd.Unit.After = lib.mkForce ["graphical-session.target"]; - dunst.Unit.After = lib.mkForce ["graphical-session.target"]; - }; }; } diff --git a/modules/gui/desktop/hyprland/apps/panel.nix b/modules/gui/desktop/hyprland/apps/panel.nix @@ -1,42 +1,20 @@ { config, - lib, pkgs, files, ... }: { ## Panel Configuration - user.homeConfig = rec { + user.homeConfig = { stylix.targets.waybar = { enable = true; + font = "sansSerif"; enableCenterBackColors = true; enableLeftBackColors = true; enableRightBackColors = true; }; - # Environment Setup - home.packages = [pkgs.unstable.wttrbar]; - systemd.user = { - services.waybar = { - # nix-community/home-manager/pull/5785 - Unit.After = lib.mkForce ["graphical-session.target"]; - - # nix-community/home-manager/4099 - Service.ExecStart = lib.mkForce (pkgs.writeShellScript "waybar-wrapper.sh" '' - ${files.path.systemd} - ${lib.getExe programs.waybar.package} - ''); - }; - - # nix-community/home-manager/2064 - targets.tray = { - Unit = { - Description = "Home Manager System Tray"; - Requires = ["graphical-session.target"]; - }; - }; - }; - + home.packages = [pkgs.wttrbar]; programs.waybar = { enable = true; systemd.enable = true; diff --git a/modules/gui/desktop/hyprland/apps/settings.nix b/modules/gui/desktop/hyprland/apps/settings.nix @@ -61,9 +61,6 @@ in { # Application Drawer "nwg-drawer -r" - # Clipboard Manager - "clipse -listen" - # Desktop Icons "pcmanfm-qt --desktop" @@ -165,7 +162,7 @@ in { # Utilities "float, class:^(${class})" "pin, class:^(${class})" - #!# "persistentsize, class:^(${class})" + "persistentsize, class:^(${class})" ]) [ "io.github.kaii_lb.Overskride" "nwg-displays" diff --git a/modules/gui/desktop/hyprland/apps/text.nix b/modules/gui/desktop/hyprland/apps/text.nix @@ -1,15 +1,21 @@ { + config, pkgs, util, files, theme, ... }: { - ## Text Editor Configuration + ## Text Configuration environment.systemPackages = [pkgs.geany]; user = { - persist.directories = [".config/geany"]; + persist.directories = [ + ".config/clipse" + ".config/geany" + ]; + homeConfig = { + # Text Editor xdg.mimeApps.defaultApplications = util.build.mime files.xdg.mime { markdown = ["geany.desktop"]; text = ["geany.desktop"]; @@ -20,6 +26,29 @@ ".config/geany/keybindings.conf".text = keybindings; ".config/geany/colorschemes/theme.conf".source = with theme; "${pkgs.custom.geany-catppuccin}/share/geany/colorschemes/${name}-${variant}.conf"; }; + + # Clipboard Manager + services.clipse = { + enable = true; + allowDuplicates = false; + historySize = 150; + theme = with config.lib.stylix.colors; { + useCustomTheme = true; + DimmedDesc = "#${base07}"; + DimmedTitle = "#${base07}"; + FilteredMatch = "#${base08}"; + NormalTitle = "#${base08}"; + NormalDesc = "#${base0B}"; + SelectedDesc = "#${base0D}"; + SelectedTitle = "#${base0D}"; + SelectedBorder = "#${base0D}"; + SelectedDescBorder = "#${base0D}"; + TitleFore = "#${base05}"; + Titleback = "#${base01}"; + StatusMsg = "#${base0E}"; + PinIndicatorColor = "#${base0F}"; + }; + }; }; }; } diff --git a/modules/gui/desktop/hyprland/apps/utilities.nix b/modules/gui/desktop/hyprland/apps/utilities.nix @@ -16,7 +16,7 @@ in { gnome-clocks gnome-disk-utility hyprpicker - unstable.hyprswitch + hyprswitch nwg-displays nwg-drawer overskride @@ -31,7 +31,7 @@ in { hyprkeys hyprshade pavucontrol - unstable.pyprland + pyprland slurp wev wl-clipboard @@ -77,11 +77,7 @@ in { hardware.brillo.enable = true; user = { - persist.directories = [ - ".config/nwg-displays" - ".local/share/clipboard" - ]; - + persist.directories = [".config/nwg-displays"]; homeConfig = { # Wallpaper Daemon services.hyprpaper = { @@ -118,13 +114,6 @@ in { inherit (config.stylix) fonts; file = kebihelp; }; - - # Clipboard Manager - ".config/clipse/config.json".text = clipse.config; - ".config/clipse/theme.json".text = theme { - inherit colors; - file = clipse.theme; - }; }; }; }; diff --git a/modules/gui/desktop/hyprland/default.nix b/modules/gui/desktop/hyprland/default.nix @@ -33,8 +33,8 @@ in { enable = true; withUWSM = true; xwayland.enable = true; - package = pkgs.hyprworld.hyprland; - portalPackage = pkgs.hyprworld.xdg-desktop-portal-hyprland; + package = pkgs.hyprland; + portalPackage = pkgs.xdg-desktop-portal-hyprland; }; # Login @@ -54,7 +54,7 @@ in { } { # Greeter - environment.persist.directories = ["/var/cache/regreet"]; + environment.persist.directories = ["/var/lib/regreet"]; stylix.targets.regreet.enable = true; programs.regreet = { extraCss = mkForce ""; diff --git a/modules/gui/desktop/hyprland/settings/default.nix b/modules/gui/desktop/hyprland/settings/default.nix @@ -12,7 +12,7 @@ in { imports = util.map.modules.list ./.; stylix.targets.hyprland.enable = true; wayland.windowManager.hyprland = { - inherit (sys.programs.hyprland) enable package; + inherit (sys.programs.hyprland) enable package portalPackage; # Use 'nwg-displays' to configure monitors extraConfig = '' @@ -146,10 +146,13 @@ in { groupbar = { enabled = true; render_titles = false; - height = 7; scrolling = true; gradients = true; - #!# rounding = 10; + height = 10; + indicator_height = 0; + gradient_rounding = 5; + gradient_round_only_edges = false; + "col.active" = mkForce active; "col.locked_active" = mkForce active; "col.inactive" = mkForce inactive; diff --git a/modules/gui/desktop/hyprland/settings/keybindings.nix b/modules/gui/desktop/hyprland/settings/keybindings.nix @@ -16,7 +16,7 @@ _: { "$mod, E, fullscreen, 1" "$mod, P, pin" "$mod, Space, togglesplit" - #!# "$mod SHIFT, S, toggleswallow" + "$mod SHIFT, S, toggleswallow" # Window Focus "$mod, left, movefocus, l" @@ -36,6 +36,10 @@ _: { "$mod SHIFT, space, togglegroup" "ALT, grave, changegroupactive, f" "ALT SHIFT, grave, changegroupactive, b" + "$mod CTRL, left, moveintogroup, l" + "$mod CTRL, right, moveintogroup, r" + "$mod CTRL, up, moveintogroup, u" + "$mod CTRL, down, moveintogroup, d" # Floating Mode "$mod, semicolon, togglefloating," @@ -44,8 +48,10 @@ _: { # Cycle Workspaces "$mod, comma, split:workspace, m-1" "$mod, period, split:workspace, m+1" - "$mod CTRL, comma, split:workspace, -1" - "$mod CTRL, period, split:workspace, +1" + "$mod CTRL, comma, split:workspace, r-1" + "$mod CTRL, period, split:workspace, r+1" + "$mod, mouse_up, split:workspace, r-1" + "$mod, mouse_down, split:workspace, r+1" # Special Workspace "$mod, 0, togglespecialworkspace, Stash" @@ -92,7 +98,6 @@ _: { bindm = [ "$mod, mouse:272, movewindow" "$mod, mouse:273, resizewindow" - "$mod SHIFT, mouse:272, moveintogroup" ]; # Ignore Locked State diff --git a/modules/gui/desktop/hyprland/settings/plugins.nix b/modules/gui/desktop/hyprland/settings/plugins.nix @@ -6,10 +6,10 @@ }: { ## Plugin Settings wayland.windowManager.hyprland = { - plugins = with pkgs.hyprworld; [ + plugins = with pkgs.hyprlandPlugins; [ hyprexpo - Hypr-DarkWindow hyprsplit + pkgs.custom.hyprdark ]; settings = { diff --git a/modules/gui/desktop/pantheon.nix b/modules/gui/desktop/pantheon.nix @@ -162,7 +162,7 @@ in { ## 3rd Party Apps Configuration { # Code Editor - user.homeConfig.programs.vscode = mkIf (exists "vscode") { + user.homeConfig.programs.vscode.profiles.default = mkIf (exists "vscode") { extensions = [pkgs.code.vscode-marketplace.sixpounder.elementary-theme]; userSettings = { "workbench.colorTheme" = "Elementary Dark"; diff --git a/modules/gui/desktop/xfce/default.nix b/modules/gui/desktop/xfce/default.nix @@ -231,7 +231,7 @@ in { }; # Code Editor - programs.vscode = mkIf (exists "vscode") { + programs.vscode.profiles.default = mkIf (exists "vscode") { extensions = [pkgs.code.vscode-marketplace.alvesvaren.arc-dark]; userSettings = { "workbench.colorTheme" = "Arc Dark Theme"; diff --git a/modules/gui/fonts.nix b/modules/gui/fonts.nix @@ -70,27 +70,25 @@ }; # Font Packages - fonts.packages = with pkgs; [ - corefonts - gyre-fonts - unifont - - fira - ibm-plex - roboto - roboto-slab - source-code-pro - ubuntu_font_family + fonts.packages = with pkgs; + [ + corefonts + gyre-fonts + unifont + fira + ibm-plex + roboto + roboto-slab + source-code-pro + ubuntu_font_family + ] # Patched Nerd Fonts - (nerdfonts.override { - fonts = [ - "FiraCode" - "FiraMono" - "RobotoMono" - "SourceCodePro" - ]; - }) - ]; + ++ (with pkgs.nerd-fonts; [ + fira-code + fira-mono + roboto-mono + sauce-code-pro + ]); }; } diff --git a/modules/gui/qt.nix b/modules/gui/qt.nix @@ -30,6 +30,7 @@ in { style = "kvantum"; }; + stylix.targets.qt.enable = false; environment = { systemPackages = [package]; etc."xdg/Kvantum/kvantum.kvconfig".text = '' diff --git a/packages/flake.nix b/packages/flake.nix @@ -49,11 +49,6 @@ in { code = vscode.extensions."${system}"; gaming = gaming.packages."${system}"; wine = windows.packages."${system}"; - hyprworld = - hyprland.packages."${system}" - // hyprland-plugins.packages."${system}" - // hyprdark.packages."${system}" - // hyprsplit.packages."${system}"; }) ] ++ [(_: _: {unstable = import unstable {inherit system config;};})]; diff --git a/packages/hyprdark/default.nix b/packages/hyprdark/default.nix @@ -0,0 +1,33 @@ +{ + lib, + pkgs, + ... +}: +with pkgs; let + metadata = import ./metadata.nix; +in + gcc14Stdenv.mkDerivation rec { + pname = "Hypr-DarkWindow"; + version = metadata.rev; + + src = fetchFromGitHub { + owner = "micha4w"; + repo = pname; + inherit (metadata) rev sha256; + }; + + nativeBuildInputs = [pkg-config]; + buildInputs = [hyprland.dev] ++ hyprland.buildInputs; + installPhase = '' + mkdir -p $out/lib + install ./out/hypr-darkwindow.so $out/lib/libHypr-DarkWindow.so + ''; + + meta = with lib; { + homepage = metadata.repo; + description = "Hyprland Plugin to invert the colors of specific windows"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = ["maydayv7"]; + }; + } diff --git a/packages/hyprdark/metadata.nix b/packages/hyprdark/metadata.nix @@ -0,0 +1,6 @@ +{ + repo = "https://github.com/micha4w/Hypr-DarkWindow"; + release = false; + rev = "d08b7133fa7ea5d05f50bd7114f5bff3b563d6af"; + sha256 = "sha256-DdCP479AZdEAm+CQTJKcZeBWUW8cSDl92HxijQQgW+U="; +} diff --git a/packages/hyprshellevents/default.nix b/packages/hyprshellevents/default.nix @@ -22,7 +22,7 @@ in nativeBuildInputs = [makeWrapper]; postInstall = '' wrapProgram $out/bin/shellevents --prefix PATH ':' \ - "${lib.makeBinPath [coreutils hyprworld.hyprland]}" + "${lib.makeBinPath [coreutils hyprland]}" ''; meta = with lib; { diff --git a/packages/hyprshellevents/metadata.nix b/packages/hyprshellevents/metadata.nix @@ -1,5 +1,5 @@ { repo = "https://github.com/hyprwm/contrib"; - rev = "0e40ccfc2d6772f9b7d5e1b50c56fb5e468a18fb"; - sha256 = "sha256-inSG4OUSdCHXSJZhLNcCUA1s0Ebomr5+v4x3FE/XQ3M="; + rev = "bd81329944be53b0ffb99e05864804b95f1d7c65"; + sha256 = "sha256-I8JVdQRu8eWvY5W8XWYZkdd5pojDHkxeqQV7mMIsbhs="; } diff --git a/packages/patches/hyprland.patch b/packages/patches/hyprland.patch @@ -0,0 +1,97 @@ +From 84b02d3375ad1ebb0002105701e835b22c9ac3b3 Mon Sep 17 00:00:00 2001 +From: Mihai Fufezan <mihai@fufexan.net> +Date: Sun, 23 Mar 2025 18:19:05 +0200 +Subject: [PATCH 1/2] hyprland: 0.47.2 -> 0.48.0 + +--- + pkgs/by-name/hy/hyprland/info.json | 10 +++++----- + pkgs/by-name/hy/hyprland/package.nix | 8 +++++--- + 2 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json +index 32a0404a26a554..f01f9233f05eb2 100644 +--- a/pkgs/by-name/hy/hyprland/info.json ++++ b/pkgs/by-name/hy/hyprland/info.json +@@ -1,7 +1,7 @@ + { +- "branch": "v0.47.2-b", +- "commit_hash": "882f7ad7d2bbfc7440d0ccaef93b1cdd78e8e3ff", +- "commit_message": "version: bump to 0.47.2", +- "date": "2025-02-02", +- "tag": "v0.47.2" ++ "branch": "main", ++ "commit_hash": "5ee35f914f921e5696030698e74fb5566a804768", ++ "commit_message": "version: bump to 0.48.0", ++ "date": "2025-03-23", ++ "tag": "v0.48.0" + } +diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix +index eca4e58f5761b9..59b7302af842c3 100644 +--- a/pkgs/by-name/hy/hyprland/package.nix ++++ b/pkgs/by-name/hy/hyprland/package.nix +@@ -86,14 +86,14 @@ assert assertMsg (!hidpiXWayland) + + customStdenv.mkDerivation (finalAttrs: { + pname = "hyprland" + optionalString debug "-debug"; +- version = "0.47.2"; ++ version = "0.48.0"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprland"; + fetchSubmodules = true; + tag = "v${finalAttrs.version}"; +- hash = "sha256-dSKR1VpjpdJVZ5dmLgIvAu3K+DYrSbohZkqxSQhjw8U="; ++ hash = "sha256-QfXnNrQSa9xDrlzl/dJvsFgMmPECveyU/7cKJ2YyIzI="; + }; + + postPatch = '' +@@ -176,7 +176,7 @@ customStdenv.mkDerivation (finalAttrs: { + (optionals withSystemd [ systemd ]) + ]; + +- mesonBuildType = if debug then "debugoptimized" else "release"; ++ mesonBuildType = if debug then "debug" else "release"; + + dontStrip = debug; + strictDeps = true; +@@ -186,6 +186,8 @@ customStdenv.mkDerivation (finalAttrs: { + "xwayland" = enableXWayland; + "legacy_renderer" = legacyRenderer; + "systemd" = withSystemd; ++ "uwsm" = false; ++ "hyprpm" = false; + }) + (mapAttrsToList mesonBool { + # PCH provides no benefits when building with Nix + +From a7547840f3b2cce404439b76b053c595e196add0 Mon Sep 17 00:00:00 2001 +From: Mihai Fufezan <mihai@fufexan.net> +Date: Sun, 23 Mar 2025 18:26:50 +0200 +Subject: [PATCH 2/2] hyprlandPlugins/hyprland-plugins: 0.47.0 -> 0.48.0 + +--- + .../hyprwm/hyprland-plugins/hyprland-plugins.nix | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +index 753386fef4ea8e..5c41bc86d71903 100644 +--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix ++++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +@@ -14,13 +14,13 @@ let + mkHyprlandPlugin, + }: + let +- version = "0.47.0"; ++ version = "0.48.0"; + + hyprland-plugins-src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprland-plugins"; +- rev = "refs/tags/v${version}"; +- hash = "sha256-zys4H2zSSIw54ecnYnBh2NUKZQraWD4B7qftuClrXho="; ++ tag = "v${version}"; ++ hash = "sha256-q6v3nkJZdu45bwCuymQ+q3U7uwfA+M3GqsvZ0TgNsi4="; + }; + in + mkHyprlandPlugin hyprland { diff --git a/packages/patches/hyprsplit.patch b/packages/patches/hyprsplit.patch @@ -0,0 +1,29 @@ +From e2bfdd171c186596ba76b34ebef8542c25104eb2 Mon Sep 17 00:00:00 2001 +From: "R. Ryantm" <ryantm-bot@ryantm.com> +Date: Mon, 24 Mar 2025 02:24:13 +0000 +Subject: [PATCH] hyprlandPlugins.hyprsplit: 0.47.2 -> 0.48.0 + +--- + .../window-managers/hyprwm/hyprland-plugins/hyprsplit.nix | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix +index 2b9f24a55b9c33..03f3f6453386fa 100644 +--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix ++++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix +@@ -9,13 +9,13 @@ + }: + mkHyprlandPlugin hyprland rec { + pluginName = "hyprsplit"; +- version = "0.47.2"; ++ version = "0.48.0"; + + src = fetchFromGitHub { + owner = "shezdy"; + repo = "hyprsplit"; + rev = "refs/tags/v${version}"; +- hash = "sha256-g3yq1TNLc3HIMXqs2wY9kUgDYsN8GHhc77wIOXjyn6E="; ++ hash = "sha256-FTp5mkrrgo/plCFHuFnx+EtDnQQoChq0mdKpb2a4LrQ="; + }; + + nativeBuildInputs = [ diff --git a/packages/patches/logseq.patch b/packages/patches/logseq.patch @@ -0,0 +1,480 @@ +From 882d96f3e755c91626ce769a22841e49e540f811 Mon Sep 17 00:00:00 2001 +From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> +Date: Wed, 12 Mar 2025 22:42:18 +0100 +Subject: [PATCH] logseq: init at 0.10.9-unstable-2025-03-11 + +--- + .../electron-forge-disable-signing.patch | 24 ++ + ...ectron-forge-package-instead-of-make.patch | 13 + + .../lo/logseq/hardcode-git-paths.patch | 98 ++++++ + pkgs/by-name/lo/logseq/package.nix | 292 ++++++++++++++++++ + pkgs/top-level/aliases.nix | 1 - + 5 files changed, 427 insertions(+), 1 deletion(-) + create mode 100644 pkgs/by-name/lo/logseq/electron-forge-disable-signing.patch + create mode 100644 pkgs/by-name/lo/logseq/electron-forge-package-instead-of-make.patch + create mode 100644 pkgs/by-name/lo/logseq/hardcode-git-paths.patch + create mode 100644 pkgs/by-name/lo/logseq/package.nix + +diff --git a/pkgs/by-name/lo/logseq/electron-forge-disable-signing.patch b/pkgs/by-name/lo/logseq/electron-forge-disable-signing.patch +new file mode 100644 +index 00000000000000..8f4d118c93d784 +--- /dev/null ++++ b/pkgs/by-name/lo/logseq/electron-forge-disable-signing.patch +@@ -0,0 +1,24 @@ ++diff --git a/resources/forge.config.js b/resources/forge.config.js ++index 5a349a2..f967102 100644 ++--- a/resources/forge.config.js +++++ b/resources/forge.config.js ++@@ -13,19 +13,6 @@ module.exports = { ++ "schemes": "logseq" ++ } ++ ], ++- osxSign: { ++- identity: 'Developer ID Application: Tiansheng Qin', ++- 'hardened-runtime': true, ++- entitlements: 'entitlements.plist', ++- 'entitlements-inherit': 'entitlements.plist', ++- 'signature-flags': 'library' ++- }, ++- osxNotarize: { ++- tool: 'notarytool', ++- appleId: process.env['APPLE_ID'], ++- appleIdPassword: process.env['APPLE_ID_PASSWORD'], ++- teamId: process.env['APPLE_TEAM_ID'] ++- }, ++ }, ++ makers: [ ++ { +diff --git a/pkgs/by-name/lo/logseq/electron-forge-package-instead-of-make.patch b/pkgs/by-name/lo/logseq/electron-forge-package-instead-of-make.patch +new file mode 100644 +index 00000000000000..480fedd2f18eb2 +--- /dev/null ++++ b/pkgs/by-name/lo/logseq/electron-forge-package-instead-of-make.patch +@@ -0,0 +1,13 @@ ++diff --git a/resources/package.json b/resources/package.json ++index 3445cbb..03927d4 100644 ++--- a/resources/package.json +++++ b/resources/package.json ++@@ -10,7 +10,7 @@ ++ "scripts": { ++ "electron:dev": "electron-forge start", ++ "electron:debug": "electron-forge start --inspect-electron", ++- "electron:make": "electron-forge make", +++ "electron:make": "electron-forge package", ++ "electron:make-linux-arm64": "electron-forge make --platform=linux --arch=arm64", ++ "electron:make-macos-arm64": "electron-forge make --platform=darwin --arch=arm64", ++ "electron:publish:github": "electron-forge publish", +diff --git a/pkgs/by-name/lo/logseq/hardcode-git-paths.patch b/pkgs/by-name/lo/logseq/hardcode-git-paths.patch +new file mode 100644 +index 00000000000000..3de53ab57baaa2 +--- /dev/null ++++ b/pkgs/by-name/lo/logseq/hardcode-git-paths.patch +@@ -0,0 +1,98 @@ ++diff --git a/bb.edn b/bb.edn ++index 76e1ba1..43d2c73 100644 ++--- a/bb.edn +++++ b/bb.edn ++@@ -4,8 +4,7 @@ ++ {:mvn/version "0.10.0"} ++ logseq/bb-tasks ++ #_{:local/root "../bb-tasks"} ++- {:git/url "https://github.com/logseq/bb-tasks" ++- :git/sha "70d3edeb287f5cec7192e642549a401f7d6d4263"} +++ {:local/root "@bb_tasks_src@"} ++ logseq/graph-parser ++ {:local/root "deps/graph-parser"} ++ org.clj-commons/digest ++diff --git a/deps.edn b/deps.edn ++index 9fb41e5..2b45436 100644 ++--- a/deps.edn +++++ b/deps.edn ++@@ -11,8 +11,7 @@ ++ cljs-bean/cljs-bean {:mvn/version "1.5.0"} ++ prismatic/dommy {:mvn/version "1.1.0"} ++ org.clojure/core.match {:mvn/version "1.0.0"} ++- com.andrewmcveigh/cljs-time {:git/url "https://github.com/logseq/cljs-time" ;; fork ++- :sha "5704fbf48d3478eedcf24d458c8964b3c2fd59a9"} +++ com.andrewmcveigh/cljs-time {:local/root "@cljs_time_src@"} ++ cljs-drag-n-drop/cljs-drag-n-drop {:mvn/version "0.1.0"} ++ cljs-http/cljs-http {:mvn/version "0.1.46"} ++ org.babashka/sci {:mvn/version "0.3.2"} ++diff --git a/deps/common/bb.edn b/deps/common/bb.edn ++index 3188222..1dba8a9 100644 ++--- a/deps/common/bb.edn +++++ b/deps/common/bb.edn ++@@ -2,8 +2,7 @@ ++ :deps ++ {logseq/bb-tasks ++ #_{:local/root "../../../bb-tasks"} ++- {:git/url "https://github.com/logseq/bb-tasks" ++- :git/sha "70d3edeb287f5cec7192e642549a401f7d6d4263"}} +++ {:local/root "@bb_tasks_src@"}} ++ ++ :pods ++ {clj-kondo/clj-kondo {:version "2023.05.26"}} ++diff --git a/deps/db/bb.edn b/deps/db/bb.edn ++index 2bf0931..e3d5ea8 100644 ++--- a/deps/db/bb.edn +++++ b/deps/db/bb.edn ++@@ -3,8 +3,7 @@ ++ :deps ++ {logseq/bb-tasks ++ #_{:local/root "../../../bb-tasks"} ++- {:git/url "https://github.com/logseq/bb-tasks" ++- :git/sha "70d3edeb287f5cec7192e642549a401f7d6d4263"}} +++ {:local/root "@bb_tasks_src@"}} ++ ++ :pods ++ {clj-kondo/clj-kondo {:version "2023.05.26"}} ++diff --git a/deps/graph-parser/bb.edn b/deps/graph-parser/bb.edn ++index 5093ff5..9cb7c54 100644 ++--- a/deps/graph-parser/bb.edn +++++ b/deps/graph-parser/bb.edn ++@@ -2,8 +2,7 @@ ++ :deps ++ {logseq/bb-tasks ++ #_{:local/root "../../../bb-tasks"} ++- {:git/url "https://github.com/logseq/bb-tasks" ++- :git/sha "70d3edeb287f5cec7192e642549a401f7d6d4263"}} +++ {:local/root "@bb_tasks_src@"}} ++ ++ :pods ++ {clj-kondo/clj-kondo {:version "2023.05.26"}} ++diff --git a/deps/graph-parser/deps.edn b/deps/graph-parser/deps.edn ++index 4675c30..57abe35 100644 ++--- a/deps/graph-parser/deps.edn +++++ b/deps/graph-parser/deps.edn ++@@ -1,8 +1,7 @@ ++ {:paths ["src"] ++ :deps ++ ;; External deps should be kept in sync with https://github.com/logseq/nbb-logseq/blob/main/bb.edn ++- {com.andrewmcveigh/cljs-time {:git/url "https://github.com/logseq/cljs-time" ;; fork ++- :sha "5704fbf48d3478eedcf24d458c8964b3c2fd59a9"} +++ {com.andrewmcveigh/cljs-time {:local/root "@cljs_time_src@"} ++ ;; local deps ++ logseq/db {:local/root "../db"} ++ logseq/common {:local/root "../common"} ++diff --git a/deps/publishing/bb.edn b/deps/publishing/bb.edn ++index 878757b..2fce25a 100644 ++--- a/deps/publishing/bb.edn +++++ b/deps/publishing/bb.edn ++@@ -2,8 +2,7 @@ ++ :deps ++ {logseq/bb-tasks ++ #_{:local/root "../../../bb-tasks"} ++- {:git/url "https://github.com/logseq/bb-tasks" ++- :git/sha "70d3edeb287f5cec7192e642549a401f7d6d4263"}} +++ {:local/root "@bb_tasks_src@"}} ++ ++ :pods ++ {clj-kondo/clj-kondo {:version "2023.05.26"}} +diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix +new file mode 100644 +index 00000000000000..bc7287d0cf6be0 +--- /dev/null ++++ b/pkgs/by-name/lo/logseq/package.nix +@@ -0,0 +1,292 @@ ++{ ++ lib, ++ stdenv, ++ ++ fetchFromGitHub, ++ fetchYarnDeps, ++ replaceVars, ++ runCommand, ++ writeShellScriptBin, ++ ++ copyDesktopItems, ++ cctools, ++ clojure, ++ makeDesktopItem, ++ makeWrapper, ++ nodejs, ++ removeReferencesTo, ++ yarnBuildHook, ++ yarnConfigHook, ++ xcbuild, ++ zip, ++ ++ electron, ++ git, ++}: ++ ++let ++ # unpack tarball containing electron's headers ++ electron-headers = runCommand "electron-headers" { } '' ++ mkdir -p $out ++ tar -C $out --strip-components=1 -xvf ${electron.headers} ++ ''; ++in ++ ++stdenv.mkDerivation (finalAttrs: { ++ pname = "logseq"; ++ version = "0.10.9-unstable-2025-03-11"; ++ ++ src = fetchFromGitHub { ++ owner = "logseq"; ++ repo = "logseq"; ++ rev = "ac0a0dae727c46b348d0f1410138d5e49d446692"; ++ hash = "sha256-esCB51BeWnni/JFL4yMKcJj5lka2+hLpcvWGify0T2o="; ++ }; ++ ++ patches = [ ++ (replaceVars ./hardcode-git-paths.patch { ++ cljs_time_src = fetchFromGitHub { ++ owner = "logseq"; ++ repo = "cljs-time"; ++ rev = "5704fbf48d3478eedcf24d458c8964b3c2fd59a9"; ++ hash = "sha256-IApL+SEm7AhbTN7J/1KiAKTx7rd53hchRh3jmPQ412g="; ++ }; ++ bb_tasks_src = fetchFromGitHub { ++ owner = "logseq"; ++ repo = "bb-tasks"; ++ rev = "70d3edeb287f5cec7192e642549a401f7d6d4263"; ++ hash = "sha256-xVJj5XCkqfaNjnhYZkuqTSJN0ry8UVMaN44r9pxggB0="; ++ }; ++ }) ++ ++ ./electron-forge-package-instead-of-make.patch ++ ./electron-forge-disable-signing.patch ++ ]; ++ ++ mavenRepo = stdenv.mkDerivation { ++ name = "logseq-${finalAttrs.version}-maven-deps"; ++ inherit (finalAttrs) src patches; ++ ++ nativeBuildInputs = [ clojure ]; ++ ++ buildPhase = '' ++ runHook preBuild ++ ++ export HOME="$(mktemp -d)" ++ mkdir -p "$out" ++ ++ # -P -> resolve all normal deps ++ # -M:alias -> resolve extra-deps of the listed aliases ++ clj -Sdeps "{:mvn/local-repo \"$out\"}" -P -M:cljs ++ ++ runHook postBuild ++ ''; ++ ++ # copied from buildMavenPackage ++ # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside ++ installPhase = '' ++ runHook preInstall ++ ++ find $out -type f \( \ ++ -name \*.lastUpdated \ ++ -o -name resolver-status.properties \ ++ -o -name _remote.repositories \) \ ++ -delete ++ ++ runHook postInstall ++ ''; ++ ++ dontFixup = true; ++ ++ outputHash = "sha256-gcq9zP5AQtpZU7sC9Oq3PkTj6uDo2NSShigkcuglV98="; ++ outputHashMode = "recursive"; ++ outputHashAlgo = "sha256"; ++ }; ++ ++ yarnOfflineCacheRoot = fetchYarnDeps { ++ name = "logseq-${finalAttrs.version}-yarn-deps-root"; ++ inherit (finalAttrs) src; ++ hash = "sha256-z4G675kxfpmG2AJlbK5bfeUUgX7jz1ys2FlMNHJqrQ4="; ++ }; ++ ++ # ./static and ./resources are combined into ./static by the build process ++ # ./static contains the lockfile and ./resources contains everything else ++ yarnOfflineCacheStaticResources = fetchYarnDeps { ++ name = "logseq-${finalAttrs.version}-yarn-deps-static-resources"; ++ inherit (finalAttrs) src; ++ sourceRoot = "${finalAttrs.src.name}/static"; ++ hash = "sha256-xuZj2EKHxvkiDPKMLh3ZSvLT54k+buHqg9lRTFv8rNI="; ++ }; ++ ++ yarnOfflineCacheAmplify = fetchYarnDeps { ++ name = "logseq-${finalAttrs.version}-yarn-deps-amplify"; ++ inherit (finalAttrs) src; ++ sourceRoot = "${finalAttrs.src.name}/packages/amplify"; ++ hash = "sha256-IOhSwIf5goXCBDGHCqnsvWLf3EUPqq75xfQg55snIp4="; ++ }; ++ ++ yarnOfflineCacheTldraw = fetchYarnDeps { ++ name = "logseq-${finalAttrs.version}-yarn-deps-tldraw"; ++ inherit (finalAttrs) src; ++ sourceRoot = "${finalAttrs.src.name}/tldraw"; ++ hash = "sha256-CtMl3MPlyO5nWfFhCC1SLb/+1HUM3YfFATAPqJg3rUo="; ++ }; ++ ++ strictDeps = true; ++ ++ nativeBuildInputs = ++ let ++ clojureWithCache = writeShellScriptBin "clojure" '' ++ exec ${lib.getExe' clojure "clojure"} -Sdeps '{:mvn/local-repo "${finalAttrs.mavenRepo}"}' "$@" ++ ''; ++ ++ # the build process runs `git describe --long --always --dirty` ++ fakeGit = writeShellScriptBin "git" '' ++ echo "${finalAttrs.src.rev or finalAttrs.version}@nixpkgs" ++ ''; ++ in ++ [ ++ clojureWithCache ++ copyDesktopItems ++ fakeGit ++ makeWrapper ++ nodejs ++ (nodejs.python.withPackages (ps: [ ps.setuptools ])) ++ removeReferencesTo ++ yarnBuildHook ++ yarnConfigHook ++ zip ++ ] ++ ++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ cctools ++ xcbuild ++ ]; ++ ++ # we'll run the hook manually multiple times ++ dontYarnInstallDeps = true; ++ ++ env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; ++ ++ postConfigure = '' ++ yarnOfflineCache="$yarnOfflineCacheRoot" yarnConfigHook ++ ++ cp resources/package.json static/package.json ++ pushd static ++ yarnOfflineCache="$yarnOfflineCacheStaticResources" yarnConfigHook ++ popd ++ ++ pushd packages/amplify ++ yarnOfflineCache="$yarnOfflineCacheAmplify" yarnConfigHook ++ popd ++ ++ pushd tldraw ++ cp yarn.lock apps/tldraw-logseq/yarn.lock ++ yarnOfflineCache="$yarnOfflineCacheTldraw" yarnConfigHook ++ pushd apps/tldraw-logseq ++ yarnOfflineCache="$yarnOfflineCacheTldraw" yarnConfigHook ++ popd ++ popd ++ ++ # this has to be done after everything is set up, because for some reason ++ # the shebangs somehow get unpatched... I don't know why... ++ patchShebangs node_modules ++ patchShebangs static/node_modules ++ patchShebangs packages/amplify/node_modules ++ patchShebangs tldraw/node_modules ++ patchShebangs tldraw/apps/tldraw-logseq/node_modules ++ ++ yarn --offline --cwd tldraw postinstall ++ yarn --offline --cwd packages/amplify postinstall ++ ++ export npm_config_nodedir=${electron-headers} ++ ++ pushd static ++ ++ # we want to use our own git, don't try downloading it ++ substituteInPlace node_modules/dugite/package.json \ ++ --replace-fail '"postinstall"' '"_postinstall"' ++ ++ # this doesn't seem to build with electron-headers ++ rm node_modules/macos-alias/binding.gyp ++ ++ # the electron-rebuild command deadlocks for some reason, let's just use normal npm rebuild (since we overrode the nodedir anyways) ++ npm rebuild --verbose ++ ++ # remove most references to electron-headers ++ # TODO: track down the remaining references ++ find node_modules -type f \( -name "*.target.mk" -o -name "config.gypi" -o -name "Makefile" \) -delete ++ ++ popd ++ ++ cp -r ${electron.dist} electron-dist ++ chmod -R u+w electron-dist ++ ++ pushd electron-dist ++ zip -0Xqr ../electron.zip . ++ popd ++ ++ rm -r electron-dist ++ ++ substituteInPlace static/node_modules/@electron/packager/dist/packager.js \ ++ --replace-fail "await this.getElectronZipPath(downloadOpts)" "\"$(pwd)/electron.zip\"" ++ ++ cp -r static/node_modules resources/node_modules ++ ''; ++ ++ yarnBuildScript = "release-electron"; ++ ++ installPhase = ++ '' ++ runHook preInstall ++ ++ # remove references to nodejs ++ find static/out/*/resources/app/node_modules -type f -executable -exec remove-references-to -t ${nodejs} '{}' \; ++ '' ++ + lib.optionalString stdenv.hostPlatform.isLinux '' ++ install -Dm644 static/icons/logseq.png "$out/share/icons/hicolor/512x512/apps/logseq.png" ++ ++ mkdir -p $out/share/logseq ++ cp -r static/out/*/{locales,resources{,.pak}} $out/share/logseq ++ ++ makeWrapper ${lib.getExe electron} $out/bin/logseq \ ++ --add-flags $out/share/logseq/resources/app \ ++ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ ++ --set-default LOCAL_GIT_DIRECTORY ${git} \ ++ --inherit-argv0 ++ '' ++ + lib.optionalString stdenv.hostPlatform.isDarwin '' ++ mkdir -p $out/Applications ++ cp -r static/out/*/Logseq.app $out/Applications ++ ++ wrapProgram $out/Applications/Logseq.app/Contents/MacOS/Logseq \ ++ --set-default LOCAL_GIT_DIRECTORY ${git} ++ ++ makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/logseq ++ '' ++ + '' ++ runHook postInstall ++ ''; ++ ++ desktopItems = [ ++ (makeDesktopItem { ++ name = "Logseq"; ++ desktopName = "Logseq"; ++ exec = "logseq %U"; ++ terminal = false; ++ icon = "logseq"; ++ startupWMClass = "Logseq"; ++ comment = "A privacy-first, open-source platform for knowledge management and collaboration."; ++ mimeTypes = [ "x-scheme-handler/logseq" ]; ++ categories = [ "Utility" ]; ++ }) ++ ]; ++ ++ meta = { ++ description = "Privacy-first, open-source platform for knowledge management and collaboration"; ++ homepage = "https://github.com/logseq/logseq"; ++ license = lib.licenses.agpl3Only; ++ maintainers = with lib.maintainers; [ tomasajt ]; ++ mainProgram = "logseq"; ++ platforms = electron.meta.platforms; ++ }; ++}) +diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix +index ab6fcfff4c273a..67bdab40630e61 100644 +--- a/pkgs/top-level/aliases.nix ++++ b/pkgs/top-level/aliases.nix +@@ -919,7 +919,6 @@ mapAliases { + lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17 + loc = throw "'loc' has been removed due to lack of upstream maintenance. Consider 'tokei' as an alternative."; # Added 2025-01-25 + loco-cli = loco; # Added 2025-02-24 +- logseq = throw "logseq has been removed, due to lack of maintenance and blocking the Electron 27 removal."; # Added 2025-02-24 + loop = throw "'loop' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 + luna-icons = throw "luna-icons has been removed as it was removed upstream"; # Added 2024-10-29 + lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 diff --git a/packages/patches/pyprland.patch b/packages/patches/pyprland.patch @@ -0,0 +1,31 @@ +From 38b8cafd5546e26279542400c68888a97aa73207 Mon Sep 17 00:00:00 2001 +From: John Titor <50095635+JohnRTitor@users.noreply.github.com> +Date: Mon, 24 Mar 2025 12:41:45 +0000 +Subject: [PATCH] pyprland: 2.4.3 -> 2.4.4 + +--- + pkgs/by-name/py/pyprland/package.nix | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix +index 00fcd1b4b052ed..3a1b8c5da185eb 100644 +--- a/pkgs/by-name/py/pyprland/package.nix ++++ b/pkgs/by-name/py/pyprland/package.nix +@@ -7,7 +7,7 @@ + + python3Packages.buildPythonApplication rec { + pname = "pyprland"; +- version = "2.4.3"; ++ version = "2.4.4"; + format = "pyproject"; + + disabled = python3Packages.pythonOlder "3.10"; +@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { + owner = "hyprland-community"; + repo = "pyprland"; + tag = version; +- hash = "sha256-0vI8f5XXYi7LG6wMH2Uw05pDbozO2eBzLCuaCHBY7BQ="; ++ hash = "sha256-Vj4Gn9zV0opvLaaMGv8zdS4tYqek0z6ppAhY+nnY6FM="; + }; + + nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/site/content/anime.md b/site/content/anime.md @@ -9,9 +9,10 @@ comments = true # Seen +- 100 Kanojo <sup>#</sup> <sup>\*</sup> - 3D Kanojo -- 86 <sup>\*</sup> <sup>#</sup> -- 100 Kanojo <sup>\*</sup> <sup>#</sup> +- 86 <sup>#</sup> <sup>\*</sup> +- 100 Kanojo <sup>#</sup> <sup>\*</sup> - A Condition called Love - A Sign of Affection - A Silent Voice @@ -21,16 +22,21 @@ comments = true - Ao can't Study - Assassination Classroom <sup>#</sup> - Bloom into You -- BLUE LOCK <sup>\*</sup> +- Blue Archive +- Blue Box <sup>\*</sup> +- BLUE LOCK <sup>#</sup> <sup>\*</sup> - Bottom-Tier Character Tomozaki <sup>#</sup> - Bunny Girl Senpai <sup>#</sup> +- Can you keep a Secret? +- Chivalry of a Failed Knight - Chuunibyou demo Koi ga Shitai! <sup>#</sup> - Clannad <sup>#</sup> - Classroom of the Elite <sup>#</sup> <sup>\*</sup> - Daily Life of an Immortal King <sup>#</sup> +- Dandadan <sup>#</sup> <sup>\*</sup> - Danna ga Nani o Itteiru ka Wakaranai Ken - Darling in the Franxx -- Date a Live <sup>\*</sup> <sup>#</sup> +- Date a Live <sup>#</sup> <sup>\*</sup> - Death Note - Demon Slayer - Domestic Girlfriend @@ -40,34 +46,37 @@ comments = true - Fruits Basket <sup>#</sup> - Fuufu Ijou, Koibito Miman <sup>\*</sup> - Gekkan Shoujo Nozaki-kun +- Giji Harem - Golden Time - Heavenly Delusion <sup>\*</sup> - Higehiro - Horimiya +- How I attended an All-Guy's Mixer - I Got a Cheat Skill in Another World and Became Unrivaled in The Real World, Too - I Want To Eat Your Pancreas -- Ijinaraide, Nagatoro-san <sup>\*</sup> <sup>#</sup> +- Ijinaraide, Nagatoro-san <sup>#</sup> <sup>\*</sup> - Insomniacs after School +- Jiisan Basan Wakagaeru - Kaiju No. 8 <sup>\*</sup> - Kaguya-sama: Love is War <sup>#</sup> - Kakegurui <sup>#</sup> - Kakkou no Iinazuke - Kanojo mo Kanojo <sup>#</sup> - Kawaii dake ja nai Shikimori-san -- Kimi ni Todoke +- Kimi ni Todoke <sup>#</sup> - Kimi no Na Wa - Koiseka - Kokoro Connect -- Komi Can't Communicate <sup>\*</sup> <sup>#</sup> -- Konosuba: God's Blessing on this Wonderful World <sup>\*</sup> <sup>#</sup> +- Komi Can't Communicate <sup>#</sup> <sup>\*</sup> +- Konosuba: God's Blessing on this Wonderful World <sup>#</sup> <sup>\*</sup> - Koori Zokusei Danshi to Cool na Douryou Joshi - Liar Liar <sup>\*</sup> -- Link Click <sup>\*</sup> <sup>#</sup> +- Link Click <sup>#</sup> <sup>\*</sup> - Lycoris Recoil <sup>\*</sup> - Mahoutsukai no Yome <sup>#</sup> <sup>\*</sup> - Masamune's Revenge <sup>#</sup> - Mashle: Magic and Muscles <sup>#</sup> <sup>\*</sup> -- My Dress Up Darling <sup>\*</sup> +- My Dress-Up Darling <sup>#</sup> - My Happy Marriage <sup>#</sup> <sup>\*</sup> - My Senpai is Annoying - Mushoku Tensei <sup>#</sup> <sup>\*</sup> @@ -77,23 +86,33 @@ comments = true - Oregairu <sup>#</sup> - Plastic Memories - Prison School +- Ranma 1/2 <sup>\*</sup> - ReLIFE <sup>#</sup> - Rent-a-Girlfriend <sup>#</sup> - RikeKoi <sup>#</sup> +- Romantic Killer <sup>\*</sup> +- Saenai Heroine no Sodatekata <sup>#</sup> - Sankarea - Saint Cecilia and Pastor Lawrence <sup>\*</sup> - Scums Wish - Sekai Saikou no Ansatsusha, Isekai Kizoku ni Tensei suru <sup>\*</sup> - Senryu Girl +- Shikanoko Nokonoko Koshitantan +- Shinigami Bocchan to Kuro Maid <sup>#</sup> - Snow White with Red Hair <sup>#</sup> +- Solo Leveling <sup>#</sup> <sup>\*</sup> - Spice and Wolf <sup>#</sup> -- Spy X Family <sup>\*</sup> <sup>#</sup> +- Spy X Family <sup>#</sup> <sup>\*</sup> - Steins;Gate <sup>#</sup> - Suki na Ko ga Megane wo Wasureta - Suzume's Door Locking - Sword Art Online <sup>#</sup> -- The Ancient Magus' Bride <sup>\*</sup> <sup>#</sup> +- Tengoku Daimakyou <sup>\*</sup> +- That time I got reincarnated as a Slime <sup>#</sup> <sup>\*</sup> +- The Ancient Magus' Bride <sup>#</sup> <sup>\*</sup> +- The Angel next door Spoils me rotten <sup>\*</sup> - The Dangers in My Heart <sup>\*</sup> +- The Irregular at Magic High School <sup>#</sup> <sup>\*</sup> - The Pet Girl of Sakurasou <sup>\*</sup> - The Quintessential Quintuplets <sup>#</sup> - Tomodachi Game <sup>\*</sup> @@ -102,7 +121,7 @@ comments = true - ToraDora! - Tsuki ga Kirei - Tsurezure Children -- Uzaki-chan wa Asobitai! <sup>\*</sup> <sup>#</sup> +- Uzaki-chan wa Asobitai! <sup>#</sup> <sup>\*</sup> - Violet Evergarden <sup>#</sup> - Vermeil in Gold <sup>\*</sup> - Weathering With You @@ -113,15 +132,12 @@ comments = true - Yosuga no Sora - Your Lie in April - Yuri on Ice! -- Zom 100: Bucket List of the Dead <sup>\*</sup> <sup>#</sup> - -# Airing - -- Blue Box +- Zom 100: Bucket List of the Dead <sup>#</sup> <sup>\*</sup> # Wishlist - [x] Assassination Classroom +- [x] Bocchi the Rock! - [x] Food Wars - [x] Engaged to the Unidentified - [ ] Hyouka @@ -129,7 +145,7 @@ comments = true - [x] Chainsaw Man - [ ] Jujutsu Kaisen <sup>#</sup> - [x] Tokyo Revengers <sup>#</sup> -- [ ] Attack on Titan <sup>#</sup> +- [x] Attack on Titan <sup>#</sup> - [ ] A Place Further than the Universe --- diff --git a/site/sass/_main.scss b/site/sass/_main.scss @@ -8,7 +8,11 @@ html { body { background-color: var(--background); color: var(--color); - font-family: "JetBrainsMono", Menlo, DejaVu Sans Mono, monospace; + font-family: + "JetBrainsMono", + Menlo, + DejaVu Sans Mono, + monospace; font-feature-settings: "liga"; font-size: $font-size; line-height: 1.54; diff --git a/site/sass/_post.scss b/site/sass/_post.scss @@ -153,7 +153,11 @@ blockquote { background: var(--accent-alpha-20); border-radius: $corner-radius; color: var(--accent-secondary); - font-family: "JetBrainsMono", Menlo, DejaVu Sans Mono, monospace; + font-family: + "JetBrainsMono", + Menlo, + DejaVu Sans Mono, + monospace; font-feature-settings: normal; font-size: 0.95rem; margin: 0 2px; @@ -163,7 +167,11 @@ blockquote { pre { border: 1px solid var(--border-color); border-radius: $corner-radius; - font-family: "JetBrainsMono", Menlo, DejaVu Sans Mono, monospace; + font-family: + "JetBrainsMono", + Menlo, + DejaVu Sans Mono, + monospace; font-size: 0.95rem; overflow: auto; padding: 15px 10px;