dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit fadfd5032f381cbe66b749da3d36fa987b9aa59f parent 83270c710f69f0852a237f2e9359358fd73b2d6a Author: maydayv7 <maydayv7@gmail.com> Date: Tue, 1 Apr 2025 22:22:28 +0530 feat: Hyprland Update Also fix Install Media Build
Diffstat:
23 files changed, 630 insertions(+), 139 deletions(-)
diff --git a/README.md b/README.md @@ -127,7 +127,7 @@ $ nix flake show github:maydayv7/dotfiles ├───apps │ └───x86_64-linux -│ ├───default: app +│ ├───hyprutils: app │ ├───install: app │ └───nixos: app ├───checks @@ -139,7 +139,7 @@ github:maydayv7/dotfiles │ └───x86_64-linux │ ├───cc: development environment 'C' │ ├───default: development environment 'devShell' -│ ├───format: development environment 'Formatter' +│ ├───format: development environment 'nix-shell' │ ├───java: development environment 'Java' │ ├───lua: development environment 'Lua' │ ├───python: development environment 'Python' @@ -152,7 +152,7 @@ github:maydayv7/dotfiles │ └───x86_64-linux: package 'treefmt' ├───installMedia: device install media ├───legacyPackages -│ └───x86_64-linux (References 'stable' channel) +│ └───x86_64-linux (Default package channel) ├───lib: utility library functions ├───nixosConfigurations │ ├───futura: NixOS configuration @@ -161,8 +161,10 @@ github:maydayv7/dotfiles ├───overlays ├───packages │ └───x86_64-linux -│ ├───install: package 'install' -│ └───nixos: package 'nixos' +│ ├───install: package 'os-install' +│ ├───nixos: package 'nixos' +│ └───website: package 'website-stable' +├───systems: supported architectures └───templates └───default: template: My NixOS Configuration ``` diff --git a/devices/flake.nix b/devices/flake.nix @@ -16,14 +16,13 @@ in { installMedia = listToAttrs (builtins.map (name: nameValuePair name (build.device { - format = "iso"; description = "Install Media"; + format = "iso"; # Region timezone = "Asia/Kolkata"; locale = "IN"; - kernelModules = ["nvme"]; kernel = "lts"; gui.desktop = name + "-iso"; diff --git a/files/hyprland/kebihelp.json b/files/hyprland/kebihelp.json @@ -405,7 +405,7 @@ }, { "value": "ALT SHIFT Q", - "label": "Minimize Submap" + "label": "Minimized Submap" }, { "value": "Return or L'", diff --git a/files/hyprland/theme/waybar.css b/files/hyprland/theme/waybar.css @@ -58,12 +58,17 @@ window#waybar { background-color: @base08; } +.modules-left #window { + color: @base0C; + background-color: transparent; +} + #taskbar button.active { - background: @base03; + background: @base0C; } #taskbar button.minimized { - border: 2px solid @base03; + border: 2px solid @base0C; } #taskbar button.urgent { diff --git a/flake.lock b/flake.lock @@ -1,5 +1,38 @@ { "nodes": { + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1742213273, + "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -178,6 +211,23 @@ } }, "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=", @@ -192,7 +242,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1673956053, @@ -352,7 +402,7 @@ "stylix", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore_3", "nixpkgs": [ "stylix", "nixpkgs" @@ -397,6 +447,28 @@ "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" @@ -468,6 +540,342 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1742215578, + "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprdark": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nix-filter": [ + "filters" + ] + }, + "locked": { + "lastModified": 1743255810, + "narHash": "sha256-Kochs2yJlTCh4ntLxUXQZz1F379b3EHTm+mwV5u2VOk=", + "owner": "micha4w", + "repo": "Hypr-DarkWindow", + "rev": "fdc621bc6e3c00f6253a9f2ae8b565d684d78098", + "type": "github" + }, + "original": { + "owner": "micha4w", + "repo": "Hypr-DarkWindow", + "type": "github" + } + }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", + "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", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks", + "systems": [ + "systems" + ], + "xdph": "xdph" + }, + "locked": { + "lastModified": 1743463509, + "narHash": "sha256-JASYdXTJovrTgT04ATMGpRruvY4+lrdhAkoPhPPb+h4=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "d1a59ec39eb4c0d6a7d3d38a26f8924e6bca5cef", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1743339740, + "narHash": "sha256-G6a7R/gb1xH0yI2uevTmDpxZf6rvMh1lOu0gYrqVu5U=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "6dca4ece21864e329394b81cfc767778089097e2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-qt-support": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "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", + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-qtutils", + "hyprlang", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1739048983, + "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1741191527, + "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprsplit": { + "inputs": { + "hyprland": [ + "hyprland" + ] + }, + "locked": { + "lastModified": 1742760110, + "narHash": "sha256-FTp5mkrrgo/plCFHuFnx+EtDnQQoChq0mdKpb2a4LrQ=", + "owner": "shezdy", + "repo": "hyprsplit", + "rev": "a451db4f300031b137af4064a22c80516467abb2", + "type": "github" + }, + "original": { + "owner": "shezdy", + "repo": "hyprsplit", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1741534688, + "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1739870480, + "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "impermanence": { "locked": { "lastModified": 1737831083, @@ -558,6 +966,29 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore_2", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -618,6 +1049,10 @@ "generators": "generators", "hardware": "hardware", "home-manager": "home-manager", + "hyprdark": "hyprdark", + "hyprland": "hyprland", + "hyprland-plugins": "hyprland-plugins", + "hyprsplit": "hyprsplit", "impermanence": "impermanence", "index": "index", "nixpkgs": [ @@ -722,7 +1157,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-utils": [ "utils" ], @@ -973,7 +1408,7 @@ }, "windows": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "nixpkgs": [ "unstable" ] @@ -991,6 +1426,47 @@ "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": 1741934139, + "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix @@ -171,6 +171,35 @@ url = "github:emmanuelrosa/erosanix"; inputs.nixpkgs.follows = "unstable"; }; + + ## Hyprland + # Core + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs = { + nixpkgs.follows = "nixpkgs"; + systems.follows = "systems"; + }; + }; + + # Plugins + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.hyprland.follows = "hyprland"; + }; + + hyprsplit = { + url = "github:shezdy/hyprsplit"; + inputs.hyprland.follows = "hyprland"; + }; + + hyprdark = { + url = "github:micha4w/Hypr-DarkWindow"; + inputs = { + hyprland.follows = "hyprland"; + nix-filter.follows = "filters"; + }; + }; }; ## Configuration ## diff --git a/modules/apps/office.nix b/modules/apps/office.nix @@ -26,6 +26,16 @@ in { obs-source-switcher ]; }; + + chromium = { + enable = true; + extensions = [ + "cjpalhdlnbpafiamejdnhcphjbkeiagm" # UBlock Origin + "djflhoibgkdhkhhcedjiklpkjnoahfmg" # User Agent Switcher + "lckanjgmijmafbedllaakclkaicjfmnk" # ClearURLs + "oofgbpoabipfcfjapgnbbjjaenockbdp" # SetupVPN + ]; + }; }; environment.systemPackages = with pkgs; [ diff --git a/modules/configuration.nix b/modules/configuration.nix @@ -87,25 +87,24 @@ in then [user] else users ) - ++ ( - if (format != null) - then [(getAttr format inputs.generators.nixosModules)] - else [] - ) ++ util.map.array (hardware.modules or []) inputs.hardware.nixosModules ++ ( - if (format == "iso") + if (format != null) then [ - { - environment.systemPackages = [pkgs.custom.install]; + (getAttr format inputs.generators.nixosModules) + ( + if (format == "iso") + then { + image.baseName = lib.mkForce "nixos"; + environment.systemPackages = [pkgs.custom.install]; - # Disabled Modules - user.homeConfig = lib.mkForce {}; - sops.secrets = lib.mkForce {}; - } + # Disabled Modules + user.homeConfig = lib.mkForce {}; + sops.secrets = lib.mkForce {}; + } + else {environment.systemPackages = [pkgs.custom.nixos];} + ) ] - else if (format != "iso") - then [{environment.systemPackages = [pkgs.custom.nixos];}] else [] ); diff --git a/modules/gui/desktop/hyprland/apps/misc.nix b/modules/gui/desktop/hyprland/apps/misc.nix @@ -12,7 +12,7 @@ in { ## 3rd Party Apps Configuration user.homeConfig = { # Theme - imports = [inputs.catppuccin.homeManagerModules.catppuccin]; + imports = [inputs.catppuccin.homeModules.catppuccin]; catppuccin = with theme; { inherit accent; flavor = variant; diff --git a/modules/gui/desktop/hyprland/apps/notify.nix b/modules/gui/desktop/hyprland/apps/notify.nix @@ -46,7 +46,6 @@ mouse_right_click = "close_current"; offset = "5x5"; padding = 8; - plain_text = "no"; progress_bar_corner_radius = 10; separator_height = 1; show_indicators = false; @@ -57,10 +56,10 @@ fullscreen_delay.fullscreen = "delay"; utility = {appname = "utility";} // ignore; - power = + upower = { appname = "poweralertd"; - icon = "preferences-system-power"; + new_icon = "/run/current-system/sw/share/icons/${theme.icons.name}/24x24/apps/preferences-system-power.svg"; } // ignore; }; diff --git a/modules/gui/desktop/hyprland/apps/panel.nix b/modules/gui/desktop/hyprland/apps/panel.nix @@ -2,6 +2,7 @@ config, pkgs, files, + theme, ... }: { ## Panel Configuration @@ -38,12 +39,13 @@ "custom/logo" "group/users" "hyprland/workspaces" - "custom/minimize" + "hyprland/submap" + "hyprland/window" ]; modules-center = [ - "hyprland/window" - "hyprland/submap" + "wlr/taskbar" + "custom/minimized" ]; modules-right = [ @@ -90,7 +92,7 @@ format = "<small>{name}</small>{icon}"; on-scroll-up = "hyprctl dispatch workspace m+1"; on-scroll-down = "hyprctl dispatch workspace m-1"; - ignore-workspaces = ["special:scratch_.*" "special:minimize"]; + ignore-workspaces = ["special:scratch_.*" "special:minimized"]; format-icons = { default = ""; special = " "; @@ -106,11 +108,6 @@ }; }; - "custom/minimize" = { - format = ""; - on-click = "hyprutils toggle minimize"; - }; - "hyprland/submap" = { always-on = false; tooltip = false; @@ -119,11 +116,34 @@ }; "hyprland/window" = { - format = ""; - icon = true; + format = "{class}"; + icon = false; separate-outputs = true; }; + "wlr/taskbar" = { + format = "{icon}"; + icon-size = 20; + all-outputs = false; + active-first = false; + icon-theme = theme.icons.name; + markup = true; + tooltip-format = "Name: <big><b>{name}</b></big> <i>{short_state}</i>\nTitle: <b>{title}</b>"; + on-click = "activate"; + on-click-middle = "minimize"; + on-click-right = "close"; + ignore-list = [ + "kitty-clip" + "kitty-dropterm" + "ulauncher" + ]; + }; + + "custom/minimized" = { + format = ""; + on-click = "hyprutils toggle minimized"; + }; + "group/menu" = { orientation = "horizontal"; modules = ["custom/hide" "keyboard-state" "tray"]; diff --git a/modules/gui/desktop/hyprland/default.nix b/modules/gui/desktop/hyprland/default.nix @@ -34,8 +34,8 @@ in { enable = true; withUWSM = true; xwayland.enable = true; - package = pkgs.hyprland; - portalPackage = pkgs.xdg-desktop-portal-hyprland; + package = pkgs.hyprworld.hyprland; + portalPackage = pkgs.hyprworld.xdg-desktop-portal-hyprland; }; # Login diff --git a/modules/gui/desktop/hyprland/settings/keybindings.nix b/modules/gui/desktop/hyprland/settings/keybindings.nix @@ -73,8 +73,8 @@ _: { "$mod, L, exec, loginctl lock-session" # Window Minimization - "ALT, Q, movetoworkspacesilent, special:minimize" - "ALT SHIFT, Q, exec, hyprutils toggle minimize" + "ALT, Q, movetoworkspacesilent, special:minimized" + "ALT SHIFT, Q, exec, hyprutils toggle minimized" # Screenshot '', Print, exec, sh -c "pgrep slurp || grimblast --notify --freeze copysave area"'' @@ -175,7 +175,7 @@ _: { submap = reset # Window Minimization - submap = Minimize + submap = Minimized bind = , left, movefocus, l bind = , right, movefocus, r bind = , up, movefocus, u @@ -184,7 +184,7 @@ _: { bind = , Return, submap, reset bind = , mouse:272, movetoworkspace, +0 bind = , mouse:272, submap, reset - bind = , escape, togglespecialworkspace, minimize + bind = , escape, togglespecialworkspace, minimized bind = , escape, submap, reset submap = reset ''; 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.hyprlandPlugins; [ + plugins = with pkgs.hyprworld; [ hyprexpo hyprsplit - pkgs.custom.hyprdark + #!# Hypr-DarkWindow ]; settings = { @@ -34,7 +34,7 @@ "$mod, grave, hyprexpo:expo, toggle" # Color Inversion - "$mod, I, invertactivewindow" + #!# "$mod, I, invertactivewindow" ]; }; }; diff --git a/modules/gui/theme.nix b/modules/gui/theme.nix @@ -74,7 +74,10 @@ in { }; homeManagerIntegration.autoImport = true; - targets.plymouth.enable = false; + targets = { + plymouth.enable = false; + chromium.enable = false; + }; }; user.homeConfig.stylix = { diff --git a/packages/flake.nix b/packages/flake.nix @@ -49,6 +49,11 @@ 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}"; }) ]; }; diff --git a/packages/hyprdark/default.nix b/packages/hyprdark/default.nix @@ -1,33 +0,0 @@ -{ - 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 @@ -1,6 +0,0 @@ -{ - repo = "https://github.com/micha4w/Hypr-DarkWindow"; - release = false; - rev = "d08b7133fa7ea5d05f50bd7114f5bff3b563d6af"; - sha256 = "sha256-DdCP479AZdEAm+CQTJKcZeBWUW8cSDl92HxijQQgW+U="; -} diff --git a/packages/hyprshellevents/metadata.nix b/packages/hyprshellevents/metadata.nix @@ -1,5 +1,5 @@ { repo = "https://github.com/hyprwm/contrib"; - rev = "bd81329944be53b0ffb99e05864804b95f1d7c65"; - sha256 = "sha256-I8JVdQRu8eWvY5W8XWYZkdd5pojDHkxeqQV7mMIsbhs="; + rev = "bc2ad24e0b2e66c3e164994c4897cd94a933fd10"; + sha256 = "sha256-YItzk1pj8Kz+b7VlC9zN1pSZ6CuX35asYy3HuMQ3lBQ="; } diff --git a/packages/patches/hyprsplit.patch b/packages/patches/hyprsplit.patch @@ -1,29 +0,0 @@ -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 @@ -1,4 +1,4 @@ -From 882d96f3e755c91626ce769a22841e49e540f811 Mon Sep 17 00:00:00 2001 +From b457b39340679f8606312546887561fe0aa5fb02 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 @@ -7,9 +7,9 @@ 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/by-name/lo/logseq/package.nix | 296 ++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - - 5 files changed, 427 insertions(+), 1 deletion(-) + 5 files changed, 431 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 @@ -17,7 +17,7 @@ Subject: [PATCH] logseq: init at 0.10.9-unstable-2025-03-11 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 +index 0000000000000..8f4d118c93d78 --- /dev/null +++ b/pkgs/by-name/lo/logseq/electron-forge-disable-signing.patch @@ -0,0 +1,24 @@ @@ -47,7 +47,7 @@ index 00000000000000..8f4d118c93d784 + { 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 +index 0000000000000..480fedd2f18eb --- /dev/null +++ b/pkgs/by-name/lo/logseq/electron-forge-package-instead-of-make.patch @@ -0,0 +1,13 @@ @@ -66,7 +66,7 @@ index 00000000000000..480fedd2f18eb2 + "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 +index 0000000000000..3de53ab57baaa --- /dev/null +++ b/pkgs/by-name/lo/logseq/hardcode-git-paths.patch @@ -0,0 +1,98 @@ @@ -170,10 +170,10 @@ index 00000000000000..3de53ab57baaa2 + {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 +index 0000000000000..75b61ff080e88 --- /dev/null +++ b/pkgs/by-name/lo/logseq/package.nix -@@ -0,0 +1,292 @@ +@@ -0,0 +1,296 @@ +{ + lib, + stdenv, @@ -372,7 +372,11 @@ index 00000000000000..bc7287d0cf6be0 + patchShebangs tldraw/apps/tldraw-logseq/node_modules + + yarn --offline --cwd tldraw postinstall -+ yarn --offline --cwd packages/amplify postinstall ++ ++ export npm_config_nodedir=${nodejs} ++ pushd packages/amplify ++ npm rebuild --verbose ++ popd + + export npm_config_nodedir=${electron-headers} + @@ -467,7 +471,7 @@ index 00000000000000..bc7287d0cf6be0 + }; +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix -index ab6fcfff4c273a..67bdab40630e61 100644 +index ab6fcfff4c273..67bdab40630e6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -919,7 +919,6 @@ mapAliases { diff --git a/scripts/hyprutils.nix b/scripts/hyprutils.nix @@ -21,7 +21,7 @@ toggle fancy - Toggle Compositor Effects float - Toggle window floating in current workspace - minimize - Show minimized windows + minimized - Show minimized windows monitor - Toggle specified Monitor service ['name'] - Toggle SystemD Service shader - Toggle Compositor Shader @@ -31,12 +31,20 @@ daemon = builtins.toFile "daemon.sh" '' event_activespecial() { case "$WORKSPACENAME" in - special:minimize*) + special:minimized*) hyprctl dispatch submap reset - hyprctl dispatch submap Minimize + hyprctl dispatch submap Minimized ;; esac } + + event_minimized() { + WINDOW="address:0x$WINDOWADDRESS" + case "$MINIMIZED" in + 0) hyprctl dispatch movetoworkspace "+0, $WINDOW" ;; + 1) hyprctl dispatch movetoworkspacesilent "special:minimized, $WINDOW" ;; + esac + } ''; in recursiveUpdate { @@ -298,10 +306,10 @@ in hyprctl notify 1 2000 0 "Toggled window floating on Workspace $WORKSPACE" hyprctl dispatch workspaceopt allfloat ;; - "minimize") + "minimized") if hyprctl workspaces | grep "special:minimize" then - hyprctl dispatch workspace special:minimize + hyprctl dispatch workspace special:minimized else hyprctl notify 1 2000 0 "No minimized windows present" fi diff --git a/scripts/nixos.nix b/scripts/nixos.nix @@ -253,7 +253,7 @@ in elif grep -wq "$2" <<<"${nixosConfigurations}" &> /dev/null then echo "Building '$2' Device Image..." - nix build ${path.system}#nixosConfigurations."$2".config.formats.iso + nix build ${path.system}#nixosConfigurations."$2".config.formats.iso else error "Unknown Variant '$2'" "# Available Variants #\n Install Media: ${installMedia}\n Devices: ${nixosConfigurations}" fi