diff --git a/Cargo.lock b/Cargo.lock index 0be5f80..9702d07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 4 +version = 3 [[package]] name = "addr2line" @@ -400,10 +400,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" -[[package]] -name = "flip-bool" -version = "0.1.0" - [[package]] name = "fnv" version = "1.0.7" diff --git a/Cargo.toml b/Cargo.toml index 208cd50..60afbd9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] resolver = "2" -members = [ "programs/bar-pinger", "programs/bar-ws-monitor", "programs/flip-bool", +members = [ "programs/bar-pinger", "programs/bar-ws-monitor", "programs/jrnl" , "programs/traveldings"] diff --git a/common.nix b/common.nix index 764bee3..94f3d5f 100644 --- a/common.nix +++ b/common.nix @@ -13,6 +13,15 @@ with lib; with builtins; { imports = [lix-module.nixosModules.default]; nix = { + package = pkgs.nixVersions.stable; + settings = { + extra-substituters = [ + "https://cache.lix.systems" + ]; + trusted-public-keys = [ + "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" + ]; + }; extraOptions = '' experimental-features = nix-command flakes keep-outputs = true @@ -57,6 +66,7 @@ with builtins; { cool-retro-term maven + zed-editor jetbrains.idea-ultimate jdk @@ -129,6 +139,15 @@ with builtins; { nixpkgs.config.packageOverrides = pkgs: { sudo = pkgs.sudo.override {withInsults = true;}; + google-fonts = pkgs.google-fonts.overrideAttrs (oldAttrs: { + src = pkgs.fetchFromGitHub { + owner = "google"; + repo = "fonts"; + rev = "c06520efccd2c99d970b536d4f62cb4d95b4e6b2"; + sha256 = "sha256-9TzeihEKIEDRtDuv+NmLWjTpoGnBR+RP/jIBfB1O06U="; + }; + installPhase = oldAttrs.installPhase + "mv $out/share/fonts/truetype $out/share/fonts/ttf"; + }); }; security.sudo.extraConfig = "Defaults insults"; diff --git a/flake.lock b/flake.lock index 02ae1c6..1162a64 100644 --- a/flake.lock +++ b/flake.lock @@ -2,26 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1741481578, - "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", + "lastModified": 1736566337, + "narHash": "sha256-SC0eDcZPqISVt6R0UfGPyQLrI0+BppjjtQ3wcSlk0oI=", "owner": "ipetkov", "repo": "crane", - "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { - "locked": { - "lastModified": 1727060013, - "narHash": "sha256-/fC5YlJy4IoAW9GhkJiwyzk0K/gQd9Qi4rRcoweyG9E=", - "owner": "ipetkov", - "repo": "crane", - "rev": "6b40cc876c929bfe1e3a24bf538ce3b5622646ba", + "rev": "9172acc1ee6c7e1cbafc3044ff850c568c75a5a3", "type": "github" }, "original": { @@ -38,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1741588215, - "narHash": "sha256-XTZ051fwGcDPtCUSb7gJv5BsUPYcvjH9mFjVZboMIKQ=", + "lastModified": 1736577158, + "narHash": "sha256-ngnAENZ+vmzOFgnj0EDtHj22nuH7MQB+EqzUmdbvaqA=", "owner": "nix-community", "repo": "fenix", - "rev": "49b0989891f48cbfe6fc288ea76c3efa84000ed5", + "rev": "05dcdb02ea657f81b13d99bd0ca36b09d25f4c43", "type": "github" }, "original": { @@ -51,50 +36,28 @@ "type": "github" } }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "typst-within", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1727245890, - "narHash": "sha256-B4gUhZxqdn24PqL7z7ZuvLOS84HVskhKRByWdgA4/RI=", - "owner": "nix-community", - "repo": "fenix", - "rev": "de3acda8b67b92abeeb35ac236924afd959874ad", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "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=", @@ -124,6 +87,31 @@ "type": "github" } }, + "helix-inline-diags": { + "inputs": { + "crane": [ + "crane" + ], + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1736602937, + "narHash": "sha256-KVw1PMrxlC1m+FT99BQxOO2nG2zQ5xDCoDgH7u3kO8A=", + "owner": "helix-editor", + "repo": "helix", + "rev": "b26903cd13fdf8976bda43abbc5e85a50130d12f", + "type": "github" + }, + "original": { + "owner": "helix-editor", + "repo": "helix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -131,11 +119,11 @@ ] }, "locked": { - "lastModified": 1741613526, - "narHash": "sha256-HUEfRLqCy47BQ7kOG4SRVhqE7J6lkFzAagnd13I17qk=", + "lastModified": 1736508663, + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "owner": "nix-community", "repo": "home-manager", - "rev": "3593ee59a44974b8518829a5239b2f77222e3c81", + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "type": "github" }, "original": { @@ -147,11 +135,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1738174211, - "narHash": "sha256-eYmp1mKM4kULV1W+EBtCPk6LmKWl2REivaYfGRl+AWo=", - "rev": "64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a", + "lastModified": 1733448312, + "narHash": "sha256-id5U81bzXk/Lg900nGLM4CQb0wmTdzIvQz7CZk2OcTM=", + "rev": "2a9e560570982a91937d199af3e7b7a8f3cbe14b", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a.tar.gz?rev=64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a9e560570982a91937d199af3e7b7a8f3cbe14b.tar.gz?rev=2a9e560570982a91937d199af3e7b7a8f3cbe14b" }, "original": { "type": "tarball", @@ -160,7 +148,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -168,11 +156,11 @@ ] }, "locked": { - "lastModified": 1738176840, - "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=", + "lastModified": 1733522213, + "narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=", "ref": "refs/heads/main", - "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e", - "revCount": 133, + "rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea", + "revCount": 124, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -184,7 +172,7 @@ "mac-brcm-fw": { "flake": false, "locked": { - "lastModified": 1735699162, + "lastModified": 1727366922, "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=", "path": "/home/jade/nix-configs/mac-brcm-fw", "type": "path" @@ -212,11 +200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -225,25 +213,13 @@ "type": "indirect" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1741445498, - "narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { @@ -254,11 +230,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1741605585, - "narHash": "sha256-1bgzejf8fwsbzr/5cRK7jPArxf7xGyQqKsy05J5p05o=", + "lastModified": 1736603572, + "narHash": "sha256-yOZxepSF/z6ZDAOlJ3VZRIGOKfroa6CmOm2x6ud8S3s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "77172a85a0cdca4a9cc2aed74de9bbb14c7c8e43", + "rev": "376250fab39653e93864b4dfd9ab161751fbe430", "type": "github" }, "original": { @@ -267,44 +243,28 @@ "type": "indirect" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "crane": "crane", "fenix": "fenix", + "helix-inline-diags": "helix-inline-diags", "home-manager": "home-manager", "lix-module": "lix-module", "mac-brcm-fw": "mac-brcm-fw", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable-small": "nixpkgs-unstable-small", - "typst-within": "typst-within" + "nixpkgs-unstable-small": "nixpkgs-unstable-small" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1741517882, - "narHash": "sha256-MmYdZyVwKa3YHzqoHdHw9/jZXkDE/5M3M+7363t4Pkc=", + "lastModified": 1736517563, + "narHash": "sha256-YJ5ajpMsyXITc91ZfnI0Mdocd+tmCFkZ3BLozUkB44M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "5e7dd31c80d5821113ed9c9aa1616a73a63b49a1", + "rev": "4f35021ca9a8e7f9ed4344139b9eaf770a2e5725", "type": "github" }, "original": { @@ -314,35 +274,27 @@ "type": "github" } }, - "rust-analyzer-src_2": { - "flake": false, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "helix-inline-diags", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1727104575, - "narHash": "sha256-lB/ZS0SnHyE8Z3G8DIL/QJPg6w6x5ZhgVO2pBqnz89g=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "3d0343251fe084b335b55c17a52bb4a3527b1bd0", + "lastModified": 1728268235, + "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", "type": "github" }, "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", + "owner": "oxalica", + "repo": "rust-overlay", "type": "github" } }, - "rust-manifest": { - "flake": false, - "locked": { - "narHash": "sha256-Yqu2/i9170R7pQhvOCR1f5SyFr7PcFbO6xcMr9KWruQ=", - "type": "file", - "url": "https://static.rust-lang.org/dist/channel-rust-1.83.0.toml" - }, - "original": { - "type": "file", - "url": "https://static.rust-lang.org/dist/channel-rust-1.83.0.toml" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -372,29 +324,6 @@ "repo": "default", "type": "github" } - }, - "typst-within": { - "inputs": { - "crane": "crane_2", - "fenix": "fenix_2", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2", - "rust-manifest": "rust-manifest", - "systems": "systems_2" - }, - "locked": { - "lastModified": 1739736913, - "narHash": "sha256-qVaWE+q1Npq8XbvrZ/c6ElU+F1u1YNf2a18X4RzVLoc=", - "owner": "schrottkatze", - "repo": "typst", - "rev": "5aa9b90a7b3e7f5ed964bf6727e445bdfc5211cd", - "type": "github" - }, - "original": { - "owner": "schrottkatze", - "repo": "typst", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c4c0b17..98b4fbc 100644 --- a/flake.nix +++ b/flake.nix @@ -5,8 +5,12 @@ nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs-stable.url = "nixpkgs/nixos-24.11"; nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small"; - typst-within = { - url = "github:schrottkatze/typst"; + helix-inline-diags = { + url = "github:helix-editor/helix"; + inputs = { + crane.follows = "crane"; + nixpkgs.follows = "nixpkgs"; + }; }; lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module"; @@ -35,8 +39,8 @@ nixpkgs, nixpkgs-stable, nixpkgs-unstable-small, + helix-inline-diags, lix-module, - typst-within, home-manager, nixos-hardware, mac-brcm-fw, @@ -90,7 +94,7 @@ nixosConfigurations = { monosodium-glutamate-g = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module; + inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module helix-inline-diags; }; system = "x86_64-linux"; modules = [ @@ -100,7 +104,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { - inherit pkgs-unstable-small pkgs-stable typst-within; + inherit pkgs-unstable-small pkgs-stable; }; home-manager.users.jade = { nixosConfig, @@ -115,7 +119,7 @@ }; denkbrett = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module; + inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module helix-inline-diags; }; system = "x86_64-linux"; modules = [ @@ -125,7 +129,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { - inherit pkgs-unstable-small pkgs-stable typst-within; + inherit pkgs-unstable-small pkgs-stable; }; home-manager.users.jade = { nixosConfig, @@ -140,7 +144,7 @@ }; potatobook-g = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs pkgs-unstable-small rs-programs lix-module; + inherit inputs pkgs-unstable-small rs-programs lix-module helix-inline-diags; }; system = "x86_64-linux"; modules = [ @@ -151,7 +155,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { - inherit pkgs-unstable-small pkgs-stable typst-within; + inherit pkgs-unstable-small pkgs-stable; }; home-manager.users.jade = { nixosConfig, diff --git a/hosts/denkbrett/modules/input.nix b/hosts/denkbrett/modules/input.nix index a6116f5..fdb5785 100644 --- a/hosts/denkbrett/modules/input.nix +++ b/hosts/denkbrett/modules/input.nix @@ -1,7 +1,8 @@ {...}: { # key remapping - jade.input.remapping = let - default = { + jade.input.remapping = { + enable = true; + devices."AT Translated Set 2 keyboard" = { swapKeys = [ ["KEY_Y" "KEY_Z"] ["KEY_LEFTALT" "KEY_LEFTMETA"] @@ -14,11 +15,6 @@ } ]; }; - in { - enable = true; - devices."AT Translated Set 2 keyboard" = default; - devices."Razer Razer Huntsman" = default; - devices."Razer Razer DeathAdder V2" = default; }; hardware.trackpoint = { diff --git a/modules/desktop-environment/audio.nix b/modules/desktop-environment/audio.nix index 2909e3a..dd5be85 100644 --- a/modules/desktop-environment/audio.nix +++ b/modules/desktop-environment/audio.nix @@ -17,6 +17,5 @@ helvum ]; - # hardware.pulseaudio.enable = pkgs.lib.mkForce false; # sound.mediaKeys.enable = true; } diff --git a/modules/desktop-environment/home/compositing.nix b/modules/desktop-environment/home/compositing.nix index fbba084..a9823d6 100644 --- a/modules/desktop-environment/home/compositing.nix +++ b/modules/desktop-environment/home/compositing.nix @@ -1,5 +1,6 @@ {...}: { services.picom = { + enable = true; backend = "glx"; shadow = true; diff --git a/modules/desktop-environment/home/sway/default.nix b/modules/desktop-environment/home/sway/default.nix index 91ecece..a1e12b3 100644 --- a/modules/desktop-environment/home/sway/default.nix +++ b/modules/desktop-environment/home/sway/default.nix @@ -159,8 +159,8 @@ in { "XF86AudioPlay" = "exec playerctl play"; "XF86AudioStop" = "exec playerctl stop"; - "XF86MonBrightnessUp" = "exec brightnessctl set 1%+"; - "XF86MonBrightnessDown" = "exec brightnessctl set 1%-"; + "XF86MonBrightnessUp" = "exec brightnessctl set 5%+"; + "XF86MonBrightnessDown" = "exec brightnessctl set 5%-"; "XF86KbdBrightnessUp" = "exec brillo -kA 10.0"; "XF86KbdBrightnessDown" = "exec brillo -kU 10.0"; diff --git a/modules/desktop-environment/home/terminal.nix b/modules/desktop-environment/home/terminal.nix index 9a41eea..cfa9ac2 100644 --- a/modules/desktop-environment/home/terminal.nix +++ b/modules/desktop-environment/home/terminal.nix @@ -5,7 +5,6 @@ name = "Departure Mono Nerd Font"; size = 12; }; - shellIntegration.enableFishIntegration = false; keybindings = { "ctrl+shift+n" = "new_os_window_with_cwd"; }; diff --git a/modules/desktop-environment/home/typst.nix b/modules/desktop-environment/home/typst.nix index e70930e..d7d3fcc 100644 --- a/modules/desktop-environment/home/typst.nix +++ b/modules/desktop-environment/home/typst.nix @@ -1,8 +1,4 @@ -{ - pkgs, - typst-within, - ... -}: let +{pkgs, ...}: let packages = { typst-configs = pkgs.fetchFromGitea { domain = "forge.katzen.cafe"; @@ -32,6 +28,5 @@ in { recursive = true; }; }; - # home.packages = [typst-within.packages."x86_64-linux".default]; home.packages = [pkgs.typst]; } diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix index b686e8d..df6d522 100644 --- a/modules/desktop/fonts.nix +++ b/modules/desktop/fonts.nix @@ -1,15 +1,4 @@ {pkgs, ...}: { - nixpkgs.config.packageOverrides = pkgs: { - google-fonts = pkgs.google-fonts.overrideAttrs (oldAttrs: { - src = pkgs.fetchFromGitHub { - owner = "google"; - repo = "fonts"; - rev = "8a0041ea7b92e339a7ce13e4e1dadcc85cb8f5df"; - sha256 = "sha256-9TzeihEKIEDRtDuv+NmLWjTpoGnBR+RP/jIBfB1O06U="; - }; - installPhase = oldAttrs.installPhase + "mv $out/share/fonts/truetype $out/share/fonts/ttf"; - }); - }; fonts.packages = with pkgs; [ nerd-fonts.fira-code nerd-fonts.departure-mono diff --git a/modules/input/evremap.nix b/modules/input/evremap.nix index cd4145e..1880eb9 100644 --- a/modules/input/evremap.nix +++ b/modules/input/evremap.nix @@ -97,8 +97,8 @@ in value = let cfgFile = toml.generate "remaps-${toString i}.toml" (elemAt devs i); in { + script = "${evremap}/bin/evremap remap ${cfgFile}"; wantedBy = ["multi-user.target"]; - serviceConfig.ExecStart = "-${evremap}/bin/evremap remap ${cfgFile}"; unitConfig = { Restart = "on-failure"; }; diff --git a/modules/shell/btop.nix b/modules/shell/btop.nix deleted file mode 100644 index 4e5f97d..0000000 --- a/modules/shell/btop.nix +++ /dev/null @@ -1,11 +0,0 @@ -{...}: { - home-manager.users.jade = {pkgs, ...}: { - programs.btop = { - enable = true; - settings = { - color_theme = "gruvbox_dark"; - vim_keys = true; - }; - }; - }; -} diff --git a/modules/shell/default.nix b/modules/shell/default.nix index a78ef80..6f7f4db 100644 --- a/modules/shell/default.nix +++ b/modules/shell/default.nix @@ -9,7 +9,6 @@ ./tty.nix ./git.nix ./mprocs.nix - ./btop.nix ]; programs.mosh.enable = true; } diff --git a/modules/shell/git.nix b/modules/shell/git.nix index f597c76..743e653 100644 --- a/modules/shell/git.nix +++ b/modules/shell/git.nix @@ -22,10 +22,14 @@ s = "status"; }; signing = { - format = "ssh"; key = "${pkgs.writeText "blue_nk3.pub" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILg7hhAKxIAbokHHcIj9HBgbkgoKGCG2R+gx7HZKL+iz cardno:000F_93C6A612"}"; signByDefault = true; }; + extraConfig = { + gpg = { + format = "ssh"; + }; + }; }; programs.jujutsu = { enable = true; diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix index e0dc3ea..8bf82af 100644 --- a/modules/shell/helix.nix +++ b/modules/shell/helix.nix @@ -1,4 +1,8 @@ -{config, ...}: { +{ + config, + helix-inline-diags, + ... +}: { home-manager.users.jade = { pkgs, pkgs-stable, @@ -19,6 +23,7 @@ programs.helix = { enable = true; defaultEditor = true; + package = helix-inline-diags.outputs.packages."x86_64-linux".default; settings = { theme = "gruvbox_dark_hard"; editor = { @@ -26,10 +31,11 @@ bufferline = "multiple"; color-modes = true; cursorline = true; - auto-save = { - after-delay.enable = true; - after-delay.timeout = 10000; - }; + # auto-save = { + # focus-lost = true; + # after-delay.enable = true; + # after-delay.timeout = 10000; + # }; auto-format = true; end-of-line-diagnostics = "hint"; # slightly optimized based on my layout @@ -93,14 +99,6 @@ # smart tab++ tab = "move_parent_node_end"; S-tab = "move_parent_node_start"; - "'" = { - D = "@sgd"; - F = "@sgy"; - d = "@vgd"; - f = "@vgy"; - h = ":toggle-option lsp.display-inlay-hints"; - t = "@|flip-bool"; - }; }; insert = { up = "no_op"; diff --git a/modules/shell/nu/aliases.nu b/modules/shell/nu/aliases.nu index 72d528d..7876154 100644 --- a/modules/shell/nu/aliases.nu +++ b/modules/shell/nu/aliases.nu @@ -27,13 +27,11 @@ alias fish = echo $"(ansi red)no, fuck that shit!"; alias px = pulsemixer; # uni -alias guni = cd ~/Docs/uni; +alias gun = cd ~/Docs/uni; alias guni = cd ~/Docs/uni/info1; alias gunids = cd ~/Docs/uni/design; alias gunida = cd ~/Docs/uni/dramaturgie; -alias gunim = cd ~/Docs/uni/mathe1-3; +alias gunm = cd ~/Docs/uni/mathe1-3; # typos alias juts = just; - -alias shut = shutdown now; diff --git a/modules/shell/nu/custom_commands.nu b/modules/shell/nu/custom_commands.nu index d777349..5b66b1b 100644 --- a/modules/shell/nu/custom_commands.nu +++ b/modules/shell/nu/custom_commands.nu @@ -70,36 +70,3 @@ def bx [from: string to: string] { print $url; ^bash -c $"nohup chromium '($url)' &"; } - -def meow [ n = 1 ] { - "m{rr,r,}{e,ee,{,e,aa}o}w{,w,ww}" | str expand | shuffle | first $n | str join ' ' -} - -alias miau = meow; - -def bars [display_name?: string] { - print $display_name; - pkill eww - if ($display_name | is-empty) { - print "Opening bars on whatever eww figures is best" - eww open-many topBar bottomBar - } else { - print $"Opening bars on ($display_name)" - eww open --screen $display_name bottomBar - eww open --screen $display_name topBar - } -} - -def "dp ccchh" [] { - layaway "hdmi2 + edp/bottom,center" - pkill eww - bars "25BL56WY" -} - -def "dp gay" [] { - layaway "dp3 + edp1/bottom,center + dp5/right,top" - # manual fix for lack of frequency in layaway, else monitor just turns off - swaymsg "output DP-3 position 0 0 scale 1 transform normal resolution 1920x1080@60Hz" - pkill eww - bars "LEN G27c-10" -} diff --git a/programs/flip-bool/Cargo.toml b/programs/flip-bool/Cargo.toml deleted file mode 100644 index c65d2fa..0000000 --- a/programs/flip-bool/Cargo.toml +++ /dev/null @@ -1,6 +0,0 @@ -[package] -name = "flip-bool" -version = "0.1.0" -edition = "2021" - -[dependencies] diff --git a/programs/flip-bool/src/main.rs b/programs/flip-bool/src/main.rs deleted file mode 100644 index 3ae9375..0000000 --- a/programs/flip-bool/src/main.rs +++ /dev/null @@ -1,25 +0,0 @@ -use std::io::{Read, Write}; - -fn main() { - let mut input = String::new(); - let mut stdin = std::io::stdin(); - let mut stdout = std::io::stdout(); - - stdin.read_to_string(&mut input).unwrap(); - - stdout - .write_all(match input.as_bytes() { - b"true" => b"false", - b"True" => b"False", - b"TRUE" => b"FALSE", - b"false" => b"true", - b"False" => b"True", - b"FALSE" => b"TRUE", - b"1" => b"0", - b"yes" => b"no", - b"0" => b"1", - b"no" => b"yes", - other => other, - }) - .unwrap(); -}