From d5b6ec3dafda3bda654bd671cac6f941b411ba82 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 11 Jan 2025 18:53:55 -0500 Subject: [PATCH 01/10] init --- home/vscode.nix | 9 +++++++++ home/yt/ytnix.nix | 1 + 2 files changed, 10 insertions(+) create mode 100644 home/vscode.nix diff --git a/home/vscode.nix b/home/vscode.nix new file mode 100644 index 0000000..5c897e4 --- /dev/null +++ b/home/vscode.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + programs.vscode = { + enable = true; + package = pkgs.vscodium; + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; + mutableExtensionsDir = false; + }; +} diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 67f448d..45d1dd3 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -6,6 +6,7 @@ imports = [ ./common.nix ../foot.nix + ../vscode.nix ]; home = { username = "yt"; From 8c8d0fbb564cb083fcd02772db435b4a9eeb24c7 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 13 Jan 2025 15:13:10 -0500 Subject: [PATCH 02/10] some nvim and vscode changes --- home/nixvim/default.nix | 5 +++-- home/vscode.nix | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 6d453f8..2ea829b 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -147,7 +147,7 @@ servers = { bashls.enable = true; lua_ls.enable = true; - nil_ls.enable = true; + nixd.enable = true; rust_analyzer = { enable = true; installRustc = true; @@ -170,7 +170,8 @@ plugins.neo-tree = { enable = true; - closeIfLastWindow = true; + buffers.followCurrentFile.enabled = true; + window.width = 30; }; plugins.cmp-buffer.enable = true; diff --git a/home/vscode.nix b/home/vscode.nix index 5c897e4..6f099d7 100644 --- a/home/vscode.nix +++ b/home/vscode.nix @@ -5,5 +5,13 @@ enableUpdateCheck = false; enableExtensionUpdateCheck = false; 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 + ]; }; } From 5b27c6e0dca223295651edfece3497f4b03256f0 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 13 Jan 2025 19:17:14 -0500 Subject: [PATCH 03/10] flake update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index cd5c828..545c2d2 100644 --- a/flake.lock +++ b/flake.lock @@ -248,11 +248,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1736785676, + "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736523798, - "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", + "lastModified": 1736701207, + "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "130595eba61081acde9001f43de3248d8888ac4a", + "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", "type": "github" }, "original": { @@ -437,11 +437,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736715511, - "narHash": "sha256-5YAiZ3wrEJ/fzFoCwNf14xqfRTvgdcnl/+y0vye3Y6A=", + "lastModified": 1736784172, + "narHash": "sha256-dXvzw4LmupgZb2VfwclzygiIyfqjnmKhTdjHDun2rDg=", "owner": "nix-community", "repo": "nixvim", - "rev": "35d6c12626f9895cd5d8ccf5d19c3d00de394334", + "rev": "a54b752259ff16d340d270928ee603b4b9599192", "type": "github" }, "original": { @@ -545,11 +545,11 @@ ] }, "locked": { - "lastModified": 1736515725, - "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=", + "lastModified": 1736808430, + "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125", + "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8", "type": "github" }, "original": { From a8ce6936a7c3988b8736d241a9e4588b97ae4ab5 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 13 Jan 2025 20:09:39 -0500 Subject: [PATCH 04/10] use unstable-small --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 545c2d2..7110280 100644 --- a/flake.lock +++ b/flake.lock @@ -360,16 +360,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736701207, - "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", + "lastModified": 1736789786, + "narHash": "sha256-YKr7RhOtFFl7metHJ2oWmPF5//mlvasFr1jJ0gLdNyQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", + "rev": "ba9f7942037ac78a690eb7e2c15f4869c9515eb4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 66f65c4..7c921e8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "cy's flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; From 66101edde51270ef759760c8c4d16aefd0db0231 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 13 Jan 2025 20:09:51 -0500 Subject: [PATCH 05/10] swap scroll doc keys --- home/nixvim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 2ea829b..f0d2e99 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -95,8 +95,8 @@ "" = "cmp.mapping.abort()"; "" = "cmp.mapping.select_next_item()"; "" = "cmp.mapping.select_prev_item()"; - "" = "cmp.mapping.scroll_docs(-4)"; - "" = "cmp.mapping.scroll_docs(4)"; + "" = "cmp.mapping.scroll_docs(-4)"; + "" = "cmp.mapping.scroll_docs(4)"; "" = '' cmp.mapping(function(fallback) if cmp.visible() then From 22f42ec745dcc7ece974f9b4b37462cf3844c94c Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 14 Jan 2025 00:01:37 -0500 Subject: [PATCH 06/10] make vim nicer --- home/nixvim/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index f0d2e99..2b4e354 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -163,7 +163,7 @@ plugins.fzf-lua = { enable = true; keymaps = { - "ff" = "git_files"; + "ff" = "files"; "fg" = "live_grep"; }; }; @@ -174,6 +174,11 @@ window.width = 30; }; + plugins.gitsigns = { + enable = true; + settings.current_line_blame = true; + }; + plugins.cmp-buffer.enable = true; plugins.cmp-emoji.enable = true; plugins.cmp-nvim-lsp.enable = true; @@ -183,6 +188,7 @@ plugins.nvim-autopairs.enable = true; plugins.rainbow-delimiters.enable = true; plugins.web-devicons.enable = true; - plugins.gitsigns.enable = true; + plugins.auto-save.enable = true; + plugins.indent-blankline.enable = true; }; } From d35639285fa19e9d1c40b4c02e9aba59b0ee0a47 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 14 Jan 2025 10:28:29 -0500 Subject: [PATCH 07/10] change forgejo landing page to explore update git email don't include vscode in common --- home/yt/common.nix | 2 +- home/yt/ytnix.nix | 1 - hosts/chunk/forgejo.nix | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/home/yt/common.nix b/home/yt/common.nix index b4894d5..77c98fe 100644 --- a/home/yt/common.nix +++ b/home/yt/common.nix @@ -30,7 +30,7 @@ programs.git = { enable = true; userName = "cy"; - userEmail = "hi@cything.io"; + userEmail = "cy@cy7.sh"; delta = { enable = true; options = { diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 45d1dd3..67f448d 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -6,7 +6,6 @@ imports = [ ./common.nix ../foot.nix - ../vscode.nix ]; home = { username = "yt"; diff --git a/hosts/chunk/forgejo.nix b/hosts/chunk/forgejo.nix index 5b8ad1d..0b644a2 100644 --- a/hosts/chunk/forgejo.nix +++ b/hosts/chunk/forgejo.nix @@ -10,7 +10,7 @@ HTTP_PORT = 3000; HTTP_ADDR = "127.0.0.1"; DOMAIN = "git.cy7.sh"; - LANDING_PAGE = "/cy"; + LANDING_PAGE = "explore"; }; session.COOKIE_SECURE = true; service.DISABLE_REGISTRATION = true; From f327c0628ac1b3cc880abae15d94394c728425b7 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 14 Jan 2025 10:50:19 -0500 Subject: [PATCH 08/10] add codespace home --- flake.nix | 9 +++++++++ home/yt/codespace.nix | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 home/yt/codespace.nix diff --git a/flake.nix b/flake.nix index 7c921e8..f11bde6 100644 --- a/flake.nix +++ b/flake.nix @@ -165,6 +165,15 @@ inputs.nixvim.homeManagerModules.nixvim ]; }; + + "codespace@codespace" = home-manager.lib.homeManagerConfiguration { + pkgs = pkgsFor.x86_64-linux; + extraSpecialArgs = { inherit inputs outputs; }; + modules = [ + ./home/yt/codespace.nix + inputs.nixvim.homeManagerModules.nixvim + ]; + }; }; }; } diff --git a/home/yt/codespace.nix b/home/yt/codespace.nix new file mode 100644 index 0000000..6720c17 --- /dev/null +++ b/home/yt/codespace.nix @@ -0,0 +1,22 @@ +{ + pkgs, + ... +}: +{ + imports = [ + ./common.nix + ]; + home = { + username = "codespace"; + homeDirectory = "/home/codespace"; + stateVersion = "24.05"; + }; + programs.home-manager.enable = true; + + systemd.user.startServices = "sd-switch"; + + home.packages = with pkgs; [ + foot.terminfo + attic-client + ]; +} From 09b6e25b2b32a867420b00ae9692abf200a087fa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 22:47:18 -0500 Subject: [PATCH 09/10] flake.lock: Update (#23) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/65a441502c9382d41ada1adbc9bd31d6c9b00fe2?narHash=sha256-snPBgTqwn3FPZVdFC5yt7Bnk3squim1vZOZ8CObWykk%3D' (2024-12-13) → 'github:nix-community/disko/0141aabed359f063de7413f80d906e1d98c0c123?narHash=sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0%3D' (2025-01-14) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/ba9f7942037ac78a690eb7e2c15f4869c9515eb4?narHash=sha256-YKr7RhOtFFl7metHJ2oWmPF5//mlvasFr1jJ0gLdNyQ%3D' (2025-01-13) → 'github:nixos/nixpkgs/69b5cebd7cc197ee5885fa694465039c42a5c8dc?narHash=sha256-j9ysmoP7UJUEZdA1/Gjqa8zsx5gaq35PxRsaTBwgoWk%3D' (2025-01-15) • Updated input 'nixpkgs-garage': 'github:cything/nixpkgs/616be0a7b830a10d0874d569aabd40034c9151aa?narHash=sha256-KpbFF8d5cqcBF7%2Bm5fXDcPn%2BADg3kURbX49JGx18NXU%3D' (2025-01-12) → 'github:cything/nixpkgs/97f27249297bf5fbc563014ae9d4884dee27f1e0?narHash=sha256-A7knAvBOwoM5X7oNdIOKvuXYtXJpuR4O8iKHIk8EwOI%3D' (2025-01-15) • Updated input 'nixvim': 'github:nix-community/nixvim/a54b752259ff16d340d270928ee603b4b9599192?narHash=sha256-dXvzw4LmupgZb2VfwclzygiIyfqjnmKhTdjHDun2rDg%3D' (2025-01-13) → 'github:nix-community/nixvim/5b068e7f8f2b6beaa1fafe0c8b3604b63bcccc2d?narHash=sha256-gb3ujURRlI/D5Jc8PUDOpJr8RyrTwnDDIDtnQK4upso%3D' (2025-01-15) Co-authored-by: github-actions[bot] --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 7110280..89484ba 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1734088167, - "narHash": "sha256-snPBgTqwn3FPZVdFC5yt7Bnk3squim1vZOZ8CObWykk=", + "lastModified": 1736864502, + "narHash": "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=", "owner": "nix-community", "repo": "disko", - "rev": "65a441502c9382d41ada1adbc9bd31d6c9b00fe2", + "rev": "0141aabed359f063de7413f80d906e1d98c0c123", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736789786, - "narHash": "sha256-YKr7RhOtFFl7metHJ2oWmPF5//mlvasFr1jJ0gLdNyQ=", + "lastModified": 1736966948, + "narHash": "sha256-j9ysmoP7UJUEZdA1/Gjqa8zsx5gaq35PxRsaTBwgoWk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ba9f7942037ac78a690eb7e2c15f4869c9515eb4", + "rev": "69b5cebd7cc197ee5885fa694465039c42a5c8dc", "type": "github" }, "original": { @@ -392,11 +392,11 @@ }, "nixpkgs-garage": { "locked": { - "lastModified": 1736657901, - "narHash": "sha256-KpbFF8d5cqcBF7+m5fXDcPn+ADg3kURbX49JGx18NXU=", + "lastModified": 1736921030, + "narHash": "sha256-A7knAvBOwoM5X7oNdIOKvuXYtXJpuR4O8iKHIk8EwOI=", "owner": "cything", "repo": "nixpkgs", - "rev": "616be0a7b830a10d0874d569aabd40034c9151aa", + "rev": "97f27249297bf5fbc563014ae9d4884dee27f1e0", "type": "github" }, "original": { @@ -437,11 +437,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736784172, - "narHash": "sha256-dXvzw4LmupgZb2VfwclzygiIyfqjnmKhTdjHDun2rDg=", + "lastModified": 1736964246, + "narHash": "sha256-gb3ujURRlI/D5Jc8PUDOpJr8RyrTwnDDIDtnQK4upso=", "owner": "nix-community", "repo": "nixvim", - "rev": "a54b752259ff16d340d270928ee603b4b9599192", + "rev": "5b068e7f8f2b6beaa1fafe0c8b3604b63bcccc2d", "type": "github" }, "original": { From ff3df361986260228b028d6deefb977b583bfe03 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 16 Jan 2025 11:01:55 -0500 Subject: [PATCH 10/10] nvim undotree and direnv --- home/nixvim/default.nix | 1 + home/yt/ytnix.nix | 5 +++++ home/zsh/default.nix | 1 + 3 files changed, 7 insertions(+) diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 2b4e354..d90b5dd 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -190,5 +190,6 @@ plugins.web-devicons.enable = true; plugins.auto-save.enable = true; plugins.indent-blankline.enable = true; + plugins.undotree.enable = true; }; } diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 67f448d..8a725fe 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -138,4 +138,9 @@ }; 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 2dd2a84..c1df4e8 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -116,4 +116,5 @@ programs.zoxide.enableZshIntegration = true; programs.eza.enableZshIntegration = true; programs.nix-index.enableZshIntegration = false; + programs.direnv.enableZshIntegration = false; }