From d2ab8f38e30c8ff62472f69072c0ba6412401802 Mon Sep 17 00:00:00 2001 From: pupbrained Date: Fri, 18 Oct 2024 00:43:17 -0400 Subject: [PATCH] updates --- flake.in.nix | 3 +- flake.lock | 352 +++++++++--------- flake.nix | 2 +- homes/x86_64-linux/marshall@navis/default.nix | 1 + .../marshall@navis/hyprland/services.nix | 4 +- homes/x86_64-linux/marshall@navis/wezterm.lua | 2 +- modules/home/shell/default.nix | 2 +- systems/x86_64-linux/navis/default.nix | 67 ++-- 8 files changed, 234 insertions(+), 199 deletions(-) diff --git a/flake.in.nix b/flake.in.nix index 699ed97..79a9c61 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -33,8 +33,7 @@ nixvim = mkInput "pupbrained/nvim-config"; treefmt-nix = mkInput "numtide/treefmt-nix"; xmonad-contrib = mkInput "xmonad/xmonad-contrib"; - # TODO: Remove this once flake is fixed - zen-browser = mkInput "fufexan/zen-browser-flake/5ea9183acb736b9a606a1f33505d20a6f14dc5cf"; + zen-browser = mkInput "fufexan/zen-browser-flake"; cosmic = mkFollowingNixpkgs "lilyinstarlight/nixos-cosmic"; darwin = mkFollowingNixpkgs "LnL7/nix-darwin/master"; diff --git a/flake.lock b/flake.lock index c0df0d7..2cd1b20 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1727261104, - "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=", + "lastModified": 1728902391, + "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b82fdaff917582a9d568969e15e61b398c71e990", + "rev": "9874e08eec85b5542ca22494e127b0cdce46b786", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1727910534, - "narHash": "sha256-IjdGPDnBNk3r5h02kiPTKUOfn+UiKNWlhy/ozC0NgyQ=", + "lastModified": 1728407414, + "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", "owner": "catppuccin", "repo": "nix", - "rev": "bad96d3fabf8d2e8f0bf0c2cb899a9fccf01ea03", + "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", "type": "github" }, "original": { @@ -87,18 +87,17 @@ }, "chaotic": { "inputs": { - "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager_2", "jovian": "jovian", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1728001451, - "narHash": "sha256-Ost5YHSZZE4ZIKBcWsXC1c7g7n3kIqaNNjs5ula/lAI=", + "lastModified": 1729092978, + "narHash": "sha256-2SMJFFgKSvrQfkfzdcYjwFGvgeoCtDdbl/CGZNIU7hs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "25f420d9cf70929455ba14642b92ae715ae8d792", + "rev": "9af42c96e8d666f1df2b087aba1a6349f1c22f4e", "type": "github" }, "original": { @@ -137,11 +136,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728184451, - "narHash": "sha256-XuvfrJ3TkHfGKRdiWPN/RD+veVtGl0Db+R44fb5gdT8=", + "lastModified": 1729209055, + "narHash": "sha256-QN0W/LJzUZGFdx4dYz8L7Z7uioAc3Po+AtGUs/IyV4Y=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "631b0cbf1466553533a87e4b8e77c00731eba21f", + "rev": "e1c81bcb1321916bc1546d3da4907f31c5a5e948", "type": "github" }, "original": { @@ -179,11 +178,11 @@ ] }, "locked": { - "lastModified": 1727999297, - "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", + "lastModified": 1728901530, + "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", + "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", "type": "github" }, "original": { @@ -256,28 +255,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1727937235, - "narHash": "sha256-Ih4RD65WZZDgtla9Uh8zm6gQJ1zgkXkiU4HKtEwQjvI=", - "owner": "nix-community", - "repo": "fenix", - "rev": "381781f96b880c2ced9019a9e2406b31ccea82b4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -295,6 +272,22 @@ } }, "flake-compat_2": { + "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_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -310,7 +303,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -324,7 +317,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_4": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -341,7 +334,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1650374568, @@ -357,7 +350,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1650374568, @@ -667,7 +660,7 @@ "nixvim", "flake-compat" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "nixvim", "nixvim", @@ -732,6 +725,28 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "hyprland", + "pre-commit-hooks", + "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", @@ -783,11 +798,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1728903686, + "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "type": "github" }, "original": { @@ -803,11 +818,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1729174520, + "narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268", "type": "github" }, "original": { @@ -854,11 +869,11 @@ ] }, "locked": { - "lastModified": 1727532803, - "narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=", + "lastModified": 1728669738, + "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f", + "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", "type": "github" }, "original": { @@ -876,15 +891,16 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_6", + "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_5", "xdph": "xdph" }, "locked": { - "lastModified": 1728142617, - "narHash": "sha256-iPiCwcslVd+s2z0IoqTOZtP2XPEVB3TCq5zFUrzNA8g=", + "lastModified": 1729195555, + "narHash": "sha256-nTMzcwH5eFX2JM5Lrtw1469BRe6hGgWWxLqJBynEdvo=", "ref": "refs/heads/main", - "rev": "0ec6072a290051a03ab66cfb9bc616b2f5540e64", - "revCount": 5298, + "rev": "0e630e9e74ad34683194a07cfe6afe55a2c0685f", + "revCount": 5352, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -912,11 +928,11 @@ ] }, "locked": { - "lastModified": 1727705521, - "narHash": "sha256-tR4bc6zONkxore1F7CRrwHs9NITht8NY0JTidPSmMXY=", + "lastModified": 1728383680, + "narHash": "sha256-/SeOrMuPEOjngI+MBlzqxQ/sJxkJFIYoef+wJ/PmX2w=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "9215288eb2ded9d0c08d468ea90ba68f43162c67", + "rev": "d05eb1ffba2ebffb5b4e1b407f134a4dcb411a88", "type": "github" }, "original": { @@ -937,38 +953,11 @@ ] }, "locked": { - "lastModified": 1727451107, - "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=", + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1721326555, - "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", "type": "github" }, "original": { @@ -993,11 +982,11 @@ ] }, "locked": { - "lastModified": 1725997860, - "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=", + "lastModified": 1728168612, + "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876", + "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "type": "github" }, "original": { @@ -1018,11 +1007,11 @@ ] }, "locked": { - "lastModified": 1727300645, - "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "lastModified": 1728941256, + "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", "type": "github" }, "original": { @@ -1058,11 +1047,11 @@ }, "impermanence": { "locked": { - "lastModified": 1727649413, - "narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=", + "lastModified": 1729068498, + "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=", "owner": "nix-community", "repo": "impermanence", - "rev": "d0b38e550039a72aff896ee65b0918e975e6d48e", + "rev": "e337457502571b23e449bf42153d7faa10c0a562", "type": "github" }, "original": { @@ -1080,11 +1069,11 @@ ] }, "locked": { - "lastModified": 1727865565, - "narHash": "sha256-SBcqfosxb0XlKdIz6QGXCnK4W/TEVHLDZHkRHZ8Me60=", + "lastModified": 1728974938, + "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "703c0ac8432f3758987e0788248ddc1a8e0bf412", + "rev": "23170582b0658e6afd913149a58863af3a57b376", "type": "github" }, "original": { @@ -1180,11 +1169,11 @@ ] }, "locked": { - "lastModified": 1728185226, - "narHash": "sha256-W+wWyNjFywVfFrbErXhGwgO2HlR0yMHqd1doEEbW9yw=", + "lastModified": 1728790083, + "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "0f7169d3ec7ef1477af6e39731e67a1dc7a9f6e7", + "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", "type": "github" }, "original": { @@ -1195,12 +1184,12 @@ }, "nix-super": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "libgit2": "libgit2", "nixpkgs": "nixpkgs_7", "nixpkgs-regression": "nixpkgs-regression", - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { "lastModified": 1713821351, @@ -1265,11 +1254,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728067476, - "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", + "lastModified": 1728909085, + "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", + "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", "type": "github" }, "original": { @@ -1295,6 +1284,22 @@ "type": "github" } }, + "nixpkgs-stable_3": { + "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_10": { "locked": { "lastModified": 1727742380, @@ -1375,8 +1380,8 @@ "nixpkgs_15": { "locked": { "lastModified": 0, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", - "path": "/nix/store/sdzpqjwx7pdx6lsq6llyfqqf7hspp83c-source", + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "path": "/nix/store/xnjw9gmfmpppdj6bxpw6cfkspc3h6xwl-source", "type": "path" }, "original": { @@ -1401,8 +1406,8 @@ "nixpkgs_17": { "locked": { "lastModified": 0, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", - "path": "/nix/store/sdzpqjwx7pdx6lsq6llyfqqf7hspp83c-source", + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "path": "/nix/store/xnjw9gmfmpppdj6bxpw6cfkspc3h6xwl-source", "type": "path" }, "original": { @@ -1428,11 +1433,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -1492,11 +1497,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -1524,11 +1529,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -1563,11 +1568,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1727996880, - "narHash": "sha256-Hm3ECx7gOSxoTLzhN7ni71APK/B2G37DR405coJqdwM=", + "lastModified": 1728515236, + "narHash": "sha256-gYObAkD39KbYdeSxOxPFaVVgfbRPPgG470E8sFMaQDM=", "owner": "pupbrained", "repo": "nvim-config", - "rev": "bb4666783362d4be9f5c48c46d55b0b4ff18aef9", + "rev": "584a15c6dcf5bea4a9ab3c804b86324b128d3b67", "type": "github" }, "original": { @@ -1579,7 +1584,7 @@ "nixvim_2": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "home-manager": "home-manager_4", @@ -1626,6 +1631,30 @@ } }, "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_3" + }, + "locked": { + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { "inputs": { "flake-compat": [ "nix-super" @@ -1682,23 +1711,6 @@ "zen-browser": "zen-browser" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1727778987, - "narHash": "sha256-OTI1eKQ3WIkj6q8PROpPY1vhaxYRdiS1btSfBowQPps=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "e1a76671af2fbc74c84c18ba18fcda5e653d7531", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1707,11 +1719,11 @@ ] }, "locked": { - "lastModified": 1728095260, - "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", + "lastModified": 1729045942, + "narHash": "sha256-HjmK0x5Zm2TK2vFpC7XBM2e3EDNVnAIuEoU2FkeN8xw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", + "rev": "9de3cea452d2401d6f93c06ad985178a4e11d1fc", "type": "github" }, "original": { @@ -1722,7 +1734,7 @@ }, "snowfall-flake": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "nixpkgs": [ "nixpkgs" ], @@ -1744,7 +1756,7 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "snowfall-flake", @@ -1768,7 +1780,7 @@ }, "snowfall-lib_2": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "flake-utils-plus": "flake-utils-plus_2", "nixpkgs": [ "nixpkgs" @@ -2017,11 +2029,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1729077719, + "narHash": "sha256-zayHqZO9gA1U85c4CPvVSnLV8/cBgc2yVrSKWaKeBUs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "5307ba60125bb024d7e52d71d582eafd511f3fee", "type": "github" }, "original": { @@ -2032,11 +2044,11 @@ }, "unstable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -2048,7 +2060,10 @@ }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols_2", + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], "hyprlang": [ "hyprland", "hyprlang" @@ -2071,11 +2086,11 @@ ] }, "locked": { - "lastModified": 1727524473, - "narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=", + "lastModified": 1728166987, + "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26", + "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", "type": "github" }, "original": { @@ -2092,11 +2107,11 @@ "unstable": "unstable" }, "locked": { - "lastModified": 1727679381, - "narHash": "sha256-EyaSYRNdZGvWDjDb9Gk3hPcXNQqwg7pyVp3SOBJ7TBo=", + "lastModified": 1728318022, + "narHash": "sha256-JYDe/lNgfiWl+QXZDtaLuU3sscybO9XQVupiFsoUInE=", "owner": "xmonad", "repo": "xmonad", - "rev": "aadb8df59bca896b198420757aff570e53bd9c9c", + "rev": "eba9e97794705349f9c6a50230bb88b8ef7d539a", "type": "github" }, "original": { @@ -2113,11 +2128,11 @@ "xmonad": "xmonad" }, "locked": { - "lastModified": 1727715770, - "narHash": "sha256-lsSmUbt1REKL2E5qon43AbPePsAyT2M16J0wWQVODW0=", + "lastModified": 1728324446, + "narHash": "sha256-Q8YdaORLH0re1+FD/5xk4YXultXZ/8JkTgIcDt2vr7o=", "owner": "xmonad", "repo": "xmonad-contrib", - "rev": "2c161ff670593d147823a08d73730080ef952753", + "rev": "1c5261d65a56d72bfb49d778f7b1e3482881d368", "type": "github" }, "original": { @@ -2131,17 +2146,16 @@ "nixpkgs": "nixpkgs_18" }, "locked": { - "lastModified": 1727727983, - "narHash": "sha256-zWOQBzmVeC2YF6R/V+GjhEjdOKW+qaHO0em5CfhjBbw=", + "lastModified": 1729041431, + "narHash": "sha256-X/z68x0FsBmmb8usu+X+ViLw5M6mdVDDB2JLCXiPpG4=", "owner": "fufexan", "repo": "zen-browser-flake", - "rev": "5ea9183acb736b9a606a1f33505d20a6f14dc5cf", + "rev": "b46602e979662038f938765e13dbe409fe461831", "type": "github" }, "original": { "owner": "fufexan", "repo": "zen-browser-flake", - "rev": "5ea9183acb736b9a606a1f33505d20a6f14dc5cf", "type": "github" } } diff --git a/flake.nix b/flake.nix index a2b22af..29f0403 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,7 @@ }; treefmt-nix.url = "github:numtide/treefmt-nix"; xmonad-contrib.url = "github:xmonad/xmonad-contrib"; - zen-browser.url = "github:fufexan/zen-browser-flake/5ea9183acb736b9a606a1f33505d20a6f14dc5cf"; + zen-browser.url = "github:fufexan/zen-browser-flake"; }; outputs = inputs: inputs.flakegen ./flake.in.nix inputs; } diff --git a/homes/x86_64-linux/marshall@navis/default.nix b/homes/x86_64-linux/marshall@navis/default.nix index 11815c3..ab07bde 100644 --- a/homes/x86_64-linux/marshall@navis/default.nix +++ b/homes/x86_64-linux/marshall@navis/default.nix @@ -107,6 +107,7 @@ in { duf eternal-terminal emacs30-pgtk + emacs-lsp-booster equibop glow grc diff --git a/homes/x86_64-linux/marshall@navis/hyprland/services.nix b/homes/x86_64-linux/marshall@navis/hyprland/services.nix index 1c60efc..3fb19a5 100644 --- a/homes/x86_64-linux/marshall@navis/hyprland/services.nix +++ b/homes/x86_64-linux/marshall@navis/hyprland/services.nix @@ -1,10 +1,10 @@ {...}: { services = { - cliphist.enable = true; + cliphist.enable = false; udiskie.enable = false; swaync = { - enable = true; + enable = false; style = builtins.fetchurl { url = "https://github.com/catppuccin/swaync/releases/download/v0.2.3/mocha.css"; sha256 = "1xr1wkg4zb467b35xhsfqiwhimfnn88i3ml5rf173rkm7fyby9qy"; diff --git a/homes/x86_64-linux/marshall@navis/wezterm.lua b/homes/x86_64-linux/marshall@navis/wezterm.lua index 0c5ab6c..f302335 100644 --- a/homes/x86_64-linux/marshall@navis/wezterm.lua +++ b/homes/x86_64-linux/marshall@navis/wezterm.lua @@ -116,7 +116,7 @@ local config = { enable_scroll_bar = false, enable_wayland = true, font_size = 12, - font = wezterm.font('Iosevka Comfy Wide Motion'), + font = wezterm.font('Iosevka Comfy Motion'), front_end = 'WebGpu', keys = keybinds, underline_position = -4, diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix index 7db69fb..dd40e57 100644 --- a/modules/home/shell/default.nix +++ b/modules/home/shell/default.nix @@ -41,7 +41,7 @@ eza = { enable = true; git = true; - icons = true; + icons = "always"; }; fzf = { diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix index 0382af6..bfe2d68 100644 --- a/systems/x86_64-linux/navis/default.nix +++ b/systems/x86_64-linux/navis/default.nix @@ -13,7 +13,7 @@ rtkit.enable = true; pam = { - services.greetd.enableGnomeKeyring = true; + services.cosmic-greeter-daemon.enableGnomeKeyring = true; loginLimits = [ { @@ -39,23 +39,29 @@ }; fonts = { - packages = with pkgs.iosevka-comfy; [ - comfy - comfy-duo - comfy-fixed - comfy-motion - comfy-motion-duo - comfy-motion-fixed - comfy-wide - comfy-wide-duo - comfy-wide-fixed - comfy-wide-motion - comfy-wide-motion-duo - comfy-wide-motion-fixed - ]; + packages = with pkgs; + [ + ibm-plex + nerdfonts + ] + ++ (with iosevka-comfy; [ + comfy + comfy-duo + comfy-fixed + comfy-motion + comfy-motion-duo + comfy-motion-fixed + comfy-wide + comfy-wide-duo + comfy-wide-fixed + comfy-wide-motion + comfy-wide-motion-duo + comfy-wide-motion-fixed + ]); fontconfig = { - subpixel.rgba = "rgb"; + hinting.enable = true; + subpixel.lcdfilter = "none"; }; }; @@ -81,12 +87,7 @@ identityPaths = ["/persist/root/.ssh/id_ed25519"]; }; - chaotic = { - scx = { - enable = true; - scheduler = "scx_rusty"; - }; - }; + chaotic.scx.enable = true; virtualisation = { spiceUSBRedirection.enable = true; @@ -407,6 +408,11 @@ zlib ]; }; + + obs-studio = { + enable = true; + enableVirtualCamera = true; + }; }; networking = { @@ -511,7 +517,22 @@ }; }; - xdg.portal.enable = true; + xdg.portal = { + enable = true; + config = { + common = { + default = [ + "cosmic" + "gtk" + ]; + }; + }; + extraPortals = [ + pkgs.xdg-desktop-portal-cosmic + pkgs.xdg-desktop-portal-gtk + ]; + xdgOpenUsePortal = true; + }; system.stateVersion = "24.05"; }