From c69b04f4ba5e40b55160fa3c007c1e9b724dbc46 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Thu, 21 Mar 2024 16:03:56 +0100 Subject: [PATCH] update some aspects, fix pinentry --- flake.lock | 157 +++++++++++++++++++++++++++++++++++--- flake.nix | 8 +- modules/firefox.nix | 3 +- modules/pass.nix | 2 +- modules/sway-defaults.nix | 1 + modules/sway.nix | 11 ++- 6 files changed, 165 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index b989a53..fe2f22a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,6 +1,61 @@ { "nodes": { + "cachix": { + "locked": { + "lastModified": 1635350005, + "narHash": "sha256-tAMJnUwfaDEB2aa31jGcu7R7bzGELM9noc91L2PbVjg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1c1f5649bb9c1b0d98637c8c365228f57126f361", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-20.09", + "repo": "nixpkgs", + "type": "github" + } + }, + "ff_nightly": { + "inputs": { + "cachix": "cachix", + "flake-compat": "flake-compat", + "lib-aggregate": "lib-aggregate", + "mozilla": "mozilla", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710982600, + "narHash": "sha256-KC8V8aTUHZAORn0uJ5ENKkF8VIBvNmZvkF/O/nSaB1A=", + "owner": "nix-community", + "repo": "flake-firefox-nightly", + "rev": "6778dc738c3a40a63df286005d44d2ddf5903e47", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-firefox-nightly", + "type": "github" + } + }, "flake-compat": { + "locked": { + "lastModified": 1688025799, + "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -18,7 +73,7 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1709336216, @@ -34,6 +89,59 @@ "type": "github" } }, + "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" + } + }, + "lib-aggregate": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1710677371, + "narHash": "sha256-yqjXunc+Zvqf6rcH7W9wMvhr18jMZhDvIdnretlfj78=", + "owner": "nix-community", + "repo": "lib-aggregate", + "rev": "f890211817b941d9ed9de48d62ba8553fa2c20f3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "lib-aggregate", + "type": "github" + } + }, + "mozilla": { + "flake": false, + "locked": { + "lastModified": 1704373101, + "narHash": "sha256-+gi59LRWRQmwROrmE1E2b3mtocwueCQqZ60CwLG+gbg=", + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "rev": "9b11a87c0cc54e308fa83aac5b4ee1816d5418a2", + "type": "github" + }, + "original": { + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "type": "github" + } + }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts", @@ -42,11 +150,11 @@ ] }, "locked": { - "lastModified": 1710637843, - "narHash": "sha256-NVszlVTM0sEe8yZuOShitwOhNdl2juD7032SQg2dV+U=", + "lastModified": 1711003080, + "narHash": "sha256-YAycKYKMytiQe9L6yZuVcq/1rCFcDHIA6/G78oSofV8=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "da2c09734818d85ef4d112997b5188b62cfdd0fd", + "rev": "1e435616e688c2b9125cd5282febcad3ab981d5e", "type": "github" }, "original": { @@ -57,11 +165,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { @@ -71,6 +179,21 @@ } }, "nixpkgs-lib": { + "locked": { + "lastModified": 1710636348, + "narHash": "sha256-/kB+ZWSdkZjbZ0FTqm0u84sf2jFS+30ysaEajmBjtoY=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "fa827dda806c5aa98f454da4c567991ab8ce422c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "dir": "lib", "lastModified": 1709237383, @@ -90,7 +213,8 @@ }, "root": { "inputs": { - "flake-compat": "flake-compat", + "ff_nightly": "ff_nightly", + "flake-compat": "flake-compat_2", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs", "swaymux": "swaymux", @@ -132,9 +256,24 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index f109f28..6e0be55 100644 --- a/flake.nix +++ b/flake.nix @@ -16,12 +16,16 @@ url = "git+https://git.grimmauld.de/Grimmauld/swaymux"; inputs.nixpkgs.follows = "nixpkgs"; }; + ff_nightly = { + url = "github:nix-community/flake-firefox-nightly"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = inputs @ { self, swaymux, utils, nixpkgs, nix-gaming, ... }: let + outputs = inputs @ { self, swaymux, utils, nixpkgs, nix-gaming, ff_nightly, ... }: let lib = nixpkgs.lib; system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; + pkgs = import nixpkgs { inherit system; overlays = []; }; in { nixosModules = rec { default = grimmShared; diff --git a/modules/firefox.nix b/modules/firefox.nix index 6ce7abb..f7590e4 100644 --- a/modules/firefox.nix +++ b/modules/firefox.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: let +{ grimm-shared-inputs, pkgs, config, lib, ... }: let cfg = config.grimmShared; in { config = with cfg; lib.mkIf (enable && firefox.enable) { @@ -6,6 +6,7 @@ in { ++ lib.optionals config.services.desktopManager.plasma6.enable [ pkgs.plasma-browser-integration ]; programs.firefox = { + # package = grimm-shared-inputs.ff_nightly.packages.${pkgs.system}.firefox-nightly-bin; enable = true; nativeMessagingHosts.packages = [] ++ lib.optionals (cfg.tooling.enable && cfg.tooling.pass) [ pkgs.passff-host ]; diff --git a/modules/pass.nix b/modules/pass.nix index 0da285d..b818606 100644 --- a/modules/pass.nix +++ b/modules/pass.nix @@ -20,7 +20,7 @@ in { settings = { # default-cache-ttl = 6000; }; - pinentryPackage = lib.mkDefault pkgs.pinentry; + pinentryPackage = lib.mkForce pkgs.pinentry; enable = true; # enableSSHSupport = true; }; diff --git a/modules/sway-defaults.nix b/modules/sway-defaults.nix index 50e6d86..7b22922 100644 --- a/modules/sway-defaults.nix +++ b/modules/sway-defaults.nix @@ -182,6 +182,7 @@ mode "resize" { bindsym Return mode "default" bindsym Escape mode "default" } +# test ''; }; }; diff --git a/modules/sway.nix b/modules/sway.nix index 1af4d7d..7e8fcf9 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -6,12 +6,14 @@ in { build_keybind_lines = lib.mapAttrsToList (key: value: "bindsym ${key} ${value}"); build_exec_lines = map (item: "exec " + item); - sway_conf = pkgs.writeText "sway.conf" (lib.strings.concatLines [ + text = lib.strings.concatLines [ (lib.strings.concatLines (build_definition_lines cfg.sway.definitions)) (lib.strings.concatLines (build_keybind_lines cfg.sway.keybinds)) (lib.strings.concatLines (build_exec_lines cfg.sway.autolaunch)) cfg.sway.extraConfig - ]); + ]; + + sway_conf = pkgs.writeText "sway.conf" text; in with cfg; lib.mkIf (enable && sway.enable) { environment.etc."sway.conf" = { source = sway_conf; @@ -39,9 +41,11 @@ do fi done ''; - reloadTriggers = [ sway_conf ]; + reloadTriggers = [ text ]; }; + programs.waybar.enable = true; + programs.sway = { enable = true; wrapperFeatures = { @@ -54,7 +58,6 @@ done swayidle wl-clipboard wf-recorder - waybar dmenu wmenu ];