From 86a5589e63bc0dc6625b127721bd9231d1c7c0aa Mon Sep 17 00:00:00 2001 From: pupbrained Date: Wed, 26 Mar 2025 23:26:03 -0400 Subject: [PATCH] updates and fixes --- _sources/generated.json | 8 +- _sources/generated.nix | 8 +- flake.in.nix | 12 - flake.lock | 517 ++++++++---------- flake.nix | 11 - homes/x86_64-linux/marshall@navis/default.nix | 7 +- .../marshall@navis/hyprland/default.nix | 5 +- .../marshall@navis/hyprland/services.nix | 2 +- modules/home/vscode/default.nix | 2 - systems/x86_64-linux/navis/default.nix | 16 +- systems/x86_64-linux/navis/facter.json | 22 +- 11 files changed, 252 insertions(+), 358 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index 81154d9..ed5123b 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -136,7 +136,7 @@ }, "sddm-theme-minesddm": { "cargoLocks": null, - "date": "2025-01-06", + "date": "2025-03-08", "extract": null, "name": "sddm-theme-minesddm", "passthru": null, @@ -148,12 +148,12 @@ "name": null, "owner": "Davi-S", "repo": "sddm-theme-minesddm", - "rev": "c483c1287030fd848e7439851cb9f6627ab60920", - "sha256": "sha256-uVlLPlYyvxxNgRzRrYfdIHwY0f7okKAq6NNgFzBw5TY=", + "rev": "56be28834dfdb05d678156ebd1d00c83dadfa3f4", + "sha256": "sha256-X64m9fs+a6M0cgJKCNsk2kQU43DEcwEvD/1nQ755BGE=", "sparseCheckout": [], "type": "github" }, - "version": "c483c1287030fd848e7439851cb9f6627ab60920" + "version": "56be28834dfdb05d678156ebd1d00c83dadfa3f4" }, "system-appearance": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 47df729..21b5e7f 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -81,15 +81,15 @@ }; sddm-theme-minesddm = { pname = "sddm-theme-minesddm"; - version = "c483c1287030fd848e7439851cb9f6627ab60920"; + version = "56be28834dfdb05d678156ebd1d00c83dadfa3f4"; src = fetchFromGitHub { owner = "Davi-S"; repo = "sddm-theme-minesddm"; - rev = "c483c1287030fd848e7439851cb9f6627ab60920"; + rev = "56be28834dfdb05d678156ebd1d00c83dadfa3f4"; fetchSubmodules = false; - sha256 = "sha256-uVlLPlYyvxxNgRzRrYfdIHwY0f7okKAq6NNgFzBw5TY="; + sha256 = "sha256-X64m9fs+a6M0cgJKCNsk2kQU43DEcwEvD/1nQ755BGE="; }; - date = "2025-01-06"; + date = "2025-03-08"; }; system-appearance = { pname = "system-appearance"; diff --git a/flake.in.nix b/flake.in.nix index d3782d1..2394146 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -50,17 +50,6 @@ nix-index-database = mkFollowingNixpkgs "nix-community/nix-index-database"; snowfall-flake = mkFollowingNixpkgs "snowfallorg/flake"; snowfall-lib = mkFollowingNixpkgs "snowfallorg/lib/dev"; - - lix = { - url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; - flake = false; - }; - - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.lix.follows = "lix"; - }; }; outputs = {...} @ inputs: @@ -88,7 +77,6 @@ chaotic.nixosModules.default cosmic.nixosModules.default impermanence.nixosModules.impermanence - lix-module.nixosModules.default nixos-facter-modules.nixosModules.facter jovian.nixosModules.default ] diff --git a/flake.lock b/flake.lock index 193c557..15aebd7 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ ] }, "locked": { - "lastModified": 1739298463, - "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=", + "lastModified": 1742213273, + "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16", + "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", "type": "github" }, "original": { @@ -134,11 +134,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1741287139, - "narHash": "sha256-lpSXdmXj6fEo3DwImX6+R/cSakuIHWJ+gLGw1ZcVOXs=", + "lastModified": 1742599566, + "narHash": "sha256-xr6ntmiUPXSh9o9mJ7og9vxALMQs1EQhIhWUAO2D1M0=", "owner": "catppuccin", "repo": "nix", - "rev": "2884670e4deddc862988ba25548211ff13a5a742", + "rev": "5e303e8d7e251868fa79f83bbda69da90aa62402", "type": "github" }, "original": { @@ -156,11 +156,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1741284766, - "narHash": "sha256-zN21lGNyFOM5RNesQsppycjEmjEzukdSwcze3jM4xNw=", + "lastModified": 1743000413, + "narHash": "sha256-3F9ap1452VmR8xDjUmeCf9h2nnRIODY4Fh5RnCr0d0s=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "5290334087dad0897a0ebe3999fa53f9c42b9623", + "rev": "21c2b03a213775c88eb0738f9ceb2e02b8463981", "type": "github" }, "original": { @@ -172,7 +172,7 @@ }, "codeium": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_16" }, "locked": { @@ -195,14 +195,15 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable", + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741259319, - "narHash": "sha256-XQrxZmJbsDRFJ78mVtjEzII/UzknDqDq0zVT1WemkLM=", + "lastModified": 1742999608, + "narHash": "sha256-BuEqHl+sLA52KXhy8XJLQEfA/EfgG/vALtd8Xh+is7I=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "b60b139bf22f5d941b626594981d698502dfc500", + "rev": "4d27b1af6c813a968b7633fe747104dd5a9d7bcb", "type": "github" }, "original": { @@ -240,11 +241,11 @@ ] }, "locked": { - "lastModified": 1741229100, - "narHash": "sha256-0HwrTDXp9buEwal/1ymK9uQmzUD5ozIA7CJGqnT/gLs=", + "lastModified": 1742869675, + "narHash": "sha256-rgwUZJZVztaNYPTsf6MIqirPL5r2JTMMyHuzk1ezyYk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "adf5c88ba1fe21af5c083b4d655004431f20c5ab", + "rev": "bb81755a3674951724d79b8cba6bbff01409d44d", "type": "github" }, "original": { @@ -326,11 +327,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1741156584, - "narHash": "sha256-Xju6PhR09gR8cSS1s4FOHw4AhUUmrFDUs9Wj/9KFoGY=", + "lastModified": 1742452566, + "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=", "owner": "nix-community", "repo": "fenix", - "rev": "1271797d7c0537b4e5bdd4061a2954b846f2c29c", + "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06", "type": "github" }, "original": { @@ -539,7 +540,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_8" + "flake-utils": "flake-utils_7" }, "locked": { "lastModified": 1715533576, @@ -558,7 +559,7 @@ }, "flake-utils-plus_2": { "inputs": { - "flake-utils": "flake-utils_9" + "flake-utils": "flake-utils_8" }, "locked": { "lastModified": 1715533576, @@ -611,24 +612,6 @@ "type": "github" } }, - "flake-utils_12": { - "inputs": { - "systems": "systems_15" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_2": { "inputs": { "systems": "systems_3" @@ -670,11 +653,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -688,11 +671,11 @@ "systems": "systems_9" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -720,24 +703,6 @@ } }, "flake-utils_7": { - "inputs": { - "systems": "systems_11" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_8": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -752,9 +717,9 @@ "type": "github" } }, - "flake-utils_9": { + "flake-utils_8": { "inputs": { - "systems": "systems_12" + "systems": "systems_11" }, "locked": { "lastModified": 1694529238, @@ -770,6 +735,24 @@ "type": "github" } }, + "flake-utils_9": { + "inputs": { + "systems": "systems_12" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakegen": { "inputs": { "systems": "systems_4" @@ -788,21 +771,6 @@ "type": "github" } }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "freetype2": { "flake": false, "locked": { @@ -827,14 +795,14 @@ "nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-unstable": "nixpkgs-unstable", "zig": "zig", - "zig2nix": "zig2nix" + "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1741213203, - "narHash": "sha256-3/z39Y2AuLIm2OKWDAR1iPi1uo+LZju1XwW2NAxKUcY=", + "lastModified": 1743017635, + "narHash": "sha256-8NANQx7t05UYXW6YKuk5QtNB8/PXzK/fG4ar6H1Y7Tw=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "e07b6fdf6ba342eb1fc4321c26fe5a6475be5133", + "rev": "494279419af16aba382fc0c25d3edb25dbec1d7f", "type": "github" }, "original": { @@ -1005,11 +973,11 @@ ] }, "locked": { - "lastModified": 1741217763, - "narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=", + "lastModified": 1742871411, + "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", "owner": "nix-community", "repo": "home-manager", - "rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da", + "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", "type": "github" }, "original": { @@ -1025,11 +993,11 @@ ] }, "locked": { - "lastModified": 1741217763, - "narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=", + "lastModified": 1742996658, + "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=", "owner": "nix-community", "repo": "home-manager", - "rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da", + "rev": "693840c01b9bef9e54100239cef937e53d4661bf", "type": "github" }, "original": { @@ -1068,11 +1036,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1741265302, - "narHash": "sha256-2HSbWe1r5DYulPzMXZYSluiwG/T+5904YmJSrPJ8tEo=", + "lastModified": 1742993028, + "narHash": "sha256-/teXJjfdp4cZetlD7lsunettI5QB3UWeODhrrDXooOs=", "owner": "VirtCode", "repo": "hypr-dynamic-cursors", - "rev": "261bc1668f7de45b48ba6a40d5d727025575390b", + "rev": "e2c32d8108960b6eaf96918485503e90a016de4b", "type": "github" }, "original": { @@ -1097,11 +1065,11 @@ ] }, "locked": { - "lastModified": 1738664950, - "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", + "lastModified": 1742215578, + "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", + "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", "type": "github" }, "original": { @@ -1155,11 +1123,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1741298937, - "narHash": "sha256-RtgISylMOdPewOmlsVG6bkmvpWUZfWveHHP2BwtCB18=", + "lastModified": 1743009764, + "narHash": "sha256-DNkfgIhRoTvH3xfp3iHVILgd6/huamgbhibY+Zn1xrs=", "ref": "refs/heads/main", - "rev": "7753e8ea686ba0aeaa825502f27e5b3f813faade", - "revCount": 5868, + "rev": "9ea76428b68fad5a68e9153bcb246547ac2e5d6c", + "revCount": 5937, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1187,11 +1155,11 @@ ] }, "locked": { - "lastModified": 1738966025, - "narHash": "sha256-MzgrF0jKlTNnNS33D8PwI5z2MJ1Tzf5MQVf/oms2pdw=", + "lastModified": 1742861859, + "narHash": "sha256-lbdHyp2+NoyciCJBtBt3Cgm2dDvoHvTdCRMbmwJoUmk=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "4f48dbe12f3cbbeb4d31c91c67b21edbc5b4b451", + "rev": "1f332c09a2382cb23da0f69a6f504f8b33433831", "type": "github" }, "original": { @@ -1309,11 +1277,11 @@ ] }, "locked": { - "lastModified": 1739048914, - "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", + "lastModified": 1741191527, + "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a7334904d591f38757c46fbe2ab68651877d9099", + "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", "type": "github" }, "original": { @@ -1350,11 +1318,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1740777046, - "narHash": "sha256-hPp+DnTYjE6M9Mdau7inbqMeLR1SpSPVyuxd+nabwaA=", + "lastModified": 1742767019, + "narHash": "sha256-FdyHDbf31jl5rIU7IQtBVTbZ1ojGrrp5aFaRrE2819s=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "b5c8adb16f4729572c67883da1bcb46e11f195d6", + "rev": "5b62529c2011ede6069445de9b5b3f8a1f10ecfe", "type": "github" }, "original": { @@ -1367,7 +1335,7 @@ "inputs": { "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_12", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1741036724, @@ -1396,11 +1364,11 @@ ] }, "locked": { - "lastModified": 1739891528, - "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=", + "lastModified": 1741534688, + "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba", + "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", "type": "github" }, "original": { @@ -1421,11 +1389,11 @@ ] }, "locked": { - "lastModified": 1739049028, - "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", + "lastModified": 1739870480, + "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "04146df74a8d5ec0b579657307be01f1e241125f", + "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", "type": "github" }, "original": { @@ -1488,11 +1456,11 @@ ] }, "locked": { - "lastModified": 1741119770, - "narHash": "sha256-8AsMJdZENVLQVpxwu5BL5HftVQYyAsI9nlQ5fezzJWY=", + "lastModified": 1742465245, + "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "7634e1f091586438191c7924aa486e04416abc25", + "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287", "type": "github" }, "original": { @@ -1507,11 +1475,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1741273541, - "narHash": "sha256-tsPWuE2A84Chs9gm6VYifFCe4zLC+A1xBCN2E64NoIA=", + "lastModified": 1742465245, + "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "571925b8525dec6eae78f658a5ec1bbcf9e1390e", + "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287", "type": "github" }, "original": { @@ -1537,43 +1505,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1741212440, - "narHash": "sha256-UrNM90hCGa4Ee8R7v6oyBL9Mqi5XbyNdUAireOzgzGs=", - "rev": "f61bcc6ca9a90f29d82e51b3e545fdf2bcfe0a08", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f61bcc6ca9a90f29d82e51b3e545fdf2bcfe0a08.tar.gz?rev=f61bcc6ca9a90f29d82e51b3e545fdf2bcfe0a08" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils_4", - "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738176840, - "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=", - "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/621aae0f3cceaffa6d73a4fb0f89c08d338d729e.tar.gz?rev=621aae0f3cceaffa6d73a4fb0f89c08d338d729e" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" - } - }, "niri": { "inputs": { "niri-stable": "niri-stable", @@ -1586,11 +1517,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1741281866, - "narHash": "sha256-e/Zok3cRBtBOYMxNDEA62rWue4BRcR92DGCwttbnanE=", + "lastModified": 1742954683, + "narHash": "sha256-ZJBJzpWQcZYuxiX7YbLCaiZl1aOt8xQphXt0ZO0st+8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "40ba2c0eced1de1f4bdfb11f368de24932339e6c", + "rev": "41db28938147dfa2a2d528f24b59b6962b96f0c5", "type": "github" }, "original": { @@ -1619,11 +1550,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1741260996, - "narHash": "sha256-uKWfBwNLZEsDnICY7immZn/oLhQos227SDiEnDQwTI4=", + "lastModified": 1742877599, + "narHash": "sha256-3Xy1mlAUcYSQSpt0Q/flA+o6Y1ZACDW52vVP2CX52w8=", "owner": "YaLTeR", "repo": "niri", - "rev": "88fcf0c2a996ef61bb1f51cb02afa7686de1bbe1", + "rev": "4534d3726676a403eb3dd19d28371bd8acd98401", "type": "github" }, "original": { @@ -1725,11 +1656,11 @@ ] }, "locked": { - "lastModified": 1740886574, - "narHash": "sha256-jN6kJ41B6jUVDTebIWeebTvrKP6YiLd1/wMej4uq4Sk=", + "lastModified": 1742701275, + "narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "26a0f969549cf4d56f6e9046b9e0418b3f3b94a5", + "rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6", "type": "github" }, "original": { @@ -1742,14 +1673,14 @@ "inputs": { "flake-compat": "flake-compat_4", "nixpkgs": "nixpkgs_14", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1738646237, - "narHash": "sha256-++0dXoZO9l5oceiGQsJmtUI5WXlPMw6QKjpg7vGPl3w=", + "lastModified": 1742098834, + "narHash": "sha256-l98XVpNXW6hr0AsxCeQZbdf6EGT8OpHdkWBi7sdel4s=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "3d1c6c27b14c4b8fcbdaec779e715f30cb72ed15", + "rev": "8457960249bcfd34c22838e20eaa7d8261428688", "type": "github" }, "original": { @@ -1818,11 +1749,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1741048562, - "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", + "lastModified": 1742751704, + "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", + "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", "type": "github" }, "original": { @@ -1850,11 +1781,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1738255539, - "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=", + "lastModified": 1741992157, + "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5", + "rev": "da4b122f63095ca1199bd4d526f9e26426697689", "type": "github" }, "original": { @@ -1866,11 +1797,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1741196730, - "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", + "lastModified": 1742751704, + "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3", + "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", "type": "github" }, "original": { @@ -1882,11 +1813,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1738136902, - "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { @@ -1961,11 +1892,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "type": "github" }, "original": { @@ -1977,11 +1908,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1741173522, - "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -2056,11 +1987,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" }, "original": { @@ -2119,8 +2050,8 @@ "nixpkgs_23": { "locked": { "lastModified": 0, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", - "path": "/nix/store/jk6xpbfh10gz6q5cqw8b2f7xk0pl7hkv-source", + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "path": "/nix/store/1728d3jg85mkz2w2cvk6vi74i30fn6x7-source", "type": "path" }, "original": { @@ -2145,8 +2076,8 @@ "nixpkgs_25": { "locked": { "lastModified": 0, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", - "path": "/nix/store/jk6xpbfh10gz6q5cqw8b2f7xk0pl7hkv-source", + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "path": "/nix/store/1728d3jg85mkz2w2cvk6vi74i30fn6x7-source", "type": "path" }, "original": { @@ -2156,11 +2087,11 @@ }, "nixpkgs_26": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -2172,11 +2103,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741173522, - "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -2252,11 +2183,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -2285,7 +2216,7 @@ "nixvim": { "inputs": { "codeium": "codeium", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_17", "nixvim": "nixvim_2", "treefmt-nix": "treefmt-nix_3" @@ -2332,7 +2263,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -2364,11 +2295,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -2396,8 +2327,6 @@ "hyprswitch": "hyprswitch", "impermanence": "impermanence", "jovian": "jovian_2", - "lix": "lix", - "lix-module": "lix-module", "niri": "niri", "nix-colors": "nix-colors", "nix-index-database": "nix-index-database", @@ -2416,11 +2345,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1741011961, - "narHash": "sha256-bssSxw3Z9CUNB9+f3EHAX/2urT15e12Jy6YU8tHyWkk=", + "lastModified": 1742296961, + "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "02862f5d52c30b476a5dca909a17aa4386d1fdc5", + "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4", "type": "github" }, "original": { @@ -2431,6 +2360,27 @@ } }, "rust-overlay": { + "inputs": { + "nixpkgs": [ + "cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742956365, + "narHash": "sha256-Slrqmt6kJ/M7Z/ce4ebQWsz2aeEodrX56CsupOEPoz0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a0e3395c63cdbc9c1ec17915f8328c077c79c4a1", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "nixpkgs": [ "hyprswitch", @@ -2451,7 +2401,7 @@ "type": "github" } }, - "rust-overlay_2": { + "rust-overlay_3": { "flake": false, "locked": { "lastModified": 1686795910, @@ -2467,7 +2417,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_4": { "inputs": { "nixpkgs": [ "wezterm", @@ -2647,21 +2597,6 @@ "type": "github" } }, - "systems_15": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -2845,11 +2780,11 @@ "nixpkgs": "nixpkgs_20" }, "locked": { - "lastModified": 1739829690, - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "lastModified": 1742982148, + "narHash": "sha256-aRA6LSxjlbMI6MmMzi/M5WH/ynd8pK+vACD9za3MKLQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "rev": "61c88349bf6dff49fa52d7dfc39b21026c2a8881", "type": "github" }, "original": { @@ -2860,11 +2795,11 @@ }, "unstable": { "locked": { - "lastModified": 1741173522, - "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -2876,21 +2811,21 @@ }, "wezterm": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_9", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", "nixpkgs": "nixpkgs_21", - "rust-overlay": "rust-overlay_3", + "rust-overlay": "rust-overlay_4", "zlib": "zlib" }, "locked": { "dir": "nix", - "lastModified": 1741299737, - "narHash": "sha256-Aqe5CndGl+zgbziooamS+7bpsmDkxksE86uRNSQ0rYg=", + "lastModified": 1742480467, + "narHash": "sha256-y4iRZ3bUpN8prKIbVQw++4yM4LtXLED7/D/9HJjGjJI=", "owner": "wez", "repo": "wezterm", - "rev": "0f180b0008694afa684b384388c8659bbfa38e2d", + "rev": "a87358516004a652ad840bc1661bdf65ffc89b43", "type": "github" }, "original": { @@ -2928,11 +2863,11 @@ ] }, "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "lastModified": 1741934139, + "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", "type": "github" }, "original": { @@ -2943,17 +2878,17 @@ }, "xmonad": { "inputs": { - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_11", "git-ignore-nix": "git-ignore-nix_2", "nixpkgs": "nixpkgs_25", "unstable": "unstable" }, "locked": { - "lastModified": 1740222736, - "narHash": "sha256-7RhlA0HKqauUK8ap8Qsp/xBVHd+4CotLqWL7+sLWyzg=", + "lastModified": 1742622039, + "narHash": "sha256-EjFs3ZOgcmLUX5LesDZFkl3fQPYwmw6KP96R+iTMIuY=", "owner": "xmonad", "repo": "xmonad", - "rev": "07d95ad8fc395866200b4587aca8b4db50aa20bd", + "rev": "f2d1efbb6f9c64579bf23a2a6701953b12248d5d", "type": "github" }, "original": { @@ -2964,17 +2899,17 @@ }, "xmonad-contrib": { "inputs": { - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_10", "git-ignore-nix": "git-ignore-nix", "nixpkgs": "nixpkgs_23", "xmonad": "xmonad" }, "locked": { - "lastModified": 1740222753, - "narHash": "sha256-40Ls5xrxv3oTDQr16YxUTsCt2domWbm4mblzYnKjW+k=", + "lastModified": 1742622018, + "narHash": "sha256-e2WDDRPS684xfBADSYWF4FTWsVCLQemOdHKYq4MoKK8=", "owner": "xmonad", "repo": "xmonad-contrib", - "rev": "4496b4f2d54b31dcf68fb5e1ad545b9afbc3dfcd", + "rev": "50e7dd4262f07ac9688f9dbc4ca85caac978b70f", "type": "github" }, "original": { @@ -3003,11 +2938,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1741140299, - "narHash": "sha256-Y2bPO92Yg5HcH5ORvrVOQb4wRGEapGEteHXGtNvboxk=", + "lastModified": 1742773235, + "narHash": "sha256-YhJex62HHVF6EfdGLIC01uM6jH8XJu5ryZ+LlhG7wMs=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "10cb041a80bb815cc1789cfa305923f1f9e3713d", + "rev": "b2613aec05f9e3f8488ef924203d62cafb712642", "type": "github" }, "original": { @@ -3021,11 +2956,11 @@ "nixpkgs": "nixpkgs_26" }, "locked": { - "lastModified": 1740729275, - "narHash": "sha256-/0dJi65+7oBpfEYWrg4jihkEzAf975TVeOk+FpxaW6o=", + "lastModified": 1742980672, + "narHash": "sha256-smpL8N1naTS8C7mPnwmkmYStLnBRzMAPzaSwUZuMfmE=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "17bd241d6a5692848b01737f595824a707de855a", + "rev": "36eb0acd12b41b8edb04f3fdf31ecab1b4897531", "type": "github" }, "original": { @@ -3049,11 +2984,11 @@ ] }, "locked": { - "lastModified": 1738239110, - "narHash": "sha256-Y5i9mQ++dyIQr+zEPNy+KIbc5wjPmfllBrag3cHZgcE=", + "lastModified": 1741825901, + "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "1a8fb6f3a04724519436355564b95fce5e272504", + "rev": "0b14285e283f5a747f372fb2931835dd937c4383", "type": "github" }, "original": { @@ -3062,32 +2997,6 @@ "type": "github" } }, - "zig2nix": { - "inputs": { - "flake-utils": [ - "ghostty", - "flake-utils" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1738263917, - "narHash": "sha256-j/3fwe2pEOquHabP/puljOKwAZFjIE9gXZqA91sC48M=", - "owner": "jcollie", - "repo": "zig2nix", - "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", - "type": "github" - }, - "original": { - "owner": "jcollie", - "repo": "zig2nix", - "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", - "type": "github" - } - }, "zlib": { "flake": false, "locked": { @@ -3104,6 +3013,32 @@ "repo": "zlib", "type": "github" } + }, + "zon2nix": { + "inputs": { + "flake-utils": [ + "ghostty", + "flake-utils" + ], + "nixpkgs": [ + "ghostty", + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1742104771, + "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=", + "owner": "jcollie", + "repo": "zon2nix", + "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", + "type": "github" + }, + "original": { + "owner": "jcollie", + "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613", + "repo": "zon2nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 8df52ce..7668838 100644 --- a/flake.nix +++ b/flake.nix @@ -40,17 +40,6 @@ hyprswitch.url = "github:h3rmt/hyprswitch/release"; impermanence.url = "github:nix-community/impermanence"; jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; - lix = { - flake = false; - url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; - }; - lix-module = { - inputs = { - lix.follows = "lix"; - nixpkgs.follows = "nixpkgs"; - }; - url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; - }; niri = { inputs.nixpkgs.follows = "nixpkgs"; url = "github:sodiboo/niri-flake"; diff --git a/homes/x86_64-linux/marshall@navis/default.nix b/homes/x86_64-linux/marshall@navis/default.nix index 2597107..3136c25 100644 --- a/homes/x86_64-linux/marshall@navis/default.nix +++ b/homes/x86_64-linux/marshall@navis/default.nix @@ -47,7 +47,6 @@ firefox glow grc - jamesdsp jdk21 killall libnotify @@ -100,7 +99,7 @@ catppuccin = { enable = true; - pointerCursor.enable = true; + pointerCursor.enable = false; flavor = "mocha"; accent = "green"; }; @@ -178,7 +177,7 @@ services = { picom = { - enable = true; + enable = false; backend = "glx"; fadeDelta = 5; fade = true; @@ -211,7 +210,7 @@ }; dunst = { - enable = true; + enable = false; settings.global = { corner_radius = 10; offset = "18x53"; diff --git a/homes/x86_64-linux/marshall@navis/hyprland/default.nix b/homes/x86_64-linux/marshall@navis/hyprland/default.nix index f68ba63..2750330 100644 --- a/homes/x86_64-linux/marshall@navis/hyprland/default.nix +++ b/homes/x86_64-linux/marshall@navis/hyprland/default.nix @@ -79,7 +79,6 @@ with pkgs; { decoration.rounding = 5; dwindle.preserve_split = true; gestures.workspace_swipe = true; - experimental.wide_color_gamut = true; # plugin.dynamic-cursors = { # enabled = true; @@ -104,8 +103,8 @@ with pkgs; { ]; windowrule = [ - "float, ^(equibop)$" - "float, ^(org.telegram.desktop)$" + "float, class:equibop" + "float, class:org.telegram.desktop" ]; layerrule = [ diff --git a/homes/x86_64-linux/marshall@navis/hyprland/services.nix b/homes/x86_64-linux/marshall@navis/hyprland/services.nix index 29c3355..53c60c6 100644 --- a/homes/x86_64-linux/marshall@navis/hyprland/services.nix +++ b/homes/x86_64-linux/marshall@navis/hyprland/services.nix @@ -1,6 +1,6 @@ {...}: { services = { - cliphist.enable = true; + cliphist.enable = false; udiskie.enable = false; }; } diff --git a/modules/home/vscode/default.nix b/modules/home/vscode/default.nix index 0eedbc6..b19f7fc 100644 --- a/modules/home/vscode/default.nix +++ b/modules/home/vscode/default.nix @@ -8,8 +8,6 @@ extensions = with pkgs.vscode-extensions; [ bbenoist.nix - catppuccin.catppuccin-vsc - catppuccin.catppuccin-vsc-icons llvm-vs-code-extensions.vscode-clangd kamadorueda.alejandra mkhl.direnv diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix index e707744..b409613 100644 --- a/systems/x86_64-linux/navis/default.nix +++ b/systems/x86_64-linux/navis/default.nix @@ -112,7 +112,7 @@ }; decky-loader = { - enable = true; + enable = false; user = "marshall"; }; }; @@ -389,8 +389,6 @@ daemonIOSchedClass = "idle"; daemonIOSchedPriority = 7; - package = inputs.lix-module.packages.${pkgs.system}.default; - gc = { automatic = true; dates = "Sat *-*-* 03:00"; @@ -523,16 +521,6 @@ spice-vdagentd.enable = true; udisks2.enable = true; - nextjs-ollama-llm-ui = { - enable = true; - }; - - ollama = { - enable = true; - loadModels = ["deepseek-r1:14b"]; - acceleration = "cuda"; - }; - btrfs.autoScrub = { enable = true; fileSystems = ["/dev/mapper/enc"]; @@ -557,8 +545,6 @@ enable = true; videoDrivers = ["nvidia"]; - displayManager.startx.enable = true; - windowManager.xmonad = { enable = false; enableContribAndExtras = true; diff --git a/systems/x86_64-linux/navis/facter.json b/systems/x86_64-linux/navis/facter.json index 98d9731..d14675f 100644 --- a/systems/x86_64-linux/navis/facter.json +++ b/systems/x86_64-linux/navis/facter.json @@ -1285,7 +1285,7 @@ "unix_device_names": [ "/dev/disk/by-diskseq/4", "/dev/disk/by-label/zram0", - "/dev/disk/by-uuid/48de73f5-b959-4122-b63a-76173f831409", + "/dev/disk/by-uuid/1df3d046-3ba6-4809-86e9-1318e1ff6a4b", "/dev/zram0" ], "resources": [ @@ -1632,7 +1632,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.13.4-cachyos xhci-hcd", + "name": "Linux 6.13.5-cachyos xhci-hcd", "value": 7531 }, "device": { @@ -1646,7 +1646,7 @@ "value": 0 }, "serial": "0000:00:14.0", - "model": "Linux 6.13.4-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.13.5-cachyos xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-0:1.0", "sysfs_bus_id": "3-0:1.0", "resources": [ @@ -1796,7 +1796,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.13.4-cachyos xhci-hcd", + "name": "Linux 6.13.5-cachyos xhci-hcd", "value": 7531 }, "device": { @@ -1810,7 +1810,7 @@ "value": 0 }, "serial": "0000:00:14.0", - "model": "Linux 6.13.4-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.13.5-cachyos xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb4/4-0:1.0", "sysfs_bus_id": "4-0:1.0", "detail": { @@ -1869,7 +1869,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.13.4-cachyos xhci-hcd", + "name": "Linux 6.13.5-cachyos xhci-hcd", "value": 7531 }, "device": { @@ -1883,7 +1883,7 @@ "value": 0 }, "serial": "0000:00:0d.0", - "model": "Linux 6.13.4-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.13.5-cachyos xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb1/1-0:1.0", "sysfs_bus_id": "1-0:1.0", "resources": [ @@ -1952,7 +1952,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.13.4-cachyos xhci-hcd", + "name": "Linux 6.13.5-cachyos xhci-hcd", "value": 7531 }, "device": { @@ -1966,7 +1966,7 @@ "value": 0 }, "serial": "0000:00:0d.0", - "model": "Linux 6.13.4-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.13.5-cachyos xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb2/2-0:1.0", "sysfs_bus_id": "2-0:1.0", "detail": { @@ -2249,7 +2249,7 @@ { "type": "mem", "base": 0, - "range": 67130720256, + "range": 67130712064, "enabled": true, "access": "read_write", "prefetch": "unknown" @@ -2551,7 +2551,7 @@ "hex": "307a", "value": 12410 }, - "sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-0/i2c-ELAN1203:00/0018:04F3:307A.0008/input/input21", + "sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN1203:00/0018:04F3:307A.0008/input/input21", "unix_device_names": [ "/dev/input/event18", "/dev/input/ + handler"