From 940be0d7765c3af790ebdc4ad92bd290ac74df2d Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sat, 3 May 2025 17:08:07 -0400 Subject: [PATCH 1/3] feat: add zellij --- nixosConfigurations/gerg-desktop/main.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixosConfigurations/gerg-desktop/main.nix b/nixosConfigurations/gerg-desktop/main.nix index a9bf051..378d707 100644 --- a/nixosConfigurations/gerg-desktop/main.nix +++ b/nixosConfigurations/gerg-desktop/main.nix @@ -25,7 +25,6 @@ packages = { inherit (pkgs) bitwarden-desktop # store stuff - #qbittorrent # steal stuff pavucontrol # gui volume control pcmanfm # file manager mpv # play stuff @@ -41,11 +40,14 @@ vesktop gh nixfmt-rfc-style + zellij + tidal-hifi + #prusa-slicer # 3D printer slicer # QMK configuration #via #qmk - tidal-hifi + #qbittorrent # steal stuff ; inherit (nvim-flake.packages) neovim; inherit (self'.packages) lint; From 924dd6c5f9f40c40b6b932d33cb94e36cb25d683 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sat, 3 May 2025 20:46:50 -0400 Subject: [PATCH 2/3] chore: update --- flake.lock | 46 ++++++++++----------- nixosConfigurations/gerg-desktop/kernel.nix | 4 +- nixosConfigurations/gerg-desktop/main.nix | 1 + 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 797e94f..d44d82b 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1745502102, - "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", + "lastModified": 1745812220, + "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=", "owner": "nix-community", "repo": "disko", - "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", + "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78", "type": "github" }, "original": { @@ -371,11 +371,11 @@ }, "master": { "locked": { - "lastModified": 1745730665, - "narHash": "sha256-YVaRnTLAXZZQALJXz76Qhmc+HDWkKhU8ZfQC5YSVMr8=", + "lastModified": 1746307609, + "narHash": "sha256-KyXS1SBYHC3rOuU+03n7FsK29dyYutDDhGGm+PclhuU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb7d9ce3fc64280c8b6efda4dd266cd2eb7f880e", + "rev": "b440606b4212f01eac9d24e5fbb9ab0b281b5548", "type": "github" }, "original": { @@ -387,11 +387,11 @@ }, "mnw": { "locked": { - "lastModified": 1745705214, - "narHash": "sha256-XGfaHbFI4vvDuaoVO3IFYZKezXIO8rhUaMCGcjY71Ac=", + "lastModified": 1746312958, + "narHash": "sha256-wY4BWW5zeRdToJ8ktLXlRqZ0USsONvYGozjuRjyClCs=", "owner": "gerg-l", "repo": "mnw", - "rev": "c1f4587db4c53dcefa432c46c7a899a116d8e924", + "rev": "05c7f86711508441fda92ecf069506b2c67f2053", "type": "github" }, "original": { @@ -473,11 +473,11 @@ ] }, "locked": { - "lastModified": 1745725746, + "lastModified": 1746054057, "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "187524713d0d9b2d2c6f688b81835114d4c2a7c6", + "rev": "13ba07d54c6ccc5af30a501df669bf3fe3dd4db8", "type": "github" }, "original": { @@ -631,11 +631,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1745719205, - "narHash": "sha256-bd4kaP41PUXXDqXv2lNY1+riXGIgrfVMg7aqbhnQtMA=", + "lastModified": 1746313024, + "narHash": "sha256-E0+wVNQaEY1okTAyLWKjV6eV8bx+evR1ZmnfcBhwnyk=", "owner": "Gerg-L", "repo": "nvim-flake", - "rev": "8494b7f482f86d0249474b9b1c5522c7e30240df", + "rev": "ab20dcd2c1da3e5a53b820dffca01c6c2b2ef68a", "type": "github" }, "original": { @@ -774,11 +774,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1745727291, - "narHash": "sha256-YW/V93WgJur6a3BVa1jynlKr2pyZlEpiXXjQjpSHc5s=", + "lastModified": 1746287507, + "narHash": "sha256-XzxmpEUbCXcBS7H00QmTAQf9xrMdvaFHrprkwb4i9CU=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "9e5c7a2e7f1ab3118ec9b7179eb28667a3575f0e", + "rev": "c09c8cbc0d650d451e4b48d00c63831437dae1b2", "type": "github" }, "original": { @@ -789,11 +789,11 @@ }, "stable": { "locked": { - "lastModified": 1745487689, - "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", + "lastModified": 1746183838, + "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", + "rev": "bf3287dac860542719fe7554e21e686108716879", "type": "github" }, "original": { @@ -892,11 +892,11 @@ }, "unstable": { "locked": { - "lastModified": 1745526057, - "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "lastModified": 1746232882, + "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", + "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", "type": "github" }, "original": { diff --git a/nixosConfigurations/gerg-desktop/kernel.nix b/nixosConfigurations/gerg-desktop/kernel.nix index 4e4f20c..bc8f562 100644 --- a/nixosConfigurations/gerg-desktop/kernel.nix +++ b/nixosConfigurations/gerg-desktop/kernel.nix @@ -11,10 +11,10 @@ kernelPackages = pkgs.linuxPackagesFor ( let - version = "6.12.11"; + version = "6.14.5"; src = pkgs.fetchurl { url = "mirror://kernel/linux/kernel/v${builtins.head (lib.splitVersion version)}.x/linux-${version}.tar.xz"; - hash = "sha256-R1Fy/b2HoVPxI6V5Umcudzvbba9bWKQX0aXkGfz+7Ek="; + hash = "sha256-KCB+xSu+qjUHAQrv+UT0QvfZ8isoa3nK9F7G3xsk9Ak="; }; in (pkgs.linuxManualConfig { diff --git a/nixosConfigurations/gerg-desktop/main.nix b/nixosConfigurations/gerg-desktop/main.nix index 378d707..7e622b8 100644 --- a/nixosConfigurations/gerg-desktop/main.nix +++ b/nixosConfigurations/gerg-desktop/main.nix @@ -21,6 +21,7 @@ "steam-unwrapped" "steam-run" "hplip" + "castlabs-electron" ]; packages = { inherit (pkgs) From c3a0dc3a4e3dfb55a9614a5c6f56981280884fe4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 4 May 2025 05:15:57 +0000 Subject: [PATCH 3/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'master': 'github:NixOS/nixpkgs/b440606b4212f01eac9d24e5fbb9ab0b281b5548?narHash=sha256-KyXS1SBYHC3rOuU%2B03n7FsK29dyYutDDhGGm%2BPclhuU%3D' (2025-05-03) → 'github:NixOS/nixpkgs/6b1c028bce9c89e9824cde040d6986d428296055?narHash=sha256-VBmKSkmw9PYBCEGhBKzORjx%2BnwNZkPZyHcUHE21A/ws%3D' (2025-05-04) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/13ba07d54c6ccc5af30a501df669bf3fe3dd4db8?narHash=sha256-iR%2BidGZJ191cY6NBXyVjh9QH8GVWTkvZw/w%2B1Igy45A%3D' (2025-04-30) → 'github:nix-community/nix-index-database/137fd2bd726fff343874f85601b51769b48685cc?narHash=sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG%2BKhPZFFQX/0o%3D' (2025-05-04) • Updated input 'nvim-flake': 'github:Gerg-L/nvim-flake/ab20dcd2c1da3e5a53b820dffca01c6c2b2ef68a?narHash=sha256-E0%2BwVNQaEY1okTAyLWKjV6eV8bx%2BevR1ZmnfcBhwnyk%3D' (2025-05-03) → 'github:Gerg-L/nvim-flake/5969983aa21131a18cfd04cce329fc5791474a22?narHash=sha256-TxXYcF4dONxp9n/oS2bo42Y1uSCsnMoMrG8yGC9KM6w%3D' (2025-05-04) • Updated input 'nvim-flake/neovim-nightly': 'github:nix-community/neovim-nightly-overlay/ce33792bf7327e4d6e338625517374e13a63cde2?narHash=sha256-7KEsZ3jzgplAlJINqP95eD4/DiPRR9YPiGWgLsu%2BlBc%3D' (2025-04-26) → 'github:nix-community/neovim-nightly-overlay/02ec02529a5d602a9e9d273531d776d160fae182?narHash=sha256-a97mwMJcE0cYGfwB5N5v%2BEy%2Bby1poGTc/fsrd47Fom8%3D' (2025-05-03) • Updated input 'nvim-flake/neovim-nightly/neovim-src': 'github:neovim/neovim/766cd01ff2ff68a0ffdfcc385e76346ce22cde7e?narHash=sha256-Axa1vdynf7glAWc7v80unyew4IJqtdq21WEf3VGwW40%3D' (2025-04-25) → 'github:neovim/neovim/5a2edc483dff93cc94847b6950713d80a51087c0?narHash=sha256-FlGgG3A9oJwGP0YTWU2Nw9fwdnqPMapjx3twonu0Vkg%3D' (2025-05-02) • Updated input 'nvim-flake/neovim-nightly/nixpkgs': 'github:NixOS/nixpkgs/507b63021ada5fee621b6ca371c4fca9ca46f52c?narHash=sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA%3D' (2025-04-23) → 'github:NixOS/nixpkgs/032bc6539bd5f14e9d0c51bd79cfe9a055b094c3?narHash=sha256-zBuvmL6%2BCUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s%3D' (2025-05-02) • Updated input 'nvim-flake/neovim-nightly/treefmt-nix': 'github:numtide/treefmt-nix/8d404a69efe76146368885110f29a2ca3700bee6?narHash=sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI%3D' (2025-04-18) → 'github:numtide/treefmt-nix/29ec5026372e0dec56f890e50dbe4f45930320fd?narHash=sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4%3D' (2025-05-02) • Updated input 'spicetify-nix': 'github:Gerg-L/spicetify-nix/c09c8cbc0d650d451e4b48d00c63831437dae1b2?narHash=sha256-XzxmpEUbCXcBS7H00QmTAQf9xrMdvaFHrprkwb4i9CU%3D' (2025-05-03) → 'github:Gerg-L/spicetify-nix/2cce21a18638b9b77914af06266f8f8dcced3f3b?narHash=sha256-vCUDNzs%2BBaz3JldS8uiYXIlCu1W4FL0Qe3z0dY9Z/2E%3D' (2025-05-04) --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index d44d82b..b9a65e6 100644 --- a/flake.lock +++ b/flake.lock @@ -371,11 +371,11 @@ }, "master": { "locked": { - "lastModified": 1746307609, - "narHash": "sha256-KyXS1SBYHC3rOuU+03n7FsK29dyYutDDhGGm+PclhuU=", + "lastModified": 1746332716, + "narHash": "sha256-VBmKSkmw9PYBCEGhBKzORjx+nwNZkPZyHcUHE21A/ws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b440606b4212f01eac9d24e5fbb9ab0b281b5548", + "rev": "6b1c028bce9c89e9824cde040d6986d428296055", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745651471, - "narHash": "sha256-7KEsZ3jzgplAlJINqP95eD4/DiPRR9YPiGWgLsu+lBc=", + "lastModified": 1746256223, + "narHash": "sha256-a97mwMJcE0cYGfwB5N5v+Ey+by1poGTc/fsrd47Fom8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "ce33792bf7327e4d6e338625517374e13a63cde2", + "rev": "02ec02529a5d602a9e9d273531d776d160fae182", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1745624544, - "narHash": "sha256-Axa1vdynf7glAWc7v80unyew4IJqtdq21WEf3VGwW40=", + "lastModified": 1746214751, + "narHash": "sha256-FlGgG3A9oJwGP0YTWU2Nw9fwdnqPMapjx3twonu0Vkg=", "owner": "neovim", "repo": "neovim", - "rev": "766cd01ff2ff68a0ffdfcc385e76346ce22cde7e", + "rev": "5a2edc483dff93cc94847b6950713d80a51087c0", "type": "github" }, "original": { @@ -473,11 +473,11 @@ ] }, "locked": { - "lastModified": 1746054057, - "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=", + "lastModified": 1746330942, + "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "13ba07d54c6ccc5af30a501df669bf3fe3dd4db8", + "rev": "137fd2bd726fff343874f85601b51769b48685cc", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745377448, - "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", + "lastModified": 1746152631, + "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", + "rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3", "type": "github" }, "original": { @@ -631,11 +631,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1746313024, - "narHash": "sha256-E0+wVNQaEY1okTAyLWKjV6eV8bx+evR1ZmnfcBhwnyk=", + "lastModified": 1746324328, + "narHash": "sha256-TxXYcF4dONxp9n/oS2bo42Y1uSCsnMoMrG8yGC9KM6w=", "owner": "Gerg-L", "repo": "nvim-flake", - "rev": "ab20dcd2c1da3e5a53b820dffca01c6c2b2ef68a", + "rev": "5969983aa21131a18cfd04cce329fc5791474a22", "type": "github" }, "original": { @@ -774,11 +774,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1746287507, - "narHash": "sha256-XzxmpEUbCXcBS7H00QmTAQf9xrMdvaFHrprkwb4i9CU=", + "lastModified": 1746332226, + "narHash": "sha256-vCUDNzs+Baz3JldS8uiYXIlCu1W4FL0Qe3z0dY9Z/2E=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "c09c8cbc0d650d451e4b48d00c63831437dae1b2", + "rev": "2cce21a18638b9b77914af06266f8f8dcced3f3b", "type": "github" }, "original": { @@ -877,11 +877,11 @@ ] }, "locked": { - "lastModified": 1744961264, - "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", + "lastModified": 1746216483, + "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8d404a69efe76146368885110f29a2ca3700bee6", + "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", "type": "github" }, "original": {