diff --git a/flake.lock b/flake.lock index 2984e35e..3085b83a 100644 --- a/flake.lock +++ b/flake.lock @@ -23,9 +23,36 @@ "type": "github" } }, + "autohide-tdrop": { + "inputs": { + "devenv": "devenv", + "fenix": "fenix", + "flake-parts": "flake-parts", + "flake-root": "flake-root", + "mk-shell-bin": "mk-shell-bin", + "nix2container": "nix2container", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1728286844, + "narHash": "sha256-JkCgvlN9uHltyc+GMHTo+VHZRwKpGMU6hwvL49tpd7U=", + "owner": "I-Want-ToBelieve", + "repo": "autohide-tdrop", + "rev": "c3eb1df4f4311de843179b03673296136ded0d2f", + "type": "github" + }, + "original": { + "owner": "I-Want-ToBelieve", + "repo": "autohide-tdrop", + "type": "github" + } + }, "basant": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], @@ -72,7 +99,7 @@ }, "deploy-rs": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ], @@ -92,6 +119,27 @@ "type": "github" } }, + "devenv": { + "inputs": { + "flake-compat": "flake-compat", + "nix": "nix", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1701187605, + "narHash": "sha256-NctguPdUeDVLXFsv6vI1RlEiHLsXkeW3pgZe/mwn1BU=", + "owner": "cachix", + "repo": "devenv", + "rev": "a7c4dd8f4eb1f98a6b8f04bf08364954e1e73e4f", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, "devshell": { "locked": { "lastModified": 1642188268, @@ -143,7 +191,45 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "autohide-tdrop", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1701671019, + "narHash": "sha256-ctG01Syj/7TrfV4arc3qyN4a3mAvgXbivYrdXKqdL8U=", + "owner": "nix-community", + "repo": "fenix", + "rev": "5e6667eda7fb055c0a8388172372fb89e5b33e05", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -159,7 +245,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1641205782, @@ -175,7 +261,74 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "path": "/nix/store/vf5ra8smwlqy3pi0300s580g5msc3xp7-source", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "type": "path" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-root": { + "locked": { + "lastModified": 1692742795, + "narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=", + "owner": "srid", + "repo": "flake-root", + "rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "flake-root", + "type": "github" + } + }, "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -190,7 +343,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_4": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -205,9 +358,32 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "autohide-tdrop", + "devenv", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "grasp": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -284,12 +460,68 @@ "type": "github" } }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "mk-shell-bin": { + "locked": { + "lastModified": 1677004959, + "narHash": "sha256-/uEkr1UkJrh11vD02aqufCxtbF5YnhRTIKlx5kyvf+I=", + "owner": "rrbutani", + "repo": "nix-mk-shell-bin", + "rev": "ff5d8bd4d68a347be5042e2f16caee391cd75887", + "type": "github" + }, + "original": { + "owner": "rrbutani", + "repo": "nix-mk-shell-bin", + "type": "github" + } + }, + "nix": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": [ + "autohide-tdrop", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1676545802, + "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=", + "owner": "domenkozar", + "repo": "nix", + "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "relaxed-flakes", + "repo": "nix", + "type": "github" + } + }, "nix-matrix-appservices": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixlib": "nixlib", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1683490239, @@ -305,6 +537,28 @@ "type": "gitlab" } }, + "nix2container": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "autohide-tdrop", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700389764, + "narHash": "sha256-hMsZ741ri9c4ZQpB6mgLY8KErk0yXVAOUjfNkP1nbbw=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "4400b77e14f3095ee3215a9a5e0f9143bc0e8f2d", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1643502816, @@ -337,6 +591,88 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1678875422, + "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1695644571, + "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1662099760, "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=", @@ -352,7 +688,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_4": { "locked": { "lastModified": 1755274400, "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=", @@ -404,9 +740,40 @@ "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "autohide-tdrop", + "devenv", + "flake-compat" + ], + "flake-utils": "flake-utils", + "gitignore": "gitignore", + "nixpkgs": [ + "autohide-tdrop", + "devenv", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1688056373, + "narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", + "autohide-tdrop": "autohide-tdrop", "basant": "basant", "deploy-rs": "deploy-rs", "disko": "disko", @@ -415,7 +782,7 @@ "home-manager": "home-manager_2", "nix-matrix-appservices": "nix-matrix-appservices", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_4", "nur": "nur", "poonam": "poonam", "rust-overlay": "rust-overlay", @@ -424,6 +791,23 @@ "vimwikicli": "vimwikicli" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1701447636, + "narHash": "sha256-WaCcxLNAqo/FAK0QtYqweKCUVTGcbKpFIHClc+k2YlI=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "e402c494b7c7d94a37c6d789a216187aaf9ccd3e", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -490,6 +874,36 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tidal-src": { "flake": false, "locked": { @@ -532,6 +946,24 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1699786194, + "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "unstable": { "locked": { "lastModified": 1752687322, @@ -550,7 +982,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_4" }, "locked": { "lastModified": 1701680307, diff --git a/flake.nix b/flake.nix index e8df696d..616d6edd 100644 --- a/flake.nix +++ b/flake.nix @@ -46,6 +46,10 @@ }; tidalcycles.url = "github:mitchmindtree/tidalcycles.nix"; tidalcycles.inputs.nixpkgs.follows = "unstable"; + autohide-tdrop = { + url = "github:I-Want-ToBelieve/autohide-tdrop"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # TODO hundred rabbits software # TODO needs secrets # dhyan.url = "git+ssh://gitea@git.sealight.xyz/aynish/dhyan?ref=main"; @@ -57,7 +61,7 @@ outputs = { self, nixpkgs, unstable, nixos-hardware, home-manager, deploy-rs , agenix, disko, basant, grasp, nix-matrix-appservices, nur, tidalcycles - , rust-overlay, vimwikicli, ... }@inputs: + , rust-overlay, vimwikicli, autohide-tdrop, ... }@inputs: let forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" @@ -73,6 +77,7 @@ }; vimwikiOverlay = final: prev: { vimwiki-cli = vimwikicli.packages.${prev.system}.vimwiki-cli; + autohide-tdrop = autohide-tdrop.packages.${prev.system}.default; }; nixpkgsFor = forAllSystems (system: @@ -88,6 +93,7 @@ "vcv-rack" "SunVox" "renoise" + "bitwig-studio-unwrapped" ]; }; overlays = [ diff --git a/home/profiles/cli/default.nix b/home/profiles/cli/default.nix index 8a99cc12..a3da81a3 100644 --- a/home/profiles/cli/default.nix +++ b/home/profiles/cli/default.nix @@ -299,7 +299,8 @@ nepl = "n repl ''"; srch = "ns nixpkgs"; orch = "ns override"; - nrb = "cd /tmp; sudo nixos-rebuild switch --flake '/home/anish/usr/helm#curve'; cd $OLDPWD"; + # need --impure for bitwig, something about my flake setup doesn't like allow unfree + nrb = "cd /tmp; sudo nixos-rebuild switch --impure --flake '/home/anish/usr/helm#curve'; cd $OLDPWD"; nrt = "cd /tmp; sudo nixos-rebuild test --flake '/home/anish/usr/helm#curve'; cd $OLDPWD"; ned = "cd /home/anish/usr/helm; vim; cd $OLDPWD"; ncd = "cd /home/anish/usr/helm"; diff --git a/home/profiles/desktop/kitty.conf b/home/profiles/desktop/kitty.conf index 2122ff7c..b8cd3ec5 100644 --- a/home/profiles/desktop/kitty.conf +++ b/home/profiles/desktop/kitty.conf @@ -9,9 +9,8 @@ mouse_map left click ungrabbed mouse_click_url_or_select confirm_os_window_close 0 enable_audio_bell no + + # Ctrl+V for paste map ctrl+v paste_from_clipboard - --- Allows zen-mode.nvim to increase font size --- allow_remote_control socket-only --- listen_on unix:/tmp/kitty +mouse_map middle release ungrabbed paste_from_clipboard diff --git a/home/profiles/desktop/rofi/emojimenu.rasi b/home/profiles/desktop/rofi/emojimenu.rasi index 662aa044..00ab4a24 100644 --- a/home/profiles/desktop/rofi/emojimenu.rasi +++ b/home/profiles/desktop/rofi/emojimenu.rasi @@ -2,12 +2,35 @@ @import "config.rasi" +textbox { + vertical-align: 0.5; + horizontal-align: 0.5; +} + listview { - columns: 4; + columns: 9; + lines: 7; + cycle: true; + dynamic: true; + layout: vertical; + flow: horizontal; + reverse: false; + fixed-height: true; + fixed-columns: true; +} + +element { + orientation: vertical; +} + +element-text { + vertical-align: 0.5; + horizontal-align: 0.5; + font: "FiraCode Nerd Font 24"; } textbox-icon { - str: "🎑"; + str: "❇️ "; } prompt { diff --git a/home/profiles/desktop/sxhkdrc b/home/profiles/desktop/sxhkdrc index 160307c0..e33ccefd 100644 --- a/home/profiles/desktop/sxhkdrc +++ b/home/profiles/desktop/sxhkdrc @@ -16,7 +16,7 @@ super + Return kitty ctrl + super + Return - xst -e bash -c "(tmux ls | grep -qEv 'attached|scratch' && tmux at) || tmux" + tdrop -n tdrop_kitty --post-create-hook "autohide-tdrop &" -ma -h 60% -w 70% -x 15% -y 32 kitty --class=tdrop_kitty super + space rofi -show drun -modi drun,run -show-icons -theme theme/appmenu.rasi @@ -25,7 +25,7 @@ super + Tab rofi -show window -show-icons -theme theme/windowmenu.rasi super + e - rofimoji --selector-args "-theme theme/emojimenu.rasi" --skin-tone moderate --action copy + rofimoji --selector-args "-theme theme/emojimenu.rasi" --skin-tone moderate --action copy --hidden-descriptions super + a paste diff --git a/hosts/curve/default.nix b/hosts/curve/default.nix index b166ef52..414c29ca 100644 --- a/hosts/curve/default.nix +++ b/hosts/curve/default.nix @@ -23,12 +23,15 @@ settings.PermitRootLogin = "no"; }; + hardware.keyboard.qmk.enable = true; + services.udev.packages = with pkgs; [ via ]; + # import profiling tools programs.systemtap.enable = true; virtualisation.docker.enable = true; virtualisation.docker.storageDriver = "btrfs"; - environment.systemPackages = with pkgs; [ docker-compose ]; + environment.systemPackages = with pkgs; [ docker-compose via ]; # Speed up boot by removing dependency on network systemd = { @@ -69,7 +72,7 @@ # lazy enable of ports necessary for KDE connect which is installed via cli home profile (for some reason?) networking.firewall = { - allowedTCPPorts = [ 22 4173 ]; # allow ssh + allowedTCPPorts = [ 22 4173 3000 ]; # allow ssh and vibekanban allowedTCPPortRanges = [{ from = 1714; to = 1764; diff --git a/hosts/profiles/desktop/default.nix b/hosts/profiles/desktop/default.nix index 6c17ce3b..f1b38f91 100644 --- a/hosts/profiles/desktop/default.nix +++ b/hosts/profiles/desktop/default.nix @@ -98,6 +98,7 @@ in { # tic-80 ytfzf yt-dlp + # autohide-tdrop ]; xdg.portal = { diff --git a/hosts/profiles/gonic/default.nix b/hosts/profiles/gonic/default.nix index 6c17e54f..e035cbbe 100644 --- a/hosts/profiles/gonic/default.nix +++ b/hosts/profiles/gonic/default.nix @@ -7,8 +7,6 @@ podcast-path /data/podcasts cache-path /data/cache playlists-path /data/playlists - transcode-cache-size 1000 - transcode-eject-interval 1440 ''; mossnet.gonic.user = "gonic"; mossnet.gonic.group = "audio"; diff --git a/hosts/profiles/music/default.nix b/hosts/profiles/music/default.nix index 5e0d4225..622af9fa 100644 --- a/hosts/profiles/music/default.nix +++ b/hosts/profiles/music/default.nix @@ -29,6 +29,7 @@ # ardour # reaper # renoise + bitwig-studio ]; services.pulseaudio.enable = false;