diff --git a/flake.lock b/flake.lock index 259d489..30eeaba 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1707961509, - "narHash": "sha256-ux65xSnbGnMDpNYSfnBbMFrE8xHYVm3wnXXeEeLo0ic=", + "lastModified": 1704157128, + "narHash": "sha256-BAna+70nf43RJ5wOOl4grL4W/o4FRNtgWZtwt/LTZvE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3ca8fd85438bf9e717628f519044b56d54e56911", + "rev": "575fcd2ddb0e7c40611ba68d4a977e0cdc729669", "type": "github" }, "original": { @@ -32,11 +32,11 @@ ] }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -50,11 +50,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -75,11 +75,11 @@ ] }, "locked": { - "lastModified": 1704029560, - "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", + "lastModified": 1701009247, + "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", + "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09", "type": "github" }, "original": { @@ -95,11 +95,11 @@ ] }, "locked": { - "lastModified": 1707919853, - "narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", + "lastModified": 1704100519, + "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", "owner": "nix-community", "repo": "home-manager", - "rev": "043ba285c6dc20f36441d48525402bcb9743c498", + "rev": "6e91c5df192395753d8e6d55a0352109cb559790", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1707962500, - "narHash": "sha256-RT/ltuugm8j0zQAsvM+d70HisZvzcofrzHFtxzG++vw=", + "lastModified": 1704146726, + "narHash": "sha256-MS/VO4Bv2N0yAUrWxCmwTU7+g5GhI6lEMy7R3ZzmswU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a42b984f51a00e88a13a45e1b5e9e3d4ec470254", + "rev": "1607e967041fd3311411de0def8cdc0610274f98", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1707913427, - "narHash": "sha256-M8o3kPqGa/jfNNtvHFldbS3l+T9RC6AhJl2nErwKYkQ=", + "lastModified": 1704027000, + "narHash": "sha256-sMJguaGNfwmzkyRLwBuQhyFBs2CB08O6dIUwJ51eoJU=", "owner": "outfoxxed", "repo": "hy3", - "rev": "f231373aeef1ab170f10b65458fa8fd0275cc4c8", + "rev": "a92314b57a1c611e3e24cfa31c14c4dc3ea638e5", "type": "github" }, "original": { @@ -198,57 +198,16 @@ "type": "github" } }, - "hyprlang": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1704287638, - "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { + "hyprpaper": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1704230242, - "narHash": "sha256-S8DM+frECqmAdaUb3y5n3RjY73ajZcL5rnmx5YO+CkY=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "db5e1399b90d5a339330bdd49c5bca6fe58d6f60", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprpaper": { - "inputs": { - "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1707095251, - "narHash": "sha256-ISuBw43oGTmQhYM+qneXU39GpWnoRpq5Siw18QZdP2E=", + "lastModified": 1703524093, + "narHash": "sha256-qqF3NyarX6ZSCBmhzO4r0BEcy6FHj6DsvF0hIMkwz/Q=", "owner": "hyprwm", "repo": "Hyprpaper", - "rev": "1013a80608891f120184aa7c1a7cfde04bfc96fb", + "rev": "ef0e051255af1b96155b222da94c94ecad1f7708", "type": "github" }, "original": { @@ -296,11 +255,11 @@ ] }, "locked": { - "lastModified": 1707358904, - "narHash": "sha256-WYP9+8nHYWmBh3tsQhos7GJ+SozP9/jv0dZsQLYlwo0=", + "lastModified": 1703730102, + "narHash": "sha256-oXEu4FYhIgS0+qMMf1YfnseMmOStK/45S4k6XUcGi4M=", "owner": "nixpak", "repo": "nixpak", - "rev": "903020fdc3e77e896404a2888f4b896638400854", + "rev": "39e3350f9d473422c8cf9e7cb362241f8ed2b974", "type": "github" }, "original": { @@ -327,11 +286,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1707786466, - "narHash": "sha256-yLPfrmW87M2qt+8bAmwopJawa+MJLh3M9rUbXtpUc1o=", + "lastModified": 1703992652, + "narHash": "sha256-C0o8AUyu8xYgJ36kOxJfXIroy9if/G6aJbNOpA5W0+M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01885a071465e223f8f68971f864b15829988504", + "rev": "32f63574c85fbc80e4ba1fbb932cde9619bad25e", "type": "github" }, "original": { @@ -343,27 +302,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1707863367, - "narHash": "sha256-LdBbCSSP7VHaHA4KXcPGKqkvsowT2+7W4jlEHJj6rPg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "35ff7e87ee05199a8003f438ec11a174bcbd98ea", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "type": "github" }, "original": { @@ -374,11 +317,11 @@ }, "nur": { "locked": { - "lastModified": 1707962215, - "narHash": "sha256-JqlV5Lp3yNcoz/LwcGGrJPz4CCEO8TySzJ6ZNb56G3o=", + "lastModified": 1704160731, + "narHash": "sha256-EKeiL8TgXcoOVfbc0QUpY0nCw1IIiQtWNWB57/dMAx4=", "owner": "nix-community", "repo": "NUR", - "rev": "b615de6a536e385b08627ae2e0d92a338c95819f", + "rev": "820a4b9b2f9111fb71d41794b38ffd46bb7e81ed", "type": "github" }, "original": { @@ -398,7 +341,7 @@ "hyprpaper": "hyprpaper", "impurity": "impurity", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nur": "nur", "rust-overlay": "rust-overlay", "stable": "stable" @@ -414,11 +357,11 @@ ] }, "locked": { - "lastModified": 1707876656, - "narHash": "sha256-urnZg6e2JjziBosarDB1MnjPeVqcu3PeSqIpqQKYrdg=", + "lastModified": 1704075545, + "narHash": "sha256-L3zgOuVKhPjKsVLc3yTm2YJ6+BATyZBury7wnhyc8QU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3ad32bb27c700b59306224e285b66577e3532dfc", + "rev": "a0df72e106322b67e9c6e591fe870380bd0da0d5", "type": "github" }, "original": { @@ -429,11 +372,11 @@ }, "stable": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1704018918, + "narHash": "sha256-erjg/HrpC9liEfm7oLqb8GXCqsxaFwIIPqCsknW5aFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "2c9c58e98243930f8cb70387934daa4bc8b00373", "type": "github" }, "original": { @@ -476,18 +419,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1706359063, - "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", + "lastModified": 1703963193, + "narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "f81c3d93cd6f61b20ae784297679283438def8df", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "f81c3d93cd6f61b20ae784297679283438def8df", "type": "gitlab" } }, @@ -497,7 +440,6 @@ "hyprland", "hyprland-protocols" ], - "hyprlang": "hyprlang", "nixpkgs": [ "hyprland", "nixpkgs" @@ -508,11 +450,11 @@ ] }, "locked": { - "lastModified": 1706521509, - "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", + "lastModified": 1703514399, + "narHash": "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", + "rev": "0a318a7a217a6402b0b705837cd5b50b0e94b31b", "type": "github" }, "original": { diff --git a/modules/core/default.nix b/modules/core/default.nix index d5591d4..e4ea8e1 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -14,16 +14,10 @@ documentation = { enable = true; doc.enable = true; - info.enable = true; man.enable = true; dev.enable = true; }; - environment.systemPackages = with pkgs; [ - man-pages - man-pages-posix - ]; - nix = { # hardlink duplicate files in the nix store settings.auto-optimise-store = true; diff --git a/modules/hyprland/1920x1080.png b/modules/hyprland/1920x1080.png deleted file mode 100644 index ce3f7bf..0000000 Binary files a/modules/hyprland/1920x1080.png and /dev/null differ diff --git a/modules/hyprland/5120x1440.png b/modules/hyprland/5120x1440.png deleted file mode 100644 index 855835b..0000000 Binary files a/modules/hyprland/5120x1440.png and /dev/null differ diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index d4371ba..b51baac 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -67,7 +67,7 @@ in { font-size = 14; ignore-empty-password = true; show-failed-attempts = true; - image = "${./5120x1440.png}"; + image = "${./wallpaper.png}"; }; }; @@ -85,11 +85,8 @@ in { }; xdg.configFile."hypr/hyprpaper.conf".text = '' - preload = ${./5120x1440.png} - preload = ${./1920x1080.png} - - wallpaper = DP-1,${./5120x1440.png} - wallpaper = eDP-1,${./1920x1080.png} + preload = ${./wallpaper.png} + wallpaper = ,${./wallpaper.png} ''; }; }; diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index 160afb6..8f7e991 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -104,15 +104,9 @@ plugin { } } -debug { - disable_logs = no -} - monitor = , preferred, auto, 1 layerrule = blur, wofi -layerrule = ignorezero, wofi -layerrule = noanim, ^(selection)$ windowrulev2 = float, class:^(opensnitch_ui)$ windowrulev2 = dimaround, class:^(opensnitch_ui)$ @@ -220,26 +214,26 @@ bind = $mod, F8, workspace, 18 bind = $mod, F9, workspace, 19 bind = $mod, F10, workspace, 20 -bind = $mod+SHIFT, 1, hy3:movetoworkspace, 01 -bind = $mod+SHIFT, 2, hy3:movetoworkspace, 02 -bind = $mod+SHIFT, 3, hy3:movetoworkspace, 03 -bind = $mod+SHIFT, 4, hy3:movetoworkspace, 04 -bind = $mod+SHIFT, 5, hy3:movetoworkspace, 05 -bind = $mod+SHIFT, 6, hy3:movetoworkspace, 06 -bind = $mod+SHIFT, 7, hy3:movetoworkspace, 07 -bind = $mod+SHIFT, 8, hy3:movetoworkspace, 08 -bind = $mod+SHIFT, 9, hy3:movetoworkspace, 09 -bind = $mod+SHIFT, 0, hy3:movetoworkspace, 10 -bind = $mod+SHIFT, F1, hy3:movetoworkspace, 11 -bind = $mod+SHIFT, F2, hy3:movetoworkspace, 12 -bind = $mod+SHIFT, F3, hy3:movetoworkspace, 13 -bind = $mod+SHIFT, F4, hy3:movetoworkspace, 14 -bind = $mod+SHIFT, F5, hy3:movetoworkspace, 15 -bind = $mod+SHIFT, F6, hy3:movetoworkspace, 16 -bind = $mod+SHIFT, F7, hy3:movetoworkspace, 17 -bind = $mod+SHIFT, F8, hy3:movetoworkspace, 18 -bind = $mod+SHIFT, F9, hy3:movetoworkspace, 19 -bind = $mod+SHIFT, F10, hy3:movetoworkspace, 20 +bind = $mod+SHIFT, 1, movetoworkspacesilent, 01 +bind = $mod+SHIFT, 2, movetoworkspacesilent, 02 +bind = $mod+SHIFT, 3, movetoworkspacesilent, 03 +bind = $mod+SHIFT, 4, movetoworkspacesilent, 04 +bind = $mod+SHIFT, 5, movetoworkspacesilent, 05 +bind = $mod+SHIFT, 6, movetoworkspacesilent, 06 +bind = $mod+SHIFT, 7, movetoworkspacesilent, 07 +bind = $mod+SHIFT, 8, movetoworkspacesilent, 08 +bind = $mod+SHIFT, 9, movetoworkspacesilent, 09 +bind = $mod+SHIFT, 0, movetoworkspacesilent, 10 +bind = $mod+SHIFT, F1, movetoworkspacesilent, 11 +bind = $mod+SHIFT, F2, movetoworkspacesilent, 12 +bind = $mod+SHIFT, F3, movetoworkspacesilent, 13 +bind = $mod+SHIFT, F4, movetoworkspacesilent, 14 +bind = $mod+SHIFT, F5, movetoworkspacesilent, 15 +bind = $mod+SHIFT, F6, movetoworkspacesilent, 16 +bind = $mod+SHIFT, F7, movetoworkspacesilent, 17 +bind = $mod+SHIFT, F8, movetoworkspacesilent, 18 +bind = $mod+SHIFT, F9, movetoworkspacesilent, 19 +bind = $mod+SHIFT, F10, movetoworkspacesilent, 20 bind = $mod+CONTROL, 1, hy3:focustab, index, 01 bind = $mod+CONTROL, 2, hy3:focustab, index, 02 diff --git a/modules/theme/default.nix b/modules/theme/default.nix index 91205f9..6aacd0e 100644 --- a/modules/theme/default.nix +++ b/modules/theme/default.nix @@ -32,25 +32,11 @@ [Appearance] style=Breeze icon_theme=breeze-dark - standard_dialogs=xdgdesktopportal # Cantata misbehaves without color overrides. This overrides the breeze colors with the # exact same colors. color_scheme_path=${./breeze-dark-colors-override.conf} custom_palette=true - - [Interface] - buttonbox_layout=0 - cursor_flash_time=1000 - dialog_buttons_have_icons=2 - double_click_interval=400 - gui_effects=General, AnimateMenu, AnimateCombo - keyboard_scheme=2 - menus_have_icons=true - show_shortcuts_in_context_menus=true - toolbutton_style=4 - underline_shortcut=1 - wheel_scroll_lines=3 ''; }; diff --git a/modules/user/modules/firefox/prefgroups.nix b/modules/user/modules/firefox/prefgroups.nix index a42a528..5defff9 100644 --- a/modules/user/modules/firefox/prefgroups.nix +++ b/modules/user/modules/firefox/prefgroups.nix @@ -25,9 +25,6 @@ rec { # disable csd "browser.tabs.inTitlebar" = 0; - - # use portal filepicker - "widget.use-xdg-desktop-portal.file-picker" = 1; }; security = {