diff --git a/flake.lock b/flake.lock index 76735a0..e7540be 100644 --- a/flake.lock +++ b/flake.lock @@ -33,6 +33,29 @@ "type": "github" } }, + "firefox-addons": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "pkgs/firefox-addons", + "lastModified": 1711124527, + "narHash": "sha256-nCTtAShwdthp+scvmLevc06gtY9gglXq2vCdsszTqIA=", + "owner": "rycee", + "repo": "nur-expressions", + "rev": "d1f6bbea177a3542d9ad3ecead77089b65e09963", + "type": "gitlab" + }, + "original": { + "dir": "pkgs/firefox-addons", + "owner": "rycee", + "repo": "nur-expressions", + "type": "gitlab" + } + }, "flake-compat": { "flake": false, "locked": { @@ -71,6 +94,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -136,7 +174,7 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ], @@ -238,6 +276,7 @@ }, "root": { "inputs": { + "firefox-addons": "firefox-addons", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 58cbd56..e46989e 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,11 @@ home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + firefox-addons = { + url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + lanzaboote = { url = "github:nix-community/lanzaboote/v0.3.0"; @@ -14,7 +19,7 @@ }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, lanzaboote, ... }: + outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, lanzaboote, ... }@inputs: let lib = nixpkgs.lib; system = "x86_64-linux"; @@ -76,6 +81,7 @@ modules = [ ./home.nix ]; extraSpecialArgs = { inherit pkgs-unstable; + inherit inputs; }; }; }; diff --git a/home.nix b/home.nix index 20a4d74..b064cb7 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, lib, ... }: +{ config, pkgs, pkgs-unstable, lib, inputs, ... }: let configDir = ./user/config; in { @@ -20,6 +20,7 @@ in pkgs-unstable.vesktop pkgs-unstable.hyprshot + pkgs-unstable.discord-screenaudio ]; @@ -66,7 +67,7 @@ in BROWSER = "firefox"; EDITOR = "nvim"; TERMINAL = "kitty"; - #NIXOS_OZONE_WL = "1"; + NIXOS_OZONE_WL = "1"; QT_QPA_PLATFORMTHEME = "gtk3"; QT_SCALE_FACTOR = "1"; MOZ_ENABLE_WAYLAND = "1"; @@ -75,7 +76,7 @@ in QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_AUTO_SCREEN_SCALE_FACTOR = "1"; WLR_DRM_DEVICES = "/dev/dri/card0"; - #WLR_NO_HARDWARE_CURSORS = "1"; # if no cursor,uncomment this line + WLR_NO_HARDWARE_CURSORS = "1"; CLUTTER_BACKEND = "wayland"; WLR_RENDERER = "vulkan"; XCURSOR_SIZE = "24"; @@ -83,13 +84,30 @@ in XDG_SESSION_DESKTOP = "Hyprland"; XDG_SESSION_TYPE = "wayland"; GTK_USE_PORTAL = "1"; - #NIXOS_XDG_OPEN_USE_PORTAL = "1"; + NIXOS_XDG_OPEN_USE_PORTAL = "1"; XDG_CACHE_HOME = "\${HOME}/.cache"; XDG_CONFIG_HOME = "\${HOME}/.config"; #XDG_BIN_HOME = "\${HOME}/.local/bin"; XDG_DATA_HOME = "\${HOME}/.local/share"; + }; + + programs.firefox = { + enable = true; + + profiles.gpskwlkr = { + extensions = with inputs.firefox-addons.packages."x86_64-linux"; [ + bypass-paywalls-clean + darkreader + facebook-container + i-dont-care-about-cookies + proton-pass + to-google-translate + view-image + youtube-shorts-block + ]; }; + }; programs.home-manager.enable = true; } diff --git a/system/nixsettings.nix b/system/nixsettings.nix index 160caf2..5dbd4ac 100644 --- a/system/nixsettings.nix +++ b/system/nixsettings.nix @@ -22,7 +22,6 @@ nixpkgs = { config = { allowUnfree = true; - allowUnfreePredicate = pkg: builtins.elem (builtins.parseDrvName pkg.name).name ["steam"]; permittedInsecurePackages = [ "electron-25.9.0" # obsidian diff --git a/system/packages.nix b/system/packages.nix index cd392ca..405dec7 100644 --- a/system/packages.nix +++ b/system/packages.nix @@ -17,6 +17,7 @@ unzip wget xdg-desktop-portal-gtk + xdg-desktop-portal-wlr zoxide ]; } diff --git a/system/users.nix b/system/users.nix index 64d6786..fa344a6 100644 --- a/system/users.nix +++ b/system/users.nix @@ -13,8 +13,6 @@ users.users.gpskwlkr = { "docker" ]; packages = with pkgs; [ - firefox - tree ]; }; diff --git a/user/config/hypr/windowrule.conf b/user/config/hypr/windowrule.conf index 513b7ed..fe24cb6 100644 --- a/user/config/hypr/windowrule.conf +++ b/user/config/hypr/windowrule.conf @@ -23,6 +23,7 @@ windowrulev2 = float, title:^(Picture-in-Picture)$ windowrulev2 = pin, title:^(Picture-in-Picture)$ windowrulev2 = float, class:^(vesktop)$,title:^(Discord Popout)$ windowrulev2 = pin, class:^(vesktop)$,title:^(Discord Popout)$ +windowrulev2 = float, class:^(steam)$,title:^(Friends List)$ # Workspace assign