From d276dea7121c741b86e410f420c35cdb48bc5528 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sun, 20 Jul 2025 02:14:20 +0200 Subject: [PATCH] changes Signed-off-by: Bloxx12 Change-Id: I6a6a696407aaf040f34e2ef257545f441b621c99 --- .gitignore | 2 +- flake.lock | 7 - flake.nix | 6 +- hosts/common.nix | 3 - modules/style/quickshell/shell/.qmlls.ini | 0 modules/system/nix/determinate.mod.nix | 12 +- npins/sources.json | 48 +++-- packages/helix/languages.nix | 29 ++- packages/nushell/config.nu | 210 +++++----------------- 9 files changed, 107 insertions(+), 210 deletions(-) delete mode 100644 flake.lock mode change 100644 => 120000 modules/style/quickshell/shell/.qmlls.ini diff --git a/.gitignore b/.gitignore index 6ae4d14..ded2432 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /.direnv -**/.qmlls.ini +.qmlls.ini diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 5999137..0000000 --- a/flake.lock +++ /dev/null @@ -1,7 +0,0 @@ -{ - "nodes": { - "root": {} - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix index 58f693a..12c4b9f 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,11 @@ _: let sources = import ./npins; - nixpkgs = (import sources.flake-compat { src = sources.nixpkgs; }).outputs; + nixpkgs = + (import sources.flake-compat { + src = sources.nixpkgs; + copySourceTreeToStore = false; + }).outputs; inherit (nixpkgs) lib; pkgsFor = nixpkgs.legacyPackages; inputs = sources; diff --git a/hosts/common.nix b/hosts/common.nix index 68f1c62..75fd334 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -12,8 +12,6 @@ let inherit (lib.meta) hiPrioSet; helix = pkgs.callPackage (self + "/packages/helix") { inherit sources; }; - - fish = pkgs.callPackage (self + "/packages/fish") { inherit sources; }; in { environment.systemPackages = @@ -46,7 +44,6 @@ in zip zoxide ; - inherit fish; } ++ builtins.attrValues (hiPrioSet { inherit helix; diff --git a/modules/style/quickshell/shell/.qmlls.ini b/modules/style/quickshell/shell/.qmlls.ini deleted file mode 100644 index a780449..0000000 --- a/modules/style/quickshell/shell/.qmlls.ini +++ /dev/null @@ -1 +0,0 @@ -/run/user/1000/quickshell/vfs/4f7a8066a49ba487f5b2754750896151/.qmlls.ini \ No newline at end of file diff --git a/modules/style/quickshell/shell/.qmlls.ini b/modules/style/quickshell/shell/.qmlls.ini new file mode 120000 index 0000000..a780449 --- /dev/null +++ b/modules/style/quickshell/shell/.qmlls.ini @@ -0,0 +1 @@ +/run/user/1000/quickshell/vfs/4f7a8066a49ba487f5b2754750896151/.qmlls.ini \ No newline at end of file diff --git a/modules/system/nix/determinate.mod.nix b/modules/system/nix/determinate.mod.nix index 74b7c72..55affa2 100644 --- a/modules/system/nix/determinate.mod.nix +++ b/modules/system/nix/determinate.mod.nix @@ -6,10 +6,16 @@ ... }: let - determinate = (import sources.flake-compat { src = sources.determinate; }).outputs; + determinate = + (import sources.flake-compat { + src = sources.determinate; + copySourceTreeToStore = false; + }).outputs; dix = - (import sources.flake-compat { src = determinate.inputs.nix; }) - .outputs.packages.${pkgs.stdenv.system}.nix; + (import sources.flake-compat { + src = determinate.inputs.nix; + copySourceTreeToStore = false; + }).outputs.packages.${pkgs.stdenv.system}.nix; # Stronger than mkDefault (1000), weaker than mkForce (50) and the "default override priority" # (100). diff --git a/npins/sources.json b/npins/sources.json index 006c756..0a9741d 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -30,20 +30,18 @@ "hash": "sha256-Z+nd/hOF4mpn1OqjvtrJZAoXwiXJ36wtoubd1kAWhmE=" }, "flake-compat": { - "type": "GitRelease", + "type": "Git", "repository": { - "type": "GitHub", - "owner": "edolstra", + "type": "Forgejo", + "server": "https://git.lix.systems/", + "owner": "lix-project", "repo": "flake-compat" }, - "pre_releases": false, - "version_upper_bound": null, - "release_prefix": null, + "branch": "main", "submodules": false, - "version": "v1.1.0", - "revision": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "url": "https://api.github.com/repos/edolstra/flake-compat/tarball/v1.1.0", - "hash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=" + "revision": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", + "url": "https://git.lix.systems/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz", + "hash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=" }, "impermanence": { "type": "Git", @@ -71,6 +69,23 @@ "url": "https://github.com/nix-community/lanzaboote/archive/5a776450d904b7ccd377c2a759703152b2553e98.tar.gz", "hash": "sha256-9Cc0YqL9ZUpaybJsrRJfXex91QlPmQNqpTLgw/KvJGA=" }, + "lix-module": { + "type": "GitRelease", + "repository": { + "type": "Forgejo", + "server": "https://git.lix.systems/", + "owner": "lix-project", + "repo": "nixos-module" + }, + "pre_releases": false, + "version_upper_bound": null, + "release_prefix": null, + "submodules": false, + "version": "2.93.1", + "revision": "c3c78a32273e89d28367d8605a4c880f0b6607e3", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/2.93.1.tar.gz", + "hash": "sha256-EfA5K5EZAnspmraJrXQlziffVpaT+QDBiE6yKmuaNNQ=" + }, "nh": { "type": "Git", "repository": { @@ -84,6 +99,19 @@ "url": "https://github.com/nix-community/nh/archive/a90e3124111d9c3eb64e97a5334db09a8e2a4bae.tar.gz", "hash": "sha256-KKaUEg1/ntHVsG61CkKFr2mfdsoK9Nj5FM/W1PBhe5o=" }, + "nil": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "oxalica", + "repo": "nil" + }, + "branch": "main", + "submodules": false, + "revision": "524ae2d67dd84d99a10f409ed6cd8e4e7b3cae3f", + "url": "https://github.com/oxalica/nil/archive/524ae2d67dd84d99a10f409ed6cd8e4e7b3cae3f.tar.gz", + "hash": "sha256-Uy2qzd+fMoBcp4NPSO7DavEC1pGMegmAqoEMvmXbIQU=" + }, "nixfmt": { "type": "GitRelease", "repository": { diff --git a/packages/helix/languages.nix b/packages/helix/languages.nix index 00b457f..1340794 100644 --- a/packages/helix/languages.nix +++ b/packages/helix/languages.nix @@ -14,8 +14,8 @@ gdb, kdePackages, lib, - nil, ruff, + nixVersions, rustPlatform, shfmt, typescript-language-server, @@ -30,24 +30,18 @@ let nixfmt = callPackage "${sources.nixfmt}/default.nix" { }; - # a newer nil version, for pipes support. - new-nil = nil.overrideAttrs (_: { - version = "unstable-18-07-2025"; - - src = fetchFromGitHub { - owner = "oxalica"; - repo = "nil"; - rev = "524ae2d67dd84d99a10f409ed6cd8e4e7b3cae3f"; - hash = "sha256-Uy2qzd+fMoBcp4NPSO7DavEC1pGMegmAqoEMvmXbIQU="; + nil = rustPlatform.buildRustPackage { + pname = "nil"; + version = "unstable"; + src = sources.nil; + cargoLock = { + lockFile = "${sources.nil}/Cargo.lock"; + allowBuiltinFetchGit = false; }; + nativeBuildInputs = [ nixVersions.latest ]; doInstallCheck = false; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit (new-nil) src; - hash = "sha256-Sljr3ff8hl/qm/0wqc1GXsEr1wWn7NAXmdrd5wHzUX8="; - }; - }); + }; new-deadnix = deadnix.overrideAttrs ( finalAttrs: previousAttrs: { @@ -65,6 +59,7 @@ let inherit (new-deadnix) src; hash = "sha256-O8yhqyPflOvQXAA19k1XpbrHysgV5VNWLBX0l5Q5GkM="; }; + meta.mainProgram = "nil"; } ); helix-languages = { @@ -274,7 +269,7 @@ let }; nil = { - command = getExe new-nil; + command = getExe nil; config.nil = { formatting.command = [ "${getExe nixfmt}" ]; diagnostics = { diff --git a/packages/nushell/config.nu b/packages/nushell/config.nu index 65a7547..076e8ad 100644 --- a/packages/nushell/config.nu +++ b/packages/nushell/config.nu @@ -107,28 +107,54 @@ $env.config.hooks = { } } -$env.config.menus = [ +let menus = [ { - marker: $"(ansi yellow)╋ " - name: help_menu - only_buffer_difference: true - style: { - description_text: yellow - selected_text: red_reverse - text: yellow - } + name: completion_menu + only_buffer_difference: false + marker: "(ansi yellow)╋ " type: { - col_padding: 2 - col_width: 20 - columns: 4 - description_rows: 10 - layout: description - selection_rows: 4 + layout: ide + min_completion_width: 0 + max_completion_width: 150 + max_completion_height: 25 + padding: 0 + border: false + cursor_offset: 0 + description_mode: "prefer_right" + min_description_width: 0 + max_description_width: 50 + max_description_height: 10 + description_offset: 1 + correct_cursor_pos: true + } + style: { + text: white + selected_text: white_reverse + description_text: yellow + match_text: { attr: u } + selected_match_text: { attr: ur } + } + } + { + name: history_menu + only_buffer_difference: true + marker: $env.PROMPT_INDICATOR + type: { + layout: list + page_size: 10 + } + style: { + text: white + selected_text: white_reverse } } ] -$env.config.keybindings = [ +$env.config.menus = $env.config.menus +| where name not-in ($menus | get name) +| append $menus + +$env.config.keybindings ++= [ { name: copy_commandline modifier: alt @@ -139,158 +165,6 @@ $env.config.keybindings = [ cmd: 'commandline | nu-highlight | $"```ansi\n($in)\n```" | wl-copy $in' } } - { - name: escape - modifier: none - keycode: escape - mode: [vi_normal vi_insert] - event: {send: esc} - } - { - name: cancel_command - modifier: control - keycode: char_c - mode: [vi_normal vi_insert] - event: {send: ctrlc} - } - { - name: quit_shell - modifier: control - keycode: char_d - mode: [vi_normal vi_insert] - event: {send: ctrld} - } - { - name: clear_screen - modifier: control - keycode: char_l - mode: [vi_normal vi_insert] - event: {send: clearscreen} - } - { - name: open_command_editor - modifier: control - keycode: char_o - mode: [vi_normal vi_insert] - event: {send: openeditor} - } - { - name: abbr - modifier: control - keycode: space - mode: [vi_normal vi_insert] - event: [ - {send: menu name: abbr_menu} - {edit: insertchar value: " "} - ] - } - { - name: move_down - modifier: none - keycode: down - mode: [vi_normal vi_insert] - event: { - until: [ - {send: menudown} - {send: down} - ] - } - } - { - name: move_left - modifier: none - keycode: left - mode: [vi_normal vi_insert] - event: { - until: [ - {send: menuleft} - {send: left} - ] - } - } - { - name: move_right_or_take_history_hint - modifier: none - keycode: right - mode: [vi_normal vi_insert] - event: { - until: [ - {send: historyhintcomplete} - {send: menuright} - {send: right} - ] - } - } - { - name: move_one_word_left - modifier: control - keycode: left - mode: [vi_normal vi_insert] - event: {edit: movewordleft} - } - { - name: move_one_word_right_or_take_history_hint - modifier: control - keycode: right - mode: [vi_normal vi_insert] - event: { - until: [ - {send: historyhintwordcomplete} - {edit: movewordright} - ] - } - } - { - name: move_to_line_start - modifier: control - keycode: char_a - mode: [vi_normal vi_insert] - event: {edit: movetolinestart} - } - { - name: move_to_line_end_or_take_history_hint - modifier: control - keycode: char_e - mode: [vi_normal vi_insert] - event: { - until: [ - {send: historyhintcomplete} - {edit: movetolineend} - ] - } - } - { - name: delete_one_character_backward - modifier: none - keycode: backspace - mode: vi_insert - event: {edit: backspace} - } - { - name: delete_one_word_backward - modifier: control - keycode: backspace - mode: vi_insert - event: {edit: backspaceword} - } - { - name: newline_or_run_command - modifier: none - keycode: enter - mode: vi_insert - event: {send: enter} - } - { - name: take_history_hint - modifier: control - keycode: char_f - mode: [vi_normal vi_insert] - event: { - until: [ - {send: historyhintcomplete} - ] - } - } ] let env_vars_file = '/tmp/nushell-env-vars'