diff --git a/flake.lock b/flake.lock index f83ea24..c131841 100644 --- a/flake.lock +++ b/flake.lock @@ -12,7 +12,7 @@ "ragenix", "nixpkgs" ], - "systems": "systems_14" + "systems": "systems_15" }, "locked": { "lastModified": 1761656077, @@ -381,7 +381,7 @@ }, "flake-utils_10": { "inputs": { - "systems": "systems_15" + "systems": "systems_13" }, "locked": { "lastModified": 1731533236, @@ -402,11 +402,11 @@ "systems": "systems_16" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -420,11 +420,11 @@ "systems": "systems_17" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -473,6 +473,24 @@ "inputs": { "systems": "systems_20" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_16": { + "inputs": { + "systems": "systems_21" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -563,24 +581,6 @@ "inputs": { "systems": "systems_7" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "inputs": { - "systems": "systems_9" - }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -595,9 +595,27 @@ "type": "github" } }, + "flake-utils_7": { + "inputs": { + "systems": "systems_8" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_8": { "inputs": { - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1731533236, @@ -747,9 +765,28 @@ "type": "github" } }, - "jujutsu": { + "isadle": { "inputs": { "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1775411699, + "narHash": "sha256-eUyn9ejgMYx4FmoRcs+Feqx6a4I+yQrmXTet3dUkmMY=", + "ref": "refs/heads/main", + "rev": "b461faf5d9c545f696386ac05b4a27d59fb54ccf", + "revCount": 1, + "type": "git", + "url": "ssh://forgejo@git.donsz.nl/jana/isadle.git" + }, + "original": { + "type": "git", + "url": "ssh://forgejo@git.donsz.nl/jana/isadle.git" + } + }, + "jujutsu": { + "inputs": { + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ], @@ -787,8 +824,8 @@ }, "mapf": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1757529600, @@ -809,7 +846,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1770927856, @@ -828,9 +865,9 @@ }, "mifg": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "naersk": "naersk", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-mozilla": "nixpkgs-mozilla" }, "locked": { @@ -850,7 +887,7 @@ "naersk": { "inputs": { "fenix": "fenix", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1763384566, @@ -869,7 +906,7 @@ "naersk_2": { "inputs": { "fenix": "fenix_2", - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_17" }, "locked": { "lastModified": 1752689277, @@ -891,7 +928,7 @@ "niri-unstable": [ "niri-unstable" ], - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -929,7 +966,7 @@ }, "niri-unstable": { "inputs": { - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -992,7 +1029,7 @@ "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_10", "nixpkgs": [ "p1n3appl3", "nixpkgs" @@ -1140,6 +1177,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1757967192, "narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=", @@ -1155,7 +1208,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1771932323, "narHash": "sha256-3PadsTzuMJT/x0KmiD/Me1GG6rW8kaHoWVduSs0ue7o=", @@ -1170,7 +1223,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1771369470, "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", @@ -1186,7 +1239,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1767379071, "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", @@ -1202,7 +1255,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1722062969, "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", @@ -1218,7 +1271,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -1234,7 +1287,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_17": { "locked": { "lastModified": 1752077645, "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", @@ -1250,7 +1303,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_18": { "locked": { "lastModified": 1755020227, "narHash": "sha256-gGmm+h0t6rY88RPTaIm3su95QvQIVjAJx558YUG4Id8=", @@ -1264,7 +1317,7 @@ "type": "indirect" } }, - "nixpkgs_18": { + "nixpkgs_19": { "locked": { "lastModified": 1771931193, "narHash": "sha256-IRPLf3y0HxdLirCVYoOYXQyoUBIM8llw7/96OHvyQoM=", @@ -1280,22 +1333,6 @@ "type": "github" } }, - "nixpkgs_19": { - "locked": { - "lastModified": 1771207753, - "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1743014863, @@ -1313,6 +1350,22 @@ } }, "nixpkgs_20": { + "locked": { + "lastModified": 1771207753, + "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_21": { "locked": { "lastModified": 1710377395, "narHash": "sha256-KMubsUWtVr7L55pXMBibBDBdmk3xrjbBPduc0E8z28c=", @@ -1326,7 +1379,7 @@ "type": "indirect" } }, - "nixpkgs_21": { + "nixpkgs_22": { "locked": { "lastModified": 1732014248, "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", @@ -1342,7 +1395,7 @@ "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_23": { "locked": { "lastModified": 1745930157, "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", @@ -1407,6 +1460,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1721379653, "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", @@ -1422,7 +1491,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1752077645, "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", @@ -1438,7 +1507,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1766070988, "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", @@ -1454,29 +1523,13 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs-unstable" ], - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1771135771, @@ -1537,12 +1590,12 @@ "p1n3appl3": { "inputs": { "catppuccin": "catppuccin", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_9", "home-manager": "home-manager_2", "nix-index-database": "nix-index-database", "nix-minecraft": "nix-minecraft", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "nixpkgs-stable": "nixpkgs-stable_2", "obs-gamepad": "obs-gamepad", "ragenix": "ragenix", @@ -1567,8 +1620,8 @@ }, "pipethon": { "inputs": { - "flake-utils": "flake-utils_10", - "nixpkgs": "nixpkgs_13" + "flake-utils": "flake-utils_11", + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1767634075, @@ -1647,12 +1700,12 @@ "inputs": { "agenix": "agenix_2", "darwin": "darwin_2", - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_12", "home-manager": "home-manager_3", "impermanence": "impermanence", "nix-index-database": "nix-index-database_2", "nixos-hardware": "nixos-hardware_2", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "ragenix": "ragenix_2" }, "locked": { @@ -1671,8 +1724,8 @@ }, "raw-data": { "inputs": { - "flake-utils": "flake-utils_12", - "nixpkgs": "nixpkgs_15" + "flake-utils": "flake-utils_13", + "nixpkgs": "nixpkgs_16" }, "locked": { "lastModified": 1768919451, @@ -1690,9 +1743,9 @@ }, "reviewqueue": { "inputs": { - "flake-utils": "flake-utils_13", + "flake-utils": "flake-utils_14", "naersk": "naersk_2", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_18", "nixpkgs-mozilla": "nixpkgs-mozilla_2" }, "locked": { @@ -1720,6 +1773,7 @@ "harmonica": "harmonica", "home-manager": "home-manager", "homepage": "homepage", + "isadle": "isadle", "jujutsu": "jujutsu", "kitty-search": "kitty-search", "mapf": "mapf", @@ -1727,7 +1781,7 @@ "mifg": "mifg", "niri": "niri", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "noctalia": "noctalia", @@ -1871,8 +1925,8 @@ }, "secrets": { "inputs": { - "flake-utils": "flake-utils_14", - "nixpkgs": "nixpkgs_18" + "flake-utils": "flake-utils_15", + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1769256063, @@ -1918,7 +1972,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_19" + "nixpkgs": "nixpkgs_20" }, "locked": { "lastModified": 1771889317, @@ -2129,6 +2183,21 @@ "type": "github" } }, + "systems_21": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -2205,21 +2274,6 @@ } }, "systems_8": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_9": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2234,10 +2288,25 @@ "type": "github" } }, + "systems_9": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "t": { "inputs": { - "flake-utils": "flake-utils_15", - "nixpkgs": "nixpkgs_20" + "flake-utils": "flake-utils_16", + "nixpkgs": "nixpkgs_21" }, "locked": { "lastModified": 1710410762, @@ -2255,7 +2324,7 @@ }, "totpal": { "inputs": { - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_22" }, "locked": { "lastModified": 1737322813, @@ -2291,7 +2360,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_13" + "systems": "systems_14" }, "locked": { "lastModified": 1731533236, @@ -2309,7 +2378,7 @@ }, "vimium-options": { "inputs": { - "nixpkgs": "nixpkgs_22" + "nixpkgs": "nixpkgs_23" }, "locked": { "lastModified": 1746118178, diff --git a/flake.nix b/flake.nix index 9b6d375..2a618d3 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,7 @@ reviewqueue.url = "github:jdonszelmann/review-queue"; compiler-construction-2021.url = "git+ssh://forgejo@git.donsz.nl/jana/eelco-visser-compiler-construction.git"; mifg.url = "git+ssh://forgejo@git.donsz.nl/jana/money.is.fckn.gay.git"; + isadle.url = "git+ssh://forgejo@git.donsz.nl/jana/isadle.git"; # server raw-data.url = "git+ssh://forgejo@git.donsz.nl/jana/raw-data.git"; diff --git a/hosts/fili/services/websites/default.nix b/hosts/fili/services/websites/default.nix index 668d7f5..b03e997 100644 --- a/hosts/fili/services/websites/default.nix +++ b/hosts/fili/services/websites/default.nix @@ -8,5 +8,6 @@ _: { ./compiler-construction-2021.nix ./mapfm-poster.nix ./money-is-fckn-gay.nix + ./isadle.nix ]; } diff --git a/hosts/fili/services/websites/isadle.nix b/hosts/fili/services/websites/isadle.nix new file mode 100644 index 0000000..da33566 --- /dev/null +++ b/hosts/fili/services/websites/isadle.nix @@ -0,0 +1,17 @@ +{ pkgs, flakes, ... }: +{ + services.nginx = { + virtualHosts."isadle.donsz.nl" = { + forceSSL = true; + http2 = true; + enableACME = true; + + locations."/" = { + root = flakes.isadle.packages.${pkgs.system}.isadle; + extraConfig = '' + autoindex on; + ''; + }; + }; + }; +} diff --git a/hosts/kili/configuration.nix b/hosts/kili/configuration.nix index 378d6d1..0871777 100644 --- a/hosts/kili/configuration.nix +++ b/hosts/kili/configuration.nix @@ -1,6 +1,7 @@ -{ pkgs -, config -, ... +{ + pkgs, + config, + ... }: { imports = [ @@ -62,25 +63,23 @@ nautilus adwaita-icon-theme - (pkgs.callPackage - ( - { stdenv }: - stdenv.mkDerivation { - name = "global-cursor-theme"; - unpackPhase = "true"; - outputs = [ "out" ]; - installPhase = '' - mkdir -p $out/share/icons/default - cat << EOF > $out/share/icons/default/index.theme - [Icon Theme] - Name=Default - Comment=Default Cursor Theme - Inherits=Adwaita - EOF - ''; - } - ) - { }) + (pkgs.callPackage ( + { stdenv }: + stdenv.mkDerivation { + name = "global-cursor-theme"; + unpackPhase = "true"; + outputs = [ "out" ]; + installPhase = '' + mkdir -p $out/share/icons/default + cat << EOF > $out/share/icons/default/index.theme + [Icon Theme] + Name=Default + Comment=Default Cursor Theme + Inherits=Adwaita + EOF + ''; + } + ) { }) perf rr @@ -109,6 +108,8 @@ hardware.graphics = { enable = true; + enable32Bit = true; + extraPackages = with pkgs; [ libva-vdpau-driver intel-media-driver @@ -158,10 +159,12 @@ programs.steam = { enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; + }; + programs.nix-ld.enable = true; # programs.mtr.enable = true; # programs.gnupg.agent = { diff --git a/pkgs/custom.nix b/pkgs/custom.nix index c87f02f..9efd206 100644 --- a/pkgs/custom.nix +++ b/pkgs/custom.nix @@ -6,6 +6,7 @@ niri-unstable, raw-data, p1n3appl3, + isadle, pkgs, ... }@inputs: @@ -20,5 +21,6 @@ in pipethon = pipethon.packages.${system}.python; raw-data = raw-data.packages.${system}.default; p1n3appl3 = p1n3appl3.packages.${system}; + isadle = isadle.packages.${system}.default; } // (import ./maple.nix inputs) diff --git a/programs/jj/default.nix b/programs/jj/default.nix index 0a0cc6e..f1a62db 100644 --- a/programs/jj/default.nix +++ b/programs/jj/default.nix @@ -167,15 +167,15 @@ inputs@{ machine, ... }: ]; t = tug; - d = "describe"; + d = [ "describe" ]; dm = [ "describe" "-m" ]; - e = "edit"; - s = "squash"; - si = "squash -i"; - sp = "split"; + e = [ "edit" ]; + s = [ "squash" ]; + si = [ "squash -i" ]; + sp = [ "split" ]; }; templates = { diff --git a/programs/nvim/config.lua b/programs/nvim/config.lua index 749e528..6f4c017 100644 --- a/programs/nvim/config.lua +++ b/programs/nvim/config.lua @@ -30,6 +30,10 @@ vim.cmd([[ inoremap FloatermToggle nnoremap FloatermToggle tnoremap FloatermToggle + + inoremap FloatermHide + nnoremap FloatermHide + tnoremap FloatermHide ]]) vim.keymap.set('n', 'gr', (function() builtin.lsp_references({}) end), {}) diff --git a/programs/nvim/editor-hax.py b/programs/nvim/editor-hax.py index a35f59e..eb83738 100755 --- a/programs/nvim/editor-hax.py +++ b/programs/nvim/editor-hax.py @@ -39,7 +39,7 @@ def find_or_create_pane(window, args): run(f"tmux send-keys -t {pane} Escape") # note the space, this tells nvim not to save it in history - run(f"tmux send-keys -t {pane} \": drop {args}\" Enter") + run(f"tmux send-keys -t {pane} F9 \": drop {args}\" Enter") run(f"tmux select-pane -t {pane} -Z") else: create_pane(args) diff --git a/programs/nvim/plugins.nix b/programs/nvim/plugins.nix index 1a7429c..3b62dc7 100644 --- a/programs/nvim/plugins.nix +++ b/programs/nvim/plugins.nix @@ -30,7 +30,7 @@ in ansiesc.enable = true; treesitter-textobjects = { - enable = false; + enable = true; settings = { lsp_interop.enable = true; select = { diff --git a/programs/xdg/default.nix b/programs/xdg/default.nix index f0b35d8..e2823f9 100644 --- a/programs/xdg/default.nix +++ b/programs/xdg/default.nix @@ -46,7 +46,12 @@ in home-config = { config, pkgs, ... }: { - home.packages = with pkgs; [ xdg-utils ]; + home.packages = with pkgs; [ + glib + (pkgs.writeShellScriptBin "xdg-open" '' + gio open "$@" + '') + ]; xdg = { enable = true; diff --git a/server exited unexpectedly b/server exited unexpectedly index c29f9e9..110d82d 100644 --- a/server exited unexpectedly +++ b/server exited unexpectedly @@ -1 +1 @@ -Ptmux;_Ga=d,q=2,d=a\\ \ No newline at end of file +Ptmux;_Gd=a,a=d,q=2\\ \ No newline at end of file