diff --git a/config/xmonad/xmonad.hs b/config/xmonad/xmonad.hs index 275854e6..7bd91daa 100644 --- a/config/xmonad/xmonad.hs +++ b/config/xmonad/xmonad.hs @@ -92,13 +92,13 @@ import XMonad.Util.WorkspaceCompare main = xmonad - . docks - . pagerHints - . setEwmhActivateHook activateSwitchWs - . ewmh - . ewmhFullscreen - . withNavigation2DConfig myNavigation2DConfig - $ myConfig + . docks + . pagerHints + . setEwmhActivateHook activateSwitchWs + . ewmh + . ewmhFullscreen + . withNavigation2DConfig myNavigation2DConfig + $ myConfig myConfig = def { modMask = mod4Mask diff --git a/flake.lock b/flake.lock index 9f8758ad..58ecaf91 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,17 @@ "nodes": { "agenix": { "inputs": { + "darwin": "darwin", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1673301561, - "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=", + "lastModified": 1675176355, + "narHash": "sha256-Qjxh5cmN56siY97mzmBLI1+cdjXSPqmfPVsKxBvHmwI=", "owner": "ryantm", "repo": "agenix", - "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68", + "rev": "b7ffcfe77f817d9ee992640ba1f270718d197f28", "type": "github" }, "original": { @@ -20,17 +21,39 @@ "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": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1674930931, - "narHash": "sha256-h8Uv+DvOAK01qm7WYe/qiBHOyeqlXyrI4edXHkouqRE=", + "lastModified": 1675419601, + "narHash": "sha256-Zt6VnU6CLxaISGmPNMGiD0A9BcgcXJTEuX196M11RYw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d1ea6872b199edc680917a7248b596e532297538", + "rev": "88dcf53013b1f8f0a6a1766fc76ed181e0a6a8db", "type": "github" }, "original": { @@ -42,11 +65,11 @@ "emacs-dir": { "flake": false, "locked": { - "lastModified": 1673830938, - "narHash": "sha256-veRijMjgo1Y07lR2VgyKsA/9IE9pJ8KY03pfnQIgON8=", + "lastModified": 1675443466, + "narHash": "sha256-WLsV1VNp8jZj0wMYu6Y//tWPLdSYT48WdHsIvTQTKjM=", "ref": "refs/heads/main", - "rev": "c98130f4103aef3322cd21f1e3a967fc4f7ea65d", - "revCount": 30, + "rev": "b14956851dc07ba683efe6349854715cae679e8c", + "revCount": 31, "submodules": true, "type": "git", "url": "https://github.com/Icy-Thought/emacs.d.git" @@ -194,11 +217,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674928308, - "narHash": "sha256-elVU4NUZEl11BdT4gC+lrpLYM8Ccxqxs19Ix84HTI9o=", + "lastModified": 1675371293, + "narHash": "sha256-LrCjtrAXj/WJphhGEMnHgZs7oTsfOlvPfOjFTIvg39k=", "owner": "nix-community", "repo": "home-manager", - "rev": "08a778d80308353f4f65c9dcd3790b5da02d6306", + "rev": "d1c7730bb707bf8124d997952f7babd2a281ae68", "type": "github" }, "original": { @@ -216,11 +239,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1674930518, - "narHash": "sha256-EVusv/SJYQHOY/6VmxXC2IFSFtQhrIk6/b0ugd6lxDk=", + "lastModified": 1675441057, + "narHash": "sha256-WpR1RqbJlNmcuRWXjbZ5MBgr1xx5f/SbWomexmishkc=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ce632b7a05a27d121c9544607ccd873adee8bd42", + "rev": "fd3a1cd086d077c39c5634ff6c9be9893857dc55", "type": "github" }, "original": { @@ -282,11 +305,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1674882405, - "narHash": "sha256-GnP517tetJRrwEGpzKPmb4n/aoh66XVuj4o1WsZgSAk=", + "lastModified": 1675378815, + "narHash": "sha256-UwiB1k95ZLPZdua7GmgywyYbvN4SFCvpa/Fw7cVmma4=", "owner": "neovim", "repo": "neovim", - "rev": "b4c4c232ba6fe3df5c6f12faff4405a16e4d40df", + "rev": "f9826e1dff5f1ac8212ca55a847c872c426142db", "type": "github" }, "original": { @@ -314,11 +337,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1674899129, - "narHash": "sha256-6LGae8WbdCN4S9+o2wfYDJPpfxC2EnXEvoopVkguNtc=", + "lastModified": 1675309347, + "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6b9c27b4c9c1c329b27a44ed1fa8935df79f9a8b", + "rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5", "type": "github" }, "original": { @@ -329,10 +352,10 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1674459583, - "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", - "path": "/nix/store/ismzj4bksv54y4x2b9spfvk9mqhbcwf8-source", - "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", + "lastModified": 1674641431, + "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", + "path": "/nix/store/714kd9iay1f89hspfp62f6xhch67n733-source", + "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", "type": "path" }, "original": { @@ -342,11 +365,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1673540789, - "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", + "lastModified": 1675273418, + "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", + "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", "type": "github" }, "original": { @@ -358,11 +381,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1674641431, - "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", + "lastModified": 1675273418, + "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", + "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", "type": "github" }, "original": { @@ -434,10 +457,10 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1674459583, - "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", - "path": "/nix/store/ismzj4bksv54y4x2b9spfvk9mqhbcwf8-source", - "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", + "lastModified": 1674641431, + "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", + "path": "/nix/store/714kd9iay1f89hspfp62f6xhch67n733-source", + "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", "type": "path" }, "original": { @@ -484,11 +507,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1674893621, - "narHash": "sha256-tbpW9zwUxrpJIaaY17pmkQUz/ZI64/OT5GN5FMV1npQ=", + "lastModified": 1675412078, + "narHash": "sha256-NAuiyJKJv6JflYP16SMauBN3zPxt7bM5aGM7XGmpUE4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "947d9a77304ace2f4eceb4291dc778145290b6be", + "rev": "0358cdb896f23a7adbb82391b85b12839a94e990", "type": "github" }, "original": { @@ -520,11 +543,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1674872860, - "narHash": "sha256-IH6FckXyjJ4atdYzIIkBBILucoFmjAqvm+NWqFqcmHg=", + "lastModified": 1675391458, + "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bbc57d7aac4ac1ec0a68ff77a22d03622cc11246", + "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", "type": "github" }, "original": { @@ -553,11 +576,11 @@ }, "unstable": { "locked": { - "lastModified": 1674641431, - "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", + "lastModified": 1675273418, + "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", + "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", "type": "github" }, "original": { @@ -586,11 +609,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1672824257, - "narHash": "sha256-SbYoZj57VlopTzI+OSW9jlgYxN1gI1KLg/s/HV+87eE=", + "lastModified": 1675374853, + "narHash": "sha256-BSrjNcddYWhFUMtjGwxiEXw67MYRaIHGvLn19Mvm1NE=", "owner": "wlroots", "repo": "wlroots", - "rev": "5f264a7d6c8af27d41ff440c05262b022c055593", + "rev": "677a3f2f8847ed2de49dd60868f9d9487a546f58", "type": "gitlab" }, "original": { diff --git a/modules/agenix.nix b/modules/agenix.nix index e678e9b1..8b26fc64 100644 --- a/modules/agenix.nix +++ b/modules/agenix.nix @@ -15,9 +15,9 @@ let secretsFile = "${secretsDir}/secrets.nix"; in { - imports = [ agenix.nixosModules.age ]; + imports = [ agenix.nixosModules.default ]; - environment.systemPackages = [ agenix.defaultPackage.x86_64-linux ]; + environment.systemPackages = [ agenix.packages.x86_64-linux.default ]; age.secrets = if pathExists secretsFile diff --git a/modules/develop/nix-lang.nix b/modules/develop/nix-lang.nix index a9c06e64..aafc0e35 100644 --- a/modules/develop/nix-lang.nix +++ b/modules/develop/nix-lang.nix @@ -19,6 +19,7 @@ in user.packages = with pkgs; [ manix nix-index + nix-init nix-output-monitor nix-tree nixpkgs-fmt