From c817a13e220c2fd418df24d41a99aeb35f3154eb Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 26 Jan 2025 13:27:10 +0100 Subject: bump --- .sops.yaml | 3 ++ _sources/generated.json | 20 ++--------- _sources/generated.nix | 14 ++------ accounts/gkleen@sif/default.nix | 7 +++- accounts/gkleen@sif/emacs.el | 1 + accounts/gkleen@sif/niri/default.nix | 6 ++-- flake.lock | 68 +++++++++++++++++------------------ modules/nix-access-tokens/default.nix | 24 +++++++++++++ modules/nix-access-tokens/nix.conf | 32 +++++++++++++++++ nvfetcher.toml | 12 +++---- overlays/batman-adv.nix | 15 -------- 11 files changed, 115 insertions(+), 87 deletions(-) create mode 100644 modules/nix-access-tokens/default.nix create mode 100644 modules/nix-access-tokens/nix.conf delete mode 100644 overlays/batman-adv.nix diff --git a/.sops.yaml b/.sops.yaml index 7b0507ee..948383b2 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -26,3 +26,6 @@ creation_rules: - path_regex: ^hosts/sif/ key_groups: - age: [ *admin_gkleen, *machine_sif ] + - path_regex: ^modules/nix-access-tokens/ + key_groups: + - age: [ *admin_gkleen, *machine_sif, *machine_surtr, *machine_vidhar ] diff --git a/_sources/generated.json b/_sources/generated.json index f73b8190..e82d7fe6 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -20,20 +20,6 @@ }, "version": "8ef9a5b73e5d1063cf912c70027c655fb19d1109" }, - "batman-adv": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "batman-adv", - "passthru": null, - "pinned": false, - "src": { - "sha256": "sha256-VYyIkH5IFfKN6EOHZxSx6AaepD3a22/hhmLhqkle5Z0=", - "type": "tarball", - "url": "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.4.tar.gz" - }, - "version": "2024.4" - }, "bpf-examples": { "cargoLocks": null, "date": "2025-01-03", @@ -450,10 +436,10 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-6OxRXUm7YnBJFdE6Iu5v4DpWWNZR5OZFdOOhfuAfbjs=", + "sha256": "sha256-HJc4JmkhrUPFaK0BrDNi+3x69Uknb77JK9cvFA2hYkA=", "type": "url", - "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.1.15.tar.gz" + "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.1.26.tar.gz" }, - "version": "2025.1.15" + "version": "2025.1.26" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index fb57de83..c1a0c6a0 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -16,14 +16,6 @@ }; date = "2021-05-30"; }; - batman-adv = { - pname = "batman-adv"; - version = "2024.4"; - src = fetchTarball { - url = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.4.tar.gz"; - sha256 = "sha256-VYyIkH5IFfKN6EOHZxSx6AaepD3a22/hhmLhqkle5Z0="; - }; - }; bpf-examples = { pname = "bpf-examples"; version = "8d53e6fc46ae625bd16b38eb1007ece99460eada"; @@ -272,10 +264,10 @@ }; yt-dlp = { pname = "yt-dlp"; - version = "2025.1.15"; + version = "2025.1.26"; src = fetchurl { - url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.1.15.tar.gz"; - sha256 = "sha256-6OxRXUm7YnBJFdE6Iu5v4DpWWNZR5OZFdOOhfuAfbjs="; + url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.1.26.tar.gz"; + sha256 = "sha256-HJc4JmkhrUPFaK0BrDNi+3x69Uknb77JK9cvFA2hYkA="; }; }; } diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 0c0872cc..2d2e25cb 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix @@ -185,7 +185,12 @@ in { }; }; - zathura.enable = true; + zathura = { + enable = true; + options = { + scroll-page-aware = true; + }; + }; imv.enable = true; mpv.config = { diff --git a/accounts/gkleen@sif/emacs.el b/accounts/gkleen@sif/emacs.el index 183cb322..5cee16b0 100644 --- a/accounts/gkleen@sif/emacs.el +++ b/accounts/gkleen@sif/emacs.el @@ -228,6 +228,7 @@ necessarily running." (global-set-key (kbd "C-x k") 'kill-buffer-with-special-emacsclient-handling)) (add-hook 'server-switch-hook 'install-emacsclient-wrapped-kill-buffer) +(add-hook 'server-switch-hook #'raise-frame) (defun move-file (new-location) "Write this file to NEW-LOCATION, and delete the old one." diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix index 2e9b6909..93acc7d7 100644 --- a/accounts/gkleen@sif/niri/default.nix +++ b/accounts/gkleen@sif/niri/default.nix @@ -22,9 +22,9 @@ let active_workspace="$(jq -r --arg workspace_output "$workspace_output" '.[] | select(.output == $workspace_output and .is_active) | .id' <<<"$workspaces_json")" active_output="$(jq -r '.[] | select(.is_focused) | .output' <<<"$workspaces_json")" if [[ $workspace_output != "$active_output" ]]; then - niri msg action move-workspace-to-monitor --output "$active_output" "$workspace_name" - socat STDIO "$NIRI_SOCKET" <<<'{"Action":{"FocusWorkspace":{"reference":{"Id":'"''${active_workspace}"'}}}}' - niri msg action move-workspace-to-index --index 1 "$workspace_name" + niri msg action move-workspace-to-monitor --reference "$workspace_name" "$active_output" + # socat STDIO "$NIRI_SOCKET" <<<'{"Action":{"FocusWorkspace":{"reference":{"Id":'"''${active_workspace}"'}}}}' + # niri msg action move-workspace-to-index --reference "$workspace_name" 1 fi while IFS=$'\n' read -r window_json; do diff --git a/flake.lock b/flake.lock index 1697d69e..1764d172 100644 --- a/flake.lock +++ b/flake.lock @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1736014120, - "narHash": "sha256-ZrI+mcuQfal5IfT4HsxVEiiFNAgV4qYh+B4/NyXxpAs=", + "lastModified": 1737831749, + "narHash": "sha256-La1xZYZ1yHvT4h5MNl5WC2wxBi2P4vozce2n7V/9+2w=", "owner": "gkleen", "repo": "home-manager", - "rev": "99e8412a18eb7e0731aa2b77abeed00d6d1863ad", + "rev": "8b16ee252e38acc29ba634ab60672a051ebc9f59", "type": "github" }, "original": { @@ -359,11 +359,11 @@ }, "impermanence": { "locked": { - "lastModified": 1736688610, - "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", + "lastModified": 1737831083, + "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", "owner": "nix-community", "repo": "impermanence", - "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", + "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", "type": "github" }, "original": { @@ -397,11 +397,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737627930, - "narHash": "sha256-oaAatwNVaX36xmI2AKIVu2oG07XJmHq2T+Y66hEprd8=", + "lastModified": 1737840481, + "narHash": "sha256-WjW3cdrmh1sGMT3CBqCFzT9BOktTa1u9ldoWEqTj7xk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f79aa307f4bc0bfbabee404e6354fd2a1edfcb01", + "rev": "8fc9dba8df75d9d004d9369b513b81180788ec15", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1736861309, - "narHash": "sha256-RSCoXyngYF+7apD5pRq6lZfRbl8vHIUVI57bbihA5Ew=", + "lastModified": 1737795105, + "narHash": "sha256-OsrjQ8O9t9NjDCwfG/EY8MT+K3lb+A5U6SZZ+4PyKzk=", "owner": "gkleen", "repo": "niri", - "rev": "80a7ee2971b2d43622f68dcdc3233ae8365338f6", + "rev": "78697d1cea20e6b53013e820999b0403c45d9f00", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1736652904, - "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=", + "lastModified": 1737257306, + "narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "271e5bd7c57e1f001693799518b10a02d1123b12", + "rev": "744d330659e207a1883d2da0141d35e520eb87bd", "type": "github" }, "original": { @@ -508,11 +508,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736441705, - "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", + "lastModified": 1737751639, + "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", + "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", "type": "github" }, "original": { @@ -630,11 +630,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1737569578, - "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47addd76727f42d351590c905d9d1905ca895b82", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { @@ -678,11 +678,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", - "owner": "NixOS", + "lastModified": 1737842646, + "narHash": "sha256-Bw3D+zXAGxcaS32BgXv3A/uLDEXn6/a18cX41USsv+M=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "34995559351f3b61c122e5566f1903d500e9b890", "type": "github" }, "original": { @@ -748,11 +748,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736774291, - "narHash": "sha256-1rEUm7R93L8rltgyBzon2/lzIN2udC/Kd8nyvuDN6ps=", + "lastModified": 1736884309, + "narHash": "sha256-eiCqmKl0BIRiYk5/ZhZozwn4/7Km9CWTbc15Cv+VX5k=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "499221030113adc5dea05886a1d7aa1cc3a315d1", + "rev": "75d0515332b7ca269f6d7abfd2c44c47a7cbca7b", "type": "github" }, "original": { @@ -891,11 +891,11 @@ ] }, "locked": { - "lastModified": 1736808430, - "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=", + "lastModified": 1737411508, + "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8", + "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", "type": "github" }, "original": { @@ -1000,11 +1000,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1736487362, - "narHash": "sha256-4kGoOA7FgK9N2mzS+TFEn41kUUNY6KwdiA/0rqlr868=", + "lastModified": 1737837494, + "narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "8f55e27f63a749881c4bbfbb6b1da028342a91d1", + "rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f", "type": "github" }, "original": { diff --git a/modules/nix-access-tokens/default.nix b/modules/nix-access-tokens/default.nix new file mode 100644 index 00000000..a3b7abfa --- /dev/null +++ b/modules/nix-access-tokens/default.nix @@ -0,0 +1,24 @@ +{ lib, config, hostName ,... }: + +let + cfg = config.nix.includeAccessTokens; +in { + options = { + nix.includeAccessTokens.enable = lib.mkEnableOption "including access tokens in nix.conf" // { default = lib.elem hostName ["sif" "surtr" "vidhar"]; }; + }; + + config = lib.mkIf cfg.enable { + nix = { + extraOptions = '' + !include ${config.sops.secrets.nixAccessTokens.path} + ''; + }; + + sops.secrets.nixAccessTokens = { + format = "binary"; + sopsFile = ./nix.conf; + mode = "0440"; + group = "wheel"; + }; + }; +} diff --git a/modules/nix-access-tokens/nix.conf b/modules/nix-access-tokens/nix.conf new file mode 100644 index 00000000..f0b394ef --- /dev/null +++ b/modules/nix-access-tokens/nix.conf @@ -0,0 +1,32 @@ +{ + "data": "ENC[AES256_GCM,data:/cdBpvCAFpgm0YWhy1WYlA09KlU6PzVfBYVLBD0boqGqvP+8wuyDzj5KWbcKsdGhoiklODiKR0ODXNU+fA35y862PFXvSb4xVyfbdKRndYdIA4W6vyobtoC9h7B1yR9pkq9L+1tqlU30Dgy2Gndg9rWHlIo+1lO/1A==,iv:B1Px2+cxCaopHZThkEG5saOib+PNvurPIS6aeAv2uPo=,tag:K3JqRaX3/iIqD3c//YdqSQ==,type:str]", + "sops": { + "kms": null, + "gcp_kms": null, + "azure_kv": null, + "hc_vault": null, + "age": [ + { + "recipient": "age1rmmhetcmllq0ahl5qznlr0eya2zdxwl9h6y5wnl97d2wtyx5t99sm2u866", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5NkZUUGI3M2pQYWVXeFV6\na2h2czRTeUJFekJCS012YlBkL1FDdTd3ekZ3ClJsTVh0R2JQM0Jua1JjL285RVA1\nRHhlbjlLdmNBUXVLelFGY2NGYWpLejQKLS0tIDBUWUhJNm8zWGoyQ0pBYnV1ZjBh\ndktNRkNPS1lpWXFITC81aEZJbXlONk0Km2c1xVKwSankaVs7O/utGJwRRX395upz\ndPbsOElTnbGmkb0esGtvGSPboTvK+gjn9w/GhaPyTnNDoos7GaIfyg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1fj65apkhfkrwyv5tx6zcs9nkjg8267fy733qph30sc7zfn7vapjqkd5kne", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6bS9iY2lua3U4U3lJa1pK\nSlZNMmFZMEU5M1V2bWRjaXIwajZJVDJPMlM4Cmd3TTNFWjVuSGdtbC9iODltTS91\nOE5XOEVEQkh0SFpVVW5jc3IzbzNpTmMKLS0tIEtrSU54QUVPa2tBZDhLYlRFWitR\nc2x6MFlxL0tobDJTek42dEcyZXpoWDgKXzQfU+o6FkbJBwmm6oaHu4sDPi822uUR\n5VY6gY/h3g2kM4cuS03Q4NJmeRxuh7cx0UqGU3j5Mf8muE1LHpYEPw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age19a7j77w267z04zls7m28a8hj4a0g5af6ltye2d5wypg33c3l89csd4r9zq", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaOVpNZ2lVT0VwbHVZNzFl\nenJsMGpnbkRvU0xOSU5obk5yT2p5ZVNzdXhNCnVlQzZtRjZNVmJLSUpKc3UwVXZs\nWi9EZ3kxZkJNeFJDSjl1L1IweTFNMXcKLS0tIDJUOTBwTldCUmlnU0tWVkZkNzJL\nejM4ajJVbVhvSm1YM2Vxa2JldllYN0UKAzxy2wkzRvCSiTy417AulpCu41z668HG\nto92eGF2ZRFfEG5LGlCKWeDcP3gM8QwKiVlm6wndbOkhMMfc4Sp3wA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1qffdqvy9arld9zd5a5cylt0n98xhcns5shxhrhwjq5g4qa844ejselaa4l", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2ejRHcGttNUxYZnFzTU5J\nMTFvY3daQ1VMM2xxYTgvLzZwT1owazVNenhzCktaWFF6K2s5UjI2b20rSHFNSS9E\nMVlJSmZhQm15eUs3U0hGTGpSRndmSDgKLS0tIDVrcjl4eDhwak1pRithbnRWWEZy\nVE9EOEpKdEJoRTFrTXpQVDc1cmsrU1kK/goTdUmpZPeMRbY1QzLXAa6Qpg4YYYYo\n3v3GK1bzdey8szfgIr1dHTtQEzqE2WX1swzZizDXj/RiUWx01Ky3GA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-01-25T19:58:58Z", + "mac": "ENC[AES256_GCM,data:Oza4XgnTX3vly89nGluLbEytk1dUYAiOhIYewQyDLLLSSlUIpXmWhV+X0HUQ9AX5kUrEhNbVzRdvUG/9YwoWjTJfvd7tw41IYeTqgykMNXJUfGssoutXfeij9YR+t5aJaRhlTkIWcBhUjXSUNyJCl6Z3XmzWstTPZXEU9VmAvuE=,iv:LqVwIiit+WqI5NWSboexWsmPzg7e63nWJYsNFEK1Uog=,tag:ClR6oI62WXEfIYYAY6vL0A==,type:str]", + "pgp": null, + "unencrypted_suffix": "_unencrypted", + "version": "3.9.3" + } +} \ No newline at end of file diff --git a/nvfetcher.toml b/nvfetcher.toml index d33040c5..e7ba37e5 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -78,12 +78,12 @@ git.fetchSubmodules = true src.git = "https://github.com/jgreco/mpv-youtube-quality" fetch.git = "https://github.com/jgreco/mpv-youtube-quality" -[batman-adv] -src.webpage = "https://www.open-mesh.org/projects/open-mesh/wiki/Download" -src.regex = "The latest version of ]*>batman-adv is ]*>batman-adv-([0-9\\.]+).tar.gz" -src.from_pattern = "^.*batman-adv-([0-9\\.]+).tar.gz.*$" -src.to_pattern = "\\1" -fetch.tarball = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-$ver.tar.gz" +# [batman-adv] +# src.webpage = "https://www.open-mesh.org/projects/open-mesh/wiki/Download" +# src.regex = "The latest version of ]*>batman-adv is ]*>batman-adv-([0-9\\.]+).tar.gz" +# src.from_pattern = "^.*batman-adv-([0-9\\.]+).tar.gz.*$" +# src.to_pattern = "\\1" +# fetch.tarball = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-$ver.tar.gz" [scutiger] src.github_tag = "bk2204/scutiger" diff --git a/overlays/batman-adv.nix b/overlays/batman-adv.nix deleted file mode 100644 index cce7dc4f..00000000 --- a/overlays/batman-adv.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ final, prev, sources, ... }: { - linuxPackages_latest = prev.linuxPackages_latest.extend (self: super: { - batman_adv = super.batman_adv.overrideAttrs (oldAttrs: { - version = "${sources.batman-adv.version}-${self.kernel.version}"; - inherit (sources.batman-adv) src; - }); - }); - - linuxPackages_6_2 = prev.linuxPackages_6_2.extend (self: super: { - batman_adv = super.batman_adv.overrideAttrs (oldAttrs: { - version = "${sources.batman-adv.version}-${self.kernel.version}"; - inherit (sources.batman-adv) src; - }); - }); -} -- cgit v1.2.3