diff --git a/.gitignore b/.gitignore index 423b41cf..d6e69f56 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /.direnv/ /wiki .DS_Store +tf/ diff --git a/.rgignore b/.rgignore index 1d741e81..68a00529 100644 --- a/.rgignore +++ b/.rgignore @@ -1 +1,3 @@ /config/trusted/tf/ +/config/tf +/tf diff --git a/config/tf b/config/tf deleted file mode 160000 index 84b1742d..00000000 --- a/config/tf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 84b1742d36714279de336e2bee37848d0b3b6de8 diff --git a/flake.lock b/flake.lock index 4169b19f..81813c65 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1657275959, - "narHash": "sha256-pg8FB1DRImBpqXHCp/0Y7bIphpVqGmkWgWOcFDMwdTg=", + "lastModified": 1657305762, + "narHash": "sha256-dsuJG/y2LtqyHhDEIo3d3g/+K9IqhG3qt/tf7WYheH4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "22448c09bae21969ca14d1558a120dafe9853c73", + "rev": "eae26b7d5fc04699078a1687185d65077bc73c96", "type": "github" }, "original": { @@ -342,12 +342,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1657208011, - "narHash": "sha256-BlIFwopAykvdy1DYayEkj6ZZdkn+cVgPNX98QVLc0jM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2770cc0b1e8faa0e20eb2c6aea64c256a706d4f2", - "type": "github" + "lastModified": 1657114324, + "narHash": "sha256-fWuaUNXrHcz/ciHRHlcSO92dvV3EVS0GJQUSBO5JIB4=", + "path": "/nix/store/7x87vd43nvg8pkcmya5ivl34q5y8kp9b-source", + "rev": "a5c867d9fe9e4380452628e8f171c26b69fa9d3d", + "type": "path" }, "original": { "id": "nixpkgs", @@ -388,11 +387,11 @@ }, "nur": { "locked": { - "lastModified": 1657272425, - "narHash": "sha256-Y1vbPYhUi0ZKqn6XxQeE/RnyMcfHIE0YCkR1iPGoToo=", + "lastModified": 1657315594, + "narHash": "sha256-lkAqmREtGhWwHK3wdVSfqt+Q+xUhZmQ0UZyubeMJLR4=", "owner": "nix-community", "repo": "nur", - "rev": "4a0d26d6ccb60f24a5e771c6de4c64622fb2b4af", + "rev": "fae381cd12525fdfb5163ce0ac78c2705d5917c4", "type": "github" }, "original": { @@ -567,6 +566,7 @@ "trusted": { "flake": false, "locked": { + "lastModified": 1, "narHash": "sha256-Q3QXOoy+iN4VK2CflvRulYvPZXYgF0dO7FoF7CvWFTA=", "path": "./empty/.", "type": "path" diff --git a/config/modules/darwin/touchid.nix b/modules/darwin/touchid.nix similarity index 100% rename from config/modules/darwin/touchid.nix rename to modules/darwin/touchid.nix diff --git a/config/modules/home/deploy.nix b/modules/home/deploy.nix similarity index 100% rename from config/modules/home/deploy.nix rename to modules/home/deploy.nix diff --git a/config/modules/home/disables.nix b/modules/home/disables.nix similarity index 100% rename from config/modules/home/disables.nix rename to modules/home/disables.nix diff --git a/config/modules/home/displays.nix b/modules/home/displays.nix similarity index 100% rename from config/modules/home/displays.nix rename to modules/home/displays.nix diff --git a/config/modules/home/firewall.nix b/modules/home/firewall.nix similarity index 100% rename from config/modules/home/firewall.nix rename to modules/home/firewall.nix diff --git a/config/modules/home/network.nix b/modules/home/network.nix similarity index 100% rename from config/modules/home/network.nix rename to modules/home/network.nix diff --git a/config/modules/home/secrets.nix b/modules/home/secrets.nix similarity index 100% rename from config/modules/home/secrets.nix rename to modules/home/secrets.nix diff --git a/config/modules/home/theme.nix b/modules/home/theme.nix similarity index 100% rename from config/modules/home/theme.nix rename to modules/home/theme.nix diff --git a/config/modules/meta/deploy.nix b/modules/meta/deploy.nix similarity index 98% rename from config/modules/meta/deploy.nix rename to modules/meta/deploy.nix index 7025cdcb..8fc75209 100644 --- a/config/modules/meta/deploy.nix +++ b/modules/meta/deploy.nix @@ -31,13 +31,13 @@ let in { imports = [ - (toString (inputs.tf-nix + "/modules/run.nix")) + "${toString inputs.tf-nix}/modules/run.nix" ] ++ (optional (builtins.pathExists ../../tf/tf.nix) (../../tf/tf.nix)); options = { deploy = { dataDir = mkOption { type = types.path; - default = ../../../tf; + default = ../../tf; }; local = { isRoot = mkOption { diff --git a/config/modules/meta/imports.nix b/modules/meta/imports.nix similarity index 72% rename from config/modules/meta/imports.nix rename to modules/meta/imports.nix index 9bd8eaad..d5ee03fa 100644 --- a/config/modules/meta/imports.nix +++ b/modules/meta/imports.nix @@ -25,19 +25,19 @@ with lib; config = { network.importing = { nixosImports = mkDefault (map (path: toString path) [ - (root + "/config/nodes/nixos/HN.nix") - (root + "/config/nodes/nixos/HN/nixos.nix") - (root + "/config/trusted/nodes/nixos/HN/nixos.nix") + (root + "/nodes/nixos/HN.nix") + (root + "/nodes/nixos/HN/nixos.nix") + (root + "/trusted/nodes/nixos/HN/nixos.nix") ]); darwinImports = mkDefault (map (path: toString path) [ - (root + "/config/nodes/darwin/HN.nix") - (root + "/config/nodes/darwin/HN/darwin.nix") - (root + "/config/trusted/nodes/darwin/HN/darwin.nix") + (root + "/nodes/darwin/HN.nix") + (root + "/nodes/darwin/HN/darwin.nix") + (root + "/trusted/nodes/darwin/HN/darwin.nix") ]); homeImports = mkDefault (map (path: toString path) [ - (root + "/config/nodes/nixos/HN/home.nix") - (root + "/config/nodes/darwin/HN/home.nix") - (root + "/config/trusted/nodes/HN/home.nix") + (root + "/nodes/nixos/HN/home.nix") + (root + "/nodes/darwin/HN/home.nix") + (root + "/trusted/nodes/HN/home.nix") ]); users = mkDefault (singleton "kat"); }; diff --git a/config/modules/meta/network.nix b/modules/meta/network.nix similarity index 100% rename from config/modules/meta/network.nix rename to modules/meta/network.nix diff --git a/config/modules/meta/secrets.nix b/modules/meta/secrets.nix similarity index 100% rename from config/modules/meta/secrets.nix rename to modules/meta/secrets.nix diff --git a/config/modules/nixos/bird.nix b/modules/nixos/bird.nix similarity index 100% rename from config/modules/nixos/bird.nix rename to modules/nixos/bird.nix diff --git a/config/modules/nixos/deploy.nix b/modules/nixos/deploy.nix similarity index 100% rename from config/modules/nixos/deploy.nix rename to modules/nixos/deploy.nix diff --git a/config/modules/nixos/disables.nix b/modules/nixos/disables.nix similarity index 100% rename from config/modules/nixos/disables.nix rename to modules/nixos/disables.nix diff --git a/config/modules/nixos/displays.nix b/modules/nixos/displays.nix similarity index 100% rename from config/modules/nixos/displays.nix rename to modules/nixos/displays.nix diff --git a/config/modules/nixos/firewall.nix b/modules/nixos/firewall.nix similarity index 100% rename from config/modules/nixos/firewall.nix rename to modules/nixos/firewall.nix diff --git a/config/modules/nixos/network.nix b/modules/nixos/network.nix similarity index 100% rename from config/modules/nixos/network.nix rename to modules/nixos/network.nix diff --git a/config/modules/nixos/nftables.nix b/modules/nixos/nftables.nix similarity index 100% rename from config/modules/nixos/nftables.nix rename to modules/nixos/nftables.nix diff --git a/config/modules/nixos/policyrouting.nix b/modules/nixos/policyrouting.nix similarity index 100% rename from config/modules/nixos/policyrouting.nix rename to modules/nixos/policyrouting.nix diff --git a/config/modules/nixos/secrets.nix b/modules/nixos/secrets.nix similarity index 100% rename from config/modules/nixos/secrets.nix rename to modules/nixos/secrets.nix diff --git a/config/modules/nixos/yggdrasil.nix b/modules/nixos/yggdrasil.nix similarity index 100% rename from config/modules/nixos/yggdrasil.nix rename to modules/nixos/yggdrasil.nix diff --git a/config/nodes/darwin/sumireko.nix b/nodes/darwin/sumireko.nix similarity index 98% rename from config/nodes/darwin/sumireko.nix rename to nodes/darwin/sumireko.nix index 46c6ed7b..02b690e0 100644 --- a/config/nodes/darwin/sumireko.nix +++ b/nodes/darwin/sumireko.nix @@ -5,7 +5,9 @@ users.kat.darwin users.kat.dev ]; + security.pam.enableSudoTouchIdAuth = true; + homebrew = { brewPrefix = "/opt/homebrew/bin"; casks = [ @@ -15,6 +17,7 @@ "discord" ]; }; + environment.systemPackages = with pkgs; [ awscli jq diff --git a/config/nodes/nixos/chen.nix b/nodes/nixos/chen.nix similarity index 100% rename from config/nodes/nixos/chen.nix rename to nodes/nixos/chen.nix diff --git a/config/nodes/nixos/daiyousei.nix b/nodes/nixos/daiyousei.nix similarity index 100% rename from config/nodes/nixos/daiyousei.nix rename to nodes/nixos/daiyousei.nix diff --git a/config/nodes/nixos/koishi.nix b/nodes/nixos/koishi.nix similarity index 100% rename from config/nodes/nixos/koishi.nix rename to nodes/nixos/koishi.nix diff --git a/config/nodes/nixos/marisa.nix b/nodes/nixos/marisa.nix similarity index 100% rename from config/nodes/nixos/marisa.nix rename to nodes/nixos/marisa.nix diff --git a/config/nodes/nixos/ran.nix b/nodes/nixos/ran.nix similarity index 100% rename from config/nodes/nixos/ran.nix rename to nodes/nixos/ran.nix diff --git a/config/nodes/nixos/rinnosuke.nix b/nodes/nixos/rinnosuke.nix similarity index 100% rename from config/nodes/nixos/rinnosuke.nix rename to nodes/nixos/rinnosuke.nix diff --git a/config/nodes/nixos/yukari.nix b/nodes/nixos/yukari.nix similarity index 100% rename from config/nodes/nixos/yukari.nix rename to nodes/nixos/yukari.nix diff --git a/outputs.nix b/outputs.nix index 48957b95..b807b2be 100644 --- a/outputs.nix +++ b/outputs.nix @@ -7,8 +7,20 @@ mkTree = import ./tree.nix { inherit lib; }; localTree = mkTree { inherit inputs; - folder = ./config; + folder = ./.; config = { + "/" = { + excludes = [ + "tf" + "inputs" + "tree" + "flake" + "meta" + "outputs" + "inputs" + "trusted" + ]; + }; "modules/nixos" = { functor = { enable = true; diff --git a/config/profiles/base/access.nix b/profiles/base/access.nix similarity index 100% rename from config/profiles/base/access.nix rename to profiles/base/access.nix diff --git a/config/profiles/base/base16.nix b/profiles/base/base16.nix similarity index 100% rename from config/profiles/base/base16.nix rename to profiles/base/base16.nix diff --git a/config/profiles/base/documentation.nix b/profiles/base/documentation.nix similarity index 100% rename from config/profiles/base/documentation.nix rename to profiles/base/documentation.nix diff --git a/config/profiles/base/home.nix b/profiles/base/home.nix similarity index 100% rename from config/profiles/base/home.nix rename to profiles/base/home.nix diff --git a/config/profiles/base/kitty.nix b/profiles/base/kitty.nix similarity index 100% rename from config/profiles/base/kitty.nix rename to profiles/base/kitty.nix diff --git a/config/profiles/base/locale.nix b/profiles/base/locale.nix similarity index 100% rename from config/profiles/base/locale.nix rename to profiles/base/locale.nix diff --git a/config/profiles/base/network.nix b/profiles/base/network.nix similarity index 100% rename from config/profiles/base/network.nix rename to profiles/base/network.nix diff --git a/config/profiles/base/nix.nix b/profiles/base/nix.nix similarity index 100% rename from config/profiles/base/nix.nix rename to profiles/base/nix.nix diff --git a/config/profiles/base/packages.nix b/profiles/base/packages.nix similarity index 100% rename from config/profiles/base/packages.nix rename to profiles/base/packages.nix diff --git a/config/profiles/base/profiles.nix b/profiles/base/profiles.nix similarity index 100% rename from config/profiles/base/profiles.nix rename to profiles/base/profiles.nix diff --git a/config/profiles/base/secrets.nix b/profiles/base/secrets.nix similarity index 100% rename from config/profiles/base/secrets.nix rename to profiles/base/secrets.nix diff --git a/config/profiles/base/shell.nix b/profiles/base/shell.nix similarity index 100% rename from config/profiles/base/shell.nix rename to profiles/base/shell.nix diff --git a/config/profiles/base/ssh.nix b/profiles/base/ssh.nix similarity index 100% rename from config/profiles/base/ssh.nix rename to profiles/base/ssh.nix diff --git a/config/profiles/base/system.nix b/profiles/base/system.nix similarity index 100% rename from config/profiles/base/system.nix rename to profiles/base/system.nix diff --git a/config/profiles/cross/aarch64.nix b/profiles/cross/aarch64.nix similarity index 100% rename from config/profiles/cross/aarch64.nix rename to profiles/cross/aarch64.nix diff --git a/config/profiles/cross/arm-common.nix b/profiles/cross/arm-common.nix similarity index 100% rename from config/profiles/cross/arm-common.nix rename to profiles/cross/arm-common.nix diff --git a/config/profiles/cross/armv6.nix b/profiles/cross/armv6.nix similarity index 100% rename from config/profiles/cross/armv6.nix rename to profiles/cross/armv6.nix diff --git a/config/profiles/cross/armv7.nix b/profiles/cross/armv7.nix similarity index 100% rename from config/profiles/cross/armv7.nix rename to profiles/cross/armv7.nix diff --git a/config/profiles/cross/default.nix b/profiles/cross/default.nix similarity index 100% rename from config/profiles/cross/default.nix rename to profiles/cross/default.nix diff --git a/config/profiles/darwin/home.nix b/profiles/darwin/home.nix similarity index 100% rename from config/profiles/darwin/home.nix rename to profiles/darwin/home.nix diff --git a/config/profiles/darwin/homebrew.nix b/profiles/darwin/homebrew.nix similarity index 100% rename from config/profiles/darwin/homebrew.nix rename to profiles/darwin/homebrew.nix diff --git a/config/profiles/darwin/nix.nix b/profiles/darwin/nix.nix similarity index 100% rename from config/profiles/darwin/nix.nix rename to profiles/darwin/nix.nix diff --git a/config/profiles/darwin/shell.nix b/profiles/darwin/shell.nix similarity index 100% rename from config/profiles/darwin/shell.nix rename to profiles/darwin/shell.nix diff --git a/config/profiles/gnome/gnome.nix b/profiles/gnome/gnome.nix similarity index 100% rename from config/profiles/gnome/gnome.nix rename to profiles/gnome/gnome.nix diff --git a/config/profiles/gui/adb.nix b/profiles/gui/adb.nix similarity index 100% rename from config/profiles/gui/adb.nix rename to profiles/gui/adb.nix diff --git a/config/profiles/gui/filesystems.nix b/profiles/gui/filesystems.nix similarity index 100% rename from config/profiles/gui/filesystems.nix rename to profiles/gui/filesystems.nix diff --git a/config/profiles/gui/fonts.nix b/profiles/gui/fonts.nix similarity index 100% rename from config/profiles/gui/fonts.nix rename to profiles/gui/fonts.nix diff --git a/config/profiles/gui/gpg.nix b/profiles/gui/gpg.nix similarity index 100% rename from config/profiles/gui/gpg.nix rename to profiles/gui/gpg.nix diff --git a/config/profiles/gui/mingetty.nix b/profiles/gui/mingetty.nix similarity index 100% rename from config/profiles/gui/mingetty.nix rename to profiles/gui/mingetty.nix diff --git a/config/profiles/gui/nfs.nix b/profiles/gui/nfs.nix similarity index 100% rename from config/profiles/gui/nfs.nix rename to profiles/gui/nfs.nix diff --git a/config/profiles/gui/profile.nix b/profiles/gui/profile.nix similarity index 100% rename from config/profiles/gui/profile.nix rename to profiles/gui/profile.nix diff --git a/config/profiles/gui/qt.nix b/profiles/gui/qt.nix similarity index 100% rename from config/profiles/gui/qt.nix rename to profiles/gui/qt.nix diff --git a/config/profiles/gui/sound.nix b/profiles/gui/sound.nix similarity index 100% rename from config/profiles/gui/sound.nix rename to profiles/gui/sound.nix diff --git a/config/profiles/gui/sway.nix b/profiles/gui/sway.nix similarity index 100% rename from config/profiles/gui/sway.nix rename to profiles/gui/sway.nix diff --git a/config/profiles/gui/udev.nix b/profiles/gui/udev.nix similarity index 100% rename from config/profiles/gui/udev.nix rename to profiles/gui/udev.nix diff --git a/config/profiles/gui/xdg-portals.nix b/profiles/gui/xdg-portals.nix similarity index 100% rename from config/profiles/gui/xdg-portals.nix rename to profiles/gui/xdg-portals.nix diff --git a/config/profiles/hardware/aarch64-darwin.nix b/profiles/hardware/aarch64-darwin.nix similarity index 100% rename from config/profiles/hardware/aarch64-darwin.nix rename to profiles/hardware/aarch64-darwin.nix diff --git a/config/profiles/hardware/aarch64-linux.nix b/profiles/hardware/aarch64-linux.nix similarity index 100% rename from config/profiles/hardware/aarch64-linux.nix rename to profiles/hardware/aarch64-linux.nix diff --git a/config/profiles/hardware/amdgpu.nix b/profiles/hardware/amdgpu.nix similarity index 100% rename from config/profiles/hardware/amdgpu.nix rename to profiles/hardware/amdgpu.nix diff --git a/config/profiles/hardware/bamboo.nix b/profiles/hardware/bamboo.nix similarity index 100% rename from config/profiles/hardware/bamboo.nix rename to profiles/hardware/bamboo.nix diff --git a/config/profiles/hardware/default.nix b/profiles/hardware/default.nix similarity index 100% rename from config/profiles/hardware/default.nix rename to profiles/hardware/default.nix diff --git a/config/profiles/hardware/eeepc-1015pem.nix b/profiles/hardware/eeepc-1015pem.nix similarity index 100% rename from config/profiles/hardware/eeepc-1015pem.nix rename to profiles/hardware/eeepc-1015pem.nix diff --git a/config/profiles/hardware/hcloud-imperative.nix b/profiles/hardware/hcloud-imperative.nix similarity index 100% rename from config/profiles/hardware/hcloud-imperative.nix rename to profiles/hardware/hcloud-imperative.nix diff --git a/config/profiles/hardware/intel-gpu.nix b/profiles/hardware/intel-gpu.nix similarity index 100% rename from config/profiles/hardware/intel-gpu.nix rename to profiles/hardware/intel-gpu.nix diff --git a/config/profiles/hardware/intel.nix b/profiles/hardware/intel.nix similarity index 100% rename from config/profiles/hardware/intel.nix rename to profiles/hardware/intel.nix diff --git a/config/profiles/hardware/laptop/default.nix b/profiles/hardware/laptop/default.nix similarity index 100% rename from config/profiles/hardware/laptop/default.nix rename to profiles/hardware/laptop/default.nix diff --git a/config/profiles/hardware/laptop/light.nix b/profiles/hardware/laptop/light.nix similarity index 100% rename from config/profiles/hardware/laptop/light.nix rename to profiles/hardware/laptop/light.nix diff --git a/config/profiles/hardware/ms-7b86.nix b/profiles/hardware/ms-7b86.nix similarity index 100% rename from config/profiles/hardware/ms-7b86.nix rename to profiles/hardware/ms-7b86.nix diff --git a/config/profiles/hardware/networkmanager.nix b/profiles/hardware/networkmanager.nix similarity index 100% rename from config/profiles/hardware/networkmanager.nix rename to profiles/hardware/networkmanager.nix diff --git a/config/profiles/hardware/oracle/common.nix b/profiles/hardware/oracle/common.nix similarity index 100% rename from config/profiles/hardware/oracle/common.nix rename to profiles/hardware/oracle/common.nix diff --git a/config/profiles/hardware/oracle/default.nix b/profiles/hardware/oracle/default.nix similarity index 100% rename from config/profiles/hardware/oracle/default.nix rename to profiles/hardware/oracle/default.nix diff --git a/config/profiles/hardware/raspi.nix b/profiles/hardware/raspi.nix similarity index 100% rename from config/profiles/hardware/raspi.nix rename to profiles/hardware/raspi.nix diff --git a/config/profiles/hardware/razer.nix b/profiles/hardware/razer.nix similarity index 100% rename from config/profiles/hardware/razer.nix rename to profiles/hardware/razer.nix diff --git a/config/profiles/hardware/rm-310.nix b/profiles/hardware/rm-310.nix similarity index 100% rename from config/profiles/hardware/rm-310.nix rename to profiles/hardware/rm-310.nix diff --git a/config/profiles/hardware/ryzen.nix b/profiles/hardware/ryzen.nix similarity index 100% rename from config/profiles/hardware/ryzen.nix rename to profiles/hardware/ryzen.nix diff --git a/config/profiles/hardware/v330-14arr.nix b/profiles/hardware/v330-14arr.nix similarity index 100% rename from config/profiles/hardware/v330-14arr.nix rename to profiles/hardware/v330-14arr.nix diff --git a/config/profiles/hardware/wifi.nix b/profiles/hardware/wifi.nix similarity index 100% rename from config/profiles/hardware/wifi.nix rename to profiles/hardware/wifi.nix diff --git a/config/profiles/hardware/x270.nix b/profiles/hardware/x270.nix similarity index 100% rename from config/profiles/hardware/x270.nix rename to profiles/hardware/x270.nix diff --git a/config/profiles/light.nix b/profiles/light.nix similarity index 100% rename from config/profiles/light.nix rename to profiles/light.nix diff --git a/config/profiles/network.nix b/profiles/network.nix similarity index 100% rename from config/profiles/network.nix rename to profiles/network.nix diff --git a/config/profiles/shared.nix b/profiles/shared.nix similarity index 100% rename from config/profiles/shared.nix rename to profiles/shared.nix diff --git a/config/profiles/vfio/profile.nix b/profiles/vfio/profile.nix similarity index 100% rename from config/profiles/vfio/profile.nix rename to profiles/vfio/profile.nix diff --git a/config/profiles/vfio/tsc-tolerance.patch b/profiles/vfio/tsc-tolerance.patch similarity index 100% rename from config/profiles/vfio/tsc-tolerance.patch rename to profiles/vfio/tsc-tolerance.patch diff --git a/config/profiles/x11/layout.xkb b/profiles/x11/layout.xkb similarity index 100% rename from config/profiles/x11/layout.xkb rename to profiles/x11/layout.xkb diff --git a/config/profiles/x11/profile.nix b/profiles/x11/profile.nix similarity index 100% rename from config/profiles/x11/profile.nix rename to profiles/x11/profile.nix diff --git a/config/services/access.nix b/services/access.nix similarity index 100% rename from config/services/access.nix rename to services/access.nix diff --git a/config/services/dht22-exporter.nix b/services/dht22-exporter.nix similarity index 100% rename from config/services/dht22-exporter.nix rename to services/dht22-exporter.nix diff --git a/config/services/dnscrypt-proxy.nix b/services/dnscrypt-proxy.nix similarity index 100% rename from config/services/dnscrypt-proxy.nix rename to services/dnscrypt-proxy.nix diff --git a/config/services/filehost.nix b/services/filehost.nix similarity index 100% rename from config/services/filehost.nix rename to services/filehost.nix diff --git a/config/services/fusionpbx.nix b/services/fusionpbx.nix similarity index 100% rename from config/services/fusionpbx.nix rename to services/fusionpbx.nix diff --git a/config/services/gitea/default.nix b/services/gitea/default.nix similarity index 100% rename from config/services/gitea/default.nix rename to services/gitea/default.nix diff --git a/config/services/gitea/public/img/favicon.svg b/services/gitea/public/img/favicon.svg similarity index 100% rename from config/services/gitea/public/img/favicon.svg rename to services/gitea/public/img/favicon.svg diff --git a/config/services/gitea/public/img/gitea-lg.png b/services/gitea/public/img/gitea-lg.png similarity index 100% rename from config/services/gitea/public/img/gitea-lg.png rename to services/gitea/public/img/gitea-lg.png diff --git a/config/services/gitea/public/img/gitea-sm.png b/services/gitea/public/img/gitea-sm.png similarity index 100% rename from config/services/gitea/public/img/gitea-sm.png rename to services/gitea/public/img/gitea-sm.png diff --git a/config/services/gitea/public/img/logo.svg b/services/gitea/public/img/logo.svg similarity index 100% rename from config/services/gitea/public/img/logo.svg rename to services/gitea/public/img/logo.svg diff --git a/config/services/gitea/templates/custom/header.tmpl b/services/gitea/templates/custom/header.tmpl similarity index 100% rename from config/services/gitea/templates/custom/header.tmpl rename to services/gitea/templates/custom/header.tmpl diff --git a/config/services/gitea/templates/home.tmpl b/services/gitea/templates/home.tmpl similarity index 100% rename from config/services/gitea/templates/home.tmpl rename to services/gitea/templates/home.tmpl diff --git a/config/services/glauth.nix b/services/glauth.nix similarity index 100% rename from config/services/glauth.nix rename to services/glauth.nix diff --git a/config/services/ha.nix b/services/ha.nix similarity index 100% rename from config/services/ha.nix rename to services/ha.nix diff --git a/config/services/hedgedoc.nix b/services/hedgedoc.nix similarity index 100% rename from config/services/hedgedoc.nix rename to services/hedgedoc.nix diff --git a/config/services/irlmail.nix b/services/irlmail.nix similarity index 100% rename from config/services/irlmail.nix rename to services/irlmail.nix diff --git a/config/services/irlsite.nix b/services/irlsite.nix similarity index 100% rename from config/services/irlsite.nix rename to services/irlsite.nix diff --git a/config/services/jellyfin.nix b/services/jellyfin.nix similarity index 100% rename from config/services/jellyfin.nix rename to services/jellyfin.nix diff --git a/config/services/jira.nix b/services/jira.nix similarity index 100% rename from config/services/jira.nix rename to services/jira.nix diff --git a/config/services/kattv-ingest.nix b/services/kattv-ingest.nix similarity index 100% rename from config/services/kattv-ingest.nix rename to services/kattv-ingest.nix diff --git a/config/services/kattv.nix b/services/kattv.nix similarity index 100% rename from config/services/kattv.nix rename to services/kattv.nix diff --git a/config/services/kattv2-ingest.nix b/services/kattv2-ingest.nix similarity index 100% rename from config/services/kattv2-ingest.nix rename to services/kattv2-ingest.nix diff --git a/config/services/kattv2.nix b/services/kattv2.nix similarity index 100% rename from config/services/kattv2.nix rename to services/kattv2.nix diff --git a/config/services/keycloak.nix b/services/keycloak.nix similarity index 100% rename from config/services/keycloak.nix rename to services/keycloak.nix diff --git a/config/services/knot/default.nix b/services/knot/default.nix similarity index 100% rename from config/services/knot/default.nix rename to services/knot/default.nix diff --git a/config/services/knot/dork.dev.nix b/services/knot/dork.dev.nix similarity index 100% rename from config/services/knot/dork.dev.nix rename to services/knot/dork.dev.nix diff --git a/config/services/knot/gensokyo.zone.nix b/services/knot/gensokyo.zone.nix similarity index 100% rename from config/services/knot/gensokyo.zone.nix rename to services/knot/gensokyo.zone.nix diff --git a/config/services/knot/kittywit.ch.nix b/services/knot/kittywit.ch.nix similarity index 100% rename from config/services/knot/kittywit.ch.nix rename to services/knot/kittywit.ch.nix diff --git a/config/services/knot/knot.yaml b/services/knot/knot.yaml similarity index 100% rename from config/services/knot/knot.yaml rename to services/knot/knot.yaml diff --git a/config/services/kubernetes.nix b/services/kubernetes.nix similarity index 100% rename from config/services/kubernetes.nix rename to services/kubernetes.nix diff --git a/config/services/logrotate.nix b/services/logrotate.nix similarity index 100% rename from config/services/logrotate.nix rename to services/logrotate.nix diff --git a/config/services/mail/autoconfig.nix b/services/mail/autoconfig.nix similarity index 100% rename from config/services/mail/autoconfig.nix rename to services/mail/autoconfig.nix diff --git a/config/services/mail/default.nix b/services/mail/default.nix similarity index 100% rename from config/services/mail/default.nix rename to services/mail/default.nix diff --git a/config/services/mail/dns.nix b/services/mail/dns.nix similarity index 100% rename from config/services/mail/dns.nix rename to services/mail/dns.nix diff --git a/config/services/mail/dovecot.nix b/services/mail/dovecot.nix similarity index 100% rename from config/services/mail/dovecot.nix rename to services/mail/dovecot.nix diff --git a/config/services/mail/opendkim.nix b/services/mail/opendkim.nix similarity index 100% rename from config/services/mail/opendkim.nix rename to services/mail/opendkim.nix diff --git a/config/services/mail/postfix.nix b/services/mail/postfix.nix similarity index 100% rename from config/services/mail/postfix.nix rename to services/mail/postfix.nix diff --git a/config/services/mail/roundcube.nix b/services/mail/roundcube.nix similarity index 100% rename from config/services/mail/roundcube.nix rename to services/mail/roundcube.nix diff --git a/config/services/mail/rspamd.nix b/services/mail/rspamd.nix similarity index 100% rename from config/services/mail/rspamd.nix rename to services/mail/rspamd.nix diff --git a/config/services/mail/sogo.nix b/services/mail/sogo.nix similarity index 100% rename from config/services/mail/sogo.nix rename to services/mail/sogo.nix diff --git a/config/services/murmur-ldap/LDAPauth.py b/services/murmur-ldap/LDAPauth.py similarity index 100% rename from config/services/murmur-ldap/LDAPauth.py rename to services/murmur-ldap/LDAPauth.py diff --git a/config/services/murmur-ldap/default.nix b/services/murmur-ldap/default.nix similarity index 100% rename from config/services/murmur-ldap/default.nix rename to services/murmur-ldap/default.nix diff --git a/config/services/murmur.nix b/services/murmur.nix similarity index 100% rename from config/services/murmur.nix rename to services/murmur.nix diff --git a/config/services/nextcloud.nix b/services/nextcloud.nix similarity index 100% rename from config/services/nextcloud.nix rename to services/nextcloud.nix diff --git a/config/services/nfs.nix b/services/nfs.nix similarity index 100% rename from config/services/nfs.nix rename to services/nfs.nix diff --git a/config/services/nginx.nix b/services/nginx.nix similarity index 100% rename from config/services/nginx.nix rename to services/nginx.nix diff --git a/config/services/openldap/default.nix b/services/openldap/default.nix similarity index 100% rename from config/services/openldap/default.nix rename to services/openldap/default.nix diff --git a/config/services/openldap/kw.ldif b/services/openldap/kw.ldif similarity index 100% rename from config/services/openldap/kw.ldif rename to services/openldap/kw.ldif diff --git a/config/services/openldap/mail.ldif b/services/openldap/mail.ldif similarity index 100% rename from config/services/openldap/mail.ldif rename to services/openldap/mail.ldif diff --git a/config/services/openldap/services.ldif b/services/openldap/services.ldif similarity index 100% rename from config/services/openldap/services.ldif rename to services/openldap/services.ldif diff --git a/config/services/openldap/users.ldif b/services/openldap/users.ldif similarity index 100% rename from config/services/openldap/users.ldif rename to services/openldap/users.ldif diff --git a/config/services/plex.nix b/services/plex.nix similarity index 100% rename from config/services/plex.nix rename to services/plex.nix diff --git a/config/services/postgres.nix b/services/postgres.nix similarity index 100% rename from config/services/postgres.nix rename to services/postgres.nix diff --git a/config/services/prosody.nix b/services/prosody.nix similarity index 100% rename from config/services/prosody.nix rename to services/prosody.nix diff --git a/config/services/restic.nix b/services/restic.nix similarity index 100% rename from config/services/restic.nix rename to services/restic.nix diff --git a/config/services/synapse.nix b/services/synapse.nix similarity index 100% rename from config/services/synapse.nix rename to services/synapse.nix diff --git a/config/services/syncplay.nix b/services/syncplay.nix similarity index 100% rename from config/services/syncplay.nix rename to services/syncplay.nix diff --git a/config/services/taskserver.nix b/services/taskserver.nix similarity index 100% rename from config/services/taskserver.nix rename to services/taskserver.nix diff --git a/config/services/transmission.nix b/services/transmission.nix similarity index 100% rename from config/services/transmission.nix rename to services/transmission.nix diff --git a/config/services/tt-rss.nix b/services/tt-rss.nix similarity index 100% rename from config/services/tt-rss.nix rename to services/tt-rss.nix diff --git a/config/services/tvheadend.nix b/services/tvheadend.nix similarity index 100% rename from config/services/tvheadend.nix rename to services/tvheadend.nix diff --git a/config/services/vaultwarden.nix b/services/vaultwarden.nix similarity index 100% rename from config/services/vaultwarden.nix rename to services/vaultwarden.nix diff --git a/config/services/vikunja.nix b/services/vikunja.nix similarity index 100% rename from config/services/vikunja.nix rename to services/vikunja.nix diff --git a/config/services/website.nix b/services/website.nix similarity index 100% rename from config/services/website.nix rename to services/website.nix diff --git a/config/services/weechat.nix b/services/weechat.nix similarity index 100% rename from config/services/weechat.nix rename to services/weechat.nix diff --git a/config/services/zfs.nix b/services/zfs.nix similarity index 100% rename from config/services/zfs.nix rename to services/zfs.nix diff --git a/config/services/znc.nix b/services/znc.nix similarity index 100% rename from config/services/znc.nix rename to services/znc.nix diff --git a/config/targets/home.nix b/targets/home.nix similarity index 100% rename from config/targets/home.nix rename to targets/home.nix diff --git a/config/targets/oci-root.nix b/targets/oci-root.nix similarity index 100% rename from config/targets/oci-root.nix rename to targets/oci-root.nix diff --git a/config/targets/rinnosuke-domains.nix b/targets/rinnosuke-domains.nix similarity index 100% rename from config/targets/rinnosuke-domains.nix rename to targets/rinnosuke-domains.nix diff --git a/config/tf.nix b/tf.nix similarity index 100% rename from config/tf.nix rename to tf.nix diff --git a/tree.nix b/tree.nix index 02684154..80725ef3 100644 --- a/tree.nix +++ b/tree.nix @@ -63,6 +63,7 @@ }; config.treeConfig = { "*" = {}; + "/" = {}; }; }; configTree.treeConfig = config; @@ -78,7 +79,7 @@ then f (path ++ [name]) (recurse (path ++ [name]) value) else f (path ++ [name]) value; in mapAttrs g set; - in recurse [] set; + in f [] (recurse [] set); getPathString = path: concatStringsSep "/" path; getConfig = path: default: configTreeModule.${getPathString path} or default; revtail = path: sublist 0 (length path - 1) path; @@ -87,7 +88,9 @@ in getConfig (path ++ singleton "*") (getConfigRecursive parentPath); processLeaves = tree: config: mapAttrsRecursive (path: value: let pathString = getPathString path; - leafConfig = getConfig path (getConfigRecursive (revtail path)); + leafConfig = if path == [] then + configTreeModule."/" + else getConfig path (getConfigRecursive (revtail path)); processConfig = path: value: let processFunctor = prev: prev // { __functor = self: { ... }: { diff --git a/trusted/flake.lock b/trusted/flake.lock index 439bdf4e..0c53d715 100644 --- a/trusted/flake.lock +++ b/trusted/flake.lock @@ -38,7 +38,7 @@ "inputs": { "nixpkgs": [ "nixfiles", - "nixpkgs-darwin" + "nixpkgs" ] }, "locked": { @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1657275959, - "narHash": "sha256-pg8FB1DRImBpqXHCp/0Y7bIphpVqGmkWgWOcFDMwdTg=", + "lastModified": 1657305762, + "narHash": "sha256-dsuJG/y2LtqyHhDEIo3d3g/+K9IqhG3qt/tf7WYheH4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "22448c09bae21969ca14d1558a120dafe9853c73", + "rev": "eae26b7d5fc04699078a1687185d65077bc73c96", "type": "github" }, "original": { @@ -261,29 +261,6 @@ "type": "github" } }, - "home-manager-darwin": { - "inputs": { - "nixpkgs": [ - "nixfiles", - "nixpkgs-darwin" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1657241847, - "narHash": "sha256-/aN3p2LaRNVXf7w92GWgXq9H5f23YRQPOvsm3BrBqzU=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "8160b3b45b8457d58d2b3af2aeb2eb6f47042e0f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "home-manager", - "type": "github" - } - }, "nix-dns": { "inputs": { "flake-utils": [ @@ -379,11 +356,9 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils", "home-manager": "home-manager", - "home-manager-darwin": "home-manager-darwin", "nix-dns": "nix-dns", "nix-doom-emacs": "nix-doom-emacs", "nixpkgs": "nixpkgs_2", - "nixpkgs-darwin": "nixpkgs-darwin", "nur": "nur", "tf-nix": "tf-nix", "trusted": [ @@ -392,45 +367,28 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-vGvSygG1efbRaUiBu48fHkLn5q1ZcN19YocDVG21vuI=", - "path": "/nix/store/n8s60kqi0wdnp3gv28b8211ldx9alvk3-source", + "narHash": "sha256-FHjqiLYqBGP1qEmyNkmHIulZKiifg+K8AD1WlIW592s=", + "path": "/nix/store/psp2lvg1gjpy781cvvd703wrjmk27d5f-source", "type": "path" }, "original": { - "path": "/nix/store/n8s60kqi0wdnp3gv28b8211ldx9alvk3-source", + "path": "/nix/store/psp2lvg1gjpy781cvvd703wrjmk27d5f-source", "type": "path" } }, "nixpkgs": { "locked": { - "lastModified": 1657208011, - "narHash": "sha256-BlIFwopAykvdy1DYayEkj6ZZdkn+cVgPNX98QVLc0jM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2770cc0b1e8faa0e20eb2c6aea64c256a706d4f2", - "type": "github" + "lastModified": 1657114324, + "narHash": "sha256-fWuaUNXrHcz/ciHRHlcSO92dvV3EVS0GJQUSBO5JIB4=", + "path": "/nix/store/7x87vd43nvg8pkcmya5ivl34q5y8kp9b-source", + "rev": "a5c867d9fe9e4380452628e8f171c26b69fa9d3d", + "type": "path" }, "original": { "id": "nixpkgs", "type": "indirect" } }, - "nixpkgs-darwin": { - "locked": { - "lastModified": 1657208011, - "narHash": "sha256-BlIFwopAykvdy1DYayEkj6ZZdkn+cVgPNX98QVLc0jM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2770cc0b1e8faa0e20eb2c6aea64c256a706d4f2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1657114324, @@ -465,11 +423,11 @@ }, "nur": { "locked": { - "lastModified": 1657272425, - "narHash": "sha256-Y1vbPYhUi0ZKqn6XxQeE/RnyMcfHIE0YCkR1iPGoToo=", + "lastModified": 1657315594, + "narHash": "sha256-lkAqmREtGhWwHK3wdVSfqt+Q+xUhZmQ0UZyubeMJLR4=", "owner": "nix-community", "repo": "nur", - "rev": "4a0d26d6ccb60f24a5e771c6de4c64622fb2b4af", + "rev": "fae381cd12525fdfb5163ce0ac78c2705d5917c4", "type": "github" }, "original": { @@ -646,21 +604,6 @@ "type": "git", "url": "ssh://git@github.com/kittywitch/nixfiles-trusted" } - }, - "utils": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/config/users/arc/default.nix b/users/arc/default.nix similarity index 100% rename from config/users/arc/default.nix rename to users/arc/default.nix diff --git a/config/users/hexchen/default.nix b/users/hexchen/default.nix similarity index 100% rename from config/users/hexchen/default.nix rename to users/hexchen/default.nix diff --git a/config/users/kat/base/base16.nix b/users/kat/base/base16.nix similarity index 100% rename from config/users/kat/base/base16.nix rename to users/kat/base/base16.nix diff --git a/config/users/kat/base/dconf.nix b/users/kat/base/dconf.nix similarity index 100% rename from config/users/kat/base/dconf.nix rename to users/kat/base/dconf.nix diff --git a/config/users/kat/base/git.nix b/users/kat/base/git.nix similarity index 100% rename from config/users/kat/base/git.nix rename to users/kat/base/git.nix diff --git a/config/users/kat/base/inputrc.nix b/users/kat/base/inputrc.nix similarity index 100% rename from config/users/kat/base/inputrc.nix rename to users/kat/base/inputrc.nix diff --git a/config/users/kat/base/packages.nix b/users/kat/base/packages.nix similarity index 100% rename from config/users/kat/base/packages.nix rename to users/kat/base/packages.nix diff --git a/config/users/kat/base/secrets.nix b/users/kat/base/secrets.nix similarity index 100% rename from config/users/kat/base/secrets.nix rename to users/kat/base/secrets.nix diff --git a/config/users/kat/base/shell.nix b/users/kat/base/shell.nix similarity index 100% rename from config/users/kat/base/shell.nix rename to users/kat/base/shell.nix diff --git a/config/users/kat/base/ssh.nix b/users/kat/base/ssh.nix similarity index 100% rename from config/users/kat/base/ssh.nix rename to users/kat/base/ssh.nix diff --git a/config/users/kat/base/state.nix b/users/kat/base/state.nix similarity index 100% rename from config/users/kat/base/state.nix rename to users/kat/base/state.nix diff --git a/config/users/kat/base/tmux.nix b/users/kat/base/tmux.nix similarity index 100% rename from config/users/kat/base/tmux.nix rename to users/kat/base/tmux.nix diff --git a/config/users/kat/base/vim/nvim.nix b/users/kat/base/vim/default.nix similarity index 63% rename from config/users/kat/base/vim/nvim.nix rename to users/kat/base/vim/default.nix index 5c5811f5..e3a59ce0 100644 --- a/config/users/kat/base/vim/nvim.nix +++ b/users/kat/base/vim/default.nix @@ -8,16 +8,25 @@ vimAlias = true; viAlias = true; plugins = with pkgs.vimPlugins; [ + # Disables and re-enables highlighting when searching vim-cool - vim-lastplace + # Colour highlighting vim-hexokinase - vim-nix + # fzf fzf-vim + # Git porcelain vim-fugitive + # Start screen vim-startify + # Re-open with cursor at the same place vim-lastplace + # Status Bar lualine-nvim + # EasyMotion Equivalent hop-nvim + # Languages + vim-nix + vim-terraform ]; extraConfig = '' luafile ${./init.lua} diff --git a/config/users/kat/base/vim/init.lua b/users/kat/base/vim/init.lua similarity index 100% rename from config/users/kat/base/vim/init.lua rename to users/kat/base/vim/init.lua diff --git a/config/users/kat/base/weechat.nix b/users/kat/base/weechat.nix similarity index 100% rename from config/users/kat/base/weechat.nix rename to users/kat/base/weechat.nix diff --git a/config/users/kat/darwin.nix b/users/kat/darwin.nix similarity index 100% rename from config/users/kat/darwin.nix rename to users/kat/darwin.nix diff --git a/config/users/kat/default.nix b/users/kat/default.nix similarity index 100% rename from config/users/kat/default.nix rename to users/kat/default.nix diff --git a/config/users/kat/dev/cookiecutter.nix b/users/kat/dev/cookiecutter.nix similarity index 100% rename from config/users/kat/dev/cookiecutter.nix rename to users/kat/dev/cookiecutter.nix diff --git a/config/users/kat/dev/doom.d/config.el b/users/kat/dev/doom.d/config.el similarity index 100% rename from config/users/kat/dev/doom.d/config.el rename to users/kat/dev/doom.d/config.el diff --git a/config/users/kat/dev/doom.d/init.el b/users/kat/dev/doom.d/init.el similarity index 100% rename from config/users/kat/dev/doom.d/init.el rename to users/kat/dev/doom.d/init.el diff --git a/config/users/kat/dev/doom.d/packages.el b/users/kat/dev/doom.d/packages.el similarity index 100% rename from config/users/kat/dev/doom.d/packages.el rename to users/kat/dev/doom.d/packages.el diff --git a/config/users/kat/dev/packages.nix b/users/kat/dev/packages.nix similarity index 100% rename from config/users/kat/dev/packages.nix rename to users/kat/dev/packages.nix diff --git a/config/users/kat/dev/rink.nix b/users/kat/dev/rink.nix similarity index 100% rename from config/users/kat/dev/rink.nix rename to users/kat/dev/rink.nix diff --git a/config/users/kat/dev/rustfmt.nix b/users/kat/dev/rustfmt.nix similarity index 100% rename from config/users/kat/dev/rustfmt.nix rename to users/kat/dev/rustfmt.nix diff --git a/config/users/kat/dev/shell.nix b/users/kat/dev/shell.nix similarity index 100% rename from config/users/kat/dev/shell.nix rename to users/kat/dev/shell.nix diff --git a/config/users/kat/dev/vim/coc.vim b/users/kat/dev/vim/coc.vim similarity index 100% rename from config/users/kat/dev/vim/coc.vim rename to users/kat/dev/vim/coc.vim diff --git a/config/users/kat/dev/vim/default.nix b/users/kat/dev/vim/default.nix similarity index 100% rename from config/users/kat/dev/vim/default.nix rename to users/kat/dev/vim/default.nix diff --git a/config/users/kat/dev/vim/init.lua b/users/kat/dev/vim/init.lua similarity index 65% rename from config/users/kat/dev/vim/init.lua rename to users/kat/dev/vim/init.lua index 03916d8a..11645d3e 100644 --- a/config/users/kat/dev/vim/init.lua +++ b/users/kat/dev/vim/init.lua @@ -49,3 +49,9 @@ api.nvim_set_keymap('n', 'ff', 'Telescope find_files', { norema api.nvim_set_keymap('n', 'fg', 'Telescope live_grep', { noremap = true, silent = true }) api.nvim_set_keymap('n', 'fb', 'Telescope buffers', { noremap = true, silent = true }) api.nvim_set_keymap('n', 'fh', 'Telescope help_tags', { noremap = true, silent = true }) + +-- hop +vim.api.nvim_set_keymap('', 'f', "lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.AFTER_CURSOR, current_line_only = true })", {}) +vim.api.nvim_set_keymap('', 'F', "lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.BEFORE_CURSOR, current_line_only = true })", {}) +vim.api.nvim_set_keymap('', 't', "lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.AFTER_CURSOR, current_line_only = true, hint_offset = -1 })", {}) +vim.api.nvim_set_keymap('', 'T', "lua require'hop'.hint_char1({ direction = require'hop.hint'.HintDirection.BEFORE_CURSOR, current_line_only = true, hint_offset = 1 })", {}) diff --git a/config/users/kat/gnome/gnome.nix b/users/kat/gnome/gnome.nix similarity index 100% rename from config/users/kat/gnome/gnome.nix rename to users/kat/gnome/gnome.nix diff --git a/config/users/kat/gui/base16.nix b/users/kat/gui/base16.nix similarity index 100% rename from config/users/kat/gui/base16.nix rename to users/kat/gui/base16.nix diff --git a/config/users/kat/gui/firefox/default.nix b/users/kat/gui/firefox/default.nix similarity index 100% rename from config/users/kat/gui/firefox/default.nix rename to users/kat/gui/firefox/default.nix diff --git a/config/users/kat/gui/firefox/tst.sass b/users/kat/gui/firefox/tst.sass similarity index 100% rename from config/users/kat/gui/firefox/tst.sass rename to users/kat/gui/firefox/tst.sass diff --git a/config/users/kat/gui/firefox/userChrome.sass b/users/kat/gui/firefox/userChrome.sass similarity index 100% rename from config/users/kat/gui/firefox/userChrome.sass rename to users/kat/gui/firefox/userChrome.sass diff --git a/config/users/kat/gui/fonts.nix b/users/kat/gui/fonts.nix similarity index 100% rename from config/users/kat/gui/fonts.nix rename to users/kat/gui/fonts.nix diff --git a/config/users/kat/gui/foot.nix b/users/kat/gui/foot.nix similarity index 100% rename from config/users/kat/gui/foot.nix rename to users/kat/gui/foot.nix diff --git a/config/users/kat/gui/gtk.nix b/users/kat/gui/gtk.nix similarity index 100% rename from config/users/kat/gui/gtk.nix rename to users/kat/gui/gtk.nix diff --git a/config/users/kat/gui/hedgedoc.nix b/users/kat/gui/hedgedoc.nix similarity index 100% rename from config/users/kat/gui/hedgedoc.nix rename to users/kat/gui/hedgedoc.nix diff --git a/config/users/kat/gui/kitty.nix b/users/kat/gui/kitty.nix similarity index 100% rename from config/users/kat/gui/kitty.nix rename to users/kat/gui/kitty.nix diff --git a/config/users/kat/gui/konawall.nix b/users/kat/gui/konawall.nix similarity index 100% rename from config/users/kat/gui/konawall.nix rename to users/kat/gui/konawall.nix diff --git a/config/users/kat/gui/layout.xkb b/users/kat/gui/layout.xkb similarity index 100% rename from config/users/kat/gui/layout.xkb rename to users/kat/gui/layout.xkb diff --git a/config/users/kat/gui/nextcloud.nix b/users/kat/gui/nextcloud.nix similarity index 100% rename from config/users/kat/gui/nextcloud.nix rename to users/kat/gui/nextcloud.nix diff --git a/config/users/kat/gui/packages.nix b/users/kat/gui/packages.nix similarity index 100% rename from config/users/kat/gui/packages.nix rename to users/kat/gui/packages.nix diff --git a/config/users/kat/gui/qt.nix b/users/kat/gui/qt.nix similarity index 100% rename from config/users/kat/gui/qt.nix rename to users/kat/gui/qt.nix diff --git a/config/users/kat/gui/ranger.nix b/users/kat/gui/ranger.nix similarity index 100% rename from config/users/kat/gui/ranger.nix rename to users/kat/gui/ranger.nix diff --git a/config/users/kat/gui/xdg.nix b/users/kat/gui/xdg.nix similarity index 100% rename from config/users/kat/gui/xdg.nix rename to users/kat/gui/xdg.nix diff --git a/config/users/kat/gui/xkb.nix b/users/kat/gui/xkb.nix similarity index 100% rename from config/users/kat/gui/xkb.nix rename to users/kat/gui/xkb.nix diff --git a/config/users/kat/i3/dunst.nix b/users/kat/i3/dunst.nix similarity index 100% rename from config/users/kat/i3/dunst.nix rename to users/kat/i3/dunst.nix diff --git a/config/users/kat/i3/i3.nix b/users/kat/i3/i3.nix similarity index 100% rename from config/users/kat/i3/i3.nix rename to users/kat/i3/i3.nix diff --git a/config/users/kat/i3/keyboard.nix b/users/kat/i3/keyboard.nix similarity index 100% rename from config/users/kat/i3/keyboard.nix rename to users/kat/i3/keyboard.nix diff --git a/config/users/kat/i3/picom.nix b/users/kat/i3/picom.nix similarity index 100% rename from config/users/kat/i3/picom.nix rename to users/kat/i3/picom.nix diff --git a/config/users/kat/i3/polybar.nix b/users/kat/i3/polybar.nix similarity index 100% rename from config/users/kat/i3/polybar.nix rename to users/kat/i3/polybar.nix diff --git a/config/users/kat/i3/rofi.nix b/users/kat/i3/rofi.nix similarity index 100% rename from config/users/kat/i3/rofi.nix rename to users/kat/i3/rofi.nix diff --git a/config/users/kat/linux/xdg.nix b/users/kat/linux/xdg.nix similarity index 100% rename from config/users/kat/linux/xdg.nix rename to users/kat/linux/xdg.nix diff --git a/config/users/kat/media/mpv.nix b/users/kat/media/mpv.nix similarity index 100% rename from config/users/kat/media/mpv.nix rename to users/kat/media/mpv.nix diff --git a/config/users/kat/media/obs.nix b/users/kat/media/obs.nix similarity index 100% rename from config/users/kat/media/obs.nix rename to users/kat/media/obs.nix diff --git a/config/users/kat/media/packages.nix b/users/kat/media/packages.nix similarity index 100% rename from config/users/kat/media/packages.nix rename to users/kat/media/packages.nix diff --git a/config/users/kat/media/syncplay.nix b/users/kat/media/syncplay.nix similarity index 100% rename from config/users/kat/media/syncplay.nix rename to users/kat/media/syncplay.nix diff --git a/config/users/kat/nixos.nix b/users/kat/nixos.nix similarity index 100% rename from config/users/kat/nixos.nix rename to users/kat/nixos.nix diff --git a/config/users/kat/personal/bitw.nix b/users/kat/personal/bitw.nix similarity index 100% rename from config/users/kat/personal/bitw.nix rename to users/kat/personal/bitw.nix diff --git a/config/users/kat/personal/email.nix b/users/kat/personal/email.nix similarity index 100% rename from config/users/kat/personal/email.nix rename to users/kat/personal/email.nix diff --git a/config/users/kat/personal/git.nix b/users/kat/personal/git.nix similarity index 100% rename from config/users/kat/personal/git.nix rename to users/kat/personal/git.nix diff --git a/config/users/kat/personal/gpg.nix b/users/kat/personal/gpg.nix similarity index 100% rename from config/users/kat/personal/gpg.nix rename to users/kat/personal/gpg.nix diff --git a/config/users/kat/personal/nano.png b/users/kat/personal/nano.png similarity index 100% rename from config/users/kat/personal/nano.png rename to users/kat/personal/nano.png diff --git a/config/users/kat/personal/packages.nix b/users/kat/personal/packages.nix similarity index 100% rename from config/users/kat/personal/packages.nix rename to users/kat/personal/packages.nix diff --git a/config/users/kat/personal/shell.nix b/users/kat/personal/shell.nix similarity index 100% rename from config/users/kat/personal/shell.nix rename to users/kat/personal/shell.nix diff --git a/config/users/kat/personal/vim/default.nix b/users/kat/personal/vim/default.nix similarity index 100% rename from config/users/kat/personal/vim/default.nix rename to users/kat/personal/vim/default.nix diff --git a/config/users/kat/personal/vim/init.vim b/users/kat/personal/vim/init.vim similarity index 100% rename from config/users/kat/personal/vim/init.vim rename to users/kat/personal/vim/init.vim diff --git a/config/users/kat/personal/weechat.nix b/users/kat/personal/weechat.nix similarity index 100% rename from config/users/kat/personal/weechat.nix rename to users/kat/personal/weechat.nix diff --git a/config/users/kat/services/mpd/beets.nix b/users/kat/services/mpd/beets.nix similarity index 100% rename from config/users/kat/services/mpd/beets.nix rename to users/kat/services/mpd/beets.nix diff --git a/config/users/kat/services/mpd/default.nix b/users/kat/services/mpd/default.nix similarity index 100% rename from config/users/kat/services/mpd/default.nix rename to users/kat/services/mpd/default.nix diff --git a/config/users/kat/services/mpd/mpd.nix b/users/kat/services/mpd/mpd.nix similarity index 100% rename from config/users/kat/services/mpd/mpd.nix rename to users/kat/services/mpd/mpd.nix diff --git a/config/users/kat/services/mpd/ncmpcpp.nix b/users/kat/services/mpd/ncmpcpp.nix similarity index 100% rename from config/users/kat/services/mpd/ncmpcpp.nix rename to users/kat/services/mpd/ncmpcpp.nix diff --git a/config/users/kat/services/weechat.nix b/users/kat/services/weechat.nix similarity index 100% rename from config/users/kat/services/weechat.nix rename to users/kat/services/weechat.nix diff --git a/config/users/kat/sway/gammastep.nix b/users/kat/sway/gammastep.nix similarity index 100% rename from config/users/kat/sway/gammastep.nix rename to users/kat/sway/gammastep.nix diff --git a/config/users/kat/sway/mako.nix b/users/kat/sway/mako.nix similarity index 100% rename from config/users/kat/sway/mako.nix rename to users/kat/sway/mako.nix diff --git a/config/users/kat/sway/packages.nix b/users/kat/sway/packages.nix similarity index 100% rename from config/users/kat/sway/packages.nix rename to users/kat/sway/packages.nix diff --git a/config/users/kat/sway/sway.nix b/users/kat/sway/sway.nix similarity index 100% rename from config/users/kat/sway/sway.nix rename to users/kat/sway/sway.nix diff --git a/config/users/kat/sway/waybar/default.nix b/users/kat/sway/waybar/default.nix similarity index 100% rename from config/users/kat/sway/waybar/default.nix rename to users/kat/sway/waybar/default.nix diff --git a/config/users/kat/sway/waybar/waybar.sass b/users/kat/sway/waybar/waybar.sass similarity index 100% rename from config/users/kat/sway/waybar/waybar.sass rename to users/kat/sway/waybar/waybar.sass diff --git a/config/users/kat/sway/wofi/default.nix b/users/kat/sway/wofi/default.nix similarity index 100% rename from config/users/kat/sway/wofi/default.nix rename to users/kat/sway/wofi/default.nix diff --git a/config/users/kat/sway/wofi/wofi.sass b/users/kat/sway/wofi/wofi.sass similarity index 100% rename from config/users/kat/sway/wofi/wofi.sass rename to users/kat/sway/wofi/wofi.sass