From 479e93469ea6c7f06594d4e53120034e23c5a35d Mon Sep 17 00:00:00 2001 From: pupbrained Date: Sat, 28 Sep 2024 22:03:51 -0400 Subject: [PATCH] should prob push this --- flake.in.nix | 19 +- flake.lock | 613 ++++++++++++------ flake.nix | 2 + homes/x86_64-linux/marshall@navis/default.nix | 70 +- .../marshall@navis/hyprland/default.nix | 12 +- homes/x86_64-linux/marshall@navis/wezterm.lua | 6 +- modules/home/shell/macchina.nix | 18 +- systems/x86_64-linux/navis/default.nix | 97 ++- systems/x86_64-linux/navis/hardware.nix | 58 +- 9 files changed, 585 insertions(+), 310 deletions(-) diff --git a/flake.in.nix b/flake.in.nix index 4dd882d..79a9c61 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -22,7 +22,6 @@ in { agenix = mkInput "ryantm/agenix"; catppuccin = mkInput "catppuccin/nix"; - chaotic = mkInput "chaotic-cx/nyx/nyxpkgs-unstable"; emacs = mkCustomUrl "git+https://git.pupbrained.xyz/pupbrained/nixmacs.git"; hyprland = mkWithSubmodules "https://github.com/hyprwm/Hyprland"; @@ -33,6 +32,8 @@ nix-super = mkCustomUrl "git+https://git.privatevoid.net/max/nix-super.git"; nixvim = mkInput "pupbrained/nvim-config"; treefmt-nix = mkInput "numtide/treefmt-nix"; + xmonad-contrib = mkInput "xmonad/xmonad-contrib"; + zen-browser = mkInput "fufexan/zen-browser-flake"; cosmic = mkFollowingNixpkgs "lilyinstarlight/nixos-cosmic"; darwin = mkFollowingNixpkgs "LnL7/nix-darwin/master"; @@ -61,13 +62,15 @@ home-manager.useGlobalPkgs = true; }; - systems.modules.nixos = [ - agenix.nixosModules.default - catppuccin.nixosModules.catppuccin - chaotic.nixosModules.default - cosmic.nixosModules.default - impermanence.nixosModules.impermanence - ]; + systems.modules.nixos = + [ + agenix.nixosModules.default + catppuccin.nixosModules.catppuccin + chaotic.nixosModules.default + cosmic.nixosModules.default + impermanence.nixosModules.impermanence + ] + ++ xmonad-contrib.nixosModules; systems.modules.darwin = [ "${home-manager}/nix-darwin" diff --git a/flake.lock b/flake.lock index 2a937af..4be5998 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1723405438, - "narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=", + "lastModified": 1727261104, + "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66", + "rev": "b82fdaff917582a9d568969e15e61b398c71e990", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1723691425, - "narHash": "sha256-F25VvHFMaqr26b7goaVWspXaK6XTRFz8RnILV+9OPkk=", + "lastModified": 1726952185, + "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=", "owner": "catppuccin", "repo": "nix", - "rev": "552056779a136092eb6358c573d925630172fc30", + "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1", "type": "github" }, "original": { @@ -87,21 +87,18 @@ }, "chaotic": { "inputs": { - "compare-to": "compare-to", "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager_2", "jovian": "jovian", - "nixpkgs": "nixpkgs_2", - "systems": "systems_2", - "yafas": "yafas" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1723531925, - "narHash": "sha256-QPETOkVNZwm3Zx0FRfkrPWScbc46I5QwIOdBmByYtKg=", + "lastModified": 1727292492, + "narHash": "sha256-vKkVoZJB35xOb1kmAH6i74ziuP0ZGKnzM6+NVi/OhD8=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b8b1c616f8b869af7bce3179ad423e3d45b0d079", + "rev": "9b30ea4a39c8c5a2b6a6519f85da38f72b7f29f0", "type": "github" }, "original": { @@ -117,11 +114,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1720551955, - "narHash": "sha256-8ZsaT5+Ny2hz3iZzV5o5/L2YYDppP+1kj7zEgXxTMjI=", + "lastModified": 1727497393, + "narHash": "sha256-AHL2qezvAAZtOP61cHtnB0RtqPej4LqtGkvXNOAESNw=", "owner": "jcdickinson", "repo": "codeium.nvim", - "rev": "f6a2ef32a9e923cb0104a19d3e426b0e40e49505", + "rev": "17bbefff02be8fd66931f366bd4ed76a76e4a57e", "type": "github" }, "original": { @@ -130,20 +127,6 @@ "type": "github" } }, - "compare-to": { - "locked": { - "lastModified": 1695341185, - "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", - "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", - "revCount": 2, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" - } - }, "cosmic": { "inputs": { "flake-compat": "flake-compat", @@ -154,11 +137,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1723685697, - "narHash": "sha256-Fp0MmV8FWrWFzYkLzPhkrc7Lj3NhMThCceDiETqEp9k=", + "lastModified": 1727571425, + "narHash": "sha256-ZhS5BBZlPlmlfA6FyG6I4s7zfwW568hxH2GoXqkf4F0=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "4e1950ec1b6ff25a0f20ff590bf22a3065b62022", + "rev": "c10249ea0cded9660cb90cd56699cecd23a1b497", "type": "github" }, "original": { @@ -196,11 +179,11 @@ ] }, "locked": { - "lastModified": 1722924007, - "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "lastModified": 1727507295, + "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70", "type": "github" }, "original": { @@ -282,11 +265,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1723444276, - "narHash": "sha256-ErWXmB84hedrDmeaHOaFFfNShC21AopTfM4x4rlvk3c=", + "lastModified": 1726900127, + "narHash": "sha256-v3r7yJY8YE4HAzD5DXOxLkzj8YZKQ0xuccp9yppGW1U=", "owner": "nix-community", "repo": "fenix", - "rev": "70c22198ab822aa93c92a7ec0933908b17131edd", + "rev": "18eefba7fd0bf03e115785948758a44125a9fd68", "type": "github" }, "original": { @@ -420,11 +403,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -435,21 +418,21 @@ }, "flake-schemas": { "locked": { - "lastModified": 1693491534, - "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=", - "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279", - "revCount": 21, + "lastModified": 1721999734, + "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", + "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", + "revCount": 75, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz" + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" } }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -503,9 +486,27 @@ "type": "github" } }, + "flake-utils_10": { + "inputs": { + "systems": "systems_11" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -538,7 +539,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1701680307, @@ -556,14 +557,14 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -574,14 +575,14 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -607,7 +608,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1694529238, @@ -623,9 +624,27 @@ "type": "github" } }, + "flake-utils_9": { + "inputs": { + "systems": "systems_10" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakegen": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1707120544, @@ -661,11 +680,11 @@ ] }, "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "lastModified": 1727514110, + "narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8", "type": "github" }, "original": { @@ -674,6 +693,44 @@ "type": "github" } }, + "git-ignore-nix": { + "inputs": { + "nixpkgs": "nixpkgs_14" + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "ref": "master", + "repo": "gitignore.nix", + "type": "github" + } + }, + "git-ignore-nix_2": { + "inputs": { + "nixpkgs": "nixpkgs_16" + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "ref": "master", + "repo": "gitignore.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -726,11 +783,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1726902823, + "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "14929f7089268481d86b83ed31ffd88713dcd415", "type": "github" }, "original": { @@ -746,11 +803,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -768,11 +825,11 @@ ] }, "locked": { - "lastModified": 1723015306, - "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -814,19 +871,20 @@ "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_6", - "systems": "systems_6", + "systems": "systems_5", "xdph": "xdph" }, "locked": { - "lastModified": 1723656907, - "narHash": "sha256-11tgstIQZP3RRrBEF3ym9L6oS+vzqZJ7Mp6eB2PaN+0=", + "lastModified": 1727549598, + "narHash": "sha256-esywx7x3PvsLepRNTP1hYL96oJAWe0lUE9u5u9TAyfI=", "ref": "refs/heads/main", - "rev": "197f8807900afc81c1c92ad17e621d1998ee268b", - "revCount": 5088, + "rev": "d73c14751ad40fd54d93baac2226f550142b0e74", + "revCount": 5275, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -854,11 +912,11 @@ ] }, "locked": { - "lastModified": 1723143591, - "narHash": "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k=", + "lastModified": 1727258890, + "narHash": "sha256-/55TVManE/J19LSzXtUNhHUpeouRqZxM08ZdWvJrNoA=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "b73d7b901d8cb1172dd25c7b7159f0242c625a77", + "rev": "4fcb465c9d771f4ae1f451e8d953250d16eead70", "type": "github" }, "original": { @@ -868,6 +926,31 @@ } }, "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1727451107, + "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -910,11 +993,11 @@ ] }, "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", + "lastModified": 1725997860, + "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", + "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876", "type": "github" }, "original": { @@ -935,11 +1018,11 @@ ] }, "locked": { - "lastModified": 1722869141, - "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=", + "lastModified": 1727300645, + "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0252fd13e78e60fb0da512a212e56007515a49f7", + "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", "type": "github" }, "original": { @@ -960,11 +1043,11 @@ ] }, "locked": { - "lastModified": 1721324119, - "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", "type": "github" }, "original": { @@ -975,11 +1058,11 @@ }, "impermanence": { "locked": { - "lastModified": 1719091691, - "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", + "lastModified": 1727556076, + "narHash": "sha256-5Iplxbdn/7kQp4UYXMnUMFL2i2lyysOhRyzvvtPe1Qc=", "owner": "nix-community", "repo": "impermanence", - "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", + "rev": "fff0d95cf40609941769a443a001b25fb95b68ab", "type": "github" }, "original": { @@ -997,11 +1080,11 @@ ] }, "locked": { - "lastModified": 1723367191, - "narHash": "sha256-noi5tre7BLtxImN38jEHeVOtOG1Xu37sJFwHKSAPHjo=", + "lastModified": 1726902390, + "narHash": "sha256-ESAD6AkxsQdV/j5ZBcO4Vg94J7Xd0nfpiEZpJtwSEhg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "91178062f365b64eece94c5dff93e09b07e87d9d", + "rev": "faf4c746c068dd8e41b1fa5f18beeabd34d4064c", "type": "github" }, "original": { @@ -1054,11 +1137,11 @@ ] }, "locked": { - "lastModified": 1722924007, - "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "lastModified": 1727507295, + "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70", "type": "github" }, "original": { @@ -1097,11 +1180,11 @@ ] }, "locked": { - "lastModified": 1723352546, - "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", + "lastModified": 1726975622, + "narHash": "sha256-bPDZosnom0+02ywmMZAvmj7zvsQ6mVv/5kmvSgbTkaY=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", + "rev": "c7515c2fdaf2e1f3f49856cef6cec95bb2138417", "type": "github" }, "original": { @@ -1182,11 +1265,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1723556749, - "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", + "lastModified": 1727264057, + "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a92571f9207810b559c9eac203d1f4d79830073", + "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", "type": "github" }, "original": { @@ -1214,11 +1297,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1723421421, - "narHash": "sha256-ohKD5dTOkz2wUa2od3G5COc0iAF2sV4HcNVeoPOfp7U=", + "lastModified": 1727571603, + "narHash": "sha256-E/oHqQDtdeGNJk5k7QhyBNhe/ujxG8oF8aMP+iWyVuY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e7d996aa858660e3261b4834ab00415cfe9b0fe", + "rev": "4a1558c5feaa3a3f558e8512590e68f1a9c87e17", "type": "github" }, "original": { @@ -1229,11 +1312,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -1245,27 +1328,95 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "lastModified": 1726871744, + "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_13": { "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "lastModified": 1726871744, + "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_14": { + "locked": { + "lastModified": 1666603677, + "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_15": { + "locked": { + "lastModified": 0, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "path": "/nix/store/fpivx4sjcp2vk4rp9nhliln5cwcp3kc6-source", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_16": { + "locked": { + "lastModified": 1666603677, + "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_17": { + "locked": { + "lastModified": 0, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "path": "/nix/store/fpivx4sjcp2vk4rp9nhliln5cwcp3kc6-source", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_18": { + "locked": { + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -1277,11 +1428,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723362943, - "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a58bc8ad779655e790115244571758e8de055e3d", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { @@ -1341,11 +1492,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1727122398, + "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", "type": "github" }, "original": { @@ -1373,11 +1524,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1723362943, - "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a58bc8ad779655e790115244571758e8de055e3d", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -1412,11 +1563,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1723434584, - "narHash": "sha256-O3zbWIsVCi7IGCJ4V90X6hp529rAJuTd0eykddPRXHM=", + "lastModified": 1727572524, + "narHash": "sha256-k77DTaj7KZpmtnIq8fn3ERT4B9RPTi8SbwQwcYsRrQM=", "owner": "pupbrained", "repo": "nvim-config", - "rev": "8b0165fcdc7b4dc2685e4350b98dc20c0ad343de", + "rev": "071ff4950f4abde59215cd8017ac7ac90178a662", "type": "github" }, "original": { @@ -1438,11 +1589,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1723323133, - "narHash": "sha256-g3wit604jFhBvjDBziJgulDUXDl/ApafMXq7o7ioMxo=", + "lastModified": 1727557953, + "narHash": "sha256-xe8JQaNOPTyzWsSlLu2yC6qw4SjOMHrXk4Iq+pIgLhM=", "owner": "nix-community", "repo": "nixvim", - "rev": "f13bdef0bc697261c51eab686c28c7e2e7b7db3c", + "rev": "2c4e4681db658deeceb2f781136d7ba1d0009521", "type": "github" }, "original": { @@ -1461,11 +1612,11 @@ ] }, "locked": { - "lastModified": 1723134722, - "narHash": "sha256-wknII7R6ewALIxIKYtqeahjUk/ZrFj1ZtSpNBaHDCyg=", + "lastModified": 1727452028, + "narHash": "sha256-ehl/A4HQFRyqj1Fk7cl+dgSf/2Fb1jLwWJtZaMU6RfU=", "owner": "NuschtOS", "repo": "search", - "rev": "1016f4620e321c12ff1dbcd464e9de889e302d1c", + "rev": "9f7426e532ef8dfc839c4a3fcc567b13a20a70d3", "type": "github" }, "original": { @@ -1526,17 +1677,19 @@ "nixvim": "nixvim", "snowfall-flake": "snowfall-flake", "snowfall-lib": "snowfall-lib_2", - "treefmt-nix": "treefmt-nix_4" + "treefmt-nix": "treefmt-nix_4", + "xmonad-contrib": "xmonad-contrib", + "zen-browser": "zen-browser" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1723304838, - "narHash": "sha256-xAxVDxuvCs8WWkrxVWjCiqxTkHhGj7sSppr1YMuEdT8=", + "lastModified": 1726443025, + "narHash": "sha256-nCmG4NJpwI0IoIlYlwtDwVA49yuspA2E6OhfCOmiArQ=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "0daeb5c0b05cfdf2101b0f078c27539099bf38e6", + "rev": "94b526fc86eaa0e90fb4d54a5ba6313aa1e9b269", "type": "github" }, "original": { @@ -1554,11 +1707,11 @@ ] }, "locked": { - "lastModified": 1723602049, - "narHash": "sha256-Z/noCSn9WPkv7O77dWKLcBxe4Ub4bWyNzsL5JhjaQfw=", + "lastModified": 1727404165, + "narHash": "sha256-kZCiYpQJBZ3kL9QymS88mCxpQwqo8KqvZeHk6LATuY8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ea0bf33a11a26a62c60123c49d96011da396602c", + "rev": "76f0a61e733259e1034dd6523e039d04932ffefc", "type": "github" }, "original": { @@ -1666,18 +1819,33 @@ "type": "github" } }, - "systems_2": { + "systems_11": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", + "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" } }, @@ -1712,21 +1880,6 @@ } }, "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1741,6 +1894,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_7": { "locked": { "lastModified": 1681028828, @@ -1813,11 +1981,11 @@ ] }, "locked": { - "lastModified": 1723303070, - "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=", + "lastModified": 1727431250, + "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "14c092e0326de759e16b37535161b3cb9770cea3", + "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", "type": "github" }, "original": { @@ -1831,11 +1999,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1723402464, - "narHash": "sha256-xjunKUFQs9D7u0TpVoXhrRYb4tbVkutRoFUHj0lEydE=", + "lastModified": 1727431250, + "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c9f97032be6816fa234f24803b8ae79dc7753a91", + "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", "type": "github" }, "original": { @@ -1849,11 +2017,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1723656612, - "narHash": "sha256-6Sx+/VhRPLR+kRf6rnNUFMQ66DUz1DMYajixYUe+CUU=", + "lastModified": 1727431250, + "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4a6d7dccf80a1aa2d04cfaa88d9e5511542a2486", + "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", "type": "github" }, "original": { @@ -1862,13 +2030,37 @@ "type": "github" } }, + "unstable": { + "locked": { + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols", + "hyprland-protocols": "hyprland-protocols_2", "hyprlang": [ "hyprland", "hyprlang" ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -1879,11 +2071,11 @@ ] }, "locked": { - "lastModified": 1722365976, - "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=", + "lastModified": 1727109343, + "narHash": "sha256-1PFckA8Im7wMSl26okwOKqBZeCFLD3LvZZFaxswDhbY=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341", + "rev": "4adb6c4c41ee5014bfe608123bfeddb26e5f5cea", "type": "github" }, "original": { @@ -1892,28 +2084,63 @@ "type": "github" } }, - "yafas": { + "xmonad": { "inputs": { - "flake-schemas": [ - "chaotic", - "flake-schemas" - ], - "systems": [ - "chaotic", - "systems" - ] + "flake-utils": "flake-utils_10", + "git-ignore-nix": "git-ignore-nix_2", + "nixpkgs": "nixpkgs_17", + "unstable": "unstable" }, "locked": { - "lastModified": 1695926485, - "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", - "owner": "UbiqueLambda", - "repo": "yafas", - "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", + "lastModified": 1726451364, + "narHash": "sha256-6WKgYq0+IzPSXxVl1MfODIVwEbd3Sw0zc5sMSOyzA8I=", + "owner": "xmonad", + "repo": "xmonad", + "rev": "a4140b93497333ec7f3127ee4dabcb8ae8a721b6", "type": "github" }, "original": { - "owner": "UbiqueLambda", - "repo": "yafas", + "owner": "xmonad", + "repo": "xmonad", + "type": "github" + } + }, + "xmonad-contrib": { + "inputs": { + "flake-utils": "flake-utils_9", + "git-ignore-nix": "git-ignore-nix", + "nixpkgs": "nixpkgs_15", + "xmonad": "xmonad" + }, + "locked": { + "lastModified": 1726510493, + "narHash": "sha256-0kGVX0iKFHlC2Kgx+bdX68P0qqPQdudSgi11bsvaNJY=", + "owner": "xmonad", + "repo": "xmonad-contrib", + "rev": "42340e0f76a7a934f2a4a8d0da3165f74f68e6be", + "type": "github" + }, + "original": { + "owner": "xmonad", + "repo": "xmonad-contrib", + "type": "github" + } + }, + "zen-browser": { + "inputs": { + "nixpkgs": "nixpkgs_18" + }, + "locked": { + "lastModified": 1727248177, + "narHash": "sha256-QHE2H3VYUK3T7zVbIfqEF7P8hBeim8vU5hXz8X6y8j0=", + "owner": "fufexan", + "repo": "zen-browser-flake", + "rev": "67f1db200b6d533cf1f2b562c183ac536919ec4b", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "zen-browser-flake", "type": "github" } } diff --git a/flake.nix b/flake.nix index 00b5da9..29f0403 100644 --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,8 @@ url = "github:snowfallorg/lib/dev"; }; treefmt-nix.url = "github:numtide/treefmt-nix"; + xmonad-contrib.url = "github:xmonad/xmonad-contrib"; + 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 ad3efe1..78d652b 100644 --- a/homes/x86_64-linux/marshall@navis/default.nix +++ b/homes/x86_64-linux/marshall@navis/default.nix @@ -31,7 +31,6 @@ eternal-terminal glow grc - iamb jamesdsp jdk21 killall @@ -44,6 +43,25 @@ python3 slack telegram-desktop + xdotool + zed-editor + (xwinwrap.overrideAttrs { + src = fetchFromGitHub { + owner = "camonater62"; + repo = "xwinwrap"; + rev = "ec74e730072225ffa740bf5076a1dd0a343bb113"; + sha256 = "0vfwbcx5y1aphiaix2zps1bl7lhbhdvm6vhys2m0kwvl6igy0cc8"; + }; + + buildPhase = '' + make all + ''; + + installPhase = '' + mkdir -p $out/bin + mv xwinwrap $out/bin + ''; + }) vesktop youki (pkgs.buildFHSUserEnv { @@ -63,6 +81,7 @@ ]) ++ (with inputs; [ nixvim.packages.${pkgs.system}.default + zen-browser.packages.${pkgs.system}.specific ]) ++ (with inputs.chaotic.packages.${pkgs.system}; [ distrobox_git @@ -138,6 +157,8 @@ }; programs = { + xmobar.enable = true; + emacs = { enable = true; package = inputs.emacs.packages.${pkgs.system}.default; @@ -157,6 +178,53 @@ }; }; + services = { + picom = { + enable = true; + backend = "glx"; + fadeDelta = 5; + fade = true; + shadow = true; + vSync = true; + + shadowExclude = [ + "class_g = 'firefox' && argb" + "class_g *?= 'slop'" + ]; + + settings = { + corner-radius = 10; + + blur-background-exclude = [ + "class_g = 'slop'" + ]; + + rounded-corners-exclude = [ + "window_type = 'dock'" + "window_type = 'desktop'" + ]; + + blur = { + method = "gaussian"; + size = 10; + deviation = 5.0; + }; + }; + }; + + dunst = { + enable = true; + settings.global = { + corner_radius = 10; + offset = "18x53"; + frame_width = 2; + font = "SN Pro 12"; + frame_color = lib.mkForce "#a6e3a1"; + }; + catppuccin.enable = true; + }; + }; + systemd.user.startServices = "sd-switch"; nix.package = lib.mkForce inputs.nix-super.packages.${pkgs.system}.default; diff --git a/homes/x86_64-linux/marshall@navis/hyprland/default.nix b/homes/x86_64-linux/marshall@navis/hyprland/default.nix index d8d1378..76bfaaf 100644 --- a/homes/x86_64-linux/marshall@navis/hyprland/default.nix +++ b/homes/x86_64-linux/marshall@navis/hyprland/default.nix @@ -62,17 +62,7 @@ with pkgs; { clipboard = "rofi -modi '   ':${rofi-clipboard}/bin/rofi-clipboard -show '   ' -show-icons"; terminal = "wezterm"; - screenshot = mode: "${ - hyprshot.overrideAttrs { - # Fixes cursors showing in region shots - src = pkgs.fetchFromGitHub { - owner = "BenCarmichael01"; - repo = "Hyprshot"; - rev = "84e2adcd5dd9060178d0d028ad032734797fba23"; - hash = "sha256-XDKwBiUMWvxoWpkdJ0EK4kEqPSTZLcF6axHjom3c5Jk="; - }; - } - }/bin/hyprshot --clipboard-only -m ${mode}"; + screenshot = mode: "${hyprshot}/bin/hyprshot --clipboard-only -m ${mode}"; in { decoration.rounding = 10; dwindle.preserve_split = true; diff --git a/homes/x86_64-linux/marshall@navis/wezterm.lua b/homes/x86_64-linux/marshall@navis/wezterm.lua index d4f256c..f10f7aa 100644 --- a/homes/x86_64-linux/marshall@navis/wezterm.lua +++ b/homes/x86_64-linux/marshall@navis/wezterm.lua @@ -114,14 +114,14 @@ local config = { default_cursor_style = 'BlinkingBar', enable_kitty_graphics = true, enable_scroll_bar = false, - enable_wayland = false, + enable_wayland = true, font_size = 12, font = wezterm.font('Maple Mono NF'), - front_end = 'OpenGL', - initial_cols = 160, + front_end = 'WebGpu', keys = keybinds, underline_position = -4, use_fancy_tab_bar = false, + window_decorations = 'NONE', warn_about_missing_glyphs = false, window_background_opacity = 0.8, window_padding = { left = 0, right = 0, top = 0, bottom = 0 }, diff --git a/modules/home/shell/macchina.nix b/modules/home/shell/macchina.nix index 312d843..585d4d2 100644 --- a/modules/home/shell/macchina.nix +++ b/modules/home/shell/macchina.nix @@ -8,18 +8,18 @@ with pkgs; { interface = "wlp4s0"; show = [ - "DesktopEnvironment" "Distribution" "Kernel" "LocalIP" - "Memory" - "Packages" - "ProcessorLoad" - "Resolution" - "Shell" - "Terminal" - "Uptime" + "DesktopEnvironment" "WindowManager" + "Packages" + "Resolution" + "Terminal" + "Shell" + "Uptime" + "ProcessorLoad" + "Memory" ]; }; @@ -67,7 +67,7 @@ with pkgs; { border = "rounded"; visible = true; inner_margin = { - x = 0; + x = 1; y = 1; }; }; diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix index 0bacc9a..60aee63 100644 --- a/systems/x86_64-linux/navis/default.nix +++ b/systems/x86_64-linux/navis/default.nix @@ -4,9 +4,10 @@ inputs, lib, ... -}: -with lib // pkgs // inputs; { - imports = [./hardware.nix]; +}: { + imports = [ + ./hardware.nix + ]; security = { rtkit.enable = true; @@ -30,7 +31,11 @@ with lib // pkgs // inputs; { ]; }; - sudo.wheelNeedsPassword = false; + sudo-rs = { + enable = true; + wheelNeedsPassword = false; + execWheelOnly = true; + }; }; console.catppuccin.enable = true; @@ -40,7 +45,7 @@ with lib // pkgs // inputs; { ]; systemd.user.extraConfig = let - path = concatStringsSep ":" [ + path = lib.concatStringsSep ":" [ "/run/wrappers/bin" "/etc/profiles/per-user/%u/bin" "/nix/var/nix/profiles/default/bin" @@ -51,7 +56,7 @@ with lib // pkgs // inputs; { ''; age = { - secrets.passwd.file = "${self}/secrets/passwd.age"; + secrets.passwd.file = ../../../secrets/passwd.age; identityPaths = ["/persist/root/.ssh/id_ed25519"]; }; @@ -60,11 +65,6 @@ with lib // pkgs // inputs; { enable = true; scheduler = "scx_rusty"; }; - - steam.extraCompatPackages = [ - luxtorpeda - proton-ge-custom - ]; }; virtualisation = { @@ -77,11 +77,11 @@ with lib // pkgs // inputs; { onShutdown = "shutdown"; qemu = { - package = qemu_kvm; + package = pkgs.qemu_kvm; swtpm.enable = true; runAsRoot = false; ovmf.enable = true; - ovmf.packages = [OVMFFull.fd]; + ovmf.packages = [pkgs.OVMFFull.fd]; }; }; @@ -100,8 +100,8 @@ with lib // pkgs // inputs; { TERMINAL = "wezterm"; }; - systemPackages = [ - agenix.packages.${system}.default + systemPackages = with pkgs; [ + inputs.agenix.packages.${system}.default nautilus internal.lightly-boehs-qt6 looking-glass-client @@ -132,13 +132,13 @@ with lib // pkgs // inputs; { boot = { blacklistedKernelModules = ["nouveau" "i915"]; - kernelPackages = linuxPackages_cachyos; + kernelPackages = pkgs.linuxPackages_cachyos; supportedFilesystems = ["btrfs" "ntfs"]; - initrd.systemd = { - enable = true; - emergencyAccess = true; # No password needed because of LUKS - }; + # initrd.systemd = { + # enable = true; + # emergencyAccess = true; # No password needed because of LUKS + # }; plymouth = { enable = true; @@ -147,7 +147,7 @@ with lib // pkgs // inputs; { extraModprobeConfig = "options nvidia " - + concatStringsSep " " [ + + lib.concatStringsSep " " [ "NVreg_UsePageAttributeTable=1" "NVreg_EnablePCIeGen3=1" "NVreg_RegistryDwords=RMUseSwI2c=0x01;RMI2cSpeed=100" @@ -172,17 +172,9 @@ with lib // pkgs // inputs; { }; nix = let - mappedRegistry = pipe inputs [ - (filterAttrs (_: isType "flake")) - (mapAttrs (_: flake: {inherit flake;})) - (x: x // {nixpkgs.flake = nixpkgs;}) - ]; - - nixSuper = nix-super.packages.${system}.default; + nixSuper = inputs.nix-super.packages.${pkgs.system}.default; in { - package = mkForce nixSuper; - registry = mappedRegistry // optionalAttrs (config.nix.package == nixSuper) {default = mappedRegistry.nixpkgs;}; - nixPath = mapAttrsToList (key: _: "${key}=flake:${key}") config.nix.registry; + package = lib.mkForce nixSuper; daemonCPUSchedPolicy = "batch"; daemonIOSchedClass = "idle"; @@ -261,7 +253,7 @@ with lib // pkgs // inputs; { hyprland = { enable = true; - package = hyprland.packages.${system}.hyprland; + package = inputs.hyprland.packages.${pkgs.system}.hyprland; }; nh = { @@ -391,7 +383,7 @@ with lib // pkgs // inputs; { }; networking = { - useDHCP = mkDefault true; + useDHCP = lib.mkDefault true; hostName = "navis"; firewall.enable = false; nameservers = ["1.1.1.1" "1.0.0.1"]; @@ -415,23 +407,11 @@ with lib // pkgs // inputs; { emacs = { enable = true; - package = inputs.emacs.packages.${system}.default; + package = inputs.emacs.packages.${pkgs.system}.default; }; - # greetd = { - # enable = true; - # settings = rec { - # initial_session = { - # command = "${pkgs.hyprland}/bin/hyprland"; - # user = "marshall"; - # }; - # - # default_session = initial_session; - # }; - # }; - - desktopManager.cosmic.enable = true; displayManager.cosmic-greeter.enable = true; + desktopManager.cosmic.enable = true; libinput = { enable = true; @@ -441,6 +421,18 @@ with lib // pkgs // inputs; { xserver = { enable = true; videoDrivers = ["nvidia"]; + + displayManager.startx.enable = true; + + windowManager.xmonad = { + enable = true; + enableContribAndExtras = true; + enableConfiguredRecompile = true; + flake = { + enable = true; + compiler = "ghc982"; + }; + }; }; pipewire = { @@ -457,7 +449,7 @@ with lib // pkgs // inputs; { users.marshall = { isNormalUser = true; extraGroups = ["wheel" "gamemode" "libvirtd" "qemu-libvirtd" "disk" "networkmanager"]; - shell = fish; + shell = pkgs.fish; hashedPasswordFile = config.age.secrets.passwd.path; }; }; @@ -476,7 +468,7 @@ with lib // pkgs // inputs; { graphics = { enable = true; enable32Bit = true; - extraPackages = [ + extraPackages = with pkgs; [ vaapiVdpau nvidia-vaapi-driver ]; @@ -489,13 +481,6 @@ with lib // pkgs // inputs; { modesetting.enable = true; powerManagement.enable = true; open = false; - - prime = { - sync.enable = true; - - intelBusId = "PCI:0:2:0"; - nvidiaBusId = "PCI:1:0:0"; - }; }; }; diff --git a/systems/x86_64-linux/navis/hardware.nix b/systems/x86_64-linux/navis/hardware.nix index 070115d..83730d3 100644 --- a/systems/x86_64-linux/navis/hardware.nix +++ b/systems/x86_64-linux/navis/hardware.nix @@ -20,35 +20,35 @@ options = ["subvol=root"]; }; - boot.initrd.systemd.services.wipe-root = { - requires = ["dev-mapper-enc.device"]; - after = ["dev-mapper-enc.device"]; - wantedBy = ["initrd.target"]; - script = lib.mkAfter '' - mkdir /btrfs_tmp - mount /dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b /btrfs_tmp - if [[ -e /btrfs_tmp/root ]]; then - mkdir -p /btrfs_tmp/old_roots - timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") - mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" - fi - - delete_subvolume_recursively() { - IFS=$'\n' - for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do - delete_subvolume_recursively "/btrfs_tmp/$i" - done - btrfs subvolume delete "$1" - } - - for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do - delete_subvolume_recursively "$i" - done - - btrfs subvolume create /btrfs_tmp/root - umount /btrfs_tmp - ''; - }; + # boot.initrd.systemd.services.wipe-root = { + # requires = ["dev-mapper-enc.device"]; + # after = ["dev-mapper-enc.device"]; + # wantedBy = ["initrd.target"]; + # script = lib.mkAfter '' + # mkdir /btrfs_tmp + # mount /dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b /btrfs_tmp + # if [[ -e /btrfs_tmp/root ]]; then + # mkdir -p /btrfs_tmp/old_roots + # timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") + # mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" + # fi + # + # delete_subvolume_recursively() { + # IFS=$'\n' + # for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do + # delete_subvolume_recursively "/btrfs_tmp/$i" + # done + # btrfs subvolume delete "$1" + # } + # + # for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do + # delete_subvolume_recursively "$i" + # done + # + # btrfs subvolume create /btrfs_tmp/root + # umount /btrfs_tmp + # ''; + # }; boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/9952fcd1-46eb-4c9c-ab7d-361d31fdb9a2";