diff --git a/flake.lock b/flake.lock index b5e8af5..f31bd16 100644 --- a/flake.lock +++ b/flake.lock @@ -25,6 +25,39 @@ "type": "github" } }, + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1771610171, + "narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -152,6 +185,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -283,6 +332,28 @@ "type": "github" } }, + "gitignore": { + "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" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -344,10 +415,333 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1753964049, + "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1770511807, + "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "7c75487edd43a71b61adb01cae8326d277aab683", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "aquamarine": "aquamarine", + "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", + "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "pre-commit-hooks": "pre-commit-hooks", + "systems": "systems_3", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1772215399, + "narHash": "sha256-wfiduannx1mWvsGAfuMk8ipOU3AAFuJYPNV4D++dhPY=", + "ref": "refs/heads/main", + "rev": "0002f148c9a4fe421a9d33c0faa5528cdc411e62", + "revCount": 6935, + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" + } + }, + "hyprland-guiutils": { + "inputs": { + "aquamarine": [ + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1767023960, + "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1765214753, + "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1771866172, + "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprland-guiutils", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1771271487, + "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1770501770, + "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1771606233, + "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, "matugen": { "inputs": { "nixpkgs": "nixpkgs_3", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1769341810, @@ -429,11 +823,11 @@ }, "nixpkgs-xr": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2", "nvfetcher": "nvfetcher", - "systems": "systems_3", + "systems": "systems_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -488,7 +882,7 @@ "nixpkgs": [ "nixpkgs-unstable" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1768910181, @@ -580,6 +974,29 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771858127, + "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -587,6 +1004,7 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", + "hyprland": "hyprland", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", @@ -611,7 +1029,7 @@ "nixpkgs-unstable" ], "nur": "nur_2", - "systems": "systems_6", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -679,6 +1097,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -693,7 +1126,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -708,7 +1141,7 @@ "type": "github" } }, - "systems_6": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -824,6 +1257,47 @@ "repo": "treefmt-nix", "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": 1761431178, + "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 89222f1..2025da3 100644 --- a/flake.nix +++ b/flake.nix @@ -50,10 +50,10 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - #hyprland = { - # url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - # inputs.nixpkgs.follows = "nixpkgs-unstable"; - #}; + hyprland = { + url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; #quickshell = { # url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; # inputs.nixpkgs.follows = "nixpkgs-unstable"; diff --git a/home-manager/hyprland/hyprland-settings.nix b/home-manager/hyprland/hyprland-settings.nix index 11f2da0..002793f 100644 --- a/home-manager/hyprland/hyprland-settings.nix +++ b/home-manager/hyprland/hyprland-settings.nix @@ -239,24 +239,21 @@ in rofimoji = "${pkgs.rofimoji}/bin/rofimoji"; kitty = "${pkgs.kitty}/bin/kitty"; #dolphin = "${pkgs.dolphin}/bin/dolphin"; - thunar = "${pkgs.xfce.thunar}/bin/thunar"; - wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy"; - wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste"; - grimblast = "${pkgs.grimblast}/bin/grimblast"; + thunar = "${pkgs.thunar}/bin/thunar"; saved-screenshot-cmd = '' ${hyprshot} -z -s -m region -o $OUT -f $FILE && notify-send "Saved screenshot to $OUT/$FILE" -h string:image-path:$OUT/$FILE && echo "file://$(realpath $OUT/$FILE)" | wl-copy -t text/uri-list ''; saved-screenshot-cmd-output = '' ${hyprshot} -z -s -m output -o $OUT -f $FILE && notify-send "Saved screenshot to $OUT/$FILE" -h string:image-path:$OUT/$FILE && echo "file://$(realpath $OUT/$FILE)" | wl-copy -t text/uri-list ''; - pdfgrep = "${pkgs.pdfgrep}/bin/pdfgrep"; - brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl"; + #pdfgrep = "${pkgs.pdfgrep}/bin/pdfgrep"; + #brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl"; #swaylock = "${pkgs.swaylock}/bin/swaylock"; hyprlock = "${pkgs.hyprlock}/bin/hyprlock"; hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker"; hyprshot = "${pkgs.hyprshot}/bin/hyprshot"; playerctl = "${pkgs.playerctl}/bin/playerctl"; - peek = "${pkgs.peek}/bin/peek"; + #peek = "${pkgs.peek}/bin/peek"; zenity = "${pkgs.zenity}/bin/zenity"; woomer = "${pkgs.woomer}/bin/woomer"; in @@ -444,7 +441,7 @@ in node = "${pkgs.nodejs}/bin/node"; set-monitor = "~/.config/hypr/monitor-config.js"; answer = "${pkgs.answer}/bin/answer"; - wlrctl = "${pkgs.wlrctl}/bin/wlrctl"; + #wlrctl = "${pkgs.wlrctl}/bin/wlrctl"; ydotool = "${pkgs.ydotool}/bin/ydotool"; wl-kbptr = "${pkgs.wl-kbptr}/bin/wl-kbptr"; in diff --git a/modules/graphical/code-android.nix b/modules/graphical/code-android.nix index 03b2ee2..ed1a323 100644 --- a/modules/graphical/code-android.nix +++ b/modules/graphical/code-android.nix @@ -16,7 +16,10 @@ in config = mkIf cfg.enable { documentation.dev.enable = true; - environment.systemPackages = with pkgs; [ android-studio android-tools ]; + environment.systemPackages = with pkgs; [ + #android-studio + android-tools + ]; users.users.${config.mainUser.name}.extraGroups = [ "adbusers" "kvm" diff --git a/modules/graphical/games.nix b/modules/graphical/games.nix index 8a3d73e..fe16ee4 100644 --- a/modules/graphical/games.nix +++ b/modules/graphical/games.nix @@ -61,14 +61,14 @@ in with pkgs; [ #taisei - osu-lazer-bin + #osu-lazer-bin wineWow64Packages.unstableFull winetricks heroic prismlauncher steamtinkerlaunch tetrio-desktop - beyond-all-reason + #beyond-all-reason #libs ] ) diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix index 73eefc1..9948e38 100644 --- a/modules/graphical/shared.nix +++ b/modules/graphical/shared.nix @@ -15,11 +15,6 @@ in }; config = - let - screenshot = pkgs.writeShellScriptBin "screenshot" '' - ${pkgs.scrot}/bin/scrot -fs - | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png -i - ''; - in mkIf cfg.enable { programs.dconf.enable = true; @@ -37,7 +32,6 @@ in ]; services.libinput = { enable = true; - # disabling mouse acceleration mouse = { accelProfile = "flat"; @@ -69,7 +63,7 @@ in #services.xserver.wacom.enable = true; services.tumbler.enable = true; # for thumbnails programs.thunar.enable = true; - programs.thunar.plugins = with pkgs.xfce; [ + programs.thunar.plugins = with pkgs; [ thunar-archive-plugin thunar-volman ]; @@ -86,7 +80,6 @@ in environment.systemPackages = with pkgs; [ file-roller keepassxc - screenshot wl-clipboard xarchiver # archive tool adwaita-icon-theme diff --git a/modules/hardware/wooting.nix b/modules/hardware/wooting.nix index 8d2e38f..fdbbf85 100644 --- a/modules/hardware/wooting.nix +++ b/modules/hardware/wooting.nix @@ -41,7 +41,7 @@ in services.udev.packages = [ wooting-udev ]; environment.systemPackages = with pkgs; [ - wootility + #wootility ]; }; } diff --git a/modules/nix/ld.nix b/modules/nix/ld.nix index 926919e..cc0065a 100644 --- a/modules/nix/ld.nix +++ b/modules/nix/ld.nix @@ -59,24 +59,24 @@ in stdenv.cc.cc systemd util-linux - xorg.libX11 - xorg.libXScrnSaver - xorg.libXau - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXdmcp - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb - xorg.libxkbfile - xorg.libxshmfence - xorg.libICE - xorg.libSM + libX11 + libXScrnSaver + libXau + libXcomposite + libXcursor + libXdamage + libXdmcp + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libxcb + libxkbfile + libxshmfence + libICE + libSM xz zlib zstd diff --git a/overlays.nix b/overlays.nix index 70f2724..1d6e687 100644 --- a/overlays.nix +++ b/overlays.nix @@ -71,15 +71,15 @@ in # }).jetbrains.jdk-no-jcef-17; #}; - hyprshade = prev.hyprshade.overrideAttrs { - version = "4.0.0"; - src = prev.fetchFromGitHub { - owner = "loqusion"; - repo = "hyprshade"; - tag = "4.0.0"; - hash = "sha256-NnKhIgDAOKOdEqgHzgLq1MSHG3FDT2AVXJZ53Ozzioc="; - }; - }; + #hyprshade = prev.hyprshade.overrideAttrs { + # version = "4.0.0"; + # src = prev.fetchFromGitHub { + # owner = "loqusion"; + # repo = "hyprshade"; + # tag = "4.0.0"; + # hash = "sha256-NnKhIgDAOKOdEqgHzgLq1MSHG3FDT2AVXJZ53Ozzioc="; + # }; + #}; yt-dlp = prev.yt-dlp.overrideAttrs { version = "2026.02.04"; src = prev.fetchFromGitHub { @@ -116,10 +116,10 @@ in #hyprland = prev.hyprland.override { # debug = true; #}; - #hyprland = - # inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland; - #xdg-desktop-portal-hyprland = - # inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + hyprland = + inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland; + xdg-desktop-portal-hyprland = + inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; # to add input capture protocol support (needed for kde connect) #hyprland = prev.hyprland.overrideAttrs (oldAttrs: { diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 5f3734c..ad56d3d 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -97,7 +97,7 @@ }; ime.enable = true; noise-supression.enable = true; - obs.enable = true; + #obs.enable = true; gpu-screen-recorder-ui.enable = true; niri.enable = false; #openrgb.enable = true;