From 2bbb14e3d125f46ba422abbb92f81b9ab9386dac Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Fri, 25 Jul 2025 16:59:55 +0200 Subject: [PATCH 01/10] hermit: configuration: enable nvidia --- hosts/hermit/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index c179d5e..1ff5f36 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -44,7 +44,7 @@ owncloud.enable = true; }; hardware = { - nvidia.enable = false; + nvidia.enable = true; intel.enable = true; bluetooth = { enable = true; From 5321f966782a0638b05c44a06d0290d12cf266c4 Mon Sep 17 00:00:00 2001 From: faukah Date: Sun, 17 Aug 2025 11:52:50 +0200 Subject: [PATCH 02/10] hermit: configuration: enable steam --- hosts/hermit/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index 1ff5f36..596197e 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -55,6 +55,7 @@ editors = { helix.enable = true; }; + steam.enable = true; }; sound.enable = true; }; From 1ef56a6c23751cf74d68f91c93389ce172d5ec03 Mon Sep 17 00:00:00 2001 From: faukah Date: Sun, 17 Aug 2025 11:52:58 +0200 Subject: [PATCH 03/10] hermit: configuration: remove explicit btop enabling --- hosts/hermit/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index 596197e..7a512ae 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -75,7 +75,6 @@ }; programs = { ssh.enable = true; - btop.enable = true; nh.enable = true; thunar.enable = true; }; From a0569d4520efd731b681189fb8487a310694ab80 Mon Sep 17 00:00:00 2001 From: faukah Date: Sun, 17 Aug 2025 11:53:17 +0200 Subject: [PATCH 04/10] hermit: programs: remove cinny-desktop --- hosts/hermit/programs.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index afad470..ab73f78 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -14,7 +14,6 @@ calc cargo-info cbonsai - cinny-desktop cmus difftastic dua From 3a754ce2af3ecd6dec3e798827dac29969185a83 Mon Sep 17 00:00:00 2001 From: faukah Date: Sun, 17 Aug 2025 11:53:29 +0200 Subject: [PATCH 05/10] helix: drop checkOnSave.command --- modules/home/dev/helix.hjem.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/home/dev/helix.hjem.nix b/modules/home/dev/helix.hjem.nix index 0cfd8b9..9ebe3a7 100644 --- a/modules/home/dev/helix.hjem.nix +++ b/modules/home/dev/helix.hjem.nix @@ -188,7 +188,6 @@ let rust-analyzer = { command = getExe pkgs.rust-analyzer; config.rust-analyzer = { - checkOnSave.command = "clippy"; procMacro.enable = true; cargo = { loadOutDirsFromCheck = true; From 3a9b8b490a8a23c5e5c266dcda7074b4d7069959 Mon Sep 17 00:00:00 2001 From: faukah Date: Sun, 17 Aug 2025 11:53:40 +0200 Subject: [PATCH 06/10] flake.nix: drop --- flake.nix | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 flake.nix diff --git a/flake.nix b/flake.nix deleted file mode 100644 index ff42b87..0000000 --- a/flake.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - description = "My NixOS config flake"; - - # No inputs, take this flakers - - outputs = - _: - let - sources = import ./npins; - nixpkgs = - (import sources.flake-compat { - src = sources.nixpkgs; - copySourceTreeToStore = false; - useBuiltinsFetchTree = true; - }).outputs; - inherit (nixpkgs) lib; - pkgsFor = nixpkgs.legacyPackages; - inputs = sources; - in - { - nixosConfigurations = import ./default.nix; - - packages = lib.mapAttrs (_: pkgs: { - inherit - (import ./packages { - inherit inputs pkgs sources; - }) - fish - kakoune - ; - }) pkgsFor; - devShells = lib.mapAttrs (_: pkgs: { - default = pkgs.mkShellNoCC { - packages = [ - (pkgs.callPackage (sources.npins + "/npins.nix") { }) - ]; - env.NPINS_OVERRIDE_nichts = "."; - }; - }) pkgsFor; - - templates = import ./templates; - }; -} From fbbefe26d7348a2149307ddd2a55d93ec276d52b Mon Sep 17 00:00:00 2001 From: faukah Date: Sun, 31 Aug 2025 13:28:30 +0200 Subject: [PATCH 07/10] templates: drop --- templates/default.nix | 6 ------ templates/rust/.envrc | 1 - templates/rust/Cargo.toml | 5 ----- templates/rust/default.nix | 8 -------- templates/rust/flake.nix | 36 ------------------------------------ templates/rust/src/main.rs | 3 --- 6 files changed, 59 deletions(-) delete mode 100644 templates/default.nix delete mode 100644 templates/rust/.envrc delete mode 100644 templates/rust/Cargo.toml delete mode 100644 templates/rust/default.nix delete mode 100644 templates/rust/flake.nix delete mode 100644 templates/rust/src/main.rs diff --git a/templates/default.nix b/templates/default.nix deleted file mode 100644 index 0dea28b..0000000 --- a/templates/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - rust = { - path = ./rust; - description = "Rust project template"; - }; -} diff --git a/templates/rust/.envrc b/templates/rust/.envrc deleted file mode 100644 index 3550a30..0000000 --- a/templates/rust/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/templates/rust/Cargo.toml b/templates/rust/Cargo.toml deleted file mode 100644 index 892d1eb..0000000 --- a/templates/rust/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[package] -name = "sample-rust" -version = "0.0.1" -license = "GPL-3.0-only" -edition = "2024" diff --git a/templates/rust/default.nix b/templates/rust/default.nix deleted file mode 100644 index 3d6c889..0000000 --- a/templates/rust/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ rustPlatform }: -rustPlatform.buildRustPackage { - pname = "some-rust-package"; - version = "0.0.1"; - - src = ./.; - cargoLock.lockFile = ./Cargo.lock; -} diff --git a/templates/rust/flake.nix b/templates/rust/flake.nix deleted file mode 100644 index 2bc9461..0000000 --- a/templates/rust/flake.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - description = "Rust project template"; - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - systems.url = "github:nix-systems/default-linux"; - }; - - outputs = - inputs: - let - inherit (inputs.nixpkgs) lib; - inherit (lib.attrsets) genAttrs mapAttrs; - - eachSystem = genAttrs (import inputs.systems); - pkgsFor = inputs.nixpkgs.legacyPackages; - in - { - packages = eachSystem (system: { - default = inputs.self.packages.${system}.ralc; - ralc = pkgsFor.${system}.callPackage ./nix/package.nix { }; - }); - - devShells = mapAttrs (_: pkgs: { - default = pkgs.mkShell { - packages = with pkgs; [ - cargo - rustc - rustfmt - bacon - rust-analyzer - rustPackages.clippy - ]; - }; - }) pkgsFor; - }; -} diff --git a/templates/rust/src/main.rs b/templates/rust/src/main.rs deleted file mode 100644 index 47ad8c6..0000000 --- a/templates/rust/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("Hello World!"); -} From 23da87bccf7305ace919e77d777a69e082597a75 Mon Sep 17 00:00:00 2001 From: faukah Date: Sun, 31 Aug 2025 13:28:38 +0200 Subject: [PATCH 08/10] npins: update sources --- npins/sources.json | 81 +++++++++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 34 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index bad3715..8fd0d9e 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -9,9 +9,9 @@ }, "branch": "master", "submodules": false, - "revision": "995b210e86c9d89cdabbdee622681389ce6c95ac", - "url": "https://github.com/nix-community/comma/archive/995b210e86c9d89cdabbdee622681389ce6c95ac.tar.gz", - "hash": "sha256-dNek1a8Yt3icWc8ZpVe1NGuG+eSoTDOmAAJbkYmMocU=" + "revision": "531e5219b25c1584461cc4b7fb11729a9b928b2b", + "url": "https://github.com/nix-community/comma/archive/531e5219b25c1584461cc4b7fb11729a9b928b2b.tar.gz", + "hash": "sha256-QmHTqpPugYmv7as7DqbVQLiXKdm73f0EpMg7nZvHQQQ=" }, "flake-compat": { "type": "Git", @@ -27,6 +27,19 @@ "url": "https://git.lix.systems/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz", "hash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=" }, + "ghostty": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "ghostty-org", + "repo": "ghostty" + }, + "branch": "main", + "submodules": false, + "revision": "d3cadf24952a6088affee9f752f75c3db8287801", + "url": "https://github.com/ghostty-org/ghostty/archive/d3cadf24952a6088affee9f752f75c3db8287801.tar.gz", + "hash": "sha256-OKeY9b+enmrLNKV9J2OCWYWNDC6MZuBbObknFCK8Qfs=" + }, "hjem": { "type": "Git", "repository": { @@ -36,9 +49,9 @@ }, "branch": "main", "submodules": false, - "revision": "3093a74542b30f8155954d585d0ae2401e3adbe5", - "url": "https://github.com/feel-co/hjem/archive/3093a74542b30f8155954d585d0ae2401e3adbe5.tar.gz", - "hash": "sha256-LzojKFWAAreWyH56aupj/MLwuPPnnyzplw/xdbavC9c=" + "revision": "2426d6ad20e767895e936ed0c9563cc4e2b6c96f", + "url": "https://github.com/feel-co/hjem/archive/2426d6ad20e767895e936ed0c9563cc4e2b6c96f.tar.gz", + "hash": "sha256-WJ70Dv+tJjIl7mMOqUgcdcz+RrujDRoeKptiU6oh1lI=" }, "impermanence": { "type": "Git", @@ -62,9 +75,9 @@ }, "branch": "master", "submodules": false, - "revision": "785a5701b22259b85735301b1aad19c2bee15498", - "url": "https://github.com/nix-community/lanzaboote/archive/785a5701b22259b85735301b1aad19c2bee15498.tar.gz", - "hash": "sha256-pZQyCkqIFwGA77np+vqVQZgg2P0qPAI6x6kC3w6+PjE=" + "revision": "892cbdca865d6b42f9c0d222fe309f7720259855", + "url": "https://github.com/nix-community/lanzaboote/archive/892cbdca865d6b42f9c0d222fe309f7720259855.tar.gz", + "hash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=" }, "lix": { "type": "Git", @@ -76,9 +89,9 @@ }, "branch": "main", "submodules": false, - "revision": "321807a40e1fdd44d950ff01746c95cb6e2eced3", - "url": "https://git.lix.systems/lix-project/lix/archive/321807a40e1fdd44d950ff01746c95cb6e2eced3.tar.gz", - "hash": "sha256-2sDX5Nv/DGIzZH+3pIlAUpZfVlMGz7Hl/mqHUaic+p8=" + "revision": "fe6395cd4d7aa1ffd415cb2267ff431b5c66152f", + "url": "https://git.lix.systems/lix-project/lix/archive/fe6395cd4d7aa1ffd415cb2267ff431b5c66152f.tar.gz", + "hash": "sha256-AGzXkcbafClvd31K/C/Nb9MByIws+WV0lYKQ1JzvVQA=" }, "lix-module": { "type": "Git", @@ -90,9 +103,9 @@ }, "branch": "main", "submodules": false, - "revision": "4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f.tar.gz", - "hash": "sha256-gbpuESxl/An4GTh7QEbQRYJozVIxWkwVGbWK0/0GoRc=" + "revision": "1c906dd92e032bcb5a27f98cf53833cae889537f", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/1c906dd92e032bcb5a27f98cf53833cae889537f.tar.gz", + "hash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=" }, "nh": { "type": "Git", @@ -103,9 +116,9 @@ }, "branch": "master", "submodules": false, - "revision": "ec34a659652d98c225e2a97d100830365d7551c3", - "url": "https://github.com/nix-community/nh/archive/ec34a659652d98c225e2a97d100830365d7551c3.tar.gz", - "hash": "sha256-+MuFPjyJl3JbNVs3Xq9dATJEbEOvwF4LMUNMmmzO7mU=" + "revision": "6cd62b00023932effbf57f21879f4d2deae4b256", + "url": "https://github.com/nix-community/nh/archive/6cd62b00023932effbf57f21879f4d2deae4b256.tar.gz", + "hash": "sha256-28NHVSsYAp4vdSApAmbbdkG4bjhBODPDiyx/E4uMGpc=" }, "nil": { "type": "Git", @@ -116,9 +129,9 @@ }, "branch": "main", "submodules": false, - "revision": "cd7a6f6d5dc58484e62a8e85677e06e47cf2bd4d", - "url": "https://github.com/oxalica/nil/archive/cd7a6f6d5dc58484e62a8e85677e06e47cf2bd4d.tar.gz", - "hash": "sha256-fK4INnIJQNAA8cyjcDRZSPleA+N/STI6I0oBDMZ2r+E=" + "revision": "f80fe365cb441624d1608235e6e793e5dce47fb0", + "url": "https://github.com/oxalica/nil/archive/f80fe365cb441624d1608235e6e793e5dce47fb0.tar.gz", + "hash": "sha256-nFK2XhrDS5igmkDQWmyTcgiJsEr3KOcR31DaSy+Fy9s=" }, "niri": { "type": "GitRelease", @@ -155,8 +168,8 @@ "nixpkgs": { "type": "Channel", "name": "nixpkgs-unstable", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre836767.e44b8dc0882d/nixexprs.tar.xz", - "hash": "sha256-euf3HhNllLzdAjWqfM+sgM8WE8H8sl7O61LpjOxsQN8=" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre852965.c3e5d9f86b3f/nixexprs.tar.xz", + "hash": "sha256-izg2LuZgjCZx+B6J+lYhk1Jo4L0yAHsZTRD8vHRhD9A=" }, "npins": { "type": "Git", @@ -167,9 +180,9 @@ }, "branch": "master", "submodules": false, - "revision": "afa9fe50cb0bff9ba7e9f7796892f71722b2180d", - "url": "https://github.com/andir/npins/archive/afa9fe50cb0bff9ba7e9f7796892f71722b2180d.tar.gz", - "hash": "sha256-D6dYAMk9eYpBriE07s8Q7M3WBT7uM9pz3RKIoNk+h7I=" + "revision": "e4683671e145c652c371b6b8ad9b0d757c88853c", + "url": "https://github.com/andir/npins/archive/e4683671e145c652c371b6b8ad9b0d757c88853c.tar.gz", + "hash": "sha256-Nu86s1xok+1EFM0J9e55hrYPgfoutEZUDBpeXReCOaY=" }, "quickshell": { "type": "Git", @@ -179,9 +192,9 @@ }, "branch": "master", "submodules": false, - "revision": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda", + "revision": "f7597cdae2d537c5b12843599955856090dc49d5", "url": null, - "hash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=" + "hash": "sha256-UkKaPXTPzT7HAcBOV4NlWx2GAEJaTf0eb5OX6Q6jPqg=" }, "spicetify-nix": { "type": "Git", @@ -192,9 +205,9 @@ }, "branch": "master", "submodules": false, - "revision": "26c488b60360e15db372483d826cec89ac532980", - "url": "https://github.com/Gerg-L/spicetify-nix/archive/26c488b60360e15db372483d826cec89ac532980.tar.gz", - "hash": "sha256-Ow+qyFckroPS4SQFHcFZ8mKh3HIQ2pQdC6DRjiYF9EE=" + "revision": "2bedaf52261ef2adbe71af70820aeb41dfe9a5ef", + "url": "https://github.com/Gerg-L/spicetify-nix/archive/2bedaf52261ef2adbe71af70820aeb41dfe9a5ef.tar.gz", + "hash": "sha256-lD4Zn37DWEx0X1DqM3npH68b7oh81H8BaaO3c6Ol/DQ=" }, "systems": { "type": "Git", @@ -218,9 +231,9 @@ }, "branch": "main", "submodules": false, - "revision": "154724c7b1bd49654ea55df719e1eb3219ec2000", - "url": "https://github.com/notashelf/watt/archive/154724c7b1bd49654ea55df719e1eb3219ec2000.tar.gz", - "hash": "sha256-hw3rL4rlIlYJMTeE7DlQ3lRhQDJURAhE+PC/NT4VAAQ=" + "revision": "f68a9795616699870d213dc9e641dab655aa434a", + "url": "https://github.com/notashelf/watt/archive/f68a9795616699870d213dc9e641dab655aa434a.tar.gz", + "hash": "sha256-pETi/Fs+8FF2ZuE+JyK9+NcFaDPMHx71UdWgmzjxvkQ=" } }, "version": 6 From 098a44be9b0a4de7ade41a9a175a25ec2855a601 Mon Sep 17 00:00:00 2001 From: faukah Date: Sun, 31 Aug 2025 13:28:55 +0200 Subject: [PATCH 09/10] hjem: switch to flake-compat --- modules/home/hjem.mod.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/home/hjem.mod.nix b/modules/home/hjem.mod.nix index 43838e6..1593737 100644 --- a/modules/home/hjem.mod.nix +++ b/modules/home/hjem.mod.nix @@ -15,7 +15,13 @@ let in { - imports = [ (sources.hjem + "/modules/nixos") ]; + imports = [ + (import sources.flake-compat { + src = sources.hjem; + copySourceTreeToStore = false; + useBuiltinsFetchTree = true; + }).outputs.nixosModules.default + ]; config = { hjem = { From 9e849b95a8e0d6630d576c8794ecfaebff11601b Mon Sep 17 00:00:00 2001 From: faukah Date: Sun, 31 Aug 2025 13:29:11 +0200 Subject: [PATCH 10/10] packages: drop --- packages/default.nix | 16 ----- packages/fish/aliases.nix | 26 -------- packages/fish/config.fish | 1 - packages/fish/default.nix | 45 -------------- packages/fish/fishinit.nix | 34 ---------- packages/fish/packages.nix | 67 -------------------- packages/fish/starship.nix | 123 ------------------------------------- packages/kakoune.nix | 69 --------------------- 8 files changed, 381 deletions(-) delete mode 100644 packages/default.nix delete mode 100644 packages/fish/aliases.nix delete mode 100644 packages/fish/config.fish delete mode 100644 packages/fish/default.nix delete mode 100644 packages/fish/fishinit.nix delete mode 100644 packages/fish/packages.nix delete mode 100644 packages/fish/starship.nix delete mode 100644 packages/kakoune.nix diff --git a/packages/default.nix b/packages/default.nix deleted file mode 100644 index bacd417..0000000 --- a/packages/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - inputs, - pkgs, - sources, -}: -let - inherit (pkgs) lib; - kakoune = pkgs.callPackage ./kakoune.nix { }; - fish = pkgs.callPackage ./fish { inherit lib; }; -in -{ - inherit - kakoune - fish - ; -} diff --git a/packages/fish/aliases.nix b/packages/fish/aliases.nix deleted file mode 100644 index e200f6c..0000000 --- a/packages/fish/aliases.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs, ... }: -let - inherit (pkgs.lib) getExe; -in -{ - ls = "${getExe pkgs.eza} --icons=never"; - la = "${getExe pkgs.eza} --icons=never -lha --git"; - - g = "git"; - n = "nix"; - k = "kak"; - - c = "clear"; - cc = "cd ~ && clear"; - mv = "mv -iv"; - rm = "${pkgs.trash-cli}/bin/trash"; - lg = "${getExe pkgs.lazygit}"; - - ytopus = "yt-dlp -x --embed-metadata --audio-quality 0 --audio-format opus --embed-metadata --embed-thumbnail"; - - cat = "${getExe pkgs.bat}"; - - kys = "shutdown now"; - - cd = "z"; -} diff --git a/packages/fish/config.fish b/packages/fish/config.fish deleted file mode 100644 index 37afd25..0000000 --- a/packages/fish/config.fish +++ /dev/null @@ -1 +0,0 @@ -set fish_greeting diff --git a/packages/fish/default.nix b/packages/fish/default.nix deleted file mode 100644 index 8b09cfb..0000000 --- a/packages/fish/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -# This shell setup was originally inspired by sioodmy. -# Some further cool tricks, like using vendor_conf.d to avoid having -# to build fish myself, are taken from viperml's setup. -{ pkgs, ... }: -let - inherit (pkgs) lib; - inherit (lib.strings) concatStringsSep; - inherit (lib.attrsets) mapAttrsToList; - - toml = pkgs.formats.toml { }; - starship-config = import ./starship.nix; - aliases = import ./aliases.nix { inherit pkgs; }; - vendorConf = "share/fish/vendor_conf.d"; - - fishinit = import ./fishinit.nix { - inherit - pkgs - aliasesStr - vendorConf - ; - }; - - aliasesStr = mapAttrsToList (k: v: "alias ${k}=\"${v}\"") aliases |> concatStringsSep "\n"; - - packages = import ./packages.nix pkgs; -in -(pkgs.symlinkJoin { - name = "fish"; - paths = [ pkgs.fish ] ++ packages; - nativeBuildInputs = [ pkgs.makeWrapper ]; - postBuild = '' - wrapProgram $out/bin/fish \ - --set STARSHIP_CONFIG "${toml.generate "starship.toml" starship-config}" \ - --prefix XDG_DATA_DIRS : "${ - lib.makeSearchPathOutput "out" "share" [ - fishinit - ] - }" - ''; -}).overrideAttrs - (_: { - passthru = { - shellPath = "/bin/fish"; - }; - }) diff --git a/packages/fish/fishinit.nix b/packages/fish/fishinit.nix deleted file mode 100644 index b818cce..0000000 --- a/packages/fish/fishinit.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - pkgs, - aliasesStr, - vendorConf, -}: -pkgs.writeTextDir "${vendorConf}/blox_config.fish" - # fish - '' - # source ${pkgs.fishPlugins.sponge}/share/zsh-defer/zsh-defer.plugin.zsh - ${pkgs.atuin}/bin/atuin init fish | source - bind up _atuin_bind_up - - ${pkgs.zoxide}/bin/zoxide init fish | source - # abbr --erase cd &>/dev/null - # alias cd=__zoxide_z - - # abbr --erase ci &>/dev/null - # alias ci=__zoxide_zi - - - ${pkgs.starship}/bin/starship init fish | source - ${pkgs.direnv}/bin/direnv hook fish | source - ${pkgs.pay-respects}/bin/pay-respects fish --alias f --nocnf | source - - # I need to source /etc/profile using foreign-env, to get stuff set by nixos, e.g. environment.systemVariables. - # set -p fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d - - # fenv source /etc/profile - - source ${./config.fish} - - - ${aliasesStr} - '' diff --git a/packages/fish/packages.nix b/packages/fish/packages.nix deleted file mode 100644 index 3a3aacb..0000000 --- a/packages/fish/packages.nix +++ /dev/null @@ -1,67 +0,0 @@ -pkgs: -builtins.attrValues { - inherit (pkgs) - # better cd - zoxide - # pipe viewer - pv - # hex editor - bvi - #better ls - eza - atuin - # better cat - bat - # clipboard - # yazi - serpl - diff-so-fancy - tig - direnv - sesh - mprocs - curlie - entr - procs - sd - # mult - glow - # dua-cli - dust - kondo - # better grep - ripgrep - # IP stuff - dig - # simply the best fetch tool out there - microfetch - fzf - element - difftastic - hexyl - yazi - gnumake - asciinema - inetutils - tokei - starship - wget - cpufetch - watchman - # yt-dlp # borked check phase - tealdeer - hyperfine - imagemagick - ffmpeg-full - # catimg - timg - nmap - fd - jq - rsync - figlet - unzip - zip - trash-cli - ; -} diff --git a/packages/fish/starship.nix b/packages/fish/starship.nix deleted file mode 100644 index dec32be..0000000 --- a/packages/fish/starship.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ - add_newline = false; - aws.symbol = " "; - buf.symbol = " "; - bun.symbol = " "; - c.symbol = " "; - cmake.symbol = " "; - conda.symbol = " "; - cpp.symbol = " "; - crystal.symbol = " "; - dart.symbol = " "; - deno.symbol = " "; - directory.read_only = " 󰌾"; - docker_context.symbol = " "; - elixir.symbol = " "; - elm.symbol = " "; - fennel = { - symbol = " "; - }; - fossil_branch = { - symbol = " "; - }; - gcloud = { - symbol = " "; - }; - git_branch = { - symbol = " "; - }; - git_commit = { - tag_symbol = "  "; - }; - golang.symbol = " "; - gradle = { - symbol = " "; - }; - guix_shell = { - symbol = " "; - }; - haskell = { - symbol = " "; - }; - haxe = { - symbol = " "; - }; - hg_branch = { - symbol = " "; - }; - hostname = { - ssh_symbol = " "; - }; - java = { - symbol = " "; - }; - julia = { - symbol = " "; - }; - kotlin = { - symbol = " "; - }; - lua = { - symbol = " "; - }; - memory_usage = { - symbol = "󰍛 "; - }; - meson = { - symbol = "󰔷 "; - }; - nim = { - symbol = "󰆥 "; - }; - nix_shell = { - symbol = " "; - }; - nodejs = { - symbol = " "; - }; - ocaml = { - symbol = " "; - }; - os = { - symbols = { - Linux = " "; - NixOS = " "; - }; - }; - package = { - symbol = "󰏗 "; - }; - perl = { - symbol = " "; - }; - php = { - symbol = " "; - }; - pijul_channel = { - symbol = " "; - }; - pixi = { - symbol = "󰏗 "; - }; - python = { - symbol = " "; - }; - rlang = { - symbol = "󰟔 "; - }; - ruby = { - symbol = " "; - }; - rust = { - symbol = "󱘗 "; - }; - scala = { - symbol = " "; - }; - swift = { - symbol = " "; - }; - zig = { - symbol = " "; - }; -} diff --git a/packages/kakoune.nix b/packages/kakoune.nix deleted file mode 100644 index 73fde0b..0000000 --- a/packages/kakoune.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - fetchFromGitHub, - makeWrapper, - stdenv, - symlinkJoin, - kakounePlugins, - ... -}: -let - custom-kakoune = stdenv.mkDerivation { - name = "custom-kakoune"; - src = fetchFromGitHub { - owner = "mawww"; - repo = "kakoune"; - rev = "da5e5bc635fa6a3def21d3d59906b9ee0f1d1831"; - hash = "sha256-+xqJrJr6nnmEpQaizQ3JMDEISCD8IMB84NJZiXJ74kY="; - }; - - makeFlags = [ - "debug=no" - "PREFIX=${placeholder "out"}" - ]; - - enableParallellBuilding = true; - - doInstallCheck = false; - installCheckPhase = '' - $out/bin/kak -ui json -e "kill 0" - ''; - postInstall = '' - cd "$out/share/kak" - autoload_target=$(readlink autoload) - rm autoload - mkdir autoload - ln -s --relative "$autoload_target" autoload - ''; - }; - plugins = builtins.attrValues { - inherit (kakounePlugins) ; - }; - - kakoune-wrapped = symlinkJoin { - name = "kakoune-wrapped"; - nativeBuildInputs = [ makeWrapper ]; - paths = [ custom-kakoune ] ++ plugins; - - postBuild = '' - # create a directory for bins that kakoune needs - # access to, without polluting the users path by adding - # that binary nested with this symlinkJoin. - mkdir -p $out/share/kak/bin - - # location of kak binary is used to find ../share/kak/autoload, - # unless explicitly overriden with KAKOUNE_RUNTIME - rm "$out/bin/kak" - makeWrapper "${custom-kakoune}/bin/kak" "$out/bin/kak" \ - --set KAKOUNE_RUNTIME "$out/share/kak" \ - --suffix PATH : "$out/share/kak/bin" - - # currently kakoune ignores doc files if they are symlinks, so workaround by - # copying doc files over, so they become regular files... - mkdir "$out/DELETE_ME" - mv "$out/share/kak/doc" "$out/DELETE_ME" - cp -r --dereference "$out/DELETE_ME/doc" "$out/share/kak" - rm -Rf "$out/DELETE_ME" - ''; - }; -in -kakoune-wrapped