From 40addb8f906650939db5ebfdb2c4fab3563564ae Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 01:09:38 -0500 Subject: [PATCH 01/77] try zen kernel --- hosts/ytnix/default.nix | 2 +- overlay/default.nix | 1 + overlay/kernel.nix | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 overlay/kernel.nix diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 01a9c97..2cac680 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -41,7 +41,7 @@ efi.canTouchEfiVariables = false; # toggle when installing }; tmp.cleanOnBoot = true; - kernelPackages = pkgs.linuxPackages_6_12; + kernelPackages = pkgs.linuxPackages_zen; extraModulePackages = with config.boot.kernelPackages; [ rtl8821ce ]; diff --git a/overlay/default.nix b/overlay/default.nix index 99fc17b..123e1f2 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -2,6 +2,7 @@ let overlays = [ ./conduwuit ./attic + ./kernel.nix ]; importedOverlays = map (m: import m) overlays; in diff --git a/overlay/kernel.nix b/overlay/kernel.nix new file mode 100644 index 0000000..b9a233b --- /dev/null +++ b/overlay/kernel.nix @@ -0,0 +1,9 @@ +final: prev: let + inherit (prev) lib; +in { + linux_zen = prev.linux_zen.override (old: { + extraStructuredConfig = with lib.kernel; { + CONFIG_SCHED_MUQSS = yes; + }; + }); +} From 38b90fd28e4c5623c2cbd198d8c84055468c59e6 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 04:04:08 -0500 Subject: [PATCH 02/77] overlay zen --- hosts/ytnix/default.nix | 2 +- overlay/kernel.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 2cac680..0024c40 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -41,7 +41,7 @@ efi.canTouchEfiVariables = false; # toggle when installing }; tmp.cleanOnBoot = true; - kernelPackages = pkgs.linuxPackages_zen; + kernelPackages = pkgs.linuxKernel.packages.linux_zen; extraModulePackages = with config.boot.kernelPackages; [ rtl8821ce ]; diff --git a/overlay/kernel.nix b/overlay/kernel.nix index b9a233b..e845a1e 100644 --- a/overlay/kernel.nix +++ b/overlay/kernel.nix @@ -1,7 +1,7 @@ final: prev: let inherit (prev) lib; in { - linux_zen = prev.linux_zen.override (old: { + linuxKernels.kernels.linux_zen = prev.linuxKernels.kernels.linux_zen.override (old: { extraStructuredConfig = with lib.kernel; { CONFIG_SCHED_MUQSS = yes; }; From 2c2d5a4103f4484deae3eb2b2a0638dfe38732b4 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 04:04:32 -0500 Subject: [PATCH 03/77] niri doesnt start if DISPLAY is set before --- home/niri/default.nix | 1 + home/yt/ytnix.nix | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/home/niri/default.nix b/home/niri/default.nix index f74bcb3..40c53d6 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -49,6 +49,7 @@ in environment = { DISPLAY = ":0"; # for xwayland-satellite + ANKI_WAYLAND = "1"; }; layout = { diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 8624bdf..2fa8d16 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -40,11 +40,6 @@ }; }; - home.sessionVariables = { - ANKI_WAYLAND = "1"; - DISPLAY = ":0"; - }; - home.packages = with pkgs; [ firefox ungoogled-chromium From 4ceb7f78305e05da7dad175b805dbc9ac6d4780e Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 04:05:32 -0500 Subject: [PATCH 04/77] add garnix.yaml --- garnix.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 garnix.yaml diff --git a/garnix.yaml b/garnix.yaml new file mode 100644 index 0000000..c189664 --- /dev/null +++ b/garnix.yaml @@ -0,0 +1,6 @@ +builds: + include: + - 'nixosConfigurations.*' + - 'homeConfigurations.*' + - '*.aarch64-linux.*' + - '*.x86_64-linux.*' From ae71a8a7791b22b88030865d7fc05ec51a829752 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 04:22:58 -0500 Subject: [PATCH 05/77] add garnix and cachix cache --- flake.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/flake.nix b/flake.nix index f75fe1e..6942dfe 100644 --- a/flake.nix +++ b/flake.nix @@ -45,11 +45,15 @@ "https://cache.cything.io/central" "https://niri.cachix.org" "https://nix-community.cachix.org" + "https://cache.garnix.io" + "https://cything.cachix.org" ]; extra-trusted-public-keys = [ "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg=" "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + "cything.cachix.org-1:xqW1W5NNL+wrM9wfSELb0MLj/harD2ZyB4HbdaMyvPI=" ]; builders-use-substitutes = true; }; From bbcc1433dedd20b729be32f145ebdefb4f92dae0 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 04:25:30 -0500 Subject: [PATCH 06/77] nix fmt --- .github/workflows/build-machines-and-homes.yml | 15 --------------- .github/workflows/build-packages.yml | 7 ------- home/niri/default.nix | 9 ++++++++- overlay/kernel.nix | 6 ++++-- 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml index 6ae6746..f5de126 100644 --- a/.github/workflows/build-machines-and-homes.yml +++ b/.github/workflows/build-machines-and-homes.yml @@ -13,7 +13,6 @@ jobs: - titan os: - ubuntu-latest - runs-on: ${{ matrix.os }} continue-on-error: true steps: @@ -28,28 +27,23 @@ jobs: remove-codeql: 'true' remove-docker-images: 'true' build-mount-path: /nix - - uses: nixbuild/nix-quick-install-action@master - - name: Sync repository uses: actions/checkout@v4 with: persist-credentials: false - - uses: cachix/cachix-action@v14 with: name: cything authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' useDaemon: false installCommand: nix profile install nixpkgs#cachix - - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: endpoint: ${{ vars.ATTIC_ENDPOINT }} cache: ${{ vars.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} - - name: Restore and cache Nix store uses: nix-community/cache-nix-action@v5.1.0 with: @@ -67,9 +61,7 @@ jobs: purge-primary-key: never # always save the cache save-always: true - - run: nix build -L .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel - build-homes: strategy: matrix: @@ -79,7 +71,6 @@ jobs: os: - ubuntu-latest # - macos-latest - runs-on: ${{ matrix.os }} continue-on-error: true steps: @@ -94,28 +85,23 @@ jobs: remove-codeql: 'true' remove-docker-images: 'true' build-mount-path: /nix - - uses: nixbuild/nix-quick-install-action@master - - name: Sync repository uses: actions/checkout@v4 with: persist-credentials: false - - uses: cachix/cachix-action@v14 with: name: cything authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' useDaemon: false installCommand: nix profile install nixpkgs#cachix - - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: endpoint: ${{ vars.ATTIC_ENDPOINT }} cache: ${{ vars.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} - - name: Restore and cache Nix store uses: nix-community/cache-nix-action@v5.1.0 with: @@ -133,5 +119,4 @@ jobs: purge-primary-key: never # always save the cache save-always: true - - run: nix build -L .#homeConfigurations."${{ matrix.home }}".activationPackage diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index a177078..4408d30 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -6,7 +6,6 @@ on: description: "package to build" required: false type: string - jobs: build-packages: strategy: @@ -19,32 +18,27 @@ jobs: - ubuntu-latest - macos-latest - ubuntu-24.04-arm - runs-on: ${{ matrix.os }} continue-on-error: true steps: - name: Install Nix uses: cachix/install-nix-action@v30 - - name: Sync repository uses: actions/checkout@v4 with: persist-credentials: false - - uses: cachix/cachix-action@v14 with: name: cything authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' useDaemon: false installCommand: nix profile install nixpkgs#cachix - - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: endpoint: ${{ vars.ATTIC_ENDPOINT }} cache: ${{ vars.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} - - name: Restore and cache Nix store uses: nix-community/cache-nix-action@v5.1.0 with: @@ -62,5 +56,4 @@ jobs: purge-primary-key: never # always save the cache save-always: true - - run: nix build -L ${{ matrix.package }} diff --git a/home/niri/default.nix b/home/niri/default.nix index 40c53d6..af7b3ba 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -32,7 +32,14 @@ in ]; } { command = [ "${lib.getExe pkgs.xwayland-satellite}" ]; } - { command = [ "wl-paste" "--watch" "cliphist" "store"]; } + { + command = [ + "wl-paste" + "--watch" + "cliphist" + "store" + ]; + } ]; hotkey-overlay.skip-at-startup = true; diff --git a/overlay/kernel.nix b/overlay/kernel.nix index e845a1e..be2404e 100644 --- a/overlay/kernel.nix +++ b/overlay/kernel.nix @@ -1,6 +1,8 @@ -final: prev: let +final: prev: +let inherit (prev) lib; -in { +in +{ linuxKernels.kernels.linux_zen = prev.linuxKernels.kernels.linux_zen.override (old: { extraStructuredConfig = with lib.kernel; { CONFIG_SCHED_MUQSS = yes; From 6a2269f5917b86b8e34f8491710715696559aee1 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 12:07:49 -0500 Subject: [PATCH 07/77] add irssi --- home/irssi.nix | 18 ++++++++++++++++++ home/yt/ytnix.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 home/irssi.nix diff --git a/home/irssi.nix b/home/irssi.nix new file mode 100644 index 0000000..65da469 --- /dev/null +++ b/home/irssi.nix @@ -0,0 +1,18 @@ +{...}: { + programs.irssi = { + enable = true; + networks.liberachat = { + nick = "cy7"; + server = { + address = "irc.libera.chat"; + port = 6697; + autoConnect = true; + }; + channels = { + nixos.autoJoin = true; + linux.autoJoin = true; + rust.autoJoin = true; + }; + }; + }; +} diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 2fa8d16..33a4aed 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -7,6 +7,7 @@ ./common.nix ../foot.nix ../niri + ../irssi.nix ]; home = { username = "yt"; From aca309a9c04984ee4f60be40477026d2043875fd Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 12:23:16 -0500 Subject: [PATCH 08/77] ghostty: init --- flake.lock | 140 ++++++++++++++++++++++++++++++++++++++++-- flake.nix | 2 + home/foot.nix | 32 ++++------ home/ghostty.nix | 18 ++++++ home/niri/default.nix | 3 +- home/yt/ytnix.nix | 1 + 6 files changed, 169 insertions(+), 27 deletions(-) create mode 100644 home/ghostty.nix diff --git a/flake.lock b/flake.lock index 8cd1162..9950639 100644 --- a/flake.lock +++ b/flake.lock @@ -74,6 +74,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -151,6 +167,24 @@ "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -165,6 +199,27 @@ "type": "github" } }, + "ghostty": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig" + }, + "locked": { + "lastModified": 1737430029, + "narHash": "sha256-z55IQogW9z4HhVeT55LlCUFKbYD5O5aLMnU5cX1WTto=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "5cb2fa6f7594202b12a2603bf32094aa75b1bf0e", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -307,7 +362,7 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" @@ -337,7 +392,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable": "nixpkgs-stable_3", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, @@ -454,6 +509,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1733423277, + "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e36963a147267afc055f7cf65225958633e536bf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -469,7 +540,7 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1737299813, "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", @@ -485,10 +556,26 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1733229606, + "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "home-manager": "home-manager_2", @@ -515,7 +602,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -547,7 +634,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1731363552, @@ -567,6 +654,7 @@ "inputs": { "disko": "disko", "flake-parts": "flake-parts", + "ghostty": "ghostty", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "niri": "niri", @@ -654,6 +742,21 @@ "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" + } + }, "treefmt": { "inputs": { "nixpkgs": [ @@ -727,6 +830,31 @@ "repo": "xwayland-satellite", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty" + ], + "flake-utils": "flake-utils", + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1717848532, + "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6942dfe..1ff46a7 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,7 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; + ghostty.url = "github:ghostty-org/ghostty"; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR }; @@ -114,6 +115,7 @@ overlays = [ inputs.niri.overlays.niri inputs.rust-overlay.overlays.default + inputs.ghostty.overlays.default ] ++ import ./overlay; }; in diff --git a/home/foot.nix b/home/foot.nix index 2df77bc..ce7cb0c 100644 --- a/home/foot.nix +++ b/home/foot.nix @@ -17,40 +17,32 @@ blink = "yes"; blink-rate = 500; beam-thickness = 1.5; + color = "161821 c6c8d1"; }; mouse = { hide-when-typing = "yes"; }; colors = { - background = "161821"; foreground = "c6c8d1"; - - selection-background = "1e2132"; - selection-foreground = "c6c8d1"; - - regular0 = "161821"; - bright0 = "6b7089"; - + background = "161821"; + regular0 = "1e2132"; regular1 = "e27878"; - bright1 = "e98989"; - regular2 = "b4be82"; - bright2 = "c0ca8e"; - regular3 = "e2a478"; - bright3 = "e9b189"; - regular4 = "84a0c6"; - bright4 = "91acd1"; - regular5 = "a093c7"; - bright5 = "ada0d3"; - regular6 = "89b8c2"; - bright6 = "95c4ce"; - regular7 = "c6c8d1"; + bright0 = "6b7089"; + bright1 = "e98989"; + bright2 = "c0ca8e"; + bright3 = "e9b189"; + bright4 = "91acd1"; + bright5 = "ada0d3"; + bright6 = "95c4ce"; bright7 = "d2d4de"; + selection-foreground = "161821"; + selection-background = "c6c8d1"; }; key-bindings = { diff --git a/home/ghostty.nix b/home/ghostty.nix new file mode 100644 index 0000000..cbde83e --- /dev/null +++ b/home/ghostty.nix @@ -0,0 +1,18 @@ +{ ... }: { + programs.ghostty = { + enable = true; + enableZshIntegration = true; + clearDefaultKeybinds = true; + settings = { + theme = "iceberg-dark"; + font-family = "IBM Plex Mono"; + font-size = "12"; + window-decoration = false; + confirm-close-surface = false; + keybind = [ + "ctrl+q=quit" + "ctrl+shift+c=copy_to_clipboard" + ]; + }; + }; +} diff --git a/home/niri/default.nix b/home/niri/default.nix index af7b3ba..fdc7418 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -6,7 +6,7 @@ }: let wallpaper = "${./nixos-c-book.png}"; - terminal = "foot"; + terminal = "ghostty"; menu = [ "fuzzel" "-w" @@ -93,6 +93,7 @@ in app-id = "anki"; title = "^Browse"; } + { app-id = "com.mitchellh.ghostt"; } ]; default-column-width.proportion = .5; } diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 33a4aed..cb0e66d 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -8,6 +8,7 @@ ../foot.nix ../niri ../irssi.nix + ../ghostty.nix ]; home = { username = "yt"; From 455b197b7f4fe58169fead8efb8439e933d46e90 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 13:35:44 -0500 Subject: [PATCH 09/77] try to fix cursor issue --- home/yt/ytnix.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index cb0e66d..e200eab 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -42,6 +42,13 @@ }; }; + home.pointerCursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern"; + gtk.enable = true; + x11.enable = true; + }; + home.packages = with pkgs; [ firefox ungoogled-chromium @@ -49,7 +56,6 @@ bitwarden-desktop bitwarden-cli fastfetch - discord nwg-look kdePackages.gwenview kdePackages.okular From 03e1a832ffebf2c33d8bc1e9d5a9028590e3dbae Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 15:36:19 -0500 Subject: [PATCH 10/77] some irssi config --- home/ghostty.nix | 1 + home/irssi.nix | 3 +++ home/yt/ytnix.nix | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/home/ghostty.nix b/home/ghostty.nix index cbde83e..9a08a74 100644 --- a/home/ghostty.nix +++ b/home/ghostty.nix @@ -12,6 +12,7 @@ keybind = [ "ctrl+q=quit" "ctrl+shift+c=copy_to_clipboard" + "ctrl+shift+v=paste_from_clipboard" ]; }; }; diff --git a/home/irssi.nix b/home/irssi.nix index 65da469..91ba914 100644 --- a/home/irssi.nix +++ b/home/irssi.nix @@ -14,5 +14,8 @@ rust.autoJoin = true; }; }; + extraConfig = '' + ignores = ( { level = "JOINS PARTS QUITS MODES NICKS"; } ) + ''; }; } diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index e200eab..33d6965 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -49,6 +49,12 @@ x11.enable = true; }; + dconf.settings = { + "org/gnome/desktop/interface" = { + cursor-theme = "Bibata-Modern"; + }; + }; + home.packages = with pkgs; [ firefox ungoogled-chromium From 0d8ec05ba669f57590aa116f2eb092813bd8d397 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 16:24:33 -0500 Subject: [PATCH 11/77] how about kitty now --- home/kitty.nix | 46 +++++++++++++++++++++++++++++++++++++ home/niri/default.nix | 2 +- home/niri/scripts/remote.sh | 4 ++-- home/yt/ytnix.nix | 1 + 4 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 home/kitty.nix diff --git a/home/kitty.nix b/home/kitty.nix new file mode 100644 index 0000000..fa8a1ba --- /dev/null +++ b/home/kitty.nix @@ -0,0 +1,46 @@ +{pkgs, ...}: { + programs.kitty = { + enable = true; + font = { + name = "IBM Plex Mono"; + package = pkgs.ibm-plex; + size = 12; + }; + themeFile = "GitHub_Dark"; + settings = { + enable_audio_bell = false; + # how many windows should be open before kitty asks + # for confirmation + confirm_os_window_close = 0; + }; + keybindings = { + # kitty_mod is ctrl+shift by default + "kitty_mod+c" = "copy_to_clipboard"; + "kitty_mod+v" = "paste_from_clipboard"; + "ctrl+q" = "quit"; + + # windows + "kitty_mod+h" = "neighboring_window left"; + "kitty_mod+alt+h" = "move_window left"; + "kitty_mod+l" = "neighboring_window right"; + "kitty_mod+alt+l" = "move_window right"; + "kitty_mod+j" = "neighboring_window down"; + "kitty_mod+alt+j" = "move_window down"; + "kitty_mod+k" = "neighboring_window up"; + "kitty_mod+alt+k" = "move_window up"; + "ctrl+f2" = "detach_tab"; + "ctrl+f3" = "detach_window new-tab"; + "ctrl+f4" = "detach_window prev-tab"; + "ctrl+alt+l" = "next_layout"; + "ctrl+alt+t" = "goto_layout tall"; + "ctrl+alt+s" = "goto_layout stack"; + + # tabs + "kitty_mod+n" = "next_tab"; + "kitty_mod+p" = "previous_tab"; + "kitty_mod+alt+n" = "move_tab_forward"; + "kitty_mod+alt+p" = "move_tab_backward"; + "kitty_mod+w" = "close_tab"; + }; + }; +} diff --git a/home/niri/default.nix b/home/niri/default.nix index fdc7418..5661d44 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -6,7 +6,7 @@ }: let wallpaper = "${./nixos-c-book.png}"; - terminal = "ghostty"; + terminal = "kitty"; menu = [ "fuzzel" "-w" diff --git a/home/niri/scripts/remote.sh b/home/niri/scripts/remote.sh index 5065980..0ef7c0d 100755 --- a/home/niri/scripts/remote.sh +++ b/home/niri/scripts/remote.sh @@ -5,7 +5,7 @@ active_window=$(niri msg --json focused-window |jq -r .app_id) if [ "$1" = "btn1" ]; then if [ "$active_window" = "anki" ]; then wtype " " - elif [ "$active_window" = "foot" ]; then + elif [ "$active_window" = "kitty" ]; then wtype -M ctrl -M shift -k c -m ctrl -m shift elif [ "$active_window" = "chromium-browser" ] || [ "$active_window" = "librewolf" ]; then wtype -M alt -P right -p right -m alt @@ -15,7 +15,7 @@ if [ "$1" = "btn1" ]; then else if [ "$active_window" = "anki" ]; then wtype "1" - elif [ "$active_window" = "foot" ]; then + elif [ "$active_window" = "kitty" ]; then wtype -M ctrl -M shift -k v -m ctrl elif [ "$active_window" = "chromium-browser" ] || [ "$active_window" = "librewolf" ]; then wtype -M alt -P left -p left -m alt diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 33d6965..b1af7f5 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -9,6 +9,7 @@ ../niri ../irssi.nix ../ghostty.nix + ../kitty.nix ]; home = { username = "yt"; From cfa298fb6360b023d5f5bd3246bff1cc5dea0d76 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 16:47:47 -0500 Subject: [PATCH 12/77] fix kde apps looking weird --- home/niri/default.nix | 2 ++ home/yt/ytnix.nix | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/home/niri/default.nix b/home/niri/default.nix index 5661d44..92f5701 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -94,6 +94,8 @@ in title = "^Browse"; } { app-id = "com.mitchellh.ghostt"; } + { app-id = "org.kde.okular"; } + { app-id = "kitty"; } ]; default-column-width.proportion = .5; } diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index b1af7f5..4dd56cc 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -22,9 +22,9 @@ qt = { enable = true; - platformTheme.name = "gtk"; - style.name = "adwaita-dark"; - style.package = pkgs.adwaita-qt; + platformTheme.name = "kde"; + style.name = "breeze-dark"; + style.package = pkgs.kdePackages.breeze; }; gtk = { From 0f913101a96f9dfdd6dd60e53aaa9ac8609637f5 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 21:56:26 -0500 Subject: [PATCH 13/77] use conduwuit from flake --- flake.lock | 749 ++++++++++++++++++++++++++++++++++++-- flake.nix | 6 + hosts/chunk/conduwuit.nix | 3 +- 3 files changed, 721 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 9950639..4e23eb9 100644 --- a/flake.lock +++ b/flake.lock @@ -1,6 +1,169 @@ { "nodes": { + "attic": { + "inputs": { + "crane": "crane", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1731270564, + "narHash": "sha256-6KMC/NH/VWP5Eb+hA56hz0urel3jP6Y6cF2PX6xaTkk=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "47752427561f1c34debb16728a210d378f0ece36", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "main", + "repo": "attic", + "type": "github" + } + }, + "cachix": { + "inputs": { + "devenv": "devenv", + "flake-compat": "flake-compat_2", + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1733424942, + "narHash": "sha256-5t7Sl6EkOaoP4FvzLmH7HFDbdl9SizmLh53RjDQCbWQ=", + "owner": "cachix", + "repo": "cachix", + "rev": "8b6b0e4694b9aa78b2ea4c93bff6e1a222dc7e4a", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "master", + "repo": "cachix", + "type": "github" + } + }, + "cachix_2": { + "inputs": { + "devenv": [ + "conduwuit", + "cachix", + "devenv" + ], + "flake-compat": [ + "conduwuit", + "cachix", + "devenv" + ], + "git-hooks": [ + "conduwuit", + "cachix", + "devenv" + ], + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1728672398, + "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", + "owner": "cachix", + "repo": "cachix", + "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "latest", + "repo": "cachix", + "type": "github" + } + }, + "complement": { + "flake": false, + "locked": { + "lastModified": 1734303596, + "narHash": "sha256-HjDRyLR4MBqQ3IjfMM6eE+8ayztXlbz3gXdyDmFla68=", + "owner": "girlbossceo", + "repo": "complement", + "rev": "14cc5be797b774f1a2b9f826f38181066d4952b8", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "ref": "main", + "repo": "complement", + "type": "github" + } + }, + "conduwuit": { + "inputs": { + "attic": "attic", + "cachix": "cachix", + "complement": "complement", + "crane": "crane_2", + "fenix": "fenix", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils", + "liburing": "liburing", + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs_5", + "rocksdb": "rocksdb" + }, + "locked": { + "lastModified": 1737153653, + "narHash": "sha256-yNdxoVZX13QUDJYM6zTMY9ExvacTqB+f0MLvDreSW8U=", + "owner": "girlbossceo", + "repo": "conduwuit", + "rev": "5b8464252c2c03edf65e43153be026dbb768a12a", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "repo": "conduwuit", + "type": "github" + } + }, "crane": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "owner": "ipetkov", + "repo": "crane", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { + "locked": { + "lastModified": 1736566337, + "narHash": "sha256-SC0eDcZPqISVt6R0UfGPyQLrI0+BppjjtQ3wcSlk0oI=", + "owner": "ipetkov", + "repo": "crane", + "rev": "9172acc1ee6c7e1cbafc3044ff850c568c75a5a3", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "master", + "repo": "crane", + "type": "github" + } + }, + "crane_3": { "locked": { "lastModified": 1731098351, "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", @@ -15,6 +178,40 @@ "type": "github" } }, + "devenv": { + "inputs": { + "cachix": "cachix_2", + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "git-hooks": [ + "conduwuit", + "cachix", + "git-hooks" + ], + "nix": "nix", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733323168, + "narHash": "sha256-d5DwB4MZvlaQpN6OQ4SLYxb5jA4UH5EtV5t5WOtjLPU=", + "owner": "cachix", + "repo": "devenv", + "rev": "efa9010b8b1cfd5dd3c7ed1e172a470c3b84a064", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -57,6 +254,29 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1736836313, + "narHash": "sha256-zdZ7/T6yG0/hzoVOiNpDiR/sW3zR6oSMrfIFJK2BrrE=", + "owner": "nix-community", + "repo": "fenix", + "rev": "056c9393c821a4df356df6ce7f14c722dc8717ec", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -74,6 +294,39 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "ref": "master", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -89,7 +342,23 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -104,6 +373,52 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "conduwuit", + "cachix", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -121,7 +436,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -142,7 +457,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -167,6 +482,25 @@ "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -181,9 +515,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -201,8 +535,8 @@ }, "ghostty": { "inputs": { - "flake-compat": "flake-compat", - "nixpkgs-stable": "nixpkgs-stable", + "flake-compat": "flake-compat_4", + "nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-unstable": "nixpkgs-unstable", "zig": "zig" }, @@ -221,12 +555,41 @@ } }, "git-hooks": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_2": { "inputs": { "flake-compat": [ "nixvim", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore_3", "nixpkgs": [ "nixvim", "nixpkgs" @@ -247,6 +610,29 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -268,7 +654,7 @@ "type": "github" } }, - "gitignore_2": { + "gitignore_3": { "inputs": { "nixpkgs": [ "nixvim", @@ -361,9 +747,9 @@ }, "lanzaboote": { "inputs": { - "crane": "crane", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", + "crane": "crane_3", + "flake-compat": "flake-compat_5", + "flake-parts": "flake-parts_4", "nixpkgs": [ "nixpkgs" ], @@ -385,6 +771,39 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, + "liburing": { + "flake": false, + "locked": { + "lastModified": 1736719310, + "narHash": "sha256-Turvx60THwzTiUHb49WV3upUgsPuktr7tVy2Lwu2xJg=", + "owner": "axboe", + "repo": "liburing", + "rev": "3124a4619e4daf26b06d48ccf0186a947070c415", + "type": "github" + }, + "original": { + "owner": "axboe", + "ref": "master", + "repo": "liburing", + "type": "github" + } + }, "niri": { "inputs": { "niri-stable": "niri-stable", @@ -392,7 +811,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3", + "nixpkgs-stable": "nixpkgs-stable_5", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, @@ -443,6 +862,47 @@ "type": "github" } }, + "nix": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv" + ], + "flake-parts": "flake-parts_2", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_3", + "nixpkgs-23-11": [ + "conduwuit", + "cachix", + "devenv" + ], + "nixpkgs-regression": [ + "conduwuit", + "cachix", + "devenv" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv" + ] + }, + "locked": { + "lastModified": 1727438425, + "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "owner": "domenkozar", + "repo": "nix", + "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -464,18 +924,56 @@ "type": "github" } }, - "nixpkgs": { + "nix-filter": { "locked": { - "lastModified": 1737401148, - "narHash": "sha256-8YfoGyE89rWpG6NjCmYrJeV8EPAKvnZf2lN402WbC/A=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7ceed4f800bec4c12c9b21c54bb76cb28a80e259", + "lastModified": 1731533336, + "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", + "owner": "numtide", + "ref": "main", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1726042813, + "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -510,16 +1008,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", - "owner": "nixos", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { - "owner": "nixos", - "ref": "release-24.11", + "owner": "NixOS", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -541,6 +1039,38 @@ } }, "nixpkgs-stable_3": { + "locked": { + "lastModified": 1733423277, + "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e36963a147267afc055f7cf65225958633e536bf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_4": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_5": { "locked": { "lastModified": 1737299813, "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", @@ -572,12 +1102,92 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1736817698, + "narHash": "sha256-1m+JP9RUsbeLVv/tF1DX3Ew9Vl/fatXnlh/g5k3jcSk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2b1fca3296ddd1602d2c4f104a4050e006f4b0cb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1737401148, + "narHash": "sha256-8YfoGyE89rWpG6NjCmYrJeV8EPAKvnZf2lN402WbC/A=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7ceed4f800bec4c12c9b21c54bb76cb28a80e259", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", - "git-hooks": "git-hooks", + "flake-compat": "flake-compat_6", + "flake-parts": "flake-parts_5", + "git-hooks": "git-hooks_2", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": [ @@ -602,7 +1212,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -623,18 +1233,34 @@ "type": "github" } }, + "nvim-github-theme": { + "flake": false, + "locked": { + "lastModified": 1735641120, + "narHash": "sha256-/A4hkKTzjzeoR1SuwwklraAyI8oMkhxrwBBV9xb59PA=", + "owner": "projekt0n", + "repo": "github-nvim-theme", + "rev": "c106c9472154d6b2c74b74565616b877ae8ed31d", + "type": "github" + }, + "original": { + "owner": "projekt0n", + "repo": "github-nvim-theme", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1731363552, @@ -650,22 +1276,58 @@ "type": "github" } }, + "rocksdb": { + "flake": false, + "locked": { + "lastModified": 1734469478, + "narHash": "sha256-IcQ4N8xADYal79K+ONmNq4RLlIwdgUqgrVzgNgiIaG8=", + "owner": "girlbossceo", + "repo": "rocksdb", + "rev": "8b4808e7de2fbb5d119d8d72cdca76d8ab84bc47", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "ref": "v9.9.3", + "repo": "rocksdb", + "type": "github" + } + }, "root": { "inputs": { + "conduwuit": "conduwuit", "disko": "disko", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_3", "ghostty": "ghostty", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "niri": "niri", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_6", "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", + "nvim-github-theme": "nvim-github-theme", "rust-overlay": "rust-overlay_2", "sops-nix": "sops-nix", "treefmt": "treefmt" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1736690231, + "narHash": "sha256-g9gyxX+F6CrkT5gRIMKPnCPom0o9ZDzYnzzeNF86D6Q=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "8364ef299790cb6ec22b9e09e873c97dbe9f2cb5", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -757,6 +1419,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt": { "inputs": { "nixpkgs": [ @@ -836,7 +1513,7 @@ "flake-compat": [ "ghostty" ], - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "ghostty", "nixpkgs-stable" diff --git a/flake.nix b/flake.nix index 1ff46a7..fdfbbc2 100644 --- a/flake.nix +++ b/flake.nix @@ -37,8 +37,14 @@ inputs.nixpkgs.follows = "nixpkgs"; }; ghostty.url = "github:ghostty-org/ghostty"; + conduwuit.url = "github:girlbossceo/conduwuit"; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR + + nvim-github-theme = { + url = "github:projekt0n/github-nvim-theme"; + flake = false; + }; }; nixConfig = { diff --git a/hosts/chunk/conduwuit.nix b/hosts/chunk/conduwuit.nix index 6bada8e..7fa1852 100644 --- a/hosts/chunk/conduwuit.nix +++ b/hosts/chunk/conduwuit.nix @@ -1,7 +1,8 @@ -{ ... }: +{ inputs, ... }: { services.conduwuit = { enable = true; + package = inputs.conduwuit.packages.x86_64-linux.static-x86_64-linux-musl-all-features-x86_64-haswell-optimised; settings.global = { port = [ 8448 ]; server_name = "cything.io"; From 2622119933d9e3b2346feaad5476b25631df9218 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 21:59:59 -0500 Subject: [PATCH 14/77] just making then nicer --- home/kitty.nix | 19 ++++++++++++++++--- home/nixvim/default.nix | 13 ++++++++----- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/home/kitty.nix b/home/kitty.nix index fa8a1ba..4799950 100644 --- a/home/kitty.nix +++ b/home/kitty.nix @@ -12,12 +12,13 @@ # how many windows should be open before kitty asks # for confirmation confirm_os_window_close = 0; + clear_all_shortcuts = true; }; keybindings = { # kitty_mod is ctrl+shift by default "kitty_mod+c" = "copy_to_clipboard"; "kitty_mod+v" = "paste_from_clipboard"; - "ctrl+q" = "quit"; + # "ctrl+q" = "quit"; # windows "kitty_mod+h" = "neighboring_window left"; @@ -28,12 +29,14 @@ "kitty_mod+alt+j" = "move_window down"; "kitty_mod+k" = "neighboring_window up"; "kitty_mod+alt+k" = "move_window up"; - "ctrl+f2" = "detach_tab"; "ctrl+f3" = "detach_window new-tab"; - "ctrl+f4" = "detach_window prev-tab"; + "ctrl+f4" = "detach_window tab-left"; + "ctrl+f5" = "load_config_file"; "ctrl+alt+l" = "next_layout"; "ctrl+alt+t" = "goto_layout tall"; "ctrl+alt+s" = "goto_layout stack"; + "kitty_mod+enter" = "new_window_with_cwd"; + "kitty_mod+r" = "resize_window"; # tabs "kitty_mod+n" = "next_tab"; @@ -41,6 +44,16 @@ "kitty_mod+alt+n" = "move_tab_forward"; "kitty_mod+alt+p" = "move_tab_backward"; "kitty_mod+w" = "close_tab"; + "kitty_mod+t" = "new_tab_with_cwd"; + "ctrl+f2" = "detach_tab"; + + # hints + "kitty_mod+o>o" = "open_url_with_hints"; + "kitty_mod+o>p" = "kitten hints --type path --program -"; + "kitty_mod+o>n" = "kitten hints --type line --program -"; + "kitty_mod+o>w" = "kitten hints --type word --program -"; + "kitty_mod+o>h" = "kitten hints --type hash --program -"; + "kitty_mod+o>l" = "kitten hints --type linenum"; }; }; } diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 98a97ee..8a302b0 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { programs.nixvim = { enable = true; @@ -15,15 +15,18 @@ incsearch = true; smartcase = true; }; - colorscheme = "iceberg"; - clipboard.register = "unnamedplus"; + colorscheme = "github_dark_tritanopia"; + clipboard.register = "unnamed"; globals = { mapleader = ","; }; - extraPlugins = with pkgs.vimPlugins; [ - iceberg-vim + extraPlugins = [ + (pkgs.vimUtils.buildVimPlugin { + name = "gitub-theme"; + src = inputs.nvim-github-theme; + }) ]; keymaps = [ From e9e20c15a6d8d4f4012ea10745e3e2aab9546c36 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 21 Jan 2025 23:25:52 -0500 Subject: [PATCH 15/77] kitty: scrollback pager stuff --- home/kitty.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home/kitty.nix b/home/kitty.nix index 4799950..fc0b577 100644 --- a/home/kitty.nix +++ b/home/kitty.nix @@ -13,6 +13,12 @@ # for confirmation confirm_os_window_close = 0; clear_all_shortcuts = true; + + # will probably lower this later but the max allowed is actually 4GB + # this is NOT stored in memory and can only be viewed wth scrollback_pager + "scrollback_pager_history_size" = "1024"; + # see https://github.com/sharkdp/bat/issues/1077#issuecomment-652785399 + "scrollback_pager" = "bat --pager='less -FR +G'"; }; keybindings = { # kitty_mod is ctrl+shift by default @@ -20,6 +26,8 @@ "kitty_mod+v" = "paste_from_clipboard"; # "ctrl+q" = "quit"; + "kitty_mod+m" = "show_scrollback"; + # windows "kitty_mod+h" = "neighboring_window left"; "kitty_mod+alt+h" = "move_window left"; From b8dcdac94b6da662a817468167e73f60b8431055 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 22 Jan 2025 00:51:17 -0500 Subject: [PATCH 16/77] remove ghostty input and flake update --- flake.lock | 182 +++++++--------------------------------------- flake.nix | 2 - home/yt/ytnix.nix | 1 - 3 files changed, 27 insertions(+), 158 deletions(-) diff --git a/flake.lock b/flake.lock index 4e23eb9..2e9a7dd 100644 --- a/flake.lock +++ b/flake.lock @@ -343,22 +343,6 @@ } }, "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -501,24 +485,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -533,27 +499,6 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat_4", - "nixpkgs-stable": "nixpkgs-stable_3", - "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" - }, - "locked": { - "lastModified": 1737430029, - "narHash": "sha256-z55IQogW9z4HhVeT55LlCUFKbYD5O5aLMnU5cX1WTto=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "5cb2fa6f7594202b12a2603bf32094aa75b1bf0e", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": [ @@ -683,11 +628,11 @@ ] }, "locked": { - "lastModified": 1737394973, - "narHash": "sha256-EW4oXMfnfA5sNM9Jqm+y98horWVvN66Gu7YIcEpFYZc=", + "lastModified": 1737480538, + "narHash": "sha256-rk/cmrvq3In0TegW9qaAxw+5YpJhRWt2p74/6JStrw0=", "owner": "nix-community", "repo": "home-manager", - "rev": "9786661d57c476021c8a0c3e53bf9fa2b4f3328b", + "rev": "4481a16d1ac5bff4a77c608cefe08c9b9efe840d", "type": "github" }, "original": { @@ -748,7 +693,7 @@ "lanzaboote": { "inputs": { "crane": "crane_3", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_4", "nixpkgs": [ "nixpkgs" @@ -811,16 +756,16 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_5", + "nixpkgs-stable": "nixpkgs-stable_4", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737373716, - "narHash": "sha256-GRI9WugYv8QlnhZlINfY8gHIR+xn/AsEXhQP3+FjUh0=", + "lastModified": 1737516423, + "narHash": "sha256-S3vmlekDRKgXsOreMMxLwJgvH313x1zU/wYtC8YThLg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "5aa5e53601ff1d93ae6b4dc6f833c73fc8de6466", + "rev": "8370d2475f0eac1b5dab31a107ee118d96692e31", "type": "github" }, "original": { @@ -849,11 +794,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1737370409, - "narHash": "sha256-khoHHrpP/yArGEm94H/GtZytGzfJECsAEGmB9DLWb7M=", + "lastModified": 1737449786, + "narHash": "sha256-G/AK0T41PpxU9hjkK/tnjODigzKcpRayo1o4pi9glqI=", "owner": "YaLTeR", "repo": "niri", - "rev": "7f025da5b6edb1d77e785ba6a6450ab10788ad8f", + "rev": "b01b8afa8c8f9070300243050d9790e38fd19145", "type": "github" }, "original": { @@ -1039,22 +984,6 @@ } }, "nixpkgs-stable_3": { - "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -1070,7 +999,7 @@ "type": "github" } }, - "nixpkgs-stable_5": { + "nixpkgs-stable_4": { "locked": { "lastModified": 1737299813, "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", @@ -1086,22 +1015,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1733229606, - "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1730531603, @@ -1168,11 +1081,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1737401148, - "narHash": "sha256-8YfoGyE89rWpG6NjCmYrJeV8EPAKvnZf2lN402WbC/A=", + "lastModified": 1737469477, + "narHash": "sha256-GG0myEzULU7uiwoNGnwqiclki+Jg8dPG6nv7yKo7lMc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ceed4f800bec4c12c9b21c54bb76cb28a80e259", + "rev": "2582766522e754520bf3f883f06560f89870a5ba", "type": "github" }, "original": { @@ -1185,7 +1098,7 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_5", "git-hooks": "git-hooks_2", "home-manager": "home-manager_2", @@ -1197,11 +1110,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737385899, - "narHash": "sha256-/zyvdstDpPhc5lhFMtKgyQdU2oXGXDb0cg4BY91NKvg=", + "lastModified": 1737484173, + "narHash": "sha256-bE9pTDqnSIMAwJeIu0MzA8ZR7LEwRbhnRpnImWIBejc=", "owner": "nix-community", "repo": "nixvim", - "rev": "115994f18e439a1cca9cdaaf15c004870256814d", + "rev": "342161bf525dd64eb53fea295a2180f71ed06de1", "type": "github" }, "original": { @@ -1212,7 +1125,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1260,7 +1173,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1731363552, @@ -1298,7 +1211,6 @@ "conduwuit": "conduwuit", "disko": "disko", "flake-parts": "flake-parts_3", - "ghostty": "ghostty", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "niri": "niri", @@ -1356,11 +1268,11 @@ ] }, "locked": { - "lastModified": 1737340068, - "narHash": "sha256-5UciRckNV+YOZ6y6ASBIb01cySB12whDxgFUK+EqT8g=", + "lastModified": 1737512878, + "narHash": "sha256-dgF6htdmfNnZzVInifks6npnCAyVsIHWSpWNs10RSW0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "275c824ed9e90e7fd4f96d187bde3670062e721f", + "rev": "06b8ed0eee289fe94c66f1202ced9a6a2c59a14c", "type": "github" }, "original": { @@ -1419,21 +1331,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt": { "inputs": { "nixpkgs": [ @@ -1441,11 +1338,11 @@ ] }, "locked": { - "lastModified": 1737103437, - "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", + "lastModified": 1737483750, + "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", + "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", "type": "github" }, "original": { @@ -1507,31 +1404,6 @@ "repo": "xwayland-satellite", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty" - ], - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index fdfbbc2..f683266 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,6 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - ghostty.url = "github:ghostty-org/ghostty"; conduwuit.url = "github:girlbossceo/conduwuit"; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR @@ -121,7 +120,6 @@ overlays = [ inputs.niri.overlays.niri inputs.rust-overlay.overlays.default - inputs.ghostty.overlays.default ] ++ import ./overlay; }; in diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 4dd56cc..b150993 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -8,7 +8,6 @@ ../foot.nix ../niri ../irssi.nix - ../ghostty.nix ../kitty.nix ]; home = { From f9806ac6368758838082f0e973fbaf8f67547530 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 22 Jan 2025 02:07:37 -0500 Subject: [PATCH 17/77] try lix --- flake.lock | 110 ++++++++++++++++++++++++++++++++++++++++++++--------- flake.nix | 19 +++++---- 2 files changed, 102 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 2e9a7dd..497bb67 100644 --- a/flake.lock +++ b/flake.lock @@ -108,7 +108,9 @@ "flake-utils": "flake-utils", "liburing": "liburing", "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "nixpkgs" + ], "rocksdb": "rocksdb" }, "locked": { @@ -499,6 +501,39 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "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" + } + }, + "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" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -749,6 +784,43 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1737234286, + "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", + "rev": "079528098f5998ba13c88821a2eca1005c1695de", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils_2", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737241037, + "narHash": "sha256-6LIpS3rK1Ch6OXis4tvBTgGBTRb+NptDAfhPNzmgZSE=", + "ref": "refs/heads/main", + "rev": "690f7c0fa2935bf591cccf4d7312b3e0f470298b", + "revCount": 129, + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/nixos-module" + } + }, "niri": { "inputs": { "niri-stable": "niri-stable", @@ -1064,22 +1136,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1736817698, - "narHash": "sha256-1m+JP9RUsbeLVv/tF1DX3Ew9Vl/fatXnlh/g5k3jcSk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b1fca3296ddd1602d2c4f104a4050e006f4b0cb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1737469477, "narHash": "sha256-GG0myEzULU7uiwoNGnwqiclki+Jg8dPG6nv7yKo7lMc=", @@ -1125,7 +1181,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1213,8 +1269,9 @@ "flake-parts": "flake-parts_3", "home-manager": "home-manager", "lanzaboote": "lanzaboote", + "lix-module": "lix-module", "niri": "niri", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", "nvim-github-theme": "nvim-github-theme", @@ -1331,6 +1388,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index f683266..f7a4272 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,14 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - conduwuit.url = "github:girlbossceo/conduwuit"; + conduwuit = { + url = "github:girlbossceo/conduwuit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + lix-module = { + url = "git+https://git.lix.systems/lix-project/nixos-module"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR @@ -85,17 +92,12 @@ ]; perSystem = { - system, + inputs', ... }: { # make pkgs available to `perSystem` - _module.args.pkgs = import inputs.nixpkgs { - inherit system; - config = { - allowUnfree = true; - }; - }; + _module.args.pkgs = inputs'.nixpkgs.legacyPackages; treefmt = { projectRootFile = "flake.nix"; @@ -140,6 +142,7 @@ ./modules inputs.lanzaboote.nixosModules.lanzaboote inputs.niri.nixosModules.niri + inputs.lix-module.nixosModules.default ]; }; chunk = lib.nixosSystem { From 7bd2af2396728b042c9b9697c026aea27d0f833f Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 22 Jan 2025 02:45:29 -0500 Subject: [PATCH 18/77] use cachix action to install latest nix --- .github/workflows/build-machines-and-homes.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml index f5de126..aa15d09 100644 --- a/.github/workflows/build-machines-and-homes.yml +++ b/.github/workflows/build-machines-and-homes.yml @@ -27,7 +27,10 @@ jobs: remove-codeql: 'true' remove-docker-images: 'true' build-mount-path: /nix - - uses: nixbuild/nix-quick-install-action@master + - name: Install Nix + uses: cachix/install-nix-action@v30 + with: + install_url: https://releases.nixos.org/nix/nix-2.25.4/install - name: Sync repository uses: actions/checkout@v4 with: From 67fd47275d6ec6846b2b5e9be39670fbebae184b Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 22 Jan 2025 03:06:58 -0500 Subject: [PATCH 19/77] cachix donesnt accept-flake-config by default --- .github/workflows/build-machines-and-homes.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml index aa15d09..e276cbf 100644 --- a/.github/workflows/build-machines-and-homes.yml +++ b/.github/workflows/build-machines-and-homes.yml @@ -31,6 +31,7 @@ jobs: uses: cachix/install-nix-action@v30 with: install_url: https://releases.nixos.org/nix/nix-2.25.4/install + extra_nix_config: 'accept-flake-config = true' - name: Sync repository uses: actions/checkout@v4 with: From 7cf2d318c60629076477354312d7aa02db38e9d6 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 22 Jan 2025 03:08:18 -0500 Subject: [PATCH 20/77] nix fmt --- home/ghostty.nix | 3 ++- home/irssi.nix | 3 ++- home/kitty.nix | 5 +++-- hosts/chunk/conduwuit.nix | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/home/ghostty.nix b/home/ghostty.nix index 9a08a74..1c592f5 100644 --- a/home/ghostty.nix +++ b/home/ghostty.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ programs.ghostty = { enable = true; enableZshIntegration = true; diff --git a/home/irssi.nix b/home/irssi.nix index 91ba914..e8133c1 100644 --- a/home/irssi.nix +++ b/home/irssi.nix @@ -1,4 +1,5 @@ -{...}: { +{ ... }: +{ programs.irssi = { enable = true; networks.liberachat = { diff --git a/home/kitty.nix b/home/kitty.nix index fc0b577..0586556 100644 --- a/home/kitty.nix +++ b/home/kitty.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ programs.kitty = { enable = true; font = { @@ -15,7 +16,7 @@ clear_all_shortcuts = true; # will probably lower this later but the max allowed is actually 4GB - # this is NOT stored in memory and can only be viewed wth scrollback_pager + # this is NOT stored in memory and can only be viewed with scrollback_pager "scrollback_pager_history_size" = "1024"; # see https://github.com/sharkdp/bat/issues/1077#issuecomment-652785399 "scrollback_pager" = "bat --pager='less -FR +G'"; diff --git a/hosts/chunk/conduwuit.nix b/hosts/chunk/conduwuit.nix index 7fa1852..25c85ab 100644 --- a/hosts/chunk/conduwuit.nix +++ b/hosts/chunk/conduwuit.nix @@ -2,7 +2,8 @@ { services.conduwuit = { enable = true; - package = inputs.conduwuit.packages.x86_64-linux.static-x86_64-linux-musl-all-features-x86_64-haswell-optimised; + package = + inputs.conduwuit.packages.x86_64-linux.static-x86_64-linux-musl-all-features-x86_64-haswell-optimised; settings.global = { port = [ 8448 ]; server_name = "cything.io"; From f9cc197be21a2ea598bb58a041300347155bcb34 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 22 Jan 2025 04:24:43 -0500 Subject: [PATCH 21/77] deduplicate flake inputs --- flake.lock | 278 +++++++++-------------------------------------------- flake.nix | 27 +++++- 2 files changed, 72 insertions(+), 233 deletions(-) diff --git a/flake.lock b/flake.lock index 497bb67..c1cf6ee 100644 --- a/flake.lock +++ b/flake.lock @@ -102,10 +102,16 @@ "attic": "attic", "cachix": "cachix", "complement": "complement", - "crane": "crane_2", + "crane": [ + "crane" + ], "fenix": "fenix", - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils", + "flake-compat": [ + "flake-compat" + ], + "flake-utils": [ + "flake-utils" + ], "liburing": "liburing", "nix-filter": "nix-filter", "nixpkgs": [ @@ -151,27 +157,11 @@ }, "crane_2": { "locked": { - "lastModified": 1736566337, - "narHash": "sha256-SC0eDcZPqISVt6R0UfGPyQLrI0+BppjjtQ3wcSlk0oI=", + "lastModified": 1737250794, + "narHash": "sha256-bdIPhvsAKyYQzqAIeay4kOxTHGwLGkhM+IlBIsmMYFI=", "owner": "ipetkov", "repo": "crane", - "rev": "9172acc1ee6c7e1cbafc3044ff850c568c75a5a3", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "master", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { - "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", - "owner": "ipetkov", - "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "c5b7075f4a6d523fe8204618aa9754e56478c0e0", "type": "github" }, "original": { @@ -312,7 +302,6 @@ } }, "flake-compat_3": { - "flake": false, "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -323,41 +312,10 @@ }, "original": { "owner": "edolstra", - "ref": "master", "repo": "flake-compat", "type": "github" } }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -405,48 +363,8 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_5": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", "nixpkgs" ] }, @@ -478,7 +396,6 @@ }, "original": { "owner": "numtide", - "ref": "main", "repo": "flake-utils", "type": "github" } @@ -501,24 +418,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "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" - } - }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -676,27 +575,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737075266, - "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -727,14 +605,22 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_3", - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_4", + "crane": [ + "crane" + ], + "flake-compat": [ + "flake-compat" + ], + "flake-parts": [ + "flake-parts" + ], "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { "lastModified": 1737299073, @@ -800,7 +686,9 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": [ + "flake-utils" + ], "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -828,7 +716,9 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_4", + "nixpkgs-stable": [ + "nixpkgs" + ], "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, @@ -1011,18 +901,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1735774519, - "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1724316499, @@ -1071,22 +949,6 @@ "type": "github" } }, - "nixpkgs-stable_4": { - "locked": { - "lastModified": 1737299813, - "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1730531603, @@ -1154,16 +1016,24 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_5", + "flake-compat": [ + "flake-compat" + ], + "flake-parts": [ + "flake-parts" + ], "git-hooks": "git-hooks_2", - "home-manager": "home-manager_2", + "home-manager": [ + "home-manager" + ], "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": [ + "treefmt" + ] }, "locked": { "lastModified": 1737484173, @@ -1181,7 +1051,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1265,8 +1135,11 @@ "root": { "inputs": { "conduwuit": "conduwuit", + "crane": "crane_2", "disko": "disko", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", + "flake-utils": "flake-utils", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "lix-module": "lix-module", @@ -1275,7 +1148,7 @@ "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", "nvim-github-theme": "nvim-github-theme", - "rust-overlay": "rust-overlay_2", + "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", "treefmt": "treefmt" } @@ -1298,27 +1171,6 @@ } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731897198, - "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -1388,21 +1240,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt": { "inputs": { "nixpkgs": [ @@ -1423,27 +1260,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737054102, - "narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "97871d416166803134ba64597a1006f3f670fbde", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index f7a4272..da5ee50 100644 --- a/flake.nix +++ b/flake.nix @@ -22,15 +22,27 @@ lanzaboote = { url = "github:nix-community/lanzaboote/master"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.crane.follows = "crane"; + inputs.flake-compat.follows = "flake-compat"; + inputs.flake-parts.follows = "flake-parts"; + inputs.rust-overlay.follows = "rust-overlay"; }; nixvim = { url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-parts.follows = "flake-parts"; + inputs.flake-compat.follows = "flake-compat"; + inputs.home-manager.follows = "home-manager"; + inputs.treefmt-nix.follows = "treefmt"; + }; + flake-parts = { + url = "github:hercules-ci/flake-parts"; + inputs.nixpkgs-lib.follows = "nixpkgs"; }; - flake-parts.url = "github:hercules-ci/flake-parts"; niri = { url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-stable.follows = "nixpkgs"; }; rust-overlay = { url = "github:oxalica/rust-overlay"; @@ -38,11 +50,17 @@ }; conduwuit = { url = "github:girlbossceo/conduwuit"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + crane.follows = "crane"; + flake-compat.follows = "flake-compat"; + flake-utils.follows = "flake-utils"; + }; }; lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; }; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR @@ -51,6 +69,11 @@ url = "github:projekt0n/github-nvim-theme"; flake = false; }; + + # deduplication + flake-utils.url = "github:numtide/flake-utils"; + crane.url = "github:ipetkov/crane"; + flake-compat.url = "github:edolstra/flake-compat"; }; nixConfig = { From df3469c7080615cf88513e389ff6f66d09179649 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 22 Jan 2025 13:37:38 -0500 Subject: [PATCH 22/77] apparently that option doesn't exist anymore --- overlay/default.nix | 1 - overlay/kernel.nix | 11 ----------- 2 files changed, 12 deletions(-) delete mode 100644 overlay/kernel.nix diff --git a/overlay/default.nix b/overlay/default.nix index 123e1f2..99fc17b 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -2,7 +2,6 @@ let overlays = [ ./conduwuit ./attic - ./kernel.nix ]; importedOverlays = map (m: import m) overlays; in diff --git a/overlay/kernel.nix b/overlay/kernel.nix deleted file mode 100644 index be2404e..0000000 --- a/overlay/kernel.nix +++ /dev/null @@ -1,11 +0,0 @@ -final: prev: -let - inherit (prev) lib; -in -{ - linuxKernels.kernels.linux_zen = prev.linuxKernels.kernels.linux_zen.override (old: { - extraStructuredConfig = with lib.kernel; { - CONFIG_SCHED_MUQSS = yes; - }; - }); -} From 62e29061dbb3e22e7d4d9cbe5eeb0bcca4a7747d Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 22 Jan 2025 14:51:00 -0500 Subject: [PATCH 23/77] add lix input --- flake.lock | 81 ++++++++++++++++++++++++++++++++++++++++++++++++------ flake.nix | 6 ++++ 2 files changed, 78 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index c1cf6ee..c1dfbce 100644 --- a/flake.lock +++ b/flake.lock @@ -671,17 +671,29 @@ } }, "lix": { - "flake": false, + "inputs": { + "flake-compat": [ + "flake-compat" + ], + "nix2container": "nix2container", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks" + }, "locked": { - "lastModified": 1737234286, - "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", - "rev": "079528098f5998ba13c88821a2eca1005c1695de", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" + "lastModified": 1737468268, + "narHash": "sha256-RVR/Wh+iTTmw3IYe9b52Gho3If9iGc6Xxpw+gmJZ50s=", + "ref": "refs/heads/main", + "rev": "9b290081147fb2abf79d2d1e0afd72d1490145f2", + "revCount": 16659, + "type": "git", + "url": "https://git.lix.systems/lix-project/lix" }, "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + "type": "git", + "url": "https://git.lix.systems/lix-project/lix" } }, "lix-module": { @@ -690,7 +702,9 @@ "flake-utils" ], "flakey-profile": "flakey-profile", - "lix": "lix", + "lix": [ + "lix" + ], "nixpkgs": [ "nixpkgs" ] @@ -869,6 +883,22 @@ "type": "github" } }, + "nix2container": { + "flake": false, + "locked": { + "lastModified": 1724996935, + "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1726042813, @@ -901,6 +931,22 @@ "type": "github" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1724316499, @@ -1088,6 +1134,22 @@ "type": "github" } }, + "pre-commit-hooks": { + "flake": false, + "locked": { + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1142,6 +1204,7 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "lanzaboote": "lanzaboote", + "lix": "lix", "lix-module": "lix-module", "niri": "niri", "nixpkgs": "nixpkgs_5", diff --git a/flake.nix b/flake.nix index da5ee50..87eae13 100644 --- a/flake.nix +++ b/flake.nix @@ -61,6 +61,12 @@ url = "git+https://git.lix.systems/lix-project/nixos-module"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; + inputs.lix.follows = "lix"; + }; + lix = { + url = "git+https://git.lix.systems/lix-project/lix"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-compat.follows = "flake-compat"; }; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR From 0ca62b620a339bd07eaa9c5e9b4d4370ade68193 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 22 Jan 2025 15:46:01 -0500 Subject: [PATCH 24/77] flake update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index c1dfbce..88dab9b 100644 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "crane_2": { "locked": { - "lastModified": 1737250794, - "narHash": "sha256-bdIPhvsAKyYQzqAIeay4kOxTHGwLGkhM+IlBIsmMYFI=", + "lastModified": 1737563566, + "narHash": "sha256-GLJvkOG29XCynQm8XWPyykMRqIhxKcBARVu7Ydrz02M=", "owner": "ipetkov", "repo": "crane", - "rev": "c5b7075f4a6d523fe8204618aa9754e56478c0e0", + "rev": "849376434956794ebc7a6b487d31aace395392ba", "type": "github" }, "original": { @@ -475,11 +475,11 @@ ] }, "locked": { - "lastModified": 1737043064, - "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1737480538, - "narHash": "sha256-rk/cmrvq3In0TegW9qaAxw+5YpJhRWt2p74/6JStrw0=", + "lastModified": 1737575492, + "narHash": "sha256-qa/D3NC1JoApnUuLrq1gseBmIxeg6icm/ojPgggMDVQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "4481a16d1ac5bff4a77c608cefe08c9b9efe840d", + "rev": "cefb1889b96ddd1dac3dd4734e894f4cadab7802", "type": "github" }, "original": { @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737516423, - "narHash": "sha256-S3vmlekDRKgXsOreMMxLwJgvH313x1zU/wYtC8YThLg=", + "lastModified": 1737545000, + "narHash": "sha256-Drl0xZR/N2w3dQtZ3hpx4LA3M34Lev7OKv9qrglncfY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8370d2475f0eac1b5dab31a107ee118d96692e31", + "rev": "04e476cb17be7c29c18a6dbcf451321f7c9b1d98", "type": "github" }, "original": { @@ -832,11 +832,11 @@ ] }, "locked": { - "lastModified": 1736819234, - "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=", + "lastModified": 1737504076, + "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6", + "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1737469477, - "narHash": "sha256-GG0myEzULU7uiwoNGnwqiclki+Jg8dPG6nv7yKo7lMc=", + "lastModified": 1737556089, + "narHash": "sha256-hToO01UT2ENoQKWVopBuGV78ZprcxjqsPVFdddcynj4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2582766522e754520bf3f883f06560f89870a5ba", + "rev": "2fc5aeb049f44ed4f9e877cda8a1c334612e1d7a", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1737484173, - "narHash": "sha256-bE9pTDqnSIMAwJeIu0MzA8ZR7LEwRbhnRpnImWIBejc=", + "lastModified": 1737566024, + "narHash": "sha256-Wm8Dn65ou0h8PiMjtYy2Z7FPewbtdbOL/C6vW4KzE48=", "owner": "nix-community", "repo": "nixvim", - "rev": "342161bf525dd64eb53fea295a2180f71ed06de1", + "rev": "5bd71b247437156df7e644d2f959bdf83fa1dceb", "type": "github" }, "original": { @@ -1105,11 +1105,11 @@ ] }, "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", + "lastModified": 1737372689, + "narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=", "owner": "NuschtOS", "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", + "rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922", "type": "github" }, "original": { From 9b0c02deb9f4fa8b21e5812bbc51ebb2cf923ef5 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 22 Jan 2025 16:28:33 -0500 Subject: [PATCH 25/77] ugprade lix to patch cache 404 bug --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 88dab9b..8f55b02 100644 --- a/flake.lock +++ b/flake.lock @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1737468268, - "narHash": "sha256-RVR/Wh+iTTmw3IYe9b52Gho3If9iGc6Xxpw+gmJZ50s=", + "lastModified": 1737579991, + "narHash": "sha256-5IKNJQP+3XWLd/s7SXGvL6ZzFwk8wDDm0QGBTQ6fw9M=", "ref": "refs/heads/main", - "rev": "9b290081147fb2abf79d2d1e0afd72d1490145f2", - "revCount": 16659, + "rev": "1fe6064ceded2a9a81ab1725d545a670d14add28", + "revCount": 16661, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1737566024, - "narHash": "sha256-Wm8Dn65ou0h8PiMjtYy2Z7FPewbtdbOL/C6vW4KzE48=", + "lastModified": 1737578990, + "narHash": "sha256-49M9B1nni54cuOH6qPM90U106VSWhAVqpy6f3sz0q4Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "5bd71b247437156df7e644d2f959bdf83fa1dceb", + "rev": "a2a4befdaf825d36a50e2fda4a004682ea6b1a22", "type": "github" }, "original": { From e51f88362645c59c03ed7c926753f518f487803c Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 22 Jan 2025 18:52:34 -0500 Subject: [PATCH 26/77] niri stuff; remove hosts module --- home/niri/default.nix | 5 ++++- hosts/ytnix/default.nix | 7 +++---- modules/default.nix | 1 - modules/niri.nix | 21 --------------------- 4 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 modules/niri.nix diff --git a/home/niri/default.nix b/home/niri/default.nix index 92f5701..0c72563 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -135,13 +135,16 @@ in "Mod+Shift+U".action = move-window-to-workspace-up; "Mod+Shift+I".action = move-window-to-workspace-down; "Mod+W".action = maximize-column; + "Mod+E".action = set-column-width "50%"; + "Mod+R".action = set-column-width "75%"; + "Mod+Q".action = set-column-width "25%"; "Mod+C".action = center-column; "Mod+Shift+Space".action = toggle-window-floating; "Mod+Space".action = switch-focus-between-floating-and-tiling; "Print".action = screenshot; "Alt+Print".action = screenshot-window; "Ctrl+Print".action = screenshot-screen; - "Mod+R".action = switch-preset-column-width; + # "Mod+R".action = switch-preset-column-width; "Mod+Shift+R".action = switch-preset-window-height; "Mod+Ctrl+R".action = reset-window-height; "Mod+F".action = fullscreen-window; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 0024c40..c2a670a 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -311,8 +311,7 @@ services.trezord.enable = true; - my.niri = { - enable = true; - package = pkgs.niri-unstable; - }; + programs.niri.enable = true; + programs.niri.package = pkgs.niri-unstable; + programs.xwayland.enable = true; } diff --git a/modules/default.nix b/modules/default.nix index bde6e96..2155137 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,6 +2,5 @@ { imports = [ ./backup.nix - ./niri.nix ]; } diff --git a/modules/niri.nix b/modules/niri.nix deleted file mode 100644 index b5a6ef4..0000000 --- a/modules/niri.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: -let - cfg = config.my.niri; -in -{ - options.my.niri = { - enable = lib.mkEnableOption "niri"; - package = lib.mkPackageOption pkgs "niri" { }; - }; - - config = lib.mkIf cfg.enable { - programs.niri.package = cfg.package; - programs.niri.enable = true; - programs.xwayland.enable = true; - }; -} From a29326adf1b4ab7f6f2ba36b454b7920321c19ac Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 22 Jan 2025 18:52:53 -0500 Subject: [PATCH 27/77] nvim: fix fzf --- home/nixvim/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 8a302b0..77586b6 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -115,7 +115,8 @@ end end) ''; - "" = '' + # plain tab conflicts with i try to indent + "" = '' cmp.mapping(function(fallback) if require("luasnip").jumpable(1) then require("luasnip").jump(1) @@ -174,6 +175,7 @@ }; plugins.fzf-lua = { enable = true; + profile = "fzf-native"; keymaps = { "ff" = "files"; "fg" = "live_grep"; From 6da74e745eaa32fe3dca816d9f9aa9742943fdbc Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 22 Jan 2025 18:53:05 -0500 Subject: [PATCH 28/77] define flake registry --- hosts/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/common.nix b/hosts/common.nix index b334b5f..2e8b31a 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -1,4 +1,4 @@ -{ ... }: +{ inputs, ... }: { nix = { settings = { @@ -26,6 +26,7 @@ extraOptions = '' builders-use-substitutes = true ''; + registry.nixpkgs.flake = inputs.nixpkgs; }; time.timeZone = "America/Toronto"; networking.firewall.logRefusedConnections = false; From 9de0b072cd075042dbe8d6a80e8c49b7acc24b58 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 23 Jan 2025 01:32:22 -0500 Subject: [PATCH 29/77] make kitty TERM work on other computers --- home/kitty.nix | 3 ++- home/yt/chunk.nix | 1 - home/yt/ytnix.nix | 6 ------ hosts/chunk/default.nix | 1 + 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/home/kitty.nix b/home/kitty.nix index 0586556..f47567c 100644 --- a/home/kitty.nix +++ b/home/kitty.nix @@ -9,7 +9,7 @@ }; themeFile = "GitHub_Dark"; settings = { - enable_audio_bell = false; + enable_audio_bell = true; # how many windows should be open before kitty asks # for confirmation confirm_os_window_close = 0; @@ -20,6 +20,7 @@ "scrollback_pager_history_size" = "1024"; # see https://github.com/sharkdp/bat/issues/1077#issuecomment-652785399 "scrollback_pager" = "bat --pager='less -FR +G'"; + "scrollback_lines" = 20000; }; keybindings = { # kitty_mod is ctrl+shift by default diff --git a/home/yt/chunk.nix b/home/yt/chunk.nix index 3285421..ad024cd 100644 --- a/home/yt/chunk.nix +++ b/home/yt/chunk.nix @@ -16,7 +16,6 @@ systemd.user.startServices = "sd-switch"; home.packages = with pkgs; [ - foot.terminfo attic-server ]; } diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index b150993..e542d2b 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -49,12 +49,6 @@ x11.enable = true; }; - dconf.settings = { - "org/gnome/desktop/interface" = { - cursor-theme = "Bibata-Modern"; - }; - }; - home.packages = with pkgs; [ firefox ungoogled-chromium diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index edb153b..7c2b8c6 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -197,4 +197,5 @@ }; }; virtualisation.oci-containers.backend = "podman"; + environment.enableAllTerminfo = true; } From dd15bcb9abc231cc43cccda3bdf0342dec497d17 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 23 Jan 2025 20:24:26 -0500 Subject: [PATCH 30/77] flake update --- flake.lock | 58 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 8f55b02..0c81455 100644 --- a/flake.lock +++ b/flake.lock @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1737575492, - "narHash": "sha256-qa/D3NC1JoApnUuLrq1gseBmIxeg6icm/ojPgggMDVQ=", + "lastModified": 1737669579, + "narHash": "sha256-v9WQ3c4ctwPMfdBZMZxpdM9xXev4uChce4BxOpvsu0E=", "owner": "nix-community", "repo": "home-manager", - "rev": "cefb1889b96ddd1dac3dd4734e894f4cadab7802", + "rev": "7b9ece1bf3c8780cde9b975b28c2d9ccd7e9cdb9", "type": "github" }, "original": { @@ -623,11 +623,11 @@ ] }, "locked": { - "lastModified": 1737299073, - "narHash": "sha256-hOydnO9trHDo3qURqLSDdmE/pHNWDzlhkmyZ/gcBX2s=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "64d20cb2afaad8b73f4e38de41d27fb30a782bb5", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1737579991, - "narHash": "sha256-5IKNJQP+3XWLd/s7SXGvL6ZzFwk8wDDm0QGBTQ6fw9M=", + "lastModified": 1737655283, + "narHash": "sha256-yAFGeCZXUL3GqDMeFcUEOC4m459Ld7j54Rxo8cmyuSQ=", "ref": "refs/heads/main", - "rev": "1fe6064ceded2a9a81ab1725d545a670d14add28", - "revCount": 16661, + "rev": "963b687443b44df6c5cbdf3426454d92830d9100", + "revCount": 16671, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -710,11 +710,11 @@ ] }, "locked": { - "lastModified": 1737241037, - "narHash": "sha256-6LIpS3rK1Ch6OXis4tvBTgGBTRb+NptDAfhPNzmgZSE=", + "lastModified": 1737675503, + "narHash": "sha256-FUWpqPOsEJwK8oomffat+lgKnoxJHArRlWo2j17EhxQ=", "ref": "refs/heads/main", - "rev": "690f7c0fa2935bf591cccf4d7312b3e0f470298b", - "revCount": 129, + "rev": "3e18a1ceec7df4514f5a045441e5f98dd003db09", + "revCount": 131, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737545000, - "narHash": "sha256-Drl0xZR/N2w3dQtZ3hpx4LA3M34Lev7OKv9qrglncfY=", + "lastModified": 1737627930, + "narHash": "sha256-oaAatwNVaX36xmI2AKIVu2oG07XJmHq2T+Y66hEprd8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "04e476cb17be7c29c18a6dbcf451321f7c9b1d98", + "rev": "f79aa307f4bc0bfbabee404e6354fd2a1edfcb01", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1737449786, - "narHash": "sha256-G/AK0T41PpxU9hjkK/tnjODigzKcpRayo1o4pi9glqI=", + "lastModified": 1737623252, + "narHash": "sha256-orq/c8lOUrZfCHQhfuLEJtMZpfBYhMtGv1Xuz99Pxj0=", "owner": "YaLTeR", "repo": "niri", - "rev": "b01b8afa8c8f9070300243050d9790e38fd19145", + "rev": "128b01e04905d833214f52a3c6fab308bcc15ce0", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1737556089, - "narHash": "sha256-hToO01UT2ENoQKWVopBuGV78ZprcxjqsPVFdddcynj4=", + "lastModified": 1737642748, + "narHash": "sha256-VsCzuoavNERLs46aw38nmORT4F5pLOZDDe2bzFo+jsE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fc5aeb049f44ed4f9e877cda8a1c334612e1d7a", + "rev": "864f89f98b0b4e1bbcb762b025fd83da8bc1bae0", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1737578990, - "narHash": "sha256-49M9B1nni54cuOH6qPM90U106VSWhAVqpy6f3sz0q4Q=", + "lastModified": 1737667561, + "narHash": "sha256-BKUapQPTji3V2uxymGq62/UWF1XMjfHvKd565jj1HlA=", "owner": "nix-community", "repo": "nixvim", - "rev": "a2a4befdaf825d36a50e2fda4a004682ea6b1a22", + "rev": "aab2b81792567237c104b90c3936e073d28a9ac6", "type": "github" }, "original": { @@ -1240,11 +1240,11 @@ ] }, "locked": { - "lastModified": 1737512878, - "narHash": "sha256-dgF6htdmfNnZzVInifks6npnCAyVsIHWSpWNs10RSW0=", + "lastModified": 1737599167, + "narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "06b8ed0eee289fe94c66f1202ced9a6a2c59a14c", + "rev": "38374302ae9edf819eac666d1f276d62c712dd06", "type": "github" }, "original": { From caa3b8d0816c00c78cc7d5d4cc1b0172182451a3 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 23 Jan 2025 21:18:36 -0500 Subject: [PATCH 31/77] lix broke --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 87eae13..77099f8 100644 --- a/flake.nix +++ b/flake.nix @@ -171,7 +171,7 @@ ./modules inputs.lanzaboote.nixosModules.lanzaboote inputs.niri.nixosModules.niri - inputs.lix-module.nixosModules.default + # inputs.lix-module.nixosModules.default # broken ]; }; chunk = lib.nixosSystem { From 76b0dd1a4e6b853cbec84e6bf9c1e95fc7e5e95f Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 23 Jan 2025 22:16:34 -0500 Subject: [PATCH 32/77] init none-ls and justfile --- home/nixvim/default.nix | 23 +++++++++++++++++++++++ justfile | 14 ++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 justfile diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 77586b6..21cd5a6 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -192,6 +192,28 @@ enable = true; settings.current_line_blame = true; }; + + plugins.none-ls = { + enable = true; + enableLspFormat = true; + sources = { + code_actions.gitsigns.enable = true; + completion = { + luasnip.enable = true; + spell.enable = true; + }; + diagnostics = { + codespell.enable = true; + commitlint.enable = true; + deadnix.enable = true; + markdownlint.enable = true; + pylint.enable = true; + }; + formatting = { + just.enable = true; + }; + }; + }; plugins.cmp-buffer.enable = true; plugins.cmp-emoji.enable = true; @@ -205,5 +227,6 @@ plugins.auto-save.enable = true; plugins.indent-blankline.enable = true; plugins.undotree.enable = true; + plugins.lsp-format.enable = true; }; } diff --git a/justfile b/justfile new file mode 100644 index 0000000..e15ec8b --- /dev/null +++ b/justfile @@ -0,0 +1,14 @@ +update: + git switch -c update + git push + git switch main + +upgrade: + git switch update + sudo nixos-rebuild switch -L --flake . --use-substitutes + nixos-rebuild switch -L --flake .#chunk --target-host root@2a0f:85c1:840:2bfb::1 --use-substitutes + nixos-rebuild switch -L --flake .#titan --target-host root@www.cything.io --use-substitutes + home-manager -L switch --flake . + git switch main + git merge update + git branch -d update From 947249cc7913929fff772b53f206bfe29fb8c3bc Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 24 Jan 2025 01:10:53 -0500 Subject: [PATCH 33/77] configure tailscale and stuff --- .sops.yaml | 5 +++++ home/nixvim/default.nix | 23 ----------------------- hosts/chunk/default.nix | 5 ++++- hosts/chunk/tailscale.nix | 9 +++++++++ hosts/ytnix/default.nix | 10 ++++++++++ hosts/ytnix/tailscale.nix | 11 +++++++++++ secrets/services/tailscale.yaml | 31 +++++++++++++++++++++++++++++++ 7 files changed, 70 insertions(+), 24 deletions(-) create mode 100644 hosts/chunk/tailscale.nix create mode 100644 hosts/ytnix/tailscale.nix create mode 100644 secrets/services/tailscale.yaml diff --git a/.sops.yaml b/.sops.yaml index 3cfb014..810c6cb 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -103,3 +103,8 @@ creation_rules: - age: - *chunk - *cy + - path_regex: secrets/services/tailscale.yaml + key_groups: + - age: + - *chunk + - *cy diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 21cd5a6..77586b6 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -192,28 +192,6 @@ enable = true; settings.current_line_blame = true; }; - - plugins.none-ls = { - enable = true; - enableLspFormat = true; - sources = { - code_actions.gitsigns.enable = true; - completion = { - luasnip.enable = true; - spell.enable = true; - }; - diagnostics = { - codespell.enable = true; - commitlint.enable = true; - deadnix.enable = true; - markdownlint.enable = true; - pylint.enable = true; - }; - formatting = { - just.enable = true; - }; - }; - }; plugins.cmp-buffer.enable = true; plugins.cmp-emoji.enable = true; @@ -227,6 +205,5 @@ plugins.auto-save.enable = true; plugins.indent-blankline.enable = true; plugins.undotree.enable = true; - plugins.lsp-format.enable = true; }; } diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 7c2b8c6..0343084 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -26,6 +26,7 @@ ./attic.nix ./forgejo.nix ./garage.nix + ./tailscale.nix ]; sops.age.keyFile = "/root/.config/sops/age/keys.txt"; @@ -66,10 +67,12 @@ "attic/env" = { sopsFile = ../../secrets/services/attic.yaml; }; - "garage/env" = { sopsFile = ../../secrets/services/garage.yaml; }; + "tailscale/auth" = { + sopsFile = ../../secrets/services/tailscale.yaml; + }; }; boot.loader.grub.enable = true; diff --git a/hosts/chunk/tailscale.nix b/hosts/chunk/tailscale.nix new file mode 100644 index 0000000..b33da9c --- /dev/null +++ b/hosts/chunk/tailscale.nix @@ -0,0 +1,9 @@ +{ config, ... }: { + services.tailscale = { + enable = true; + authKeyFile = config.sops.secrets."tailscale/auth".path; + extraUpFlags = [ "--advertise-exit-node" ]; + useRoutingFeatures = "server"; + openFirewall = true; + }; +} diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index c2a670a..54f13da 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -9,6 +9,7 @@ ./hardware-configuration.nix ../common.nix ../zsh.nix + ./tailscale.nix ]; sops.age.keyFile = "/root/.config/sops/age/keys.txt"; @@ -32,6 +33,9 @@ sopsFile = ../../secrets/newsboat.yaml; owner = "yt"; }; + "tailscale/auth" = { + sopsFile = ../../secrets/services/tailscale.yaml; + }; }; boot = { @@ -58,6 +62,7 @@ pkiBundle = "/var/lib/sbctl"; }; kernel.sysctl."kernel.sysrq" = 1; + binfmt.emulatedSystems = [ "aarch64-linux" ]; }; networking = { @@ -128,6 +133,7 @@ "wheel" "libvirtd" "docker" + "disk" ]; environment.systemPackages = with pkgs; [ @@ -314,4 +320,8 @@ programs.niri.enable = true; programs.niri.package = pkgs.niri-unstable; programs.xwayland.enable = true; + + services.udev.extraHwdb = '' + SUBSYSTEM=="usb", SYSFS{idVendor}=="090c", SYSFS{idProduct}=="1000", ACTION=="add", GROUP="users", MODE="0664" + ''; } diff --git a/hosts/ytnix/tailscale.nix b/hosts/ytnix/tailscale.nix new file mode 100644 index 0000000..71d47c8 --- /dev/null +++ b/hosts/ytnix/tailscale.nix @@ -0,0 +1,11 @@ +{ config, ... }: { + services.tailscale = { + enable = true; + authKeyFile = config.sops.secrets."tailscale/auth".path; + openFirewall = true; + useRoutingFeatures = "client"; + extraUpFlags = [ + "--exit-node=100.122.132.30" + ]; + }; +} diff --git a/secrets/services/tailscale.yaml b/secrets/services/tailscale.yaml new file mode 100644 index 0000000..27997b8 --- /dev/null +++ b/secrets/services/tailscale.yaml @@ -0,0 +1,31 @@ +tailscale: + auth: ENC[AES256_GCM,data:7gGiUBRUK25Tp5y/5DDZKOTxKPFFfN1UUeBOdMLLQqobq643MKdJ9imxkKmKFg/FwgLYft/uzdxQGGlE7Q==,iv:HRmd+T1QuTYP8VrX/bZt8dWSwm5rcUvpEMqCMPfxjE4=,tag:PRZn2Pm6yydfEULrYGM6yg==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1eg6sxflw6l44fp20sl068sampwd95fm0mnh4ssegrhtktgm50ptqcuspyn + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2Z1JZZmZMaDQ3UHYvbXYr + c05RaEMxUGJXSGczUDBkL1UxT0hjQ0VNNkJNClFUNmJ5d3gyaHFwMTdNVW9GQ2ly + V3haMkx5Z1B5dmJ0SE4wY0UzMWswQ0EKLS0tIGNpZVo3UmtHcjFZVE5FMmdpOGMx + UFZGb3I1L3FJYVE2VjJ5aTVoZlo4bFUKwH2sPBwuLQXrHmiKYSu4Eut/H2j/2tUW + 1y8Eph7l6w3kfhZRRbo6cZ8gcbZNHPSPeAvWf/TpYumiTt1WBt8SMw== + -----END AGE ENCRYPTED FILE----- + - recipient: age10h6pg5qdpc4t0rpmksfv788a57f04n83zgqaezkjjn65nkhv547s0vxfdn + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSVXBMTEMrY1NGa1NBSjZP + R04wYUsrdGlVa3FnL1NYVG4xdUdqeHNnM0ZJCmhMSzFoRVFSOFBrQlU3VUtwaU0r + TEtad1B5NGh3OW1oajNvckhJcExrU0kKLS0tIFc5K3JOVTUvSFU1dmQxMUFRZ1o3 + em5IemlsM29zVy9GK3RmTlgzVnRpMDAKRatmFgCdoXcypQ+1EDedCuVctl0SFMf4 + kjtHrTSpept/y9bpTUy656aPRQ1LvqvfPs7Co1ssC/YWFroDsLgv4w== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2025-01-24T05:26:20Z" + mac: ENC[AES256_GCM,data:GbQrLESUR/x+eLzukOR1FaJsd8zxlrz9dc/2kDBKUYAgI8L4QwLmwRuzpaIJgNLv2PdLTW83oSC8ekxR8fmsap40DpiygcrmPdPUeVFbEPaz7SSvU+DCgB0UX+qNQ9aOQ0BIbeKKOIj3r9enGv2o6DKY8I85n7VXjnGZAmCf1C8=,iv:UrtVqRGwvOpXOH3X3qF6ZF+VwqO0VGt+hFG7r6oUqCg=,tag:TD4mG3t5ORYgAS0GBmA7Eg==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.9.3 From 4fa0aed92e30b688a8061c014c7d98109cac239c Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 24 Jan 2025 05:44:35 -0500 Subject: [PATCH 34/77] git enable signoff and change mergetool Signed-off-by: cy --- home/yt/common.nix | 11 ++++++----- home/zsh/default.nix | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/home/yt/common.nix b/home/yt/common.nix index 77c98fe..4d7acca 100644 --- a/home/yt/common.nix +++ b/home/yt/common.nix @@ -44,7 +44,11 @@ rebase = true; autostash = true; }; - merge.tool = "vimdiff"; + merge = { + tool = "vimdiff"; + keepBackup = false; + prompt = false; + }; rebase = { stat = true; autoStash = true; @@ -52,10 +56,7 @@ updateRefs = true; }; help.autocorrect = 1; - mergetool = { - prompt = false; - path = "nvim-open"; - }; + "mergetool \"vimdiff\"".cmd = "nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'"; }; }; programs.ripgrep.enable = true; diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 994fa1f..363efd6 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -94,8 +94,8 @@ "ga" = "git add"; "gaa" = "git add --all"; "gb" = "git branch"; - "gc" = "git commit --verbose"; - "gcmsg" = "git commit --message"; + "gc" = "git commit --verbose -s"; + "gcmsg" = "git commit -s --message"; "gd" = "git diff"; "gdca" = "git diff --cached"; "gds" = "git diff --staged"; From c1cb989017e5abedcfc0004bbf39723e0d9024d0 Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 24 Jan 2025 13:34:49 -0500 Subject: [PATCH 35/77] flake update Signed-off-by: cy --- flake.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 0c81455..e3203fe 100644 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ }, "crane_2": { "locked": { - "lastModified": 1737563566, - "narHash": "sha256-GLJvkOG29XCynQm8XWPyykMRqIhxKcBARVu7Ydrz02M=", + "lastModified": 1737689766, + "narHash": "sha256-ivVXYaYlShxYoKfSo5+y5930qMKKJ8CLcAoIBPQfJ6s=", "owner": "ipetkov", "repo": "crane", - "rev": "849376434956794ebc7a6b487d31aace395392ba", + "rev": "6fe74265bbb6d016d663b1091f015e2976c4a527", "type": "github" }, "original": { @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1737669579, - "narHash": "sha256-v9WQ3c4ctwPMfdBZMZxpdM9xXev4uChce4BxOpvsu0E=", + "lastModified": 1737704314, + "narHash": "sha256-zta8jvOQ2wRCZmiwFEnS5iCulWAh8e+fLUlQxrgOBjM=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b9ece1bf3c8780cde9b975b28c2d9ccd7e9cdb9", + "rev": "a0428685572b134f6594e7d7f5db5e1febbab2d7", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1737655283, - "narHash": "sha256-yAFGeCZXUL3GqDMeFcUEOC4m459Ld7j54Rxo8cmyuSQ=", + "lastModified": 1737726524, + "narHash": "sha256-Tw4kY4m5iNkRWCzmZO8ZO0i5iufD2K11leRy3uPR+g0=", "ref": "refs/heads/main", - "rev": "963b687443b44df6c5cbdf3426454d92830d9100", - "revCount": 16671, + "rev": "ca68979174da416f0c3d11beaa19d3965a4654a0", + "revCount": 16681, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737627930, - "narHash": "sha256-oaAatwNVaX36xmI2AKIVu2oG07XJmHq2T+Y66hEprd8=", + "lastModified": 1737723936, + "narHash": "sha256-7badcmkmjaOeEshFdGnoEofrZO667t/k5jDa0/NINpI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f79aa307f4bc0bfbabee404e6354fd2a1edfcb01", + "rev": "84a8590f8196d3fccb1618a153dbd6bac325e3c4", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1737623252, - "narHash": "sha256-orq/c8lOUrZfCHQhfuLEJtMZpfBYhMtGv1Xuz99Pxj0=", + "lastModified": 1737697331, + "narHash": "sha256-9k77pFW2ANx8bZc+RcF6YP9McFZsUCWWY+XwBX0P3/Q=", "owner": "YaLTeR", "repo": "niri", - "rev": "128b01e04905d833214f52a3c6fab308bcc15ce0", + "rev": "748d90b443b9f20134020c21760b5b6c2c42a7de", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1737642748, - "narHash": "sha256-VsCzuoavNERLs46aw38nmORT4F5pLOZDDe2bzFo+jsE=", + "lastModified": 1737706285, + "narHash": "sha256-k/f1rAyCjGkNu4BnlnUGEvQPSnYVG7UHoOeaQQcjQps=", "owner": "nixos", "repo": "nixpkgs", - "rev": "864f89f98b0b4e1bbcb762b025fd83da8bc1bae0", + "rev": "dcb7446a099fe1c95b3694fdb7a4dda8f19d6ba8", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1737667561, - "narHash": "sha256-BKUapQPTji3V2uxymGq62/UWF1XMjfHvKd565jj1HlA=", + "lastModified": 1737735875, + "narHash": "sha256-uZpZbT5kH7whiMpaMQjSPxRbRTmH5LaoBat6eQBHHaY=", "owner": "nix-community", "repo": "nixvim", - "rev": "aab2b81792567237c104b90c3936e073d28a9ac6", + "rev": "bd3184f4957d5484bb5ebef4b9bc6f9cc53cfad5", "type": "github" }, "original": { @@ -1240,11 +1240,11 @@ ] }, "locked": { - "lastModified": 1737599167, - "narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=", + "lastModified": 1737685583, + "narHash": "sha256-p+NVABRpGi+pT+xxf9HcLcFVxG6L+vEEy+NwzB9T0f8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "38374302ae9edf819eac666d1f276d62c712dd06", + "rev": "eb64cbcc8eee0fa87ebded92805280d2ec97415a", "type": "github" }, "original": { From 5e3715f8f70425d5c782869a873d2433a78796aa Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 24 Jan 2025 15:33:52 -0500 Subject: [PATCH 36/77] make justfile work --- justfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/justfile b/justfile index e15ec8b..95b1fda 100644 --- a/justfile +++ b/justfile @@ -1,5 +1,8 @@ update: git switch -c update + nix flake update + git add flake.lock + git commit -s -m "flake update" git push git switch main From 750b202a4278ab8f8168f614c59b66d442c199bf Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 24 Jan 2025 22:41:26 -0500 Subject: [PATCH 37/77] flake update Signed-off-by: cy --- flake.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index e3203fe..5bdd825 100644 --- a/flake.lock +++ b/flake.lock @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1737704314, - "narHash": "sha256-zta8jvOQ2wRCZmiwFEnS5iCulWAh8e+fLUlQxrgOBjM=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "a0428685572b134f6594e7d7f5db5e1febbab2d7", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1737726524, - "narHash": "sha256-Tw4kY4m5iNkRWCzmZO8ZO0i5iufD2K11leRy3uPR+g0=", + "lastModified": 1737770806, + "narHash": "sha256-mdtBGOkNySRbQ1zkroCdyOHFqMOZSOJCPxjXTpCaWvc=", "ref": "refs/heads/main", - "rev": "ca68979174da416f0c3d11beaa19d3965a4654a0", - "revCount": 16681, + "rev": "5a41803f744822377587f784ded0e6a061b39cd4", + "revCount": 16688, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737723936, - "narHash": "sha256-7badcmkmjaOeEshFdGnoEofrZO667t/k5jDa0/NINpI=", + "lastModified": 1737746480, + "narHash": "sha256-Lccg6b+Sz6TSDj4BpLZhugauwDa/CyCjF7E6W3VvYa0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "84a8590f8196d3fccb1618a153dbd6bac325e3c4", + "rev": "afeb7877090d50d02c1ecab3159b328b85a44868", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1737735875, - "narHash": "sha256-uZpZbT5kH7whiMpaMQjSPxRbRTmH5LaoBat6eQBHHaY=", + "lastModified": 1737747541, + "narHash": "sha256-dA54OnUCUtVZfnSuD1dAEcosZzx/tch9KvtDz/Y3FIo=", "owner": "nix-community", "repo": "nixvim", - "rev": "bd3184f4957d5484bb5ebef4b9bc6f9cc53cfad5", + "rev": "5fda6e093da13f37c63a5577888a668c38f30dc7", "type": "github" }, "original": { @@ -1240,11 +1240,11 @@ ] }, "locked": { - "lastModified": 1737685583, - "narHash": "sha256-p+NVABRpGi+pT+xxf9HcLcFVxG6L+vEEy+NwzB9T0f8=", + "lastModified": 1737771740, + "narHash": "sha256-lWIdF4qke63TdCHnJ0QaUHfG8YvsDrBqzL4jiHYQd+Y=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "eb64cbcc8eee0fa87ebded92805280d2ec97415a", + "rev": "cfaaa1dddd280af09aca84af84612fbccd986ae2", "type": "github" }, "original": { From 42e66561b728b65c80811a66943fb378cc267b84 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 25 Jan 2025 09:13:58 -0500 Subject: [PATCH 38/77] flake update Signed-off-by: cy --- flake.lock | 64 +++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 5bdd825..b775756 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1733424942, - "narHash": "sha256-5t7Sl6EkOaoP4FvzLmH7HFDbdl9SizmLh53RjDQCbWQ=", + "lastModified": 1737621947, + "narHash": "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=", "owner": "cachix", "repo": "cachix", - "rev": "8b6b0e4694b9aa78b2ea4c93bff6e1a222dc7e4a", + "rev": "f65a3cd5e339c223471e64c051434616e18cc4f5", "type": "github" }, "original": { @@ -120,11 +120,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1737153653, - "narHash": "sha256-yNdxoVZX13QUDJYM6zTMY9ExvacTqB+f0MLvDreSW8U=", + "lastModified": 1737792515, + "narHash": "sha256-+mR9BsX2a+RBFMcWXIrRnwHnR8bpPL6vuhaFfSshGJY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "5b8464252c2c03edf65e43153be026dbb768a12a", + "rev": "cd5d4f48bec719a938f50cb17b667668105a1141", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1736836313, - "narHash": "sha256-zdZ7/T6yG0/hzoVOiNpDiR/sW3zR6oSMrfIFJK2BrrE=", + "lastModified": 1737700483, + "narHash": "sha256-1778bR4GDDc51/iZQvcshGLZ4JU87zCzqei8Hn7vU1A=", "owner": "nix-community", "repo": "fenix", - "rev": "056c9393c821a4df356df6ce7f14c722dc8717ec", + "rev": "bab2a2840bc2d5ae7c6a133602185edbe4ca7daa", "type": "github" }, "original": { @@ -656,11 +656,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1736719310, - "narHash": "sha256-Turvx60THwzTiUHb49WV3upUgsPuktr7tVy2Lwu2xJg=", + "lastModified": 1737600516, + "narHash": "sha256-EKyLQ3pbcjoU5jH5atge59F4fzuhTsb6yalUj6Ve2t8=", "owner": "axboe", "repo": "liburing", - "rev": "3124a4619e4daf26b06d48ccf0186a947070c415", + "rev": "6c509e2b0c881a13b83b259a221bf15fc9b3f681", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1737770806, - "narHash": "sha256-mdtBGOkNySRbQ1zkroCdyOHFqMOZSOJCPxjXTpCaWvc=", + "lastModified": 1737810081, + "narHash": "sha256-WByslFoA16T/o5Fd+ebhSwmXtbL18L3ameJbzfepbI8=", "ref": "refs/heads/main", - "rev": "5a41803f744822377587f784ded0e6a061b39cd4", - "revCount": 16688, + "rev": "0ad79775b6f9800eb00a2870f01eab338befcced", + "revCount": 16689, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737746480, - "narHash": "sha256-Lccg6b+Sz6TSDj4BpLZhugauwDa/CyCjF7E6W3VvYa0=", + "lastModified": 1737797805, + "narHash": "sha256-revbNiDQIhSwkAvGE2IVf3iSHbp1LB52KXu3nukATfE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "afeb7877090d50d02c1ecab3159b328b85a44868", + "rev": "ab19f1d6bf4b38558c84df4990ec0618ec526eb5", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1737697331, - "narHash": "sha256-9k77pFW2ANx8bZc+RcF6YP9McFZsUCWWY+XwBX0P3/Q=", + "lastModified": 1737795105, + "narHash": "sha256-zQSNUKj671I9M4DdMD4iMUnIIWN5oiaWdqDHUSVcaVE=", "owner": "YaLTeR", "repo": "niri", - "rev": "748d90b443b9f20134020c21760b5b6c2c42a7de", + "rev": "78697d1cea20e6b53013e820999b0403c45d9f00", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1737706285, - "narHash": "sha256-k/f1rAyCjGkNu4BnlnUGEvQPSnYVG7UHoOeaQQcjQps=", + "lastModified": 1737795611, + "narHash": "sha256-0kGPO515JdDt6gPcR25QTGyNJnT1UFtH1tdkR2QdLAY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dcb7446a099fe1c95b3694fdb7a4dda8f19d6ba8", + "rev": "ed45d51fb4c860e70760a042dd9ff99bd016497e", "type": "github" }, "original": { @@ -1180,16 +1180,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1734469478, - "narHash": "sha256-IcQ4N8xADYal79K+ONmNq4RLlIwdgUqgrVzgNgiIaG8=", + "lastModified": 1737761947, + "narHash": "sha256-FqpAOeFGuA+luV36jaf5aVz3UB183n6wUrTbFxCwjjQ=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "8b4808e7de2fbb5d119d8d72cdca76d8ab84bc47", + "rev": "d078ca31e802696b26d972bda7bed86ee1382156", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.9.3", + "ref": "v9.10.0", "repo": "rocksdb", "type": "github" } @@ -1219,11 +1219,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1736690231, - "narHash": "sha256-g9gyxX+F6CrkT5gRIMKPnCPom0o9ZDzYnzzeNF86D6Q=", + "lastModified": 1737634189, + "narHash": "sha256-AG5G9KDsl0Ngby9EfWvlemma7WWG0KCADTIccPJuzUE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "8364ef299790cb6ec22b9e09e873c97dbe9f2cb5", + "rev": "84d44d0a574630aa8500ed62b6c01ccd3fae2473", "type": "github" }, "original": { From ca047c1885c76e71ce19ac7022df6c94b5bca9e7 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 25 Jan 2025 09:47:52 -0500 Subject: [PATCH 39/77] add beta nix cache Signed-off-by: cy --- flake.nix | 1 + hosts/chunk/tailscale.nix | 5 ++++- hosts/common.nix | 21 +++++++++++++++++---- hosts/ytnix/tailscale.nix | 1 + 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 77099f8..e27afc9 100644 --- a/flake.nix +++ b/flake.nix @@ -89,6 +89,7 @@ "https://nix-community.cachix.org" "https://cache.garnix.io" "https://cything.cachix.org" + "https://aseipp-nix-cache.global.ssl.fastly.net" ]; extra-trusted-public-keys = [ "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg=" diff --git a/hosts/chunk/tailscale.nix b/hosts/chunk/tailscale.nix index b33da9c..fefc8e5 100644 --- a/hosts/chunk/tailscale.nix +++ b/hosts/chunk/tailscale.nix @@ -2,7 +2,10 @@ services.tailscale = { enable = true; authKeyFile = config.sops.secrets."tailscale/auth".path; - extraUpFlags = [ "--advertise-exit-node" ]; + extraUpFlags = [ + "--advertise-exit-node" + "--accept-dns=false" + ]; useRoutingFeatures = "server"; openFirewall = true; }; diff --git a/hosts/common.nix b/hosts/common.nix index 2e8b31a..c4bc548 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -9,8 +9,21 @@ "root" "@wheel" ]; - trusted-public-keys = [ "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg=" ]; - substituters = [ "https://cache.cything.io/central" ]; + trusted-public-keys = [ + "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg=" + "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + "cything.cachix.org-1:xqW1W5NNL+wrM9wfSELb0MLj/harD2ZyB4HbdaMyvPI=" + ]; + substituters = [ + "https://aseipp-nix-cache.global.ssl.fastly.net" + "https://cache.cything.io/central" + "https://niri.cachix.org" + "https://nix-community.cachix.org" + "https://cache.garnix.io" + "https://cything.cachix.org" + ]; }; channel.enable = false; optimise = { @@ -24,8 +37,8 @@ options = "--delete-older-than 14d"; }; extraOptions = '' - builders-use-substitutes = true - ''; + builders-use-substitutes = true + ''; registry.nixpkgs.flake = inputs.nixpkgs; }; time.timeZone = "America/Toronto"; diff --git a/hosts/ytnix/tailscale.nix b/hosts/ytnix/tailscale.nix index 71d47c8..91d67bf 100644 --- a/hosts/ytnix/tailscale.nix +++ b/hosts/ytnix/tailscale.nix @@ -6,6 +6,7 @@ useRoutingFeatures = "client"; extraUpFlags = [ "--exit-node=100.122.132.30" + "--accept-dns=false" ]; }; } From 5fc61d955bf52a66befa891582e8d2b4f6fc6b0a Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 25 Jan 2025 17:24:02 -0500 Subject: [PATCH 40/77] flake update Signed-off-by: cy --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index b775756..bb0643e 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1737792515, - "narHash": "sha256-+mR9BsX2a+RBFMcWXIrRnwHnR8bpPL6vuhaFfSshGJY=", + "lastModified": 1737830431, + "narHash": "sha256-C/tkJeSefIAK9wke33HBvxCoBF/hqa+1+oPaLriOrNE=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "cd5d4f48bec719a938f50cb17b667668105a1141", + "rev": "9514064c1c709dc7c437b1478b224bb0d711ec05", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1737700483, - "narHash": "sha256-1778bR4GDDc51/iZQvcshGLZ4JU87zCzqei8Hn7vU1A=", + "lastModified": 1737786656, + "narHash": "sha256-ubCW9Jy7ZUOF354bWxTgLDpVnTvIpNr6qR4H/j7I0oo=", "owner": "nix-community", "repo": "fenix", - "rev": "bab2a2840bc2d5ae7c6a133602185edbe4ca7daa", + "rev": "2f721f527886f801403f389a9cabafda8f1e3b7f", "type": "github" }, "original": { @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737797805, - "narHash": "sha256-revbNiDQIhSwkAvGE2IVf3iSHbp1LB52KXu3nukATfE=", + "lastModified": 1737840481, + "narHash": "sha256-WjW3cdrmh1sGMT3CBqCFzT9BOktTa1u9ldoWEqTj7xk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ab19f1d6bf4b38558c84df4990ec0618ec526eb5", + "rev": "8fc9dba8df75d9d004d9369b513b81180788ec15", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1737747541, - "narHash": "sha256-dA54OnUCUtVZfnSuD1dAEcosZzx/tch9KvtDz/Y3FIo=", + "lastModified": 1737832569, + "narHash": "sha256-VkK73VRVgvSQOPw9qx9HzvbulvUM9Ae4nNd3xNP+pkI=", "owner": "nix-community", "repo": "nixvim", - "rev": "5fda6e093da13f37c63a5577888a668c38f30dc7", + "rev": "d7df58321110d3b0e12a829bbd110db31ccd34b1", "type": "github" }, "original": { @@ -1180,16 +1180,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1737761947, - "narHash": "sha256-FqpAOeFGuA+luV36jaf5aVz3UB183n6wUrTbFxCwjjQ=", + "lastModified": 1737828695, + "narHash": "sha256-8Ev6zzhNPU798JNvU27a7gj5X+6SDG3jBweUkQ59DbA=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "d078ca31e802696b26d972bda7bed86ee1382156", + "rev": "a4d9230dcc9d03be428b9a728133f8f646c0065c", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.10.0", + "ref": "v9.9.3", "repo": "rocksdb", "type": "github" } @@ -1219,11 +1219,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1737634189, - "narHash": "sha256-AG5G9KDsl0Ngby9EfWvlemma7WWG0KCADTIccPJuzUE=", + "lastModified": 1737728869, + "narHash": "sha256-U4pl3Hi0lT6GP4ecN3q9wdD2sdaKMbmD/5NJ1NdJ9AM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "84d44d0a574630aa8500ed62b6c01ccd3fae2473", + "rev": "6e4c29f7ce18cea7d3d31237a4661ab932eab636", "type": "github" }, "original": { @@ -1343,11 +1343,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1736487362, - "narHash": "sha256-4kGoOA7FgK9N2mzS+TFEn41kUUNY6KwdiA/0rqlr868=", + "lastModified": 1737837494, + "narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "8f55e27f63a749881c4bbfbb6b1da028342a91d1", + "rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f", "type": "github" }, "original": { From 6ae187f7c618cfd82fc953cf48507faae72da700 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 25 Jan 2025 19:47:39 -0500 Subject: [PATCH 41/77] forgejo: use forgejo package and forgejo-dark theme Signed-off-by: cy --- hosts/chunk/forgejo.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hosts/chunk/forgejo.nix b/hosts/chunk/forgejo.nix index 07d0e69..fd842ce 100644 --- a/hosts/chunk/forgejo.nix +++ b/hosts/chunk/forgejo.nix @@ -1,7 +1,8 @@ -{ ... }: +{ pkgs, ... }: { services.forgejo = { enable = true; + package = pkgs.forgejo; # uses forgejo-lts by default user = "git"; group = "git"; settings = { @@ -16,7 +17,7 @@ service.DISABLE_REGISTRATION = true; ui = { AMBIGUOUS_UNICODE_DETECTION = false; - DEFAULT_THEME = "gitea-dark"; + DEFAULT_THEME = "forgejo-dark"; }; actions.ENABLED = false; repository.ENABLE_PUSH_CREATE_USER = true; From 7b48435796d687b3dcfec5153249b636991ae7aa Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 25 Jan 2025 23:48:18 -0500 Subject: [PATCH 42/77] git sign with ssh Signed-off-by: cy --- home/yt/ytnix.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index e542d2b..6b9ece5 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -149,4 +149,12 @@ enable = true; nix-direnv.enable = true; }; + + programs.git.extraConfig = { + user = { + signingKey = "~/.ssh/id.key"; + }; + gpg.format = "ssh"; + global.gpgsign = true; + }; } From 84c2b18dfa29333af0eb608406fc7e2e5b04f38f Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 25 Jan 2025 19:49:15 -0500 Subject: [PATCH 43/77] re-enable lix Signed-off-by: cy --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index e27afc9..95a0154 100644 --- a/flake.nix +++ b/flake.nix @@ -172,7 +172,7 @@ ./modules inputs.lanzaboote.nixosModules.lanzaboote inputs.niri.nixosModules.niri - # inputs.lix-module.nixosModules.default # broken + inputs.lix-module.nixosModules.default # broken ]; }; chunk = lib.nixosSystem { From 80da2cfc708772010467523148e560a11f6e7d61 Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 26 Jan 2025 16:55:42 -0500 Subject: [PATCH 44/77] git: specify the ssh key for push to work Signed-off-by: cy --- home/yt/ytnix.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 6b9ece5..b15d8b3 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -155,6 +155,7 @@ signingKey = "~/.ssh/id.key"; }; gpg.format = "ssh"; - global.gpgsign = true; + commit.gpgsign = true; + core.sshCommand = "ssh -i ~/.ssh/id.key"; }; } From b1a19557862cd7784eca183325e752cadcb5d141 Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 26 Jan 2025 17:43:18 -0500 Subject: [PATCH 45/77] make mouse cursor better again Signed-off-by: cy --- home/yt/ytnix.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index b15d8b3..97cefe9 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -28,10 +28,6 @@ gtk = { enable = true; - cursorTheme = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern"; - }; theme = { package = pkgs.adw-gtk3; name = "adw-gtk3-dark"; @@ -44,7 +40,8 @@ home.pointerCursor = { package = pkgs.bibata-cursors; - name = "Bibata-Modern"; + name = "Bibata-Modern-Classic"; + size = 23; gtk.enable = true; x11.enable = true; }; From 7367b2d1a5f6ec8df5a1d61e4d5552abc10aca74 Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 26 Jan 2025 22:35:43 -0500 Subject: [PATCH 46/77] flake update Signed-off-by: cy --- flake.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index bb0643e..ee29dc4 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1737830431, - "narHash": "sha256-C/tkJeSefIAK9wke33HBvxCoBF/hqa+1+oPaLriOrNE=", + "lastModified": 1737945015, + "narHash": "sha256-VCa7UAWqP14IC+fmT4P3rxGhkugDlU/4FZqqPyFUs9s=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "9514064c1c709dc7c437b1478b224bb0d711ec05", + "rev": "71a3855af61b0071832c23085f76a8711e32b49c", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1737810081, - "narHash": "sha256-WByslFoA16T/o5Fd+ebhSwmXtbL18L3ameJbzfepbI8=", + "lastModified": 1737857294, + "narHash": "sha256-bzC+anLF/NlgolaMoB4uTFgSejLJlTzPcNF1Kbq/BP0=", "ref": "refs/heads/main", - "rev": "0ad79775b6f9800eb00a2870f01eab338befcced", - "revCount": 16689, + "rev": "4af6b5ed9f8f2412bef5331b8e3b93f3ad305ea1", + "revCount": 16694, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737840481, - "narHash": "sha256-WjW3cdrmh1sGMT3CBqCFzT9BOktTa1u9ldoWEqTj7xk=", + "lastModified": 1737924584, + "narHash": "sha256-8XAz2IFUdSN7IblSWgQQVjivlZ0uWn3Y5jN3G6+/jss=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8fc9dba8df75d9d004d9369b513b81180788ec15", + "rev": "d3682c753abbbc8d41578aa12e6f10508d801f4b", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1737795105, - "narHash": "sha256-zQSNUKj671I9M4DdMD4iMUnIIWN5oiaWdqDHUSVcaVE=", + "lastModified": 1737918541, + "narHash": "sha256-NKartmApYTAjteTg78OAIAYGvtl9QCDcKp8tPk3KCuI=", "owner": "YaLTeR", "repo": "niri", - "rev": "78697d1cea20e6b53013e820999b0403c45d9f00", + "rev": "baa051891237054f2d4db86d7bcfe0f17440c35f", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1737795611, - "narHash": "sha256-0kGPO515JdDt6gPcR25QTGyNJnT1UFtH1tdkR2QdLAY=", + "lastModified": 1737917096, + "narHash": "sha256-wOo5jWu88VRbm0TTNl9KxE4nIkfnXVKxLvZwpTn75wk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed45d51fb4c860e70760a042dd9ff99bd016497e", + "rev": "a47cb26bbe26d63321cbb96de6d1981d790d9748", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1737832569, - "narHash": "sha256-VkK73VRVgvSQOPw9qx9HzvbulvUM9Ae4nNd3xNP+pkI=", + "lastModified": 1737914312, + "narHash": "sha256-PBF4R+yQt5Sls7CsA9Miwx28XtOP/yqaqejZ3RKSes0=", "owner": "nix-community", "repo": "nixvim", - "rev": "d7df58321110d3b0e12a829bbd110db31ccd34b1", + "rev": "8e5422bf3e76f410b97d2da640d0829e87657de9", "type": "github" }, "original": { @@ -1105,11 +1105,11 @@ ] }, "locked": { - "lastModified": 1737372689, - "narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=", + "lastModified": 1737823349, + "narHash": "sha256-LAppb+sftyvJbPdrBG1uN9GYWHz6q7bUpkpDjljcSRo=", "owner": "NuschtOS", "repo": "search", - "rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922", + "rev": "f91a0ac0f4ecf0ad1d1d88140f66520dae6ce4bd", "type": "github" }, "original": { @@ -1240,11 +1240,11 @@ ] }, "locked": { - "lastModified": 1737771740, - "narHash": "sha256-lWIdF4qke63TdCHnJ0QaUHfG8YvsDrBqzL4jiHYQd+Y=", + "lastModified": 1737944843, + "narHash": "sha256-ZSXR/po/slqpsk3JLVjXbE04Vqrb4k7yCGHjyMj3tOk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cfaaa1dddd280af09aca84af84612fbccd986ae2", + "rev": "27bb917a41480b6ceee8e42d32dfcc9ecc6fa6c6", "type": "github" }, "original": { From 61b1399131045afb98f4f5f397b9461fd5b29772 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 27 Jan 2025 02:28:39 -0500 Subject: [PATCH 47/77] enable ssh agent Signed-off-by: cy --- hosts/chunk/default.nix | 7 +++++-- hosts/chunk/tailscale.nix | 3 ++- hosts/ytnix/default.nix | 6 ++++++ hosts/ytnix/tailscale.nix | 3 ++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 0343084..6021b41 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -75,8 +75,11 @@ }; }; - boot.loader.grub.enable = true; - boot.loader.grub.device = "/dev/vda"; + boot = { + loader.grub.enable = true; + loader.grub.device = "/dev/vda"; + kernelPackages = pkgs.linuxPackages_latest; + }; system.stateVersion = "24.05"; diff --git a/hosts/chunk/tailscale.nix b/hosts/chunk/tailscale.nix index fefc8e5..e170e6b 100644 --- a/hosts/chunk/tailscale.nix +++ b/hosts/chunk/tailscale.nix @@ -1,4 +1,5 @@ -{ config, ... }: { +{ config, ... }: +{ services.tailscale = { enable = true; authKeyFile = config.sops.secrets."tailscale/auth".path; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 54f13da..6192e43 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -324,4 +324,10 @@ services.udev.extraHwdb = '' SUBSYSTEM=="usb", SYSFS{idVendor}=="090c", SYSFS{idProduct}=="1000", ACTION=="add", GROUP="users", MODE="0664" ''; + + programs.ssh = { + askPassword = "${pkgs.seahorse}/libexec/seahorse/ssh-askpass"; + startAgent = true; + enableAskPassword = true; + }; } diff --git a/hosts/ytnix/tailscale.nix b/hosts/ytnix/tailscale.nix index 91d67bf..63489ae 100644 --- a/hosts/ytnix/tailscale.nix +++ b/hosts/ytnix/tailscale.nix @@ -1,4 +1,5 @@ -{ config, ... }: { +{ config, ... }: +{ services.tailscale = { enable = true; authKeyFile = config.sops.secrets."tailscale/auth".path; From a9a3ee84139e743431fc87f94c5fb2ae803feb5f Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 27 Jan 2025 04:02:11 -0500 Subject: [PATCH 48/77] init Signed-off-by: cy --- modules/caddy.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 modules/caddy.nix diff --git a/modules/caddy.nix b/modules/caddy.nix new file mode 100644 index 0000000..9ee9913 --- /dev/null +++ b/modules/caddy.nix @@ -0,0 +1,29 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.my.caddy; + commonExtraConfig = '' + encode zstd gzip + header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" + ''; +in +{ + options.my.caddy = { + enable = lib.mkEnableOption "caddy reverse proxy"; + acmeCa = lib.mkOption { + type = lib.types.str; + }; + }; + + config = lib.mkIf cfg.enable { + services.caddy = { + enable = true; + logFormat = lib.mkForce "level INFO"; + acmeCa = "https://acme-v02.api.letsencrypt.org/directory"; + }; + }; +} From cad577b1931eabc568f7eef6659e5405f20a1eec Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 27 Jan 2025 05:49:00 -0500 Subject: [PATCH 49/77] migrate chunk to caddy module Signed-off-by: cy --- hosts/chunk/Caddyfile | 89 ------------------------------------- hosts/chunk/adguard.nix | 5 +++ hosts/chunk/attic.nix | 5 +++ hosts/chunk/conduwuit.nix | 5 +++ hosts/chunk/default.nix | 12 ++--- hosts/chunk/deluge.nix | 5 +++ hosts/chunk/element.nix | 5 +++ hosts/chunk/forgejo.nix | 16 +++++++ hosts/chunk/garage.nix | 5 +++ hosts/chunk/grafana.nix | 5 +++ hosts/chunk/hedgedoc.nix | 5 +++ hosts/chunk/immich.nix | 5 +++ hosts/chunk/miniflux.nix | 5 +++ hosts/chunk/redlib.nix | 5 +++ hosts/chunk/vaultwarden.nix | 5 +++ modules/caddy.nix | 16 +++---- modules/default.nix | 1 + 17 files changed, 91 insertions(+), 103 deletions(-) delete mode 100644 hosts/chunk/Caddyfile diff --git a/hosts/chunk/Caddyfile b/hosts/chunk/Caddyfile deleted file mode 100644 index 5e56278..0000000 --- a/hosts/chunk/Caddyfile +++ /dev/null @@ -1,89 +0,0 @@ -{ - acme_ca https://acme.zerossl.com/v2/DV90 - acme_eab { - key_id {$EAB_KEY_ID} - mac_key {$EAB_MAC_KEY} - } -} - -(common) { - encode zstd gzip - header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" -} - -git.cything.io { - import common - - # wrap in route so things are evaluated in the order written - route { - # rewrite gitlab URIs to make it work with forgejo - uri path_regexp /-/ / - uri replace /blob/ /src/ - redir https://git.cy7.sh{uri} permanent - } -} - -git.cy7.sh { - import common - reverse_proxy localhost:3000 -} - -rss.cy7.sh { - import common - reverse_proxy localhost:8080 -} - -photos.cy7.sh { - import common - reverse_proxy localhost:2283 -} - -chat.cything.io { - import common - reverse_proxy localhost:8448 -} - -pass.cy7.sh { - import common - reverse_proxy localhost:8081 -} - -dns.cything.io { - import common - reverse_proxy localhost:8082 -} - -pad.cything.io { - import common - reverse_proxy localhost:8085 -} - -red.cything.io { - import common - reverse_proxy localhost:8087 -} - -grafana.cything.io { - import common - reverse_proxy localhost:8088 -} - -element.cything.io { - import common - reverse_proxy localhost:8089 -} - -cache.cything.io { - import common - reverse_proxy localhost:8090 -} - -s3.cy7.sh { - import common - reverse_proxy localhost:3900 -} - -admin.s3.cy7.sh { - import common - reverse_proxy localhost:3903 -} diff --git a/hosts/chunk/adguard.nix b/hosts/chunk/adguard.nix index fe4b9bb..74207fc 100644 --- a/hosts/chunk/adguard.nix +++ b/hosts/chunk/adguard.nix @@ -21,4 +21,9 @@ ]; }; }; + + services.caddy.virtualHosts."dns.cything.io".extraConfig = '' + import common + reverse_proxy localhost:8082 + ''; } diff --git a/hosts/chunk/attic.nix b/hosts/chunk/attic.nix index 2f84394..c41e985 100644 --- a/hosts/chunk/attic.nix +++ b/hosts/chunk/attic.nix @@ -31,4 +31,9 @@ }; }; }; + + services.caddy.virtualHosts."cache.cything.io".extraConfig = '' + import common + reverse_proxy localhost:8090 + ''; } diff --git a/hosts/chunk/conduwuit.nix b/hosts/chunk/conduwuit.nix index 25c85ab..8aa8998 100644 --- a/hosts/chunk/conduwuit.nix +++ b/hosts/chunk/conduwuit.nix @@ -10,4 +10,9 @@ allow_check_for_updates = true; }; }; + + services.caddy.virtualHosts."chat.cything.io".extraConfig = '' + import common + reverse_proxy localhost:8448 + ''; } diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 6021b41..577e9b5 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -183,11 +183,13 @@ programs.gnupg.agent.enable = true; programs.git.enable = true; - services.caddy = { - enable = true; - configFile = ./Caddyfile; - environmentFile = config.sops.secrets."caddy/env".path; - logFormat = lib.mkForce "level INFO"; + my.caddy.enable = true; + services.caddy.virtualHosts."cy7.sh" = { + serverAliases = [ "www.cy7.sh" ]; + extraConfig = '' + import common + redir https://cything.io temporary + ''; }; # container stuff diff --git a/hosts/chunk/deluge.nix b/hosts/chunk/deluge.nix index 638c728..5dd3fd4 100644 --- a/hosts/chunk/deluge.nix +++ b/hosts/chunk/deluge.nix @@ -7,4 +7,9 @@ port = 8112; }; }; + + services.caddy.virtualHosts."t.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:8112 + ''; } diff --git a/hosts/chunk/element.nix b/hosts/chunk/element.nix index 81ab246..5a12e1e 100644 --- a/hosts/chunk/element.nix +++ b/hosts/chunk/element.nix @@ -25,4 +25,9 @@ ${pkgs.podman}/bin/podman network create element-net ''; }; + + services.caddy.virtualHosts."element.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:8089 + ''; } diff --git a/hosts/chunk/forgejo.nix b/hosts/chunk/forgejo.nix index fd842ce..26fb541 100644 --- a/hosts/chunk/forgejo.nix +++ b/hosts/chunk/forgejo.nix @@ -30,4 +30,20 @@ name = "git"; }; }; + + services.caddy.virtualHosts."git.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:3000 + ''; + services.caddy.virtualHosts."git.cything.io".extraConfig = '' + import common + + # wrap in route so things are evaluated in the order written + route { + # rewrite gitlab URIs to make it work with forgejo + uri path_regexp /-/ / + uri replace /blob/ /src/ + redir https://git.cy7.sh{uri} permanent + } + ''; } diff --git a/hosts/chunk/garage.nix b/hosts/chunk/garage.nix index fe3ef46..75730a1 100644 --- a/hosts/chunk/garage.nix +++ b/hosts/chunk/garage.nix @@ -16,4 +16,9 @@ }; environmentFile = config.sops.secrets."garage/env".path; }; + + services.caddy.virtualHosts."s3.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:3900 + ''; } diff --git a/hosts/chunk/grafana.nix b/hosts/chunk/grafana.nix index 0575f51..007bcf1 100644 --- a/hosts/chunk/grafana.nix +++ b/hosts/chunk/grafana.nix @@ -31,4 +31,9 @@ } ]; }; + + services.caddy.virtualHosts."grafana.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:8088 + ''; } diff --git a/hosts/chunk/hedgedoc.nix b/hosts/chunk/hedgedoc.nix index 1988520..62505f9 100644 --- a/hosts/chunk/hedgedoc.nix +++ b/hosts/chunk/hedgedoc.nix @@ -16,4 +16,9 @@ protocolUseSSL = true; }; }; + + services.caddy.virtualHosts."pad.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:8085 + ''; } diff --git a/hosts/chunk/immich.nix b/hosts/chunk/immich.nix index 2062330..9661e8c 100644 --- a/hosts/chunk/immich.nix +++ b/hosts/chunk/immich.nix @@ -95,4 +95,9 @@ in ${pkgs.podman}/bin/podman network create immich-net ''; }; + + services.caddy.virtualHosts."photos.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:2283 + ''; } diff --git a/hosts/chunk/miniflux.nix b/hosts/chunk/miniflux.nix index f40b2b6..84783f6 100644 --- a/hosts/chunk/miniflux.nix +++ b/hosts/chunk/miniflux.nix @@ -9,4 +9,9 @@ FORCE_REFRESH_INTERVAL = 0; # don't rate limit me }; }; + + services.caddy.virtualHosts."rss.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:8080 + ''; } diff --git a/hosts/chunk/redlib.nix b/hosts/chunk/redlib.nix index 39585f1..d095da5 100644 --- a/hosts/chunk/redlib.nix +++ b/hosts/chunk/redlib.nix @@ -10,4 +10,9 @@ REDLIB_ROBOTS_DISABLE_INDEXING = "on"; }; }; + + services.caddy.virtualHosts."red.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:8087 + ''; } diff --git a/hosts/chunk/vaultwarden.nix b/hosts/chunk/vaultwarden.nix index b97835e..7529610 100644 --- a/hosts/chunk/vaultwarden.nix +++ b/hosts/chunk/vaultwarden.nix @@ -10,4 +10,9 @@ DATABASE_URL = "postgresql://vaultwarden:vaultwarden@127.0.0.1:5432/vaultwarden"; }; }; + + services.caddy.virtualHosts."pass.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:8081 + ''; } diff --git a/modules/caddy.nix b/modules/caddy.nix index 9ee9913..6d38b01 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -1,29 +1,27 @@ { config, lib, - pkgs, ... }: let cfg = config.my.caddy; - commonExtraConfig = '' - encode zstd gzip - header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" - ''; in { options.my.caddy = { enable = lib.mkEnableOption "caddy reverse proxy"; - acmeCa = lib.mkOption { - type = lib.types.str; - }; }; config = lib.mkIf cfg.enable { services.caddy = { enable = true; logFormat = lib.mkForce "level INFO"; - acmeCa = "https://acme-v02.api.letsencrypt.org/directory"; + acmeCA = "https://acme-v02.api.letsencrypt.org/directory"; + extraConfig = '' + (common) { + encode zstd gzip + header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" + } + ''; }; }; } diff --git a/modules/default.nix b/modules/default.nix index 2155137..070a96e 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,5 +2,6 @@ { imports = [ ./backup.nix + ./caddy.nix ]; } From da557a7b7e16f82f9f3cac33d3aa02ea937b54f4 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 27 Jan 2025 20:07:41 -0500 Subject: [PATCH 50/77] titan: redirect to new website Signed-off-by: cy --- hosts/titan/Caddyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/titan/Caddyfile b/hosts/titan/Caddyfile index 70cc99f..5969134 100644 --- a/hosts/titan/Caddyfile +++ b/hosts/titan/Caddyfile @@ -13,7 +13,7 @@ cything.io { import common - reverse_proxy localhost:8084 + redir https://cy7.sh/posts{uri} permanent header /.well-known/matrix/* Content-Type application/json header /.well-known/matrix/* Access-Control-Allow-Origin * From 443ea96d1fb162f07958b58e3c800656d1756186 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 27 Jan 2025 20:23:15 -0500 Subject: [PATCH 51/77] make justfile better and cleanup zsh Signed-off-by: cy --- home/zsh/default.nix | 5 ----- justfile | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 363efd6..eb920d5 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -39,11 +39,6 @@ initExtra = '' # disable control+s to pause terminal unsetopt FLOW_CONTROL - # manually integrate fzf cause we need to make sure zsh-vi-mode - # won't override C-r - function zvm_after_init() { - eval "$(${pkgs.fzf}/bin/fzf --zsh)" - } # useful emacs mode bindings bindkey -M viins "^E" end-of-line diff --git a/justfile b/justfile index 95b1fda..e113688 100644 --- a/justfile +++ b/justfile @@ -1,9 +1,10 @@ update: + git branch -D update || true git switch -c update nix flake update git add flake.lock git commit -s -m "flake update" - git push + git push -f git switch main upgrade: From f9837b7cab5fcaec02cbc9c8be9d258bbbeb66e1 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 28 Jan 2025 00:39:23 -0500 Subject: [PATCH 52/77] make treesitter nicer Signed-off-by: cy --- home/nixvim/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 77586b6..89bfd94 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -171,7 +171,11 @@ plugins.treesitter = { enable = true; nixGrammars = true; - settings.indent.enable = true; + settings = { + indent.enable = true; + auto_install = true; + highlight.enable = true; + }; }; plugins.fzf-lua = { enable = true; From 1e55f3901c048163287f205a445a4d246321cba9 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 28 Jan 2025 22:38:24 -0500 Subject: [PATCH 53/77] fix matrix Signed-off-by: cy --- hosts/titan/Caddyfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hosts/titan/Caddyfile b/hosts/titan/Caddyfile index 5969134..c306399 100644 --- a/hosts/titan/Caddyfile +++ b/hosts/titan/Caddyfile @@ -13,14 +13,16 @@ cything.io { import common - redir https://cy7.sh/posts{uri} permanent header /.well-known/matrix/* Content-Type application/json header /.well-known/matrix/* Access-Control-Allow-Origin * header /.well-known/matrix/* Access-Control-Allow-Methods GET,POST,PUT,DELETE,OPTIONS,PATCH,HEAD header /.well-known/matrix/* Access-Control-Allow-Headers X-Requested-With,Content-Type,Authorization,Origin,Accept - respond /.well-known/matrix/server {"m.server":"chat.cything.io:443"} - respond /.well-known/matrix/client {"m.server":{"base_url":"https://chat.cything.io"},"m.homeserver":{"base_url":"https://chat.cything.io"},"org.matrix.msc3575.proxy":{"url":"https://chat.cything.io"}} + route { + respond /.well-known/matrix/server {"m.server":"chat.cything.io:443"} + respond /.well-known/matrix/client {"m.server":{"base_url":"https://chat.cything.io"},"m.homeserver":{"base_url":"https://chat.cything.io"},"org.matrix.msc3575.proxy":{"url":"https://chat.cything.io"}} + redir https://cy7.sh/posts{uri} permanent + } } www.cything.io { From 0506c6c92fc502e2f42cfb8bfcb1c6649236e550 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 28 Jan 2025 22:38:40 -0500 Subject: [PATCH 54/77] install ghidra and disable mouse warp Signed-off-by: cy --- home/niri/default.nix | 7 ++++++- home/yt/common.nix | 1 + home/yt/ytnix.nix | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/home/niri/default.nix b/home/niri/default.nix index 0c72563..ea9acb9 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -50,7 +50,7 @@ in natural-scroll = true; click-method = "clickfinger"; }; - warp-mouse-to-focus = true; + warp-mouse-to-focus = false; focus-follows-mouse.enable = false; }; @@ -79,6 +79,11 @@ in } { app-id = "mpv"; } { app-id = "Bitwarden"; } + { + app-id = "ghidra-Ghidra"; + # pop-up windows + title = "^win(.*)"; + } ]; open-floating = true; } diff --git a/home/yt/common.nix b/home/yt/common.nix index 4d7acca..e919d4b 100644 --- a/home/yt/common.nix +++ b/home/yt/common.nix @@ -61,4 +61,5 @@ }; programs.ripgrep.enable = true; programs.man.generateCaches = true; + programs.fd.enable = true; } diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 97cefe9..fa26fd2 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -103,6 +103,10 @@ github-cli fuzzel nixpkgs-review + just + hugo + ghidra + sequoia ]; programs.waybar.enable = true; @@ -155,4 +159,9 @@ commit.gpgsign = true; core.sshCommand = "ssh -i ~/.ssh/id.key"; }; + + home.sessionVariables = { + # to make ghidra work on xwayland + _JAVA_AWT_WM_NONREPARENTING = 1; + }; } From d79a34328a9ee28f084ab6dce37d4d45e25b480e Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 28 Jan 2025 22:40:30 -0500 Subject: [PATCH 55/77] flake update Signed-off-by: cy --- flake.lock | 70 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index ee29dc4..fa1bec7 100644 --- a/flake.lock +++ b/flake.lock @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1737968762, + "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1737857294, - "narHash": "sha256-bzC+anLF/NlgolaMoB4uTFgSejLJlTzPcNF1Kbq/BP0=", + "lastModified": 1738097047, + "narHash": "sha256-GcgcCYhAkxU9BtzsUImFRIEFK0WqgjKrMqMySImGLK4=", "ref": "refs/heads/main", - "rev": "4af6b5ed9f8f2412bef5331b8e3b93f3ad305ea1", - "revCount": 16694, + "rev": "3a41bf32a78550f7373b51d39c07a4bb91bb9f2e", + "revCount": 16702, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -710,11 +710,11 @@ ] }, "locked": { - "lastModified": 1737675503, - "narHash": "sha256-FUWpqPOsEJwK8oomffat+lgKnoxJHArRlWo2j17EhxQ=", + "lastModified": 1738009885, + "narHash": "sha256-zPch36LSTs8dZJZlIiufXuY7wut06xp4CMdf/oqXoq0=", "ref": "refs/heads/main", - "rev": "3e18a1ceec7df4514f5a045441e5f98dd003db09", - "revCount": 131, + "rev": "cf43eeb6b376cc36f70b0632bc39dc949b9f3b59", + "revCount": 132, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737924584, - "narHash": "sha256-8XAz2IFUdSN7IblSWgQQVjivlZ0uWn3Y5jN3G6+/jss=", + "lastModified": 1737961005, + "narHash": "sha256-b4hqJNgyx8lnngz7NFcJ1W+59xQnMQYF0EK5g0IOy7c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d3682c753abbbc8d41578aa12e6f10508d801f4b", + "rev": "e98ae62893568dd31e7a7e4e75e1dbbf23f759a0", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1737918541, - "narHash": "sha256-NKartmApYTAjteTg78OAIAYGvtl9QCDcKp8tPk3KCuI=", + "lastModified": 1737956052, + "narHash": "sha256-Gr+tkCSuhQ5NT04hv/PoHExCgbuqRA/GZQv+le40LNY=", "owner": "YaLTeR", "repo": "niri", - "rev": "baa051891237054f2d4db86d7bcfe0f17440c35f", + "rev": "9b4d73f13a6906537faf01b5c5e5e2fee9dd602e", "type": "github" }, "original": { @@ -832,11 +832,11 @@ ] }, "locked": { - "lastModified": 1737504076, - "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", + "lastModified": 1738033138, + "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", + "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1737917096, - "narHash": "sha256-wOo5jWu88VRbm0TTNl9KxE4nIkfnXVKxLvZwpTn75wk=", + "lastModified": 1738090407, + "narHash": "sha256-X6BvM495ef4Rk+7WFhvYFwJoKteQYgvSaRERLGofZ+s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a47cb26bbe26d63321cbb96de6d1981d790d9748", + "rev": "2c00621e9692affa61da62f82e76648c5a07e6a0", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1737914312, - "narHash": "sha256-PBF4R+yQt5Sls7CsA9Miwx28XtOP/yqaqejZ3RKSes0=", + "lastModified": 1738106190, + "narHash": "sha256-woDlUpfK4n1znQfGREKDLMVOQ4JZo7L6YY/sTPZGw0g=", "owner": "nix-community", "repo": "nixvim", - "rev": "8e5422bf3e76f410b97d2da640d0829e87657de9", + "rev": "eeafe2a7153197982ccd6ad6678192bca1df446e", "type": "github" }, "original": { @@ -1105,11 +1105,11 @@ ] }, "locked": { - "lastModified": 1737823349, - "narHash": "sha256-LAppb+sftyvJbPdrBG1uN9GYWHz6q7bUpkpDjljcSRo=", + "lastModified": 1737924095, + "narHash": "sha256-9RO/IlxiE7bpY7GYsdDMNB533PnDOBo9UvYyXXqlN4c=", "owner": "NuschtOS", "repo": "search", - "rev": "f91a0ac0f4ecf0ad1d1d88140f66520dae6ce4bd", + "rev": "5efc9c966bb9bdad07a3c28667eac38b758c6f18", "type": "github" }, "original": { @@ -1240,11 +1240,11 @@ ] }, "locked": { - "lastModified": 1737944843, - "narHash": "sha256-ZSXR/po/slqpsk3JLVjXbE04Vqrb4k7yCGHjyMj3tOk=", + "lastModified": 1738117527, + "narHash": "sha256-GFviGfaezjGLFUlxdv3zyC7rSZvTXqwcG/YsF6MDkOw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "27bb917a41480b6ceee8e42d32dfcc9ecc6fa6c6", + "rev": "6a3dc6ce4132bd57359214d986db376f2333c14d", "type": "github" }, "original": { @@ -1310,11 +1310,11 @@ ] }, "locked": { - "lastModified": 1737483750, - "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", + "lastModified": 1738070913, + "narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", + "rev": "bebf27d00f7d10ba75332a0541ac43676985dea3", "type": "github" }, "original": { From b2a67402567092d91808af74d327a5938e850e79 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 29 Jan 2025 15:24:42 -0500 Subject: [PATCH 56/77] vscode goodies Signed-off-by: cy --- home/irssi.nix | 2 +- home/kitty.nix | 1 + home/niri/default.nix | 11 ++++++----- home/vscode.nix | 29 ++++++++++++++++++++++++----- home/yt/ytnix.nix | 1 + 5 files changed, 33 insertions(+), 11 deletions(-) diff --git a/home/irssi.nix b/home/irssi.nix index e8133c1..2221b42 100644 --- a/home/irssi.nix +++ b/home/irssi.nix @@ -1,4 +1,4 @@ -{ ... }: +{... }: { programs.irssi = { enable = true; diff --git a/home/kitty.nix b/home/kitty.nix index f47567c..7134390 100644 --- a/home/kitty.nix +++ b/home/kitty.nix @@ -58,6 +58,7 @@ "ctrl+f2" = "detach_tab"; # hints + # > basically means the preceding key is a prefix (think tmux) "kitty_mod+o>o" = "open_url_with_hints"; "kitty_mod+o>p" = "kitten hints --type path --program -"; "kitty_mod+o>n" = "kitten hints --type line --program -"; diff --git a/home/niri/default.nix b/home/niri/default.nix index ea9acb9..67720cb 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -73,10 +73,6 @@ in window-rules = [ { matches = [ - { - app-id = "anki"; - title = "Add"; - } { app-id = "mpv"; } { app-id = "Bitwarden"; } { @@ -88,7 +84,12 @@ in open-floating = true; } { - matches = [ { app-id = "anki"; } ]; + matches = [ + { + app-id = "anki"; + title = "Add"; + } + ]; default-column-width.proportion = .25; } { diff --git a/home/vscode.nix b/home/vscode.nix index d2b7bb0..b964fa6 100644 --- a/home/vscode.nix +++ b/home/vscode.nix @@ -8,11 +8,30 @@ mutableExtensionsDir = false; extensions = with pkgs.vscode-extensions; [ vscodevim.vim - jnoortheen.nix-ide # nix language support - editorconfig.editorconfig # editorconfig - dracula-theme.theme-dracula # color scheme - tomoki1207.pdf # pdf viewer - yzhang.markdown-all-in-one # markdown tools + jnoortheen.nix-ide + editorconfig.editorconfig + github.github-vscode-theme ]; + userSettings = { + "workbench.colorTheme" = "GitHub Dark Default"; + "files.autoSave" = "afterDelay"; + "nix.enableLanguageServer" = true; + "nix.serverPath" = "nixd"; + "editor.fontFamily" = "IBM Plex Mono"; + "editor.fontSize" = 15; + "editor.wordWrap" = "on"; + + # vim mode + "vim.handleKeys" = { + "" = false; # file tree toggle + }; + "vim.normalModeKeyBindings" = [ + { + "before" = [";"]; + "after" = [":"]; + "silent" = true; + } + ]; + }; }; } diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index fa26fd2..e0ed53c 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -9,6 +9,7 @@ ../niri ../irssi.nix ../kitty.nix + ../vscode.nix ]; home = { username = "yt"; From 069a65d4c7c11a8a569f16fd026297d937245f39 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 29 Jan 2025 16:23:33 -0500 Subject: [PATCH 57/77] nixvim: add copilot stuff --- home/nixvim/default.nix | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 89bfd94..f123392 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -24,7 +24,7 @@ extraPlugins = [ (pkgs.vimUtils.buildVimPlugin { - name = "gitub-theme"; + name = "github-theme"; src = inputs.nvim-github-theme; }) ]; @@ -71,6 +71,35 @@ key = ""; mode = "i"; } + # quick chat with copilot + { + key = "ccq"; + action.__raw = '' + function() + local input = vim.fn.input("Quick chat: ") + if input ~= "" then + require("CopilotChat").ask(input, { selection = require("CopilotChat.select").buffer }) + end + end + ''; + mode = [ "n" "v" ]; + } + # ask perplexity a quick question + { + key = "ccs"; + action.__raw = '' + function() + local input = vim.fn.input("Perplexity: ") + if input ~= "" then + require("CopilotChat").ask(input, { + agent = "perplexityai", + selection = false, + }) + end + end + ''; + mode = [ "n" "v" ]; + } ]; plugins.cmp = { @@ -197,6 +226,13 @@ settings.current_line_blame = true; }; + plugins.copilot-chat = { + enable = true; + settings = { + model = "claude-3.5-sonnet"; + }; + }; + plugins.cmp-buffer.enable = true; plugins.cmp-emoji.enable = true; plugins.cmp-nvim-lsp.enable = true; From b07c2558694f96b00f4fd006424056d5beb504ed Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 29 Jan 2025 16:48:28 -0500 Subject: [PATCH 58/77] nix fmt and some cleanup Signed-off-by: cy --- flake.nix | 3 --- home/irssi.nix | 2 +- home/nixvim/default.nix | 10 ++++++++-- home/vscode.nix | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 95a0154..0f4e96a 100644 --- a/flake.nix +++ b/flake.nix @@ -126,9 +126,6 @@ ... }: { - # make pkgs available to `perSystem` - _module.args.pkgs = inputs'.nixpkgs.legacyPackages; - treefmt = { projectRootFile = "flake.nix"; programs.nixfmt.enable = true; diff --git a/home/irssi.nix b/home/irssi.nix index 2221b42..e8133c1 100644 --- a/home/irssi.nix +++ b/home/irssi.nix @@ -1,4 +1,4 @@ -{... }: +{ ... }: { programs.irssi = { enable = true; diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index f123392..26b8bc6 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -82,7 +82,10 @@ end end ''; - mode = [ "n" "v" ]; + mode = [ + "n" + "v" + ]; } # ask perplexity a quick question { @@ -98,7 +101,10 @@ end end ''; - mode = [ "n" "v" ]; + mode = [ + "n" + "v" + ]; } ]; diff --git a/home/vscode.nix b/home/vscode.nix index b964fa6..0c1bf95 100644 --- a/home/vscode.nix +++ b/home/vscode.nix @@ -27,8 +27,8 @@ }; "vim.normalModeKeyBindings" = [ { - "before" = [";"]; - "after" = [":"]; + "before" = [ ";" ]; + "after" = [ ":" ]; "silent" = true; } ]; From 67048909a94a6f8a90307eb16d8d3f36413c4b13 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 29 Jan 2025 16:49:19 -0500 Subject: [PATCH 59/77] flake update Signed-off-by: cy --- flake.lock | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index fa1bec7..6646c08 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1737945015, - "narHash": "sha256-VCa7UAWqP14IC+fmT4P3rxGhkugDlU/4FZqqPyFUs9s=", + "lastModified": 1738132650, + "narHash": "sha256-ryebu2VoopIpr5+DuHIs2/x60u+3EzRJexYRWVJn2AE=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "71a3855af61b0071832c23085f76a8711e32b49c", + "rev": "eb7d893c8675f955fa770c8ae6f1c32a2394284c", "type": "github" }, "original": { @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1737968762, - "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", + "lastModified": 1738178313, + "narHash": "sha256-/8TLf6LkXGRGERzcWMNDeXjYaHSbexmfV+ofheo7K6k=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", + "rev": "420a0d9506b5dac4d86a68b9ef8e763624ad86c6", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1738097047, - "narHash": "sha256-GcgcCYhAkxU9BtzsUImFRIEFK0WqgjKrMqMySImGLK4=", + "lastModified": 1738174211, + "narHash": "sha256-eYmp1mKM4kULV1W+EBtCPk6LmKWl2REivaYfGRl+AWo=", "ref": "refs/heads/main", - "rev": "3a41bf32a78550f7373b51d39c07a4bb91bb9f2e", - "revCount": 16702, + "rev": "64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a", + "revCount": 17329, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -710,11 +710,11 @@ ] }, "locked": { - "lastModified": 1738009885, - "narHash": "sha256-zPch36LSTs8dZJZlIiufXuY7wut06xp4CMdf/oqXoq0=", + "lastModified": 1738176840, + "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=", "ref": "refs/heads/main", - "rev": "cf43eeb6b376cc36f70b0632bc39dc949b9f3b59", - "revCount": 132, + "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e", + "revCount": 133, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737961005, - "narHash": "sha256-b4hqJNgyx8lnngz7NFcJ1W+59xQnMQYF0EK5g0IOy7c=", + "lastModified": 1738156024, + "narHash": "sha256-D3cox2cbtFauXz1skDTkJwSU0272wY6wRwiFNm5TV/c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e98ae62893568dd31e7a7e4e75e1dbbf23f759a0", + "rev": "541920ede8b5d48f110c94d858a1ddf283eac3b9", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1737956052, - "narHash": "sha256-Gr+tkCSuhQ5NT04hv/PoHExCgbuqRA/GZQv+le40LNY=", + "lastModified": 1738148186, + "narHash": "sha256-Yd2xKbZ8S4LC5sxPleuutlX0RbKnI93LhciVhneNBHQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "9b4d73f13a6906537faf01b5c5e5e2fee9dd602e", + "rev": "1d3820a064f1f3b686eb6e8a1aab155681a96457", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1738090407, - "narHash": "sha256-X6BvM495ef4Rk+7WFhvYFwJoKteQYgvSaRERLGofZ+s=", + "lastModified": 1738178544, + "narHash": "sha256-UbM+zJFlze877N5j2YMLKYFX7t05VvmuNX2M0vJ7RfI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2c00621e9692affa61da62f82e76648c5a07e6a0", + "rev": "975ac0ab33ee7fea64842047a96f5d679d90913c", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1738106190, - "narHash": "sha256-woDlUpfK4n1znQfGREKDLMVOQ4JZo7L6YY/sTPZGw0g=", + "lastModified": 1738184667, + "narHash": "sha256-+pG3UJVAdVCF3nGRpy5n/tbCzGa64DCWOC8hAxnssD0=", "owner": "nix-community", "repo": "nixvim", - "rev": "eeafe2a7153197982ccd6ad6678192bca1df446e", + "rev": "2f5374c3dcd06c750c36798bce6bccdf8a25bc89", "type": "github" }, "original": { From 4f015ecb455827a787003302ab3a785f2f6b8bd4 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 29 Jan 2025 21:48:31 -0500 Subject: [PATCH 60/77] vscode: overlay github codespaces extension Signed-off-by: cy --- home/vscode.nix | 6 ++++-- overlay/default.nix | 1 + overlay/vscode.nix | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 overlay/vscode.nix diff --git a/home/vscode.nix b/home/vscode.nix index 0c1bf95..214a060 100644 --- a/home/vscode.nix +++ b/home/vscode.nix @@ -11,6 +11,7 @@ jnoortheen.nix-ide editorconfig.editorconfig github.github-vscode-theme + github.codespaces ]; userSettings = { "workbench.colorTheme" = "GitHub Dark Default"; @@ -18,10 +19,10 @@ "nix.enableLanguageServer" = true; "nix.serverPath" = "nixd"; "editor.fontFamily" = "IBM Plex Mono"; - "editor.fontSize" = 15; + "editor.fontSize" = 16; "editor.wordWrap" = "on"; - # vim mode + # vim mode settings "vim.handleKeys" = { "" = false; # file tree toggle }; @@ -32,6 +33,7 @@ "silent" = true; } ]; + "workbench.startupEditor" = "none"; }; }; } diff --git a/overlay/default.nix b/overlay/default.nix index 99fc17b..5b6a9a8 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -2,6 +2,7 @@ let overlays = [ ./conduwuit ./attic + ./vscode.nix ]; importedOverlays = map (m: import m) overlays; in diff --git a/overlay/vscode.nix b/overlay/vscode.nix new file mode 100644 index 0000000..4de2d90 --- /dev/null +++ b/overlay/vscode.nix @@ -0,0 +1,14 @@ +final: prev: { + vscode-extensions = prev.vscode-extensions // { + github = prev.vscode-extensions.github // { + codespaces = prev.vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "github"; + name = "codespaces"; + version = "1.17.3"; + hash = "sha256-idJFYHJ4yeqpFZBX55Y0v1yfzgqyhS0MrC4yIto7i7w="; + }; + }; + }; + }; +} From 4e0c1fbbb4e2ee46580e2ce7ac07380e541e2aff Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 30 Jan 2025 12:33:03 -0500 Subject: [PATCH 61/77] caddy: use acme_dns for wildcard TLS to work use cloudflare dns plugin to update zone --- modules/caddy.nix | 13 +++++++++++++ secrets/services/caddy.yaml | 8 ++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/modules/caddy.nix b/modules/caddy.nix index 6d38b01..03d7a4a 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ... }: let @@ -14,6 +15,14 @@ in config = lib.mkIf cfg.enable { services.caddy = { enable = true; + package = pkgs.caddy.withPlugins { + plugins = [ + # error message will tell you the correct version tag to use + # (still need the @ to pass nix config check) + "github.com/caddy-dns/cloudflare@v0.0.0-20240703190432-89f16b99c18e" + ]; + hash = "sha256-jCcSzenewQiW897GFHF9WAcVkGaS/oUu63crJu7AyyQ="; + }; logFormat = lib.mkForce "level INFO"; acmeCA = "https://acme-v02.api.letsencrypt.org/directory"; extraConfig = '' @@ -22,6 +31,10 @@ in header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" } ''; + globalConfig = '' + acme_dns cloudflare {$CLOUDFLARE_KEY} + ''; + environmentFile = config.sops.secrets."caddy/env".path; }; }; } diff --git a/secrets/services/caddy.yaml b/secrets/services/caddy.yaml index 9fea4c0..2ff8b4c 100644 --- a/secrets/services/caddy.yaml +++ b/secrets/services/caddy.yaml @@ -1,5 +1,5 @@ caddy: - env: ENC[AES256_GCM,data:uVCkVky5MRRhN+g4f634nBjvpcI5Ldy+eOKXg7eGu9foswTHA1SXDs67+Wuvo/jaPw7Zg67xKZRHnoTon1udQzyfu0T6pmVKfsUPewITYCd+qLTanFz6uVRUHzpUVwjCZNqB8gxNr/BiZ70NG4vQXRjgd3zKFrQYQBr4zSaP2vK1pRdbuQ==,iv:dQBfX4X8huUp2dqY3tEGW+BPZ/XADT10ptt85R7X+AY=,tag:cvMbFjkRHoxxnNfz8dGv5g==,type:str] + env: ENC[AES256_GCM,data:XyxcCVT+rwlS7A3xzUgGqpMoLwhfUJo2++zPTgoPt3q6Edt14bYQJsoSJXnKx/lGg/0ilNfEEg8AEnru/Mzx0bWedSdWuZ380l8wlLiucqQThhEBhEJlyd94BMNzhxFdj82w0ejp4oWb5By/WjkFNesvAyxPIo/Ir4S+fTgGpA1iO2Ms8Pdjp00qeXYsK1CfjaXOYlEP+8BxntN2JKLYb8Cgs7dLmHfUwP6gTFKlTukUTtQZYUw336q3TtGy,iv:Ab/E0ljUBxzWlXfAC2BXCYxlgo0ErvKFaubgVjFR3OU=,tag:Yr24/DofYS2lM6f2/1LQ3Q==,type:str] sops: kms: [] gcp_kms: [] @@ -33,8 +33,8 @@ sops: Q2hBZE1FOHJ3aW5rVmoyK045eG11cmsKFOmP5iWONREZvxu0rM+fKMPQKgnYq5LH AKMZFsP7nnUxjdCXEA18sDg4Rf0qp8i3uQK3D6P7417j9ye/YZA4BQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-17T03:25:37Z" - mac: ENC[AES256_GCM,data:bhFBLkT2q6HGtTPtHLVZkKZn00Lbm11/u3qSR19lU2E1SsQ7mpukvCqcTxNWtJ+HHth6yJJfgM6XABKq/9/598L2MgGuF3C/GGS3xpjwHh5RyV8t1lV8cqDaZGjGOMGx35lFQ6DoXOreQrtP/f7MKzf+nVNFr1NbTR8YhqR1xDU=,iv:+fjYlbyIyM9nLagrvE+PUhC2pT7QTsTSQX7ELZ7Wuhs=,tag:GWQv6VmIsWwFzb4bUr5CLg==,type:str] + lastmodified: "2025-01-30T17:26:39Z" + mac: ENC[AES256_GCM,data:saoalvnwHsv0CTw/cRZqibnH9oGoZTNwGUT7RePKRa8OwNzbUEzQt+Z1WrmmWoqR+omQXLE+lpOPv6uNYxvAWnIelzCGeBBCMSBxtjlTUsjts7oFo7d9C5SdTIOkzotDxryvjRupb0P7hAmEqcSUKRZipJy5MVR7VXR1XZ4fIPM=,iv:VaP05zj8L2pygi1/M4BnOV3Inf0ssaWMu+aTBkdDMys=,tag:nuZT8GMB4F0T5dHnTvHOhA==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.9.4 From d0ba9ca90b2c5447e018145c3427f221ebfd24fe Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 30 Jan 2025 12:35:19 -0500 Subject: [PATCH 62/77] make garage better Signed-off-by: cy --- hosts/chunk/default.nix | 2 -- hosts/chunk/garage.nix | 27 +++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 577e9b5..e149526 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -1,6 +1,4 @@ { - config, - lib, pkgs, ... }: diff --git a/hosts/chunk/garage.nix b/hosts/chunk/garage.nix index 75730a1..a6f39dd 100644 --- a/hosts/chunk/garage.nix +++ b/hosts/chunk/garage.nix @@ -8,6 +8,12 @@ s3_api = { s3_region = "earth"; api_bind_addr = "[::]:3900"; + root_domain = ".s3.cy7.sh"; + }; + s3_web = { + bind_addr = "[::]:3902"; + root_domain = ".web.s3.cy7.sh"; + index = "index.html"; }; admin.api_bind_addr = "[::]:3903"; rpc_bind_addr = "[::]:3901"; @@ -17,8 +23,21 @@ environmentFile = config.sops.secrets."garage/env".path; }; - services.caddy.virtualHosts."s3.cy7.sh".extraConfig = '' - import common - reverse_proxy localhost:3900 - ''; + services.caddy.virtualHosts = { + "s3.cy7.sh" = { + serverAliases = [ "*.s3.cy7.sh" ]; + extraConfig = '' + import common + reverse_proxy localhost:3900 + ''; + }; + "*.web.s3.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:3902 + ''; + "admin.s3.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:3903 + ''; + }; } From 30c82dcb4f92f028437e4645d0f40226d329eff5 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 30 Jan 2025 12:47:19 -0500 Subject: [PATCH 63/77] add sccache, some vscode changes, use kitten ssh --- .sops.yaml | 5 +++++ home/kitty.nix | 2 ++ home/niri/default.nix | 1 + home/vscode.nix | 3 ++- home/yt/ytnix.nix | 17 +++++++++++++++++ hosts/ytnix/default.nix | 8 ++++++++ secrets/yt/aws.yaml | 32 ++++++++++++++++++++++++++++++++ 7 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 secrets/yt/aws.yaml diff --git a/.sops.yaml b/.sops.yaml index 810c6cb..e067ba9 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -108,3 +108,8 @@ creation_rules: - age: - *chunk - *cy + - path_regex: secrets/yt/(.*).yaml$ + key_groups: + - age: + - *yt + - *cy \ No newline at end of file diff --git a/home/kitty.nix b/home/kitty.nix index 7134390..da676cb 100644 --- a/home/kitty.nix +++ b/home/kitty.nix @@ -67,4 +67,6 @@ "kitty_mod+o>l" = "kitten hints --type linenum"; }; }; + + programs.zsh.shellAliases."ssh" = "kitten ssh"; } diff --git a/home/niri/default.nix b/home/niri/default.nix index 67720cb..f1c8172 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -102,6 +102,7 @@ in { app-id = "com.mitchellh.ghostt"; } { app-id = "org.kde.okular"; } { app-id = "kitty"; } + { app-id = "VSCodium"; } ]; default-column-width.proportion = .5; } diff --git a/home/vscode.nix b/home/vscode.nix index 214a060..2680ffe 100644 --- a/home/vscode.nix +++ b/home/vscode.nix @@ -11,7 +11,8 @@ jnoortheen.nix-ide editorconfig.editorconfig github.github-vscode-theme - github.codespaces + github.copilot + rust-lang.rust-analyzer ]; userSettings = { "workbench.colorTheme" = "GitHub Dark Default"; diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index e0ed53c..c047e8f 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -1,5 +1,6 @@ { pkgs, + lib, ... }: { @@ -108,6 +109,8 @@ hugo ghidra sequoia + sccache + awscli2 ]; programs.waybar.enable = true; @@ -164,5 +167,19 @@ home.sessionVariables = { # to make ghidra work on xwayland _JAVA_AWT_WM_NONREPARENTING = 1; + + # sccache stuff + RUSTC_WRAPPER = "${lib.getExe pkgs.sccache}"; + SCCACHE_BUCKET = "sccache"; + SCCACHE_REGION = "earth"; + SCCACHE_ENDPOINT = "https://sccache.s3.cy7.sh"; + SCCACHE_ALLOW_CORE_DUMPS = "true"; + SCCACHE_S3_USE_SSL = "true"; + SCCACHE_CACHE_MULTIARCH = "true"; + SCCACHE_LOG_LEVEL = "warn"; + AWS_DEFAULT_REGION = "earth"; + AWS_ENDPOINT_URL = "https://s3.cy7.sh"; + AWS_ACCESS_KEY_ID = "$(cat /run/secrets/aws/key_id)"; + AWS_SECRET_ACCESS_KEY = "$(cat /run/secrets/aws/key_secret)"; }; } diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 6192e43..0bb554d 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -36,6 +36,14 @@ "tailscale/auth" = { sopsFile = ../../secrets/services/tailscale.yaml; }; + "aws/key_id" = { + sopsFile = ../../secrets/yt/aws.yaml; + owner = "yt"; + }; + "aws/key_secret" = { + sopsFile = ../../secrets/yt/aws.yaml; + owner = "yt"; + }; }; boot = { diff --git a/secrets/yt/aws.yaml b/secrets/yt/aws.yaml new file mode 100644 index 0000000..95bdf7a --- /dev/null +++ b/secrets/yt/aws.yaml @@ -0,0 +1,32 @@ +aws: + key_id: ENC[AES256_GCM,data:vxa8IS5zVOStsQaQNoPy36MeCw2KD2Th5tg=,iv:TrPukr/bpkGysf1YigBlXwaCu0H1FM6ivCVQEgnst6A=,tag:yrlcsDkLkH7U2i3JgjDaBA==,type:str] + key_secret: ENC[AES256_GCM,data:R9hFgtylEW1RphrP7/9Hi7HIb7gcQX1WDEVfnUTTzh+/0LM2Rb9CdkaleO8wNlcyYVE/jUKtqdqqrospAJ7+Zw==,iv:3+yCVqH441+oXFLI5usaQdhnE3GFhbJjMsYeRvk8xEw=,tag:STxA32cSdwPBikXyVEP5+Q==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1sy0at69err83qyml2vqu8xvwjccfws447aaadfvacj2qluw3p45s2mtrw8 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKaUZKbTVjZ1NEWlE5RzZT + T1dKdkRQajEva0tpRXhxYUlYWmw1b3MwSFZvCmhteVJ2VGhVNnZTZkJlem1OT3dL + dGlQTWdOUlo3TXNOS0wvNlpqVWpZSFEKLS0tIC9DNjY3OW1zWUlRQ1ZEOGlBRk9R + azQxMGhQejQ5M0N1YjFtSW5uVnRCQ3MKtt26G2PxIry/lppOT/NUX8jebEb5NgqO + HuHj7WT51Gtotfgb22VfGeOCaw9+pPYSjdk9WV4z57r7Z/lylALKRw== + -----END AGE ENCRYPTED FILE----- + - recipient: age10h6pg5qdpc4t0rpmksfv788a57f04n83zgqaezkjjn65nkhv547s0vxfdn + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPaVIwbExDUjJiVFpHOFJu + dk1SUHc5UDRFUENsbkg2RmQvazdEZ1NKeEhvCjVCNzdwRFN0aUZJL0pVSTI1RUxv + Ymhhc0tsSENVa1VUKzRBZk5IcjEvNFUKLS0tIFpPNlRXOVYyVnpyUmtLMTFqNlZ0 + UlYrTExEUVc0dURLR1czN3BnYzZ2VGMKCbAgM50jvs9VciA1Pb/VY+2I4x62LBGe + j7eHkfTFc8Gnk/rZA9/ZJDLFr/FUPMQWK/NVoz6oLjO6oVFXqN6OqA== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2025-01-30T17:45:09Z" + mac: ENC[AES256_GCM,data:uXnJ8DCs1ZZ72PFAmSQpqvVH2UYvRX8AeUC00A6WsgNL9sz6H0b7PwXBn4SucHACwLwilMVKYpFGE1pPMsIgpHxU5coNhvTfth/ChY1KS73LAwrJUAyUoFI3mumPkklj7b/u1CbBfhuhA2QoZVl+d9BGQn5CQu3+BySUmcT+P9k=,iv:H/hUTBDNcsGBP5TA/7U1QMZogZvuoPuEAg/tBCpbf9w=,tag:W7rH84Na/tHPuJlA9tRXEQ==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.9.4 From 1c449848e29aa5c8c0fd6241bc82d530fe9e0007 Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 31 Jan 2025 14:27:16 -0500 Subject: [PATCH 64/77] overlay cutter Signed-off-by: cy --- flake.lock | 17 +++++++++++++++++ flake.nix | 8 ++++++-- home/yt/ytnix.nix | 4 ++-- home/zsh/default.nix | 4 ++-- hosts/ytnix/default.nix | 2 ++ 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6646c08..7bd5e59 100644 --- a/flake.lock +++ b/flake.lock @@ -915,6 +915,22 @@ "type": "github" } }, + "nixpkgs-cutter": { + "locked": { + "lastModified": 1738351607, + "narHash": "sha256-jJ9u1dLnhGeAeQdmziihaka33zEwBOIKmlB6YbFcIjs=", + "owner": "cything", + "repo": "nixpkgs", + "rev": "940b291c7c6ad8e999cb34d8d5de7913f6776c26", + "type": "github" + }, + "original": { + "owner": "cything", + "ref": "cutter-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-garage": { "locked": { "lastModified": 1736921030, @@ -1208,6 +1224,7 @@ "lix-module": "lix-module", "niri": "niri", "nixpkgs": "nixpkgs_5", + "nixpkgs-cutter": "nixpkgs-cutter", "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", "nvim-github-theme": "nvim-github-theme", diff --git a/flake.nix b/flake.nix index 0f4e96a..9bf1fff 100644 --- a/flake.nix +++ b/flake.nix @@ -70,6 +70,7 @@ }; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR + nixpkgs-cutter.url = "github:cything/nixpkgs/cutter-unstable"; nvim-github-theme = { url = "github:projekt0n/github-nvim-theme"; @@ -136,7 +137,7 @@ settings.global.excludes = [ "secrets/*" - "**/*.png" # tries to format a png file?? + "**/*.png" # tries to format a png file ]; }; }; @@ -149,6 +150,9 @@ overlays = [ inputs.niri.overlays.niri inputs.rust-overlay.overlays.default + (final: prev: { + cutter = inputs.nixpkgs-cutter.legacyPackages.${prev.system}.cutter; + }) ] ++ import ./overlay; }; in @@ -169,7 +173,7 @@ ./modules inputs.lanzaboote.nixosModules.lanzaboote inputs.niri.nixosModules.niri - inputs.lix-module.nixosModules.default # broken + inputs.lix-module.nixosModules.default ]; }; chunk = lib.nixosSystem { diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index c047e8f..0aa8b30 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -111,6 +111,8 @@ sequoia sccache awscli2 + lldb + (cutter.withPlugins (plugins: [ plugins.rz-ghidra ])) ]; programs.waybar.enable = true; @@ -148,8 +150,6 @@ ''; }; - services.gnome-keyring.enable = true; - programs.direnv = { enable = true; nix-direnv.enable = true; diff --git a/home/zsh/default.nix b/home/zsh/default.nix index eb920d5..52fd38a 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -89,8 +89,8 @@ "ga" = "git add"; "gaa" = "git add --all"; "gb" = "git branch"; - "gc" = "git commit --verbose -s"; - "gcmsg" = "git commit -s --message"; + "gc" = "git commit --verbose"; + "gcmsg" = "git commit --message"; "gd" = "git diff"; "gdca" = "git diff --cached"; "gds" = "git diff --staged"; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 0bb554d..ecc2d7e 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -282,6 +282,8 @@ xdg.portal = { enable = true; wlr.enable = true; + xdgOpenUsePortal = true; + extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-gnome ]; }; programs.obs-studio = { From a31dbdaf0f02a93e781d5082ffebd110512c117f Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 31 Jan 2025 21:55:47 -0500 Subject: [PATCH 65/77] don't overlay cutter Signed-off-by: cy --- flake.lock | 17 ----------------- flake.nix | 4 ---- home/yt/ytnix.nix | 2 +- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 7bd5e59..6646c08 100644 --- a/flake.lock +++ b/flake.lock @@ -915,22 +915,6 @@ "type": "github" } }, - "nixpkgs-cutter": { - "locked": { - "lastModified": 1738351607, - "narHash": "sha256-jJ9u1dLnhGeAeQdmziihaka33zEwBOIKmlB6YbFcIjs=", - "owner": "cything", - "repo": "nixpkgs", - "rev": "940b291c7c6ad8e999cb34d8d5de7913f6776c26", - "type": "github" - }, - "original": { - "owner": "cything", - "ref": "cutter-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-garage": { "locked": { "lastModified": 1736921030, @@ -1224,7 +1208,6 @@ "lix-module": "lix-module", "niri": "niri", "nixpkgs": "nixpkgs_5", - "nixpkgs-cutter": "nixpkgs-cutter", "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", "nvim-github-theme": "nvim-github-theme", diff --git a/flake.nix b/flake.nix index 9bf1fff..38609a5 100644 --- a/flake.nix +++ b/flake.nix @@ -70,7 +70,6 @@ }; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR - nixpkgs-cutter.url = "github:cything/nixpkgs/cutter-unstable"; nvim-github-theme = { url = "github:projekt0n/github-nvim-theme"; @@ -150,9 +149,6 @@ overlays = [ inputs.niri.overlays.niri inputs.rust-overlay.overlays.default - (final: prev: { - cutter = inputs.nixpkgs-cutter.legacyPackages.${prev.system}.cutter; - }) ] ++ import ./overlay; }; in diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 0aa8b30..c72ead1 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -112,7 +112,7 @@ sccache awscli2 lldb - (cutter.withPlugins (plugins: [ plugins.rz-ghidra ])) + (cutter.withPlugins (plugins: with plugins; [ rz-ghidra jsdec sigdb ])) ]; programs.waybar.enable = true; From 95ff04af253818ac633a7e32860fa920437f620c Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 31 Jan 2025 23:44:15 -0500 Subject: [PATCH 66/77] nix-ld to make binaryninja work --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 5 +++++ hosts/ytnix/default.nix | 39 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 6646c08..7b3064c 100644 --- a/flake.lock +++ b/flake.lock @@ -883,6 +883,26 @@ "type": "github" } }, + "nix-ld": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737361468, + "narHash": "sha256-+CtIrQZ22MOAOHcpg1zbhX/fVkmEc8A8lYVpXAbXElQ=", + "owner": "nix-community", + "repo": "nix-ld", + "rev": "7f15f8622b63b907fef137689f4528a9447d9377", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-ld", + "type": "github" + } + }, "nix2container": { "flake": false, "locked": { @@ -1207,6 +1227,7 @@ "lix": "lix", "lix-module": "lix-module", "niri": "niri", + "nix-ld": "nix-ld", "nixpkgs": "nixpkgs_5", "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", diff --git a/flake.nix b/flake.nix index 38609a5..66dad85 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,10 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-compat.follows = "flake-compat"; }; + nix-ld = { + url = "github:nix-community/nix-ld"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR @@ -170,6 +174,7 @@ inputs.lanzaboote.nixosModules.lanzaboote inputs.niri.nixosModules.niri inputs.lix-module.nixosModules.default + inputs.nix-ld.nixosModules.nix-ld ]; }; chunk = lib.nixosSystem { diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index ecc2d7e..b748be0 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -276,7 +276,44 @@ programs.virt-manager.enable = true; services.usbmuxd.enable = true; - programs.nix-ld.enable = true; + programs.nix-ld.dev = { + enable = true; + # nix run github:thiagokokada/nix-alien#nix-alien-find-libs ./ + libraries = with pkgs; [ + mesa + extest + stdenv.cc.cc + libGL + fontconfig + libxkbcommon + zlib + libxml2 + dbus + freetype + egl-wayland + waylandpp + cairo + xcb-util-cursor + xorg.libX11 + xorg.libxcb + xorg.xcbutilwm + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxkbfile + xorg.libxshmfence + ]; + }; programs.evolution.enable = true; xdg.portal = { From 3510da965738ac5570d011cc58e439a43fef8764 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 1 Feb 2025 12:08:57 -0500 Subject: [PATCH 67/77] install ida-free --- home/yt/ytnix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index c72ead1..0e43354 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -113,6 +113,7 @@ awscli2 lldb (cutter.withPlugins (plugins: with plugins; [ rz-ghidra jsdec sigdb ])) + ida-free ]; programs.waybar.enable = true; From 258cce19fbf7d46086a8b517cc2c8ad67c700a84 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 1 Feb 2025 12:10:21 -0500 Subject: [PATCH 68/77] flake update Signed-off-by: cy --- flake.lock | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 7b3064c..6b42d56 100644 --- a/flake.lock +++ b/flake.lock @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1738178313, - "narHash": "sha256-/8TLf6LkXGRGERzcWMNDeXjYaHSbexmfV+ofheo7K6k=", + "lastModified": 1738428726, + "narHash": "sha256-OUoEgorFHBVnqQ2lITqs6MGN7MH4t/8hLEO29OKu6CM=", "owner": "nix-community", "repo": "home-manager", - "rev": "420a0d9506b5dac4d86a68b9ef8e763624ad86c6", + "rev": "dae6d3460c8bab3ac9f38a86affe45b32818e764", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1738174211, - "narHash": "sha256-eYmp1mKM4kULV1W+EBtCPk6LmKWl2REivaYfGRl+AWo=", + "lastModified": 1738341980, + "narHash": "sha256-xOpkKwNkpbK6lL/V48xIsONnk8PBzbf7D98EqqGpGGs=", "ref": "refs/heads/main", - "rev": "64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a", - "revCount": 17329, + "rev": "083c6de22cb306b0f1f7bd8e062ecdd72133e4e2", + "revCount": 17337, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738156024, - "narHash": "sha256-D3cox2cbtFauXz1skDTkJwSU0272wY6wRwiFNm5TV/c=", + "lastModified": 1738410471, + "narHash": "sha256-j0XZIViI4ZEFwhrEzVKz696/4DZ9pRiWtGfxJogA+MM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "541920ede8b5d48f110c94d858a1ddf283eac3b9", + "rev": "16f8e14385163479aca7231d8fab0091adac2e56", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738148186, - "narHash": "sha256-Yd2xKbZ8S4LC5sxPleuutlX0RbKnI93LhciVhneNBHQ=", + "lastModified": 1738404307, + "narHash": "sha256-BFtfL5kZbIsDAMgbVP5E0HbqDapYWw4NBw1xS0AOCCc=", "owner": "YaLTeR", "repo": "niri", - "rev": "1d3820a064f1f3b686eb6e8a1aab155681a96457", + "rev": "32ad545f842f4c176548e30d183d10e0a2bab752", "type": "github" }, "original": { @@ -832,11 +832,11 @@ ] }, "locked": { - "lastModified": 1738033138, - "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", + "lastModified": 1738277753, + "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", + "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1738178544, - "narHash": "sha256-UbM+zJFlze877N5j2YMLKYFX7t05VvmuNX2M0vJ7RfI=", + "lastModified": 1738396600, + "narHash": "sha256-fWpw3MUUidq+GzuQdgpZwk4Vh4MF6MN2HEyyT2PguGI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "975ac0ab33ee7fea64842047a96f5d679d90913c", + "rev": "6eec6bbb933a6dad6cf6afe3d51329f31d22e974", "type": "github" }, "original": { @@ -1102,11 +1102,11 @@ ] }, "locked": { - "lastModified": 1738184667, - "narHash": "sha256-+pG3UJVAdVCF3nGRpy5n/tbCzGa64DCWOC8hAxnssD0=", + "lastModified": 1738428106, + "narHash": "sha256-HpuE7jQnyOXJStEoP2AAsOTTqsdudn6xV1o+EbV8ssc=", "owner": "nix-community", "repo": "nixvim", - "rev": "2f5374c3dcd06c750c36798bce6bccdf8a25bc89", + "rev": "8f8f50243ea803304b1bd04aa56bd736fe2c28eb", "type": "github" }, "original": { @@ -1261,11 +1261,11 @@ ] }, "locked": { - "lastModified": 1738117527, - "narHash": "sha256-GFviGfaezjGLFUlxdv3zyC7rSZvTXqwcG/YsF6MDkOw=", + "lastModified": 1738376888, + "narHash": "sha256-S6ErHxkSm0iA7ZMsjjDaASWxbELYcdfv8BhOkkj1rHw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6a3dc6ce4132bd57359214d986db376f2333c14d", + "rev": "83284068670d5ae4a43641c4afb150f3446be70d", "type": "github" }, "original": { @@ -1281,11 +1281,11 @@ ] }, "locked": { - "lastModified": 1737411508, - "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", + "lastModified": 1738291974, + "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", "owner": "Mic92", "repo": "sops-nix", - "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", + "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", "type": "github" }, "original": { From 81e06a0513922790f1c6e36405f7c3981e5f79e3 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 1 Feb 2025 22:36:56 -0500 Subject: [PATCH 69/77] install plasma and use plasma-manager to configure --- flake.lock | 24 ++++++++++++++++++++++++ flake.nix | 6 ++++++ home/plasma.nix | 25 +++++++++++++++++++++++++ home/yt/ytnix.nix | 2 ++ hosts/ytnix/default.nix | 15 +++++++++++++++ 5 files changed, 72 insertions(+) create mode 100644 home/plasma.nix diff --git a/flake.lock b/flake.lock index 6b42d56..55872fd 100644 --- a/flake.lock +++ b/flake.lock @@ -1154,6 +1154,29 @@ "type": "github" } }, + "plasma-manager": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736549395, + "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=", + "owner": "nix-community", + "repo": "plasma-manager", + "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "plasma-manager", + "type": "github" + } + }, "pre-commit-hooks": { "flake": false, "locked": { @@ -1232,6 +1255,7 @@ "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", "nvim-github-theme": "nvim-github-theme", + "plasma-manager": "plasma-manager", "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", "treefmt": "treefmt" diff --git a/flake.nix b/flake.nix index 66dad85..cb60dbb 100644 --- a/flake.nix +++ b/flake.nix @@ -72,6 +72,11 @@ url = "github:nix-community/nix-ld"; inputs.nixpkgs.follows = "nixpkgs"; }; + plasma-manager = { + url = "github:nix-community/plasma-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; + }; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR @@ -218,6 +223,7 @@ ./home/yt/ytnix.nix inputs.nixvim.homeManagerModules.nixvim inputs.niri.homeModules.config + inputs.plasma-manager.homeManagerModules.plasma-manager ]; }; diff --git a/home/plasma.nix b/home/plasma.nix new file mode 100644 index 0000000..077b530 --- /dev/null +++ b/home/plasma.nix @@ -0,0 +1,25 @@ +{ ... }: +{ + programs.plasma = { + enable = true; + workspace = { + lookAndFeel = "org.ide.breezedark.desktop"; + cursor = { + theme = "Bibata-Modern-Classic"; + size = 32; + }; + }; + + fonts = { + general = { + family = "IBM Plex Mono"; + pointSize = 12; + }; + }; + + input.keyboard = { + numlockOnStartup = "on"; + options = [ "ctrl:nocaps" ]; + }; + }; +} diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 0e43354..4a8b31e 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -11,6 +11,7 @@ ../irssi.nix ../kitty.nix ../vscode.nix + ../plasma.nix ]; home = { username = "yt"; @@ -114,6 +115,7 @@ lldb (cutter.withPlugins (plugins: with plugins; [ rz-ghidra jsdec sigdb ])) ida-free + patchelf ]; programs.waybar.enable = true; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index b748be0..e0d7c1d 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -174,6 +174,8 @@ haskell-language-server ghc sbctl # secure boot + wine-wayland + wine64 ]; environment.sessionVariables = { @@ -187,6 +189,12 @@ services.displayManager = { enable = true; autoLogin.user = "yt"; + defaultSession = "plasma"; + sddm = { + enable = true; + wayland.enable = true; + autoNumlock = true; + }; }; fonts.packages = with pkgs; [ @@ -294,6 +302,8 @@ waylandpp cairo xcb-util-cursor + libplist + p11-kit xorg.libX11 xorg.libxcb xorg.xcbutilwm @@ -377,4 +387,9 @@ startAgent = true; enableAskPassword = true; }; + + services.desktopManager.plasma6 = { + enable = true; + enableQt5Integration = true; + }; } From b131f134bc9f35d2bc3286704176331bf2fb6372 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 1 Feb 2025 23:40:16 -0500 Subject: [PATCH 70/77] add kwin bindings and fix stuff --- home/plasma.nix | 44 +++++++++++++++++++++++++++++++++++++++++++- home/yt/ytnix.nix | 14 ++++++++------ 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/home/plasma.nix b/home/plasma.nix index 077b530..3d919d3 100644 --- a/home/plasma.nix +++ b/home/plasma.nix @@ -2,11 +2,13 @@ { programs.plasma = { enable = true; + overrideConfig = true; + immutableByDefault = true; workspace = { lookAndFeel = "org.ide.breezedark.desktop"; cursor = { theme = "Bibata-Modern-Classic"; - size = 32; + size = 23; }; }; @@ -21,5 +23,45 @@ numlockOnStartup = "on"; options = [ "ctrl:nocaps" ]; }; + + # Meta key is actually the Super key in KDE + + hotkeys.commands = { + "launch-terminal" = { + name = "launch terminal"; + key = "Meta+Return"; + command = "kitty"; + }; + }; + + shortcuts = { + kwin = { + "Switch Window Down" = "Meta+J"; + "Switch Window Left" = "Meta+H"; + "Switch Window Right" = "Meta+L"; + "Switch Window Up" = "Meta+K"; + "Window Quick Tile Down" = "Meta+Shift+J"; + "Window Quick Tile Left" = "Meta+Shift+H"; + "Window Quick Tile Right" = "Meta+Shift+L"; + "Window Quick Tile Up" = "Meta+Shift+K"; + "Window Close" = "Meta+Ctrl+Q"; + "Window Maximize" = "Meta+W"; + "Window Minimize" = "Meta+Shift+-"; + "Window Fullscreen" = "Meta+F"; + "Window Shrink Horizontal" = "Meta+-"; + }; + + ksmserver = { + "Lock Session" = [ + "Screensaver" + "Meta+Ctrl+L" + ]; + }; + }; + + configFile = { + # save RAM + baloofilerc."Basic Settings"."Indexing-Enabled" = false; + }; }; } diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 4a8b31e..f409021 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -22,12 +22,14 @@ systemd.user.startServices = "sd-switch"; - qt = { - enable = true; - platformTheme.name = "kde"; - style.name = "breeze-dark"; - style.package = pkgs.kdePackages.breeze; - }; + # keep this commented when using plasma + # otherwise "system settings" in KDE will not function + # qt = { + # enable = true; + # platformTheme.name = "kde"; + # style.name = "breeze-dark"; + # style.package = pkgs.kdePackages.breeze; + # }; gtk = { enable = true; From c9d700390cf37a9f2acfd8ef1d2b298ee9ec3eda Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 2 Feb 2025 10:52:53 -0500 Subject: [PATCH 71/77] manually redirect renamed repo --- hosts/chunk/forgejo.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/chunk/forgejo.nix b/hosts/chunk/forgejo.nix index 26fb541..0abc681 100644 --- a/hosts/chunk/forgejo.nix +++ b/hosts/chunk/forgejo.nix @@ -33,6 +33,10 @@ services.caddy.virtualHosts."git.cy7.sh".extraConfig = '' import common + + # renamed repo + uri replace /cy/infra /cy/nixos-config + reverse_proxy localhost:3000 ''; services.caddy.virtualHosts."git.cything.io".extraConfig = '' From 11fb3de60c14f06d0834c535a38b1cd16a50779e Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 2 Feb 2025 15:25:04 -0500 Subject: [PATCH 72/77] some more plasma config --- home/plasma.nix | 13 +++++++++++++ hosts/ytnix/default.nix | 3 +++ 2 files changed, 16 insertions(+) diff --git a/home/plasma.nix b/home/plasma.nix index 3d919d3..facdad1 100644 --- a/home/plasma.nix +++ b/home/plasma.nix @@ -32,6 +32,11 @@ key = "Meta+Return"; command = "kitty"; }; + "launch-browser" = { + name = "launch browser"; + key = "Meta+B"; + command = "librewolf"; + }; }; shortcuts = { @@ -63,5 +68,13 @@ # save RAM baloofilerc."Basic Settings"."Indexing-Enabled" = false; }; + + # looks like KDE overrides services.logind settings + powerdevil.AC = { + whenLaptopLidClosed = "hibernate"; + }; + powerdevil.battery = { + whenLaptopLidClosed = "hibernate"; + }; }; } diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index e0d7c1d..bd175eb 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -304,6 +304,9 @@ xcb-util-cursor libplist p11-kit + kdePackages.qtwayland + qt6.qtwayland + libsForQt5.qt5.qtwayland xorg.libX11 xorg.libxcb xorg.xcbutilwm From 78f94a64297c35a92d71fb7161713789d16d9baa Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 2 Feb 2025 15:26:01 -0500 Subject: [PATCH 73/77] flake update Signed-off-by: cy --- flake.lock | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 55872fd..df9e697 100644 --- a/flake.lock +++ b/flake.lock @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1738428726, - "narHash": "sha256-OUoEgorFHBVnqQ2lITqs6MGN7MH4t/8hLEO29OKu6CM=", + "lastModified": 1738448366, + "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", "owner": "nix-community", "repo": "home-manager", - "rev": "dae6d3460c8bab3ac9f38a86affe45b32818e764", + "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1738341980, - "narHash": "sha256-xOpkKwNkpbK6lL/V48xIsONnk8PBzbf7D98EqqGpGGs=", + "lastModified": 1738446528, + "narHash": "sha256-NYL/r7EXSyYP7nXuYGvGYMI9QtztGjVaKKofBt/pCv8=", "ref": "refs/heads/main", - "rev": "083c6de22cb306b0f1f7bd8e062ecdd72133e4e2", - "revCount": 17337, + "rev": "a51380645f61b33d37a536b596d16c481f7b84a6", + "revCount": 17342, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738410471, - "narHash": "sha256-j0XZIViI4ZEFwhrEzVKz696/4DZ9pRiWtGfxJogA+MM=", + "lastModified": 1738502867, + "narHash": "sha256-92cVHcxV7j00BquLo5I4G8EwKzrq2AlHuD3AQV9r+T8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "16f8e14385163479aca7231d8fab0091adac2e56", + "rev": "cf0be7affb15e21727d137c029146fe7df2bc6d0", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738404307, - "narHash": "sha256-BFtfL5kZbIsDAMgbVP5E0HbqDapYWw4NBw1xS0AOCCc=", + "lastModified": 1738479340, + "narHash": "sha256-sutel7RKfu9eIJsjswSzptCIvKELbXQCSldt0PtwSd0=", "owner": "YaLTeR", "repo": "niri", - "rev": "32ad545f842f4c176548e30d183d10e0a2bab752", + "rev": "d5592743cb04cef3fe50c987b7ba9349c5090dbd", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1738396600, - "narHash": "sha256-fWpw3MUUidq+GzuQdgpZwk4Vh4MF6MN2HEyyT2PguGI=", + "lastModified": 1738487426, + "narHash": "sha256-hnB0V0R/aKASnTBeTthFvW60uydv1xswWD4weqSuSfg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6eec6bbb933a6dad6cf6afe3d51329f31d22e974", + "rev": "8ed1fafea6a613d962f6a84c1153d34dc8b06d83", "type": "github" }, "original": { @@ -1102,11 +1102,11 @@ ] }, "locked": { - "lastModified": 1738428106, - "narHash": "sha256-HpuE7jQnyOXJStEoP2AAsOTTqsdudn6xV1o+EbV8ssc=", + "lastModified": 1738517265, + "narHash": "sha256-ZzulGUIHZhvcSHx+1ucCJkIcn27r9H+cSzCCpKxJcls=", "owner": "nix-community", "repo": "nixvim", - "rev": "8f8f50243ea803304b1bd04aa56bd736fe2c28eb", + "rev": "56d0c4579e022b44a3e324f722fa23a6f4295798", "type": "github" }, "original": { @@ -1125,11 +1125,11 @@ ] }, "locked": { - "lastModified": 1737924095, - "narHash": "sha256-9RO/IlxiE7bpY7GYsdDMNB533PnDOBo9UvYyXXqlN4c=", + "lastModified": 1738445998, + "narHash": "sha256-wF2ZcRKF37re161jrXtNyjGMBDsIFtPeDvmIVfp8f7w=", "owner": "NuschtOS", "repo": "search", - "rev": "5efc9c966bb9bdad07a3c28667eac38b758c6f18", + "rev": "381d84a7422a4dbfef6a9c7703dbaf42036ae1c3", "type": "github" }, "original": { @@ -1285,11 +1285,11 @@ ] }, "locked": { - "lastModified": 1738376888, - "narHash": "sha256-S6ErHxkSm0iA7ZMsjjDaASWxbELYcdfv8BhOkkj1rHw=", + "lastModified": 1738463259, + "narHash": "sha256-+5QJpiRpkh1ALvKcMEpPyGwkPZfaynsYF4SFdNW5UfQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "83284068670d5ae4a43641c4afb150f3446be70d", + "rev": "e2bb8c205a069514535f083742c7da8dfb6e02b9", "type": "github" }, "original": { From 0029f8f82218e05ff179983cd642dd4509b39b62 Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 2 Feb 2025 16:09:55 -0500 Subject: [PATCH 74/77] comment out gtk config --- home/yt/ytnix.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index f409021..797e9d7 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -31,17 +31,18 @@ # style.package = pkgs.kdePackages.breeze; # }; - gtk = { - enable = true; - theme = { - package = pkgs.adw-gtk3; - name = "adw-gtk3-dark"; - }; - iconTheme = { - package = pkgs.adwaita-icon-theme; - name = "Adwaita"; - }; - }; + # this one too + # gtk = { + # enable = true; + # theme = { + # package = pkgs.adw-gtk3; + # name = "adw-gtk3-dark"; + # }; + # iconTheme = { + # package = pkgs.adwaita-icon-theme; + # name = "Adwaita"; + # }; + # }; home.pointerCursor = { package = pkgs.bibata-cursors; From df2f9668f1f2d7e440eea51b3a5f702d6b24a333 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 4 Feb 2025 10:11:36 -0500 Subject: [PATCH 75/77] use ghidra-bin cause debugger works --- home/yt/ytnix.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 797e9d7..2aa25ae 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -111,14 +111,19 @@ nixpkgs-review just hugo - ghidra + ghidra-bin sequoia sccache awscli2 lldb - (cutter.withPlugins (plugins: with plugins; [ rz-ghidra jsdec sigdb ])) + (cutter.withPlugins (p: with p; [ + rz-ghidra + jsdec + sigdb + ])) ida-free patchelf + radare2 ]; programs.waybar.enable = true; From 579a3ada7725f9906d2afb7b4493391576fd6641 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 5 Feb 2025 14:08:14 -0500 Subject: [PATCH 76/77] bring cything.io to chunk --- home/yt/ytnix.nix | 1 + hosts/chunk/conduwuit.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 2aa25ae..748ba3b 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -124,6 +124,7 @@ ida-free patchelf radare2 + p7zip ]; programs.waybar.enable = true; diff --git a/hosts/chunk/conduwuit.nix b/hosts/chunk/conduwuit.nix index 8aa8998..99d3958 100644 --- a/hosts/chunk/conduwuit.nix +++ b/hosts/chunk/conduwuit.nix @@ -15,4 +15,21 @@ import common reverse_proxy localhost:8448 ''; + + services.caddy.virtualHosts."cything.io" = { + serverAliases = [ "www.cything.io" ]; + extraConfig = '' + import common + + header /.well-known/matrix/* Content-Type application/json + header /.well-known/matrix/* Access-Control-Allow-Origin * + header /.well-known/matrix/* Access-Control-Allow-Methods GET,POST,PUT,DELETE,OPTIONS,PATCH,HEAD + header /.well-known/matrix/* Access-Control-Allow-Headers X-Requested-With,Content-Type,Authorization,Origin,Accept + route { + respond /.well-known/matrix/server {"m.server":"chat.cything.io:443"} + respond /.well-known/matrix/client {"m.server":{"base_url":"https://chat.cything.io"},"m.homeserver":{"base_url":"https://chat.cything.io"},"org.matrix.msc3575.proxy":{"url":"https://chat.cything.io"}} + redir https://cy7.sh/posts{uri} permanent + } + ''; + }; } From b219d4d5de9fe739dc178856d73faaa3dd3b6669 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 5 Feb 2025 14:12:59 -0500 Subject: [PATCH 77/77] ytnix: downgrade kernel to 6.12 https://github.com/tomaspinho/rtl8821ce/issues/356 --- hosts/ytnix/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index bd175eb..b92493c 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -53,7 +53,8 @@ efi.canTouchEfiVariables = false; # toggle when installing }; tmp.cleanOnBoot = true; - kernelPackages = pkgs.linuxKernel.packages.linux_zen; + # upgrade after https://github.com/tomaspinho/rtl8821ce/issues/356 is fixed + kernelPackages = pkgs.linuxKernel.packages.linux_6_12; extraModulePackages = with config.boot.kernelPackages; [ rtl8821ce ];