diff --git a/flake.lock b/flake.lock index c96a0f8..af3ec73 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,17 @@ "nodes": { "agenix": { "inputs": { + "darwin": "darwin", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1665870395, - "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", + "lastModified": 1675176355, + "narHash": "sha256-Qjxh5cmN56siY97mzmBLI1+cdjXSPqmfPVsKxBvHmwI=", "owner": "ryantm", "repo": "agenix", - "rev": "a630400067c6d03c9b3e0455347dc8559db14288", + "rev": "b7ffcfe77f817d9ee992640ba1f270718d197f28", "type": "github" }, "original": { @@ -23,11 +24,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1672679724, - "narHash": "sha256-7BSC3EZ4DHA+xpztIQd6Jm6GjEm5obSoBhrUZR8WlIw=", + "lastModified": 1674781645, + "narHash": "sha256-NGp5BLOQmiXsUh9nrXP+PeVXyK1c8Ij5EnwtFXAkD9w=", "owner": "arkenfox", "repo": "user.js", - "rev": "f5e54b4a709ca3d58e12e7524e71d3cd7f994515", + "rev": "b99dd27de828be13530ce2f48c9178d34f5f82ab", "type": "github" }, "original": { @@ -53,18 +54,41 @@ "type": "github" } }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "emacs": { "inputs": { "emacs-overlay": "emacs-overlay", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1675071250, - "narHash": "sha256-MrNYL8XGyKdcCaUHCVm2VTtHHZ/3MpwVYX514mw88SQ=", + "lastModified": 1675333319, + "narHash": "sha256-V7hcI+5hc/iPHxWrgdy3ip3aNgdWzpreE1C+cbRzlbo=", "ref": "main", - "rev": "2d2c401dc225dcbc9c13943062dbc2542059b050", - "revCount": 69, + "rev": "cb0e0ad408f7fa8243713932abf7aa008147f2ff", + "revCount": 78, "type": "git", "url": "ssh://git@gitea.moritzboeh.me/moritz/emacs.git" }, @@ -80,11 +104,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1674874856, - "narHash": "sha256-RWFiIGbcvN13aj2MKETjoUt3upbAziNTdeW1AESOkWg=", + "lastModified": 1675309900, + "narHash": "sha256-liDBB8HjXkJZ/WJ1hGDKuCl5QkPPJko9XY/eyxKd7lg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d2d7a3c5eb96fa6ca486b3adc0694295aedef6c7", + "rev": "7276116feb26bf3fc2834709a2ea2f6ed738cc52", "type": "github" }, "original": { @@ -96,11 +120,27 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -187,11 +227,11 @@ "forgit-git": { "flake": false, "locked": { - "lastModified": 1671476278, - "narHash": "sha256-guAjxFhtybbRyRRXDELDHrM2Xzmi96wPxD2nhL9Ifmk=", + "lastModified": 1675097212, + "narHash": "sha256-PGFYw7JbuYHOVycPlYcRItElcyuKEg2cGv4wn6In5Mo=", "owner": "wfxr", "repo": "forgit", - "rev": "ffda73bac3a435a9bbc6f29f2fd98517fbe5d9db", + "rev": "aa85792ec465ceee254be0e8e70d8703c7029f66", "type": "github" }, "original": { @@ -201,6 +241,28 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "emacs", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "pre-commit-hooks", @@ -229,11 +291,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1673089714, - "narHash": "sha256-D58SGNOVe+s7r2iewnCA8q68gyrfQcOnD1TdJo1wFLY=", + "lastModified": 1675303228, + "narHash": "sha256-dHJbFg7gTuTyEUdJoNDp6l2bac6HXAT/bz9cVEqL+Uw=", "owner": "nix-community", "repo": "home-manager", - "rev": "9e565f0d9d41c19a94f55af205c328ec5177fc0a", + "rev": "4a958524903e6019f5f69a23e0c0f16e5af01eb0", "type": "github" }, "original": { @@ -248,7 +310,7 @@ "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { "lastModified": 1665343480, @@ -290,11 +352,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1673095759, - "narHash": "sha256-60efSiA7BmaX9j6hTbWVi4Tk7ZdeEWGlF0ntWYS8zmI=", + "lastModified": 1675285561, + "narHash": "sha256-0l239rdKHmtCf8xckssOk3bXf+gTXZa6gOEVVVeIfb0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "af4b9700b7a1a1b36439dc51334b9aeaadcfcd41", + "rev": "32d56fec977b109aeecb06288a1b45cfe6b83117", "type": "github" }, "original": { @@ -304,29 +366,18 @@ } }, "hyprland-protocols": { - "flake": false, - "locked": { - "lastModified": 1670703428, - "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", - "type": "github" + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_2": { - "flake": false, "locked": { - "lastModified": 1670703428, - "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", + "lastModified": 1671839510, + "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", + "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", "type": "github" }, "original": { @@ -340,11 +391,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1672925969, - "narHash": "sha256-d94BZH6gJ6s3GmudyKc4XleARpLnYkxhxa6YMb7yKAw=", + "lastModified": 1675010546, + "narHash": "sha256-mx2WkCa2yUaZakioiLY7dHrU0fZS2szlqghbDbc34RE=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "50852e531987d20c432122fbec7f1f089bc2dc09", + "rev": "0c2386861afbb10c8c5eb6de868fa2a519df2907", "type": "github" }, "original": { @@ -355,11 +406,11 @@ }, "master": { "locked": { - "lastModified": 1673107670, - "narHash": "sha256-XYlaFrmKkl87V8ut5Xb/i0qq9P2RLCRi5IzcxgplbhI=", + "lastModified": 1675333202, + "narHash": "sha256-ZcZqGz2K7V9/uIrWfdmKUfC5PkcuR29DKTqUTF5BURo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da1f6f31200da59235673fe0d5be645ef17f06b0", + "rev": "a2780dc543d24f33d7a2d7fa5b2bf609ed8c1849", "type": "github" }, "original": { @@ -386,27 +437,43 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1671271954, - "narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=", + "lastModified": 1673800717, + "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3", + "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1673800717, + "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1674869206, - "narHash": "sha256-yfafZreWPEIuUX+9GWHX8/8UlaM8hiVNRrOtNMP+v4s=", + "lastModified": 1675249806, + "narHash": "sha256-u8Rcqekusl3pMZm68hZqr6zozI8Ug5IxqOiqDLAlu1k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "13645205311aa81dbc7c5adeee0382e38e52ee7c", + "rev": "79feedf38536de2a27d13fe2eaf200a9c05193ba", "type": "github" }, "original": { @@ -434,11 +501,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1672791794, - "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=", + "lastModified": 1673540789, + "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", + "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", "type": "github" }, "original": { @@ -450,11 +517,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1658826464, - "narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=", + "lastModified": 1674641431, + "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce49cb7792a7ffd65ef352dda1110a4e4a204eac", + "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", "type": "github" }, "original": { @@ -466,11 +533,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1672997035, - "narHash": "sha256-DNaNjsGMRYefBTAxFIrVOB2ok477cj1FTpqnu/mKRf4=", + "lastModified": 1675249806, + "narHash": "sha256-u8Rcqekusl3pMZm68hZqr6zozI8Ug5IxqOiqDLAlu1k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1ffcf798e93b169321106a4aef79526a2b4bd0a", + "rev": "79feedf38536de2a27d13fe2eaf200a9c05193ba", "type": "github" }, "original": { @@ -497,6 +564,34 @@ } }, "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": [ + "emacs", + "flake-utils" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "emacs", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1675169698, + "narHash": "sha256-C1wFiyJ+4SRvIsFkdMIN1Fa+58APmyTGKWpX9EKOehM=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "ce4efeec34c6eb35ba07b8fceaae87d6b46c1c5f", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { "inputs": { "flake-utils": [ "howdy", @@ -521,20 +616,20 @@ "type": "github" } }, - "pre-commit-hooks_2": { + "pre-commit-hooks_3": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_4", - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": "nixpkgs_7", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1672912243, - "narHash": "sha256-QnQeKUjco2kO9J4rBqIBPp5XcOMblIMnmyhpjeaJBYc=", + "lastModified": 1675169698, + "narHash": "sha256-C1wFiyJ+4SRvIsFkdMIN1Fa+58APmyTGKWpX9EKOehM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a4548c09eac4afb592ab2614f4a150120b29584c", + "rev": "ce4efeec34c6eb35ba07b8fceaae87d6b46c1c5f", "type": "github" }, "original": { @@ -557,18 +652,18 @@ "hyprpaper": "hyprpaper", "master": "master", "nixpkgs": "nixpkgs_6", - "pre-commit-hooks": "pre-commit-hooks_2", + "pre-commit-hooks": "pre-commit-hooks_3", "stable": "stable", "utils": "utils_2" } }, "stable": { "locked": { - "lastModified": 1672968032, - "narHash": "sha256-26Jns3GmHem44a06UN5Rj/KOD9qNJThyQrom02Ijur8=", + "lastModified": 1675237434, + "narHash": "sha256-YoFR0vyEa1HXufLNIFgOGhIFMRnY6aZ0IepZF5cYemo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2dea8991d89b9f1e78d874945f78ca15f6954289", + "rev": "285b3ff0660640575186a4086e1f8dc0df2874b5", "type": "github" }, "original": { @@ -615,11 +710,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1671183014, - "narHash": "sha256-oMWT5Zbe/3HFINAk38jNVxiZ4PCYvPJj2Jo4iiyBtm0=", + "lastModified": 1672824257, + "narHash": "sha256-SbYoZj57VlopTzI+OSW9jlgYxN1gI1KLg/s/HV+87eE=", "owner": "wlroots", "repo": "wlroots", - "rev": "dc7cc98cf21a8dc19ab8895505500e3700646af0", + "rev": "5f264a7d6c8af27d41ff440c05262b022c055593", "type": "gitlab" }, "original": { @@ -631,18 +726,21 @@ }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols_2", + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], "nixpkgs": [ "hyprland", "nixpkgs" ] }, "locked": { - "lastModified": 1671837878, - "narHash": "sha256-OmFDyktTc/l+3wHboHeFpAQgPt3r7jjqZf8MrwuUGMo=", + "lastModified": 1673116118, + "narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e47f4cec698080768821b271510985ab94a37e91", + "rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fb43cfe..1157fa1 100644 --- a/flake.nix +++ b/flake.nix @@ -70,7 +70,7 @@ overlay = import ./overlays { inherit inputs; }; channels.nixpkgs.overlaysBuilder = channels: [ - inputs.agenix.overlay + inputs.agenix.overlays.default inputs.emacs.overlays.default inputs.howdy.overlays.default inputs.hypr-contrib.overlays.default diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 705d0e3..1ba9353 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -102,7 +102,7 @@ with lib; { # ripping abcde - handbrake + stable.handbrake # HACK to fix broken ffmpeg on unstable picard # other diff --git a/modules/security/default.nix b/modules/security/default.nix index 3506583..c3cf86f 100644 --- a/modules/security/default.nix +++ b/modules/security/default.nix @@ -70,9 +70,11 @@ # SSH services.openssh = { - # Disable ssh password login - passwordAuthentication = lib.mkDefault false; - logLevel = "VERBOSE"; + settings = { + # Disable ssh password login + passwordAuthentication = lib.mkDefault false; + logLevel = "VERBOSE"; + }; extraConfig = '' AllowAgentForwarding no AllowTcpForwarding no diff --git a/overlays/default.nix b/overlays/default.nix index 071a899..9a3101b 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -9,14 +9,6 @@ ''; }; - waybar-hyprland = prev.waybar.overrideAttrs (old: { - pname = "${old.pname}-hyprland"; - postPatch = old.postPatch or "" + '' - sed -i 's,zext_workspace_handle_v1_activate(workspace_handle_);,const std::string command = "${final.hyprland}/bin/hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());,g' src/modules/wlr/workspace_manager.cpp - ''; - mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ]; - }); - master = import inputs.master { inherit (prev) system; config.allowUnfree = true;