diff --git a/.vscode/settings.json b/.vscode/settings.json index d00dd3c..9231f19 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,7 @@ }, "options": { "nixos": { - "expr": "(builtins.getFlake \"/profiles/asakiyuki/nixos\").nixosConfigurations.ideapad-slim-5.options" + "expr": "(builtins.getFlake \"/home/asakiyuki/nixos\").nixosConfigurations.ideapad-slim-5.options" } } } diff --git a/devices/home-server/hardware-configuration.nix b/devices/home-server/hardware-configuration.nix index 1a5df02..34620a6 100644 --- a/devices/home-server/hardware-configuration.nix +++ b/devices/home-server/hardware-configuration.nix @@ -25,7 +25,7 @@ device = "/dev/disk/by-uuid/16cfcdf6-15bb-4b63-835f-044867999510"; fsType = "ext4"; }; - "/profiles/asakiyuki/HOST" = { + "/home/asakiyuki/HOST" = { device = "/dev/disk/by-uuid/414e2a24-605f-47c3-a325-8db8a4934329"; fsType = "ext4"; }; diff --git a/devices/ideapad-slim-5/mount.nix b/devices/ideapad-slim-5/mount.nix index dff8085..4c85d22 100644 --- a/devices/ideapad-slim-5/mount.nix +++ b/devices/ideapad-slim-5/mount.nix @@ -11,7 +11,7 @@ ]; }; "/mnt/waydroid" = { - device = "/profiles/asakiyuki/.local/share/waydroid/data/media/0"; + device = "/home/asakiyuki/.local/share/waydroid/data/media/0"; fsType = "fuse.bindfs"; options = [ "mirror=1000" diff --git a/host/desktop/default.nix b/host/desktop/default.nix index 8c6bc80..2637dee 100644 --- a/host/desktop/default.nix +++ b/host/desktop/default.nix @@ -33,7 +33,7 @@ (libs.root "/modules/features/system/docker.nix") (libs.root "/modules/features/system/upower.nix") - (libs.root "/profiles/asakiyuki/configuration.nix") + (libs.root "/users/asakiyuki/configuration.nix") (libs.root "/modules/services/pipewire.nix") (libs.root "/modules/home-manager.nix") diff --git a/host/server/default.nix b/host/server/default.nix index 8859cdf..5118189 100644 --- a/host/server/default.nix +++ b/host/server/default.nix @@ -9,8 +9,8 @@ (libs.root "/modules/features/system/packages.nix") (libs.root "/modules/features/system/nix-dl.nix") - (libs.root "/profiles/asakiyuki/configuration.nix") - (libs.root "/profiles/junko/configuration.nix") + (libs.root "/users/asakiyuki/configuration.nix") + (libs.root "/users/junko/configuration.nix") (libs.root "/options/system/default.nix") (libs.root "/overlays/nixpkgs.nix") diff --git a/modules/features/home/neovide.nix b/modules/features/home/neovide.nix index cc64b6d..18a7d84 100644 --- a/modules/features/home/neovide.nix +++ b/modules/features/home/neovide.nix @@ -2,7 +2,7 @@ programs.neovide = { enable = true; settings = { - neovim-bin = "/etc/profiles/per-user/asakiyuki/bin/nvim"; + neovim-bin = "/etc/home/per-user/asakiyuki/bin/nvim"; }; }; } diff --git a/modules/services/cloudflare-dyndns.nix b/modules/services/cloudflare-dyndns.nix index a9935f1..1a0b1a6 100644 --- a/modules/services/cloudflare-dyndns.nix +++ b/modules/services/cloudflare-dyndns.nix @@ -1,8 +1,8 @@ {...}: { services.cloudflare-dyndns = { enable = true; - apiTokenFile = "/profiles/asakiyuki/.secret/CLOUDFLARE_TOKEN_KEY"; - frequency = "*:0/5"; + apiTokenFile = "/home/asakiyuki/.secret/CLOUDFLARE_TOKEN_KEY"; + frequency = ":0/5"; proxied = true; ipv6 = false; ipv4 = true; diff --git a/modules/services/httpd.nix b/modules/services/httpd.nix new file mode 100644 index 0000000..8e8a119 --- /dev/null +++ b/modules/services/httpd.nix @@ -0,0 +1,32 @@ +{...}: { + services.httpd = { + enable = true; + adminAddr = "vantrong2007vn@gmail.com"; + + user = "static"; + group = "public"; + + virtualHosts = { + localhost = { + documentRoot = "/host/PUBLIC"; + listen = [ + { + ip = "0.0.0.0"; + port = 37284; + } + ]; + extraConfig = '' + + Options -Indexes +FollowSymLinks + AllowOverride None + Require all granted + + + Require all denied + + + ''; + }; + }; + }; +} diff --git a/modules/services/openssh.nix b/modules/services/openssh.nix index 5957ed2..4c61a20 100644 --- a/modules/services/openssh.nix +++ b/modules/services/openssh.nix @@ -3,7 +3,7 @@ enable = true; ports = [15523]; authorizedKeysInHomedir = true; - authorizedKeysFiles = ["/profiles/asakiyuki/.ssh/authorized_keys"]; + authorizedKeysFiles = ["/home/asakiyuki/.ssh/authorized_keys"]; settings = { AllowUsers = [ "asakiyuki" diff --git a/profiles/asakiyuki/configuration.nix b/users/asakiyuki/configuration.nix similarity index 100% rename from profiles/asakiyuki/configuration.nix rename to users/asakiyuki/configuration.nix diff --git a/profiles/asakiyuki/files.nix b/users/asakiyuki/files.nix similarity index 100% rename from profiles/asakiyuki/files.nix rename to users/asakiyuki/files.nix diff --git a/profiles/asakiyuki/programs.nix b/users/asakiyuki/programs.nix similarity index 100% rename from profiles/asakiyuki/programs.nix rename to users/asakiyuki/programs.nix diff --git a/profiles/junko/configuration.nix b/users/junko/configuration.nix similarity index 100% rename from profiles/junko/configuration.nix rename to users/junko/configuration.nix