add tabby cat

update/fix nu stuff
try fixing env stuff (again)
2024-11-05 15:16:23 +01:00 · 2024-10-11 08:52:24 +02:00 · 2024-10-11 08:51:35 +02:00 · 2024-10-11 08:51:20 +02:00 · 2024-10-11 08:50:47 +02:00 · 2024-10-11 08:50:19 +02:00
10 changed files with 59 additions and 135 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -119,17 +119,6 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"

-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.2.0"
@ -323,7 +312,7 @@ dependencies = [
 "parking_lot",
 "signal-hook",
 "signal-hook-mio",
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@ -339,7 +328,7 @@ dependencies = [
 "parking_lot",
 "signal-hook",
 "signal-hook-mio",
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@ -348,7 +337,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@ -541,15 +530,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"

-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@ -768,16 +748,6 @@ dependencies = [
 "wasm-bindgen",
 ]

-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@ -875,7 +845,7 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
 "libc",
 "wasi",
 "windows-sys 0.52.0",
@ -899,12 +869,6 @@ dependencies = [
 "autocfg",
 ]

-[[package]]
-name = "numtoa"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
-
 [[package]]
 name = "object"
 version = "0.36.4"
@ -950,7 +914,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
 "cfg-if",
 "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall",
 "smallvec",
 "windows-targets 0.48.5",
 ]
@ -1140,15 +1104,6 @@ dependencies = [
 "unicode-width",
 ]

-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@ -1158,12 +1113,6 @@ dependencies = [
 "bitflags 1.3.2",
 ]

-[[package]]
-name = "redox_termios"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb"
-
 [[package]]
 name = "redox_users"
 version = "0.4.5"
@ -1539,33 +1488,18 @@ dependencies = [

 [[package]]
 name = "temp-file"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f210bda61d003f311d95611d1b68361df8fe8e732c3609f945441bde881321d"
-
-[[package]]
-name = "termion"
-version = "1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e"
-dependencies = [
- "libc",
- "numtoa",
- "redox_syscall 0.2.16",
- "redox_termios",
-]
+checksum = "b5ff282c3f91797f0acb021f3af7fffa8a78601f0f2fd0a9f79ee7dcf9a9af9e"

 [[package]]
 name = "termsize"
-version = "0.1.6"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e86d824a8e90f342ad3ef4bd51ef7119a9b681b0cc9f8ee7b2852f02ccd2517"
+checksum = "6f11ff5c25c172608d5b85e2fb43ee9a6d683a7f4ab7f96ae07b3d8b590368fd"
 dependencies = [
- "atty",
- "kernel32-sys",
 "libc",
- "termion",
- "winapi 0.2.8",
+ "winapi",
 ]

 [[package]]
@ -1894,12 +1828,6 @@ dependencies = [
 "rustls-pki-types",
 ]

-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@ -1910,12 +1838,6 @@ dependencies = [
 "winapi-x86_64-pc-windows-gnu",
 ]

-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
--- a/flake.lock
+++ b/flake.lock
@ -2,11 +2,11 @@
  "nodes": {
    "crane": {
      "locked": {
-        "lastModified": 1725125250,
-        "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=",
+        "lastModified": 1728344376,
+        "narHash": "sha256-lxTce2XE6mfJH8Zk6yBbqsbu9/jpwdymbSH5cCbiVOA=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f",
+        "rev": "fd86b78f5f35f712c72147427b1eb81a9bd55d0b",
        "type": "github"
      },
      "original": {
@ -23,11 +23,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1725258763,
-        "narHash": "sha256-7s5RfYlTljWnKGkK4hOMJCJ0sNQoLYjMxezX3Vijy/0=",
+        "lastModified": 1728542061,
+        "narHash": "sha256-2YAnVU67qimQGO71rCBWcv7RrRK5gYgysXe3NVomuwQ=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "0774f58cf1025bbb713971deecc7f07c856be6ed",
+        "rev": "b135535125e24270dddddc8cfab455533492e4ad",
        "type": "github"
      },
      "original": {
@ -59,11 +59,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
        "type": "github"
      },
      "original": {
@ -99,11 +99,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1724856988,
-        "narHash": "sha256-JBLe2CxAhG+J8+x8qmbzkGHNYmGcSiuY2QO4Zhb72lI=",
+        "lastModified": 1728372216,
+        "narHash": "sha256-amGNilpQ/vohlgerF/5D4QNsXCRbh2H06nmWyz/xyS8=",
        "owner": "helix-editor",
        "repo": "helix",
-        "rev": "1b5295a3f3d7cccd96eed5bfd394807a4dae87fc",
+        "rev": "761f70d61179f38152e76c1f224589a53b62d00f",
        "type": "github"
      },
      "original": {
@ -119,11 +119,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725180166,
-        "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
+        "lastModified": 1728337164,
+        "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
+        "rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
        "type": "github"
      },
      "original": {
@ -135,11 +135,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1723511168,
-        "narHash": "sha256-XDcqLVPcsMhORerIPuQ1XNALtDvG6QRA2dKyNrccXyg=",
-        "rev": "f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44",
+        "lastModified": 1727712632,
+        "narHash": "sha256-7kaZRZCWG8PmxwIDTVKjJo3VtAGDun7mqfAMlucQbdQ=",
+        "rev": "a16ceb9411c57993d811c6bebb517742fe3d34e3",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44.tar.gz?rev=f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/a16ceb9411c57993d811c6bebb517742fe3d34e3.tar.gz?rev=a16ceb9411c57993d811c6bebb517742fe3d34e3"
      },
      "original": {
        "type": "tarball",
@ -156,11 +156,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723511483,
-        "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=",
+        "lastModified": 1727752861,
+        "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=",
        "ref": "refs/heads/main",
-        "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9",
-        "revCount": 106,
+        "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d",
+        "revCount": 116,
        "type": "git",
        "url": "https://git.lix.systems/lix-project/nixos-module"
      },
@ -200,11 +200,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1725103162,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "lastModified": 1728492678,
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
        "type": "github"
      },
      "original": {
@ -230,11 +230,11 @@
    },
    "nixpkgs-unstable-small": {
      "locked": {
-        "lastModified": 1725274606,
-        "narHash": "sha256-xXINAjCR8eTmp3AxZTk/PIH9nNoFNN0OM7MUw6eB7oQ=",
+        "lastModified": 1728534991,
+        "narHash": "sha256-wLUZyvtOOowAz0kTrU2MoC4nXWniFaVezGyzuEt5HPc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "66a352a3f27a2eb2f27e42a13c6fe245d3be2b98",
+        "rev": "6b955bdbb9efe4a5c047746323951fe1bdf8d01b",
        "type": "github"
      },
      "original": {
@ -260,11 +260,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1725191098,
-        "narHash": "sha256-YH0kH5CSOnAuPUB1BUzUqvnKiv5SgDhfMNjrkki9Ahk=",
+        "lastModified": 1728505432,
+        "narHash": "sha256-QFPMazeiGLo7AGy4RREmTgko0Quch/toMVKhGUjDEeo=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "779d9eee2ea403da447278a7007c9627c8878856",
+        "rev": "0fb804acb375b02a3beeaceeb75b71969ef37b15",
        "type": "github"
      },
      "original": {
--- a/hosts/catbook-j/configuration.nix
+++ b/hosts/catbook-j/configuration.nix
@ -43,7 +43,6 @@

  environment.variables = {
    VDPAU_DRIVER = lib.mkIf config.hardware.graphics.enable (lib.mkDefault "va_gl");
-    S10E_JRNL_FILE_LOC = "/home/jade/Docs/jrnl.md";
  };

  programs.wireshark.enable = true;
--- a/10
+++ b/10
@ -1,13 +1,13 @@
-upgrade: build
+upgrade: update build

 test:
-	sudo nixos-rebuild test --flake . --impure
+	sudo nixos-rebuild test --flake . --impure --log-format multiline

 build: 
-	sudo nixos-rebuild switch --flake . --impure --fast
+	sudo nixos-rebuild switch --flake . --impure --fast --log-format multiline

 update:
-	nix flake update --commit-lock-file
+	nix flake update --commit-lock-file --log-format multiline

 build-mac:
-	sudo nixos-rebuild switch --flake . --impure --override-input mac-brcm-fw path:/home/jade/mac-brcm-fw --fast
+	sudo nixos-rebuild switch --flake . --impure --override-input mac-brcm-fw path:/home/jade/mac-brcm-fw --fast --log-format multiline
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@ -69,6 +69,9 @@ in
    };

    home-manager.users.jade = {pkgs, ...}: {
+      home.sessionVariables = {
+        "S10E_JRNL_FILE_LOC" = "/home/jade/Docs/jrnl.md";
+      };
      programs.ssh = {
        controlMaster = "yes";
      };
--- a/modules/desktop/firefox.nix
+++ b/modules/desktop/firefox.nix
@ -31,6 +31,7 @@
          "youtube-mrbeastify"
          "return-youtube-dislikes"
          "multi-account-containers"
+          "tabby-cat-friend"
        ];
        Extensions.Uninstall = [
          "google@search.mozilla.org"
--- a/modules/shell/helix.nix
+++ b/modules/shell/helix.nix
@ -20,6 +20,7 @@
    };
    programs.helix = {
      enable = true;
+      defaultEditor = true;
      package = helix-inline-diags.outputs.packages."x86_64-linux".default;
      settings = {
        theme = "gruvbox";
--- a/other/config.nu
+++ b/other/config.nu
@ -232,7 +232,6 @@ $env.config = {
    }

    color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record
-    use_grid_icons: true
    footer_mode: "25" # always, never, number_of_rows, auto
    float_precision: 2 # the precision for displaying floats in tables
    buffer_editor: "" # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL
@ -833,12 +832,6 @@ def start_zellij [] {

 # start_zellij

-# plugin add nu_plugin_net
-# plugin add nu_plugin_gstat
-# plugin add nu_plugin_query
-# plugin add nu_plugin_polars
-# plugin add nu_plugin_formats
-
 def nsp [ 
    ...programs: string
 ] {
--- a/programs/jrnl/Cargo.toml
+++ b/programs/jrnl/Cargo.toml
@ -14,5 +14,5 @@ owo-colors = "4.0.0"
 petgraph = "0.6.4"
 ratatui = "0.26.2"
 temp-file = "0.1.8"
-termsize = "0.1.6"
+termsize = "0.1.9"
 inquire = "0.7.5"
--- a/programs/jrnl/src/commands/list_entries.rs
+++ b/programs/jrnl/src/commands/list_entries.rs
@ -7,13 +7,18 @@ pub fn list_entries(path: PathBuf) -> io::Result<()> {
    let file = fs::read_to_string(path)?;

    if let Some(doc) = Doc::new(&file) {
+        // TODO: testing, so this shit doesn't blow the fuck up in our face anymore
        let termsize::Size { cols, .. } = termsize::get().unwrap();
+        assert!(cols > 0, "we don't have a terminal width.");
+
        for (i, entry) in doc.entries.into_iter().enumerate() {
            let n = format!("{:>2}", i + 1);
            let r = format!(". {}", entry.title,);
            let l = format!(" {} ", crate::utils::format_datetime(entry.timestamp));

-            let padding = " ".repeat(cols as usize - (n.len() + r.len() + l.len()));
+            let fuck_you_debugging = cols as usize - (n.len() + r.chars().count() + l.len());
+            dbg!(fuck_you_debugging);
+            let padding = " ".repeat(fuck_you_debugging);

            println!("{}{r}{padding}{}", n.cyan(), l.white())
        }
Author	SHA1	Message	Date
Schrottkatze	8d34a32f24	add tabby cat	2024-10-11 08:52:24 +02:00
Schrottkatze	da38ff265d	update/fix nu stuff	2024-10-11 08:51:35 +02:00
Schrottkatze	70145c2a66	try fixing env stuff (again)	2024-10-11 08:51:20 +02:00
Schrottkatze	6022a6e330	set log-format to multiline	2024-10-11 08:50:47 +02:00
Schrottkatze	5c16f2df1b	fix jrnl not working anymore	2024-10-11 08:50:19 +02:00
Schrottkatze	be22d9da42	flake.lock: Update Flake lock file updates: • Updated input 'crane': 'github:ipetkov/crane/96fd12c7100e9e05fa1a0a5bd108525600ce282f' (2024-08-31) → 'github:ipetkov/crane/fd86b78f5f35f712c72147427b1eb81a9bd55d0b' (2024-10-07) • Updated input 'fenix': 'github:nix-community/fenix/0774f58cf1025bbb713971deecc7f07c856be6ed' (2024-09-02) → 'github:nix-community/fenix/b135535125e24270dddddc8cfab455533492e4ad' (2024-10-10) • Updated input 'fenix/rust-analyzer-src': 'github:rust-lang/rust-analyzer/779d9eee2ea403da447278a7007c9627c8878856' (2024-09-01) → 'github:rust-lang/rust-analyzer/0fb804acb375b02a3beeaceeb75b71969ef37b15' (2024-10-09) • Updated input 'helix-inline-diags': 'github:helix-editor/helix/1b5295a3f3d7cccd96eed5bfd394807a4dae87fc' (2024-08-28) → 'github:helix-editor/helix/761f70d61179f38152e76c1f224589a53b62d00f' (2024-10-08) • Updated input 'home-manager': 'github:nix-community/home-manager/471e3eb0a114265bcd62d11d58ba8d3421ee68eb' (2024-09-01) → 'github:nix-community/home-manager/038630363e7de57c36c417fd2f5d7c14773403e4' (2024-10-07) • Updated input 'lix-module': 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=cecf70b77539c1a593f60ec9d0305b5e537ab6a9' (2024-08-13) → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d' (2024-10-01) • Updated input 'lix-module/flake-utils': 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) • Updated input 'lix-module/lix': '`f9a3bf6ccc`.tar.gz?narHash=sha256-XDcqLVPcsMhORerIPuQ1XNALtDvG6QRA2dKyNrccXyg%3D&rev=f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44' (2024-08-13) → '`a16ceb9411`.tar.gz?narHash=sha256-7kaZRZCWG8PmxwIDTVKjJo3VtAGDun7mqfAMlucQbdQ%3D&rev=a16ceb9411c57993d811c6bebb517742fe3d34e3' (2024-09-30) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/12228ff1752d7b7624a54e9c1af4b222b3c1073b' (2024-08-31) → 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7' (2024-10-09) • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/66a352a3f27a2eb2f27e42a13c6fe245d3be2b98' (2024-09-02) → 'github:NixOS/nixpkgs/6b955bdbb9efe4a5c047746323951fe1bdf8d01b' (2024-10-10)	2024-10-10 14:40:29 +02:00