diff --git a/.gitignore b/.gitignore index 6e53a16..d80e300 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,6 @@ !.gitignore -!docs/ - !hosts/ !hosts/**/ diff --git a/docs/LICENSE.md b/LICENSE.md similarity index 100% rename from docs/LICENSE.md rename to LICENSE.md diff --git a/docs/README.md b/README.md similarity index 100% rename from docs/README.md rename to README.md diff --git a/hosts/best/default.nix b/hosts/best/default.nix index 1b959ec..18982fb 100644 --- a/hosts/best/default.nix +++ b/hosts/best/default.nix @@ -1,7 +1,8 @@ lib: lib.nixosSystem' ({ config, keys, lib, ... }: let inherit (lib) collectNix remove; in { - imports = collectNix ./. |> remove ./default.nix; + imports = collectNix ./. + |> remove ./default.nix; secrets.id.file = ./id.age; services.openssh.hostKeys = [{ diff --git a/hosts/disk/default.nix b/hosts/disk/default.nix index 8e6cdcd..2c5e398 100644 --- a/hosts/disk/default.nix +++ b/hosts/disk/default.nix @@ -1,7 +1,8 @@ lib: lib.nixosSystem' ({ config, keys, lib, ... }: let inherit (lib) collectNix remove; in { - imports = collectNix ./. |> remove ./default.nix; + imports = collectNix ./. + |> remove ./default.nix; secrets.id.file = ./id.age; services.openssh.hostKeys = [{ diff --git a/hosts/nine/default.nix b/hosts/nine/default.nix index 2d06ed6..575ad85 100644 --- a/hosts/nine/default.nix +++ b/hosts/nine/default.nix @@ -1,7 +1,8 @@ lib: lib.nixosSystem' ({ config, keys, lib, ... }: let inherit (lib) collectNix remove; in { - imports = collectNix ./. |> remove ./default.nix; + imports = collectNix ./. + |> remove ./default.nix; secrets.id.file = ./id.age; services.openssh.hostKeys = [{ diff --git a/hosts/pala/default.nix b/hosts/pala/default.nix index d0f1b58..add1ba3 100644 --- a/hosts/pala/default.nix +++ b/hosts/pala/default.nix @@ -1,7 +1,8 @@ -lib: lib.darwinSystem' ({ lib, ... }: let +lib: lib.darwinSystem' ({ config, lib, ... }: let inherit (lib) collectNix remove; in { - imports = collectNix ./. |> remove ./default.nix; + imports = collectNix ./. + |> remove ./default.nix; type = "desktop"; @@ -14,8 +15,8 @@ in { home-manager.users.pala.home = { stateVersion = "25.05"; - homeDirectory = "/Users/pala"; + homeDirectory = config.users.users.pala.home; }; - system.stateVersion = 5; + system.stateVersion = 5; }) diff --git a/modules/common/editor/default.nix b/modules/common/editor/default.nix index 8e549c1..6f0d919 100644 --- a/modules/common/editor/default.nix +++ b/modules/common/editor/default.nix @@ -154,7 +154,7 @@ in { # NIX nixfmt-rfc-style - nil + nixd # PYTHON basedpyright diff --git a/modules/linux/hyprland/hyprland.nix b/modules/linux/hyprland/hyprland.nix index c9cb071..e55548b 100644 --- a/modules/linux/hyprland/hyprland.nix +++ b/modules/linux/hyprland/hyprland.nix @@ -35,18 +35,6 @@ in merge <| mkIf config.isDesktop { }; home-manager.sharedModules = [{ - xdg.configFile."xkb/symbols/tr-swapped-i".text = '' - default partial - xkb_symbols "basic" { - include "tr(basic)" - - name[Group1]="Turkish (i and ı swapped)"; - - key { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ idotless, Iabovedot, paragraph , none ]}; - key { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ i , I , apostrophe, dead_caron ]}; - }; - ''; - wayland.windowManager.hyprland = enabled { systemd = enabled { enableXdgAutostart = true; diff --git a/modules/linux/localisation.nix b/modules/linux/localisation.nix index dacb110..6787e72 100644 --- a/modules/linux/localisation.nix +++ b/modules/linux/localisation.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let inherit (lib) const genAttrs merge mkIf; in merge { - console.keyMap = pkgs.writeText "trq-swapped-i.map" '' + console.keyMap = pkgs.writeText "trq-swapped-i.map" /* hs */ '' include "${pkgs.kbd}/share/keymaps/i386/qwerty/trq.map" keycode 23 = i @@ -11,6 +11,20 @@ in merge { keycode 40 = +dotlessi +Idotabove ''; + home-manager.sharedModules = [{ + xdg.configFile."xkb/symbols/tr-swapped-i".text = /* rs */ '' + default partial + xkb_symbols "basic" { + include "tr(basic)" + + name[Group1]="Turkish (i and ı swapped)"; + + key { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ idotless, Iabovedot, paragraph , none ]}; + key { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ i , I , apostrophe, dead_caron ]}; + }; + ''; + }]; + i18n.defaultLocale = "C.UTF-8"; } <| mkIf config.isDesktop { i18n.extraLocaleSettings = genAttrs [