diff --git a/flake.lock b/flake.lock index 6d6cd5f..3236ef1 100644 --- a/flake.lock +++ b/flake.lock @@ -59,29 +59,6 @@ "type": "github" } }, - "arkenfox": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit": "pre-commit" - }, - "locked": { - "lastModified": 1725263787, - "narHash": "sha256-OSNjus8VSkLCSikN6Qeq+II1bwqTRJEwl6NJvFoQHoE=", - "owner": "dwarfmaster", - "repo": "arkenfox-nixos", - "rev": "72addd96455cce49c0c8524c53aecd02cf20adec", - "type": "github" - }, - "original": { - "owner": "dwarfmaster", - "repo": "arkenfox-nixos", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -186,7 +163,7 @@ }, "devshell_2": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1728330715, @@ -224,7 +201,7 @@ }, "firefox-addons": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] @@ -262,19 +239,17 @@ } }, "flake-compat": { - "flake": false, "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, "flake-compat_2": { @@ -294,36 +269,6 @@ } }, "flake-compat_3": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_4": { - "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_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -436,24 +381,6 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "locked": { "lastModified": 1629284811, "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", @@ -468,9 +395,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -486,7 +413,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { "systems": [ "stylix", @@ -529,7 +456,7 @@ "nixvim", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "nixvim", "nixpkgs" @@ -555,7 +482,7 @@ "stylix", "flake-compat" ], - "gitignore": "gitignore_3", + "gitignore": "gitignore_2", "nixpkgs": [ "stylix", "nixpkgs" @@ -581,28 +508,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "arkenfox", - "pre-commit", - "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_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -624,7 +529,7 @@ "type": "github" } }, - "gitignore_3": { + "gitignore_2": { "inputs": { "nixpkgs": [ "stylix", @@ -646,7 +551,7 @@ "type": "github" } }, - "gitignore_4": { + "gitignore_3": { "inputs": { "nixpkgs": [ "xremap", @@ -723,7 +628,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2", + "systems": "systems", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -808,7 +713,7 @@ }, "home-manager_4": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1735381016, @@ -898,9 +803,9 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_6", + "systems": "systems_5", "xdph": "xdph" }, "locked": { @@ -1129,16 +1034,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", - "owner": "NixOS", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1192,22 +1097,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -1240,22 +1129,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1705856552, - "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1736200483, "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", @@ -1271,23 +1144,7 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1735669367, - "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1708475490, "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", @@ -1303,7 +1160,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1722073938, "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", @@ -1319,7 +1176,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1734649271, "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", @@ -1335,7 +1192,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1735291276, "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", @@ -1351,7 +1208,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1733097829, "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", @@ -1370,12 +1227,14 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, @@ -1396,7 +1255,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1423,7 +1282,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_3", "treefmt-nix": "treefmt-nix_3" }, "locked": { @@ -1440,37 +1299,16 @@ "url": "https://git.ghoscht.com/ghoscht/picoKontroller" } }, - "pre-commit": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_5", - "gitignore": "gitignore_4", + "flake-compat": "flake-compat_3", + "gitignore": "gitignore_3", "nixpkgs": [ "xremap", "hyprland", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1734797603, @@ -1489,14 +1327,13 @@ "root": { "inputs": { "arion": "arion", - "arkenfox": "arkenfox", "disko": "disko", "firefox-addons": "firefox-addons", "hardware": "hardware", "heliox-cli": "heliox-cli", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "picokontroller": "picokontroller", @@ -1532,15 +1369,15 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" @@ -1621,21 +1458,6 @@ } }, "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1702,7 +1524,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1706462057, @@ -1741,7 +1563,7 @@ }, "treefmt-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1710278050, @@ -1759,7 +1581,7 @@ }, "treefmt-nix_4": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1735135567, diff --git a/flake.nix b/flake.nix index 036884f..238ab48 100644 --- a/flake.nix +++ b/flake.nix @@ -24,20 +24,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - arkenfox = { - url = "github:dwarfmaster/arkenfox-nixos"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - xremap = { url = "github:xremap/nix-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - # flatpaks = { - # url = "github:GermanBread/declarative-flatpak/stable-v3"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; heliox-cli = { @@ -65,118 +56,123 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixvim.url = "github:nix-community/nixvim/nixos-24.11"; + nixvim = { + url = "github:nix-community/nixvim/nixos-24.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { - self, - nixpkgs, - home-manager, - ... - } @ inputs: let - inherit (self) outputs; - # Supported systems for your flake packages, shell, etc. - systems = [ - "aarch64-linux" - "i686-linux" - "x86_64-linux" - "aarch64-darwin" - "x86_64-darwin" - ]; - # This is a function that generates an attribute by calling a function you - # pass to it, with each system as an argument - forAllSystems = nixpkgs.lib.genAttrs systems; - vars = import ./vars.nix; - in { - # Your custom packages - # Accessible through 'nix build', 'nix shell', etc - packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); - # Formatter for your nix files, available through 'nix fmt' - # Other options beside 'alejandra' include 'nixpkgs-fmt' - formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + outputs = + { self + , nixpkgs + , home-manager + , ... + } @ inputs: + let + inherit (self) outputs; + # Supported systems for your flake packages, shell, etc. + systems = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + # This is a function that generates an attribute by calling a function you + # pass to it, with each system as an argument + forAllSystems = nixpkgs.lib.genAttrs systems; + vars = import ./vars.nix; + in + { + # Your custom packages + # Accessible through 'nix build', 'nix shell', etc + packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + # Formatter for your nix files, available through 'nix fmt' + # Other options beside 'alejandra' include 'nixpkgs-fmt' + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); - # Your custom packages and modifications, exported as overlays - overlays = import ./overlays {inherit inputs;}; - # Reusable nixos modules you might want to export - # These are usually stuff you would upstream into nixpkgs - nixosModules = import ./modules/nixos; - # Reusable home-manager modules you might want to export - # These are usually stuff you would upstream into home-manager - homeManagerModules = import ./modules/home-manager; + # Your custom packages and modifications, exported as overlays + overlays = import ./overlays { inherit inputs; }; + # Reusable nixos modules you might want to export + # These are usually stuff you would upstream into nixpkgs + nixosModules = import ./modules/nixos; + # Reusable home-manager modules you might want to export + # These are usually stuff you would upstream into home-manager + homeManagerModules = import ./modules/home-manager; - # NixOS configuration entrypoint - # Available through 'nixos-rebuild --flake .#your-hostname' - nixosConfigurations = { - adalbert = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs vars;}; - modules = [ - ./hosts/adalbert - ]; - }; - ludwig = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs vars;}; - modules = [ - ./hosts/ludwig - ]; - }; - leopold = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs vars;}; - modules = [ - ./hosts/leopold - ]; - }; - franz = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs vars;}; - modules = [ - ./hosts/franz - ]; - }; - # build with nix build .#nixosConfigurations.eustachius.config.system.build.sdImage - eustachius = nixpkgs.lib.nixosSystem { - system = "aarch64-linux"; - modules = [ - "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix" - ./hosts/eustachius + # NixOS configuration entrypoint + # Available through 'nixos-rebuild --flake .#your-hostname' + nixosConfigurations = { + adalbert = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs vars; }; + modules = [ + ./hosts/adalbert + ]; + }; + ludwig = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs vars; }; + modules = [ + ./hosts/ludwig + ]; + }; + leopold = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs vars; }; + modules = [ + ./hosts/leopold + ]; + }; + franz = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs vars; }; + modules = [ + ./hosts/franz + ]; + }; + # build with nix build .#nixosConfigurations.eustachius.config.system.build.sdImage + eustachius = nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + modules = [ + "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix" + ./hosts/eustachius - # extra config for sdImage generator - { - sdImage.compressImage = false; - } - ]; + # extra config for sdImage generator + { + sdImage.compressImage = false; + } + ]; + }; }; - }; - # Standalone home-manager configuration entrypoint - # Available through 'home-manager --flake .#your-username@your-hostname' - homeConfigurations = { - "${vars.user}@adalbert" = home-manager.lib.homeManagerConfiguration { + # Standalone home-manager configuration entrypoint + # Available through 'home-manager --flake .#your-username@your-hostname' + homeConfigurations = { + "${vars.user}@adalbert" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance + extraSpecialArgs = { inherit inputs outputs vars; }; + modules = [ + ./home/adalbert.nix + ]; + }; + }; + "${vars.user}@ludwig" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs vars;}; + extraSpecialArgs = { inherit inputs outputs vars; }; modules = [ - ./home/adalbert.nix + ./home/ludwig.nix ]; }; + "${vars.user}@franz" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance + extraSpecialArgs = { inherit inputs outputs vars; }; + modules = [ + ./home/franz.nix + ]; + }; + # "${vars.user}@eustachius" = home-manager.lib.homeManagerConfiguration { + # pkgs = nixpkgs.legacyPackages.aarch64-linux; # Home-manager requires 'pkgs' instance + # extraSpecialArgs = {inherit inputs outputs vars;}; + # modules = [ + # ./home/eustachius.nix + # ]; + # }; }; - "${vars.user}@ludwig" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs vars;}; - modules = [ - ./home/ludwig.nix - ]; - }; - "${vars.user}@franz" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs vars;}; - modules = [ - ./home/franz.nix - ]; - }; - # "${vars.user}@eustachius" = home-manager.lib.homeManagerConfiguration { - # pkgs = nixpkgs.legacyPackages.aarch64-linux; # Home-manager requires 'pkgs' instance - # extraSpecialArgs = {inherit inputs outputs vars;}; - # modules = [ - # ./home/eustachius.nix - # ]; - # }; - }; } diff --git a/home/features/desktop/common/firefox.nix b/home/features/desktop/common/firefox.nix index dc4c63f..6241701 100644 --- a/home/features/desktop/common/firefox.nix +++ b/home/features/desktop/common/firefox.nix @@ -2,19 +2,12 @@ , pkgs , ... }: { - imports = [ inputs.arkenfox.hmModules.default ]; - # Enable kde-connect for non-Plasma DEs - home.file.".mozilla/native-messaging-hosts/org.kde.plasma.browser_integration.json".source = "${pkgs.plasma5Packages.plasma-browser-integration}/lib/mozilla/native-messaging-hosts/org.kde.plasma.browser_integration.json"; + home.file.".librewolf/native-messaging-hosts/org.kde.plasma.browser_integration.json".source = "${pkgs.plasma5Packages.plasma-browser-integration}/lib/mozilla/native-messaging-hosts/org.kde.plasma.browser_integration.json"; - programs.firefox = { + programs.librewolf = { enable = true; - arkenfox = { - enable = true; - version = "128.0"; - }; - profiles.Default = { extensions = with inputs.firefox-addons.packages."x86_64-linux"; [ bitwarden @@ -125,7 +118,10 @@ }; settings = { - "media.hardwaremediakeys.enabled" = false; + "ui.context_menus.after_mouseup" = true; # Fixes context menu after Gesturefy swipe + "extensions.screenshots.disabled" = true; # Firefox Screenshot feature is annoying + "privacy.clearOnShutdown_v2.cookiesAndStorage" = false; # Disable cookie clearing + "media.hardwaremediakeys.enabled" = false; # Interferes with KDE Connect "dom.security.https_only_mode" = true; "browser.download.panel.shown" = false; "browser.toolbars.bookmarks.visibility" = "always"; @@ -133,62 +129,8 @@ "browser.formfill.enable" = false; "signon. prefillForms" = false; "browser.shell.checkDefaultBrowser" = false; - # "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["addon_darkreader_org-browser-action","plasma-browser-integration_kde_org-browser-action","_506e023c-7f2b-40a3-8066-bc5deb40aebe_-browser-action","_testpilot-containers-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7_-browser-action","gdpr_cavi_au_dk-browser-action","firefoxcolor_mozilla_com-browser-action","firefox-translations-addon_mozilla_org-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","downloads-button","unified-extensions-button","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button"],"PersonalToolbar":["personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","addon_darkreader_org-browser-action","ublock0_raymondhill_net-browser-action","plasma-browser-integration_kde_org-browser-action","_506e023c-7f2b-40a3-8066-bc5deb40aebe_-browser-action","_testpilot-containers-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7_-browser-action","gdpr_cavi_au_dk-browser-action","firefoxcolor_mozilla_com-browser-action","firefox-translations-addon_mozilla_org-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","unified-extensions-area"],"currentVersion":20,"newElementCount":4}''; }; - arkenfox = { - enable = true; - "0000".enable = true; - "0100" = { - enable = true; - # Allow setting homepage - "0102"."browser.startup.page".value = 1; - }; - "0200" = { - enable = true; - }; - "0300".enable = true; - # We keep safebrowsing - "0400".enable = false; - "0600" = { - enable = true; - "0610"."browser.send_pings".enable = true; - }; - "0700" = { - enable = true; - # Disable DNS over HTTPS - "0710"."network.trr.mode".value = 5; - }; - # "0800" = { - # enable = true; - # # Keep using url bar as search bar - # "0801"."keyword.enabled".value = true; - # }; - "0900".enable = true; - "1000" = { - enable = true; - # Enable disk cache for performance reasons - "1001"."browser.cache.disk.enable".enable = true; - "1001"."browser.cache.disk.enable".value = true; - }; - "1200".enable = true; - # I don't use container tabs - "1700".enable = false; - "2600" = { - enable = true; - # useDownloadDir - "2651".enable = false; - # always_ask_before_handling_new_types - "2654".enable = false; - }; - "2700".enable = true; - "2800" = { - "2812".enable = true; - }; - "5000" = { - "5008".enable = true; - }; - }; }; }; diff --git a/home/features/desktop/common/wezterm.nix b/home/features/desktop/common/wezterm.nix index fba34a0..39ddc47 100644 --- a/home/features/desktop/common/wezterm.nix +++ b/home/features/desktop/common/wezterm.nix @@ -9,7 +9,7 @@ return { front_end = "WebGpu", -- fixes https://github.com/wez/wezterm/issues/5990H warn_about_missing_glyphs=false, - -- window_background_opacity = 0.83, + enable_wayland = true, hide_tab_bar_if_only_one_tab = true, window_close_confirmation = "NeverPrompt", use_ime = true, diff --git a/home/features/desktop/hyprland/default.nix b/home/features/desktop/hyprland/default.nix index 56b5125..3e633a3 100644 --- a/home/features/desktop/hyprland/default.nix +++ b/home/features/desktop/hyprland/default.nix @@ -1,4 +1,7 @@ -{ pkgs, ... }: { +{ lib +, pkgs +, ... +}: { imports = [ ./config.nix ./variables.nix ]; home.packages = with pkgs; [ hyprpicker # color picker @@ -7,6 +10,7 @@ hyprpolkitagent grim slurp + # clipboard management wl-clip-persist wl-clipboard @@ -36,13 +40,13 @@ modules-left = [ "hyprland/workspaces" ]; modules-center = [ "hyprland/window" ]; - modules-right = [ "tray" "memory" "cpu" "clock" ]; + modules-right = lib.mkDefault [ "tray" "memory" "cpu" "clock" ]; tray.spacing = 10; clock.tooltip-format = "{:%d.%m.%Y}"; cpu.format = "{}%  "; - memory.format = " {}%  "; + memory.format = " | {}%  "; "hyprland/workspaces" = { format = "{icon}"; @@ -110,31 +114,4 @@ gl_FragColor = outCol; } ''; - - # systemd.user.services.wl-gammarelay-rs = { - # Unit = { - # PartOf = [ "graphical-session.target" ]; - # After = [ "graphical-session-pre.target" ]; - # }; - # - # Service = { - # ExecStart = "${pkgs.wl-gammarelay-rs}/bin/wl-gammarelay-rs"; - # ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR2 $MAINPID"; - # Restart = "on-failure"; - # KillMode = "mixed"; - # }; - # - # Install = { WantedBy = [ "default.target" ]; }; - # }; - # systemd.user.services.wl-gammarelay-rs-restart = { - # Unit = { - # After = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" "suspend-then-hibernate.target" ]; - # }; - # - # Service = { - # ExecStart = "${pkgs.bash}/bin/bash -c '${cmd} 6000 && ${cmd} 4000'"; - # }; - # - # Install = { WantedBy = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" "suspend-then-hibernate.target" ]; }; - # }; } diff --git a/home/ludwig.nix b/home/ludwig.nix index 2f3d8a7..36e8444 100644 --- a/home/ludwig.nix +++ b/home/ludwig.nix @@ -21,13 +21,29 @@ wayland.windowManager.hyprland = { settings = { + exec-once = [ + "${pkgs.batsignal}/bin/batsignal -c 20 -w 30 -f 80 -n BAT0 -a Battery" + ]; bind = [ ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" ", XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-" - ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" - ", XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +10%" - ", XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 10%-" + ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" + ", XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +10%" + ", XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 10%-" ]; }; }; + + programs.waybar = { + settings = { + mainBar = { + modules-right = [ "tray" "memory" "cpu" "battery" "clock" ]; + battery = { + format = "{capacity}% {icon} "; + format-icons = [ "" "" "" "" "" ]; + max-length = 25; + }; + }; + }; + }; } diff --git a/hosts/common/optional/kde-connect.nix b/hosts/common/optional/kde-connect.nix index 3ed1be8..a1541f9 100644 --- a/hosts/common/optional/kde-connect.nix +++ b/hosts/common/optional/kde-connect.nix @@ -1,20 +1,14 @@ -{ - config, - lib, - pkgs, - ... -}: { +{ pkgs, ... }: { programs.kdeconnect.enable = true; # Create system services for KDE connect systemd.user.services.kdeconnect = { description = "Adds communication between your desktop and your smartphone"; - after = ["graphical-session-pre.target"]; - partOf = ["graphical-session.target"]; - wantedBy = ["graphical-session.target"]; + after = [ "graphical-session-pre.target" ]; + partOf = [ "graphical-session.target" ]; + wantedBy = [ "graphical-session.target" ]; serviceConfig = { - #Environment = "PATH=${config.home.profileDirectory}/bin"; ExecStart = "${pkgs.plasma5Packages.kdeconnect-kde}/libexec/kdeconnectd"; Restart = "on-abort"; };