diff --git a/darwin/profiles/desktop/default.nix b/darwin/profiles/core/default.nix similarity index 67% rename from darwin/profiles/desktop/default.nix rename to darwin/profiles/core/default.nix index 6ef2a74..72849b1 100644 --- a/darwin/profiles/desktop/default.nix +++ b/darwin/profiles/core/default.nix @@ -3,7 +3,5 @@ ../../modules ./nix - ./packages - ./system ]; } diff --git a/darwin/profiles/desktop/nix/default.nix b/darwin/profiles/core/nix/default.nix similarity index 100% rename from darwin/profiles/desktop/nix/default.nix rename to darwin/profiles/core/nix/default.nix diff --git a/darwin/profiles/desktop/nix/flake.nix b/darwin/profiles/core/nix/flake.nix similarity index 100% rename from darwin/profiles/desktop/nix/flake.nix rename to darwin/profiles/core/nix/flake.nix diff --git a/darwin/profiles/desktop/nix/gc.nix b/darwin/profiles/core/nix/gc.nix similarity index 100% rename from darwin/profiles/desktop/nix/gc.nix rename to darwin/profiles/core/nix/gc.nix diff --git a/darwin/profiles/desktop/nix/nix.nix b/darwin/profiles/core/nix/nix.nix similarity index 100% rename from darwin/profiles/desktop/nix/nix.nix rename to darwin/profiles/core/nix/nix.nix diff --git a/darwin/profiles/device-type/desktop/default.nix b/darwin/profiles/device-type/desktop/default.nix new file mode 100644 index 0000000..be0a56f --- /dev/null +++ b/darwin/profiles/device-type/desktop/default.nix @@ -0,0 +1,6 @@ +{...}: { + imports = [ + ./packages + ./system + ]; +} diff --git a/darwin/profiles/desktop/packages/core.nix b/darwin/profiles/device-type/desktop/packages/core.nix similarity index 100% rename from darwin/profiles/desktop/packages/core.nix rename to darwin/profiles/device-type/desktop/packages/core.nix diff --git a/darwin/profiles/desktop/packages/default.nix b/darwin/profiles/device-type/desktop/packages/default.nix similarity index 100% rename from darwin/profiles/desktop/packages/default.nix rename to darwin/profiles/device-type/desktop/packages/default.nix diff --git a/darwin/profiles/desktop/packages/fonts.nix b/darwin/profiles/device-type/desktop/packages/fonts.nix similarity index 100% rename from darwin/profiles/desktop/packages/fonts.nix rename to darwin/profiles/device-type/desktop/packages/fonts.nix diff --git a/darwin/profiles/desktop/packages/homebrew.nix b/darwin/profiles/device-type/desktop/packages/homebrew.nix similarity index 100% rename from darwin/profiles/desktop/packages/homebrew.nix rename to darwin/profiles/device-type/desktop/packages/homebrew.nix diff --git a/darwin/profiles/desktop/packages/unfree.nix b/darwin/profiles/device-type/desktop/packages/unfree.nix similarity index 100% rename from darwin/profiles/desktop/packages/unfree.nix rename to darwin/profiles/device-type/desktop/packages/unfree.nix diff --git a/darwin/profiles/desktop/system/default.nix b/darwin/profiles/device-type/desktop/system/default.nix similarity index 100% rename from darwin/profiles/desktop/system/default.nix rename to darwin/profiles/device-type/desktop/system/default.nix diff --git a/darwin/profiles/desktop/system/system.nix b/darwin/profiles/device-type/desktop/system/system.nix similarity index 100% rename from darwin/profiles/desktop/system/system.nix rename to darwin/profiles/device-type/desktop/system/system.nix diff --git a/darwin/profiles/desktop/addtional/gaming.nix b/darwin/profiles/use-cases/gaming.nix similarity index 100% rename from darwin/profiles/desktop/addtional/gaming.nix rename to darwin/profiles/use-cases/gaming.nix diff --git a/flake.nix b/flake.nix index e5fd8d1..e584a42 100755 --- a/flake.nix +++ b/flake.nix @@ -167,18 +167,19 @@ specialArgs = {inherit inputs;}; modules = [ # OS - ./nixos/profiles/desktop - ./nixos/profiles/core/addtional/zram-generator.nix - ./nixos/profiles/desktop/addtional/gaming.nix - ./nixos/profiles/desktop/addtional/virtualbox.nix - ./nixos/profiles/desktop/addtional/wayland.nix - ./nixos/profiles/desktop/addtional/virt-manager.nix + ./nixos/profiles/core + ./nixos/profiles/device-type/laptop + ./nixos/profiles/use-cases/zram-generator.nix + ./nixos/profiles/use-cases/gaming.nix + ./nixos/profiles/use-cases/wayland.nix + ./nixos/profiles/use-cases/virt-manager.nix # User - ./users/guanranwang/nixos/profiles/desktop - ./users/guanranwang/nixos/profiles/core/addtional/clash-meta-client.nix - ./users/guanranwang/nixos/profiles/desktop/addtional/gaming.nix - ./users/guanranwang/nixos/profiles/desktop/addtional/torrenting.nix + ./users/guanranwang/nixos/profiles/core + ./users/guanranwang/nixos/profiles/device-type/laptop + ./users/guanranwang/nixos/profiles/use-cases/clash-meta-client.nix + ./users/guanranwang/nixos/profiles/use-cases/gaming.nix + ./users/guanranwang/nixos/profiles/use-cases/torrenting.nix # Hardware ./nixos/hardware/lenovo/legion/81fw/Aristotle @@ -194,10 +195,12 @@ system = "x86_64-darwin"; specialArgs = {inherit inputs;}; modules = [ - ./darwin/profiles/desktop + ./darwin/profiles/core + ./darwin/profiles/device-type/desktop - ./users/guanranwang/darwin/profiles/desktop - ./users/guanranwang/darwin/profiles/core/addtional/networking/clash-meta-client.nix + ./users/guanranwang/darwin/profiles/core + ./users/guanranwang/darwin/profiles/device-type/desktop + ./users/guanranwang/darwin/profiles/use-cases/clash-meta-client.nix ./darwin/hardware/apple/imac/18-3 diff --git a/nixos/hardware/lenovo/legion/81fw/Aristotle/default.nix b/nixos/hardware/lenovo/legion/81fw/Aristotle/default.nix index dd7199b..f0e8645 100644 --- a/nixos/hardware/lenovo/legion/81fw/Aristotle/default.nix +++ b/nixos/hardware/lenovo/legion/81fw/Aristotle/default.nix @@ -7,5 +7,4 @@ ]; _module.args.disks = ["/dev/nvme0n1"]; # Disko - boot.initrd.systemd.enable = true; # LUKS TPM unlocking } diff --git a/nixos/modules/boot/boot.nix b/nixos/modules/boot/boot.nix index 0e1dafd..b3d91eb 100755 --- a/nixos/modules/boot/boot.nix +++ b/nixos/modules/boot/boot.nix @@ -27,17 +27,5 @@ in { "systemd.show_status=auto" "rd.udev.log_level=3" ]); - - ### Misc - boot.loader = { - efi.canTouchEfiVariables = true; - systemd-boot = { - enable = lib.mkDefault true; # mkDefault for Lanzaboote - editor = false; # Disabled for security - ### Utilities - #netbootxyz.enable = true; - #memtest86.enable = true; - }; - }; }; } diff --git a/nixos/modules/hardware/gpu/intel.nix b/nixos/modules/hardware/gpu/intel.nix index 79939f6..2afc06a 100644 --- a/nixos/modules/hardware/gpu/intel.nix +++ b/nixos/modules/hardware/gpu/intel.nix @@ -18,9 +18,7 @@ in { driSupport32Bit = true; }; - boot.initrd.kernelModules = ["i915"]; # if not enabled, plymouth's distro logo wont show for some reason nixpkgs.config.packageOverrides = pkgs: {vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};}; - hardware.opengl = { extraPackages = with pkgs; [ intel-media-driver # libva_driver_name=ihd diff --git a/nixos/modules/hardware/gpu/nvidia.nix b/nixos/modules/hardware/gpu/nvidia.nix index 52b51b3..11d0e6d 100755 --- a/nixos/modules/hardware/gpu/nvidia.nix +++ b/nixos/modules/hardware/gpu/nvidia.nix @@ -12,37 +12,39 @@ in { # https://nixos.wiki/wiki/Nvidia config = lib.mkIf cfg.enable { + # Enable OpenGL hardware.opengl = { enable = true; driSupport = true; driSupport32Bit = true; }; - services.xserver.videoDrivers = ["nvidia"]; # tell xorg to use the nvidia driver, also valid for wayland + # Load nvidia driver for Xorg and Wayland + services.xserver.videoDrivers = ["nvidia"]; + + #nixpkgs.config.nvidia.acceptLicense = true; hardware.nvidia = { - package = config.boot.kernelPackages.nvidiaPackages.stable; - open = false; + #package = config.boot.kernelPackages.nvidiaPackages.legacy_470; modesetting.enable = true; - #dynamicboost.enable = true; - powerManagement = { - enable = true; # experimental power management feature - #finegrained = true; - }; }; # cfg.prime hardware.nvidia.prime = lib.mkIf cfg.prime { - sync.enable = false; offload = { enable = true; enableOffloadCmd = true; }; + + #sync.enable = true; + #reverseSync.enable = true; + ### Device specific, please put those configuration in `machines/your-machine.nix` # nvidiaBusId = "PCI:1:0:0"; # intelBusId = "PCI:0:2:0"; }; + environment.sessionVariables = { - "GAMEMODERUNEXEC" = lib.mkIf (cfg.prime || config.programs.gamemode.enable) "env __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia __VK_LAYER_NV_optimus=NVIDIA_only"; # gamemode: nvidia offload + "GAMEMODERUNEXEC" = lib.mkIf (config.hardware.nvidia.prime.offload.enable || config.programs.gamemode.enable) "nvidia-offload"; # gamemode: nvidia offload }; }; } diff --git a/nixos/profiles/core/default.nix b/nixos/profiles/core/default.nix index 0b9a166..2d91b46 100644 --- a/nixos/profiles/core/default.nix +++ b/nixos/profiles/core/default.nix @@ -3,22 +3,34 @@ lib, ... }: { - # Imported by default, check out ./desktop.nix or ./server.nix + # Imported by default imports = [ - ../../modules # idk where should i import it + ../../modules ./nix ./packages ./sysctl.nix ]; + boot.initrd.systemd.enable = true; + boot.loader = { + efi.canTouchEfiVariables = true; + systemd-boot = { + enable = lib.mkDefault true; # mkDefault for Lanzaboote + editor = false; # Disabled for security + ### Utilities + #netbootxyz.enable = true; + #memtest86.enable = true; + }; + }; + users.mutableUsers = false; # Programs - environment.defaultPackages = []; # make sure to add another editor and set the $EDITOR variable, in this case I am using neovim + environment.defaultPackages = []; programs = { dconf.enable = true; - nano.enable = false; + nano.enable = false; # make sure to add another editor and set the $EDITOR variable, in this case I am using neovim neovim = { enable = true; viAlias = true; @@ -36,7 +48,7 @@ "--my-next-gpu-wont-be-nvidia") (lib.strings.optionalString config.myFlake.nixos.hardware.gpu.amd.enable - "[ 5.996722] amdgpu 0000:67:00.0: Fatal error during GPU init--my-next-gpu-wont-be-nvidia") + "[ 5.996722] amdgpu 0000:67:00.0: Fatal error during GPU init") ]; openssh = { @@ -67,7 +79,7 @@ # ref: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/profiles/hardened.nix # ref: https://madaidans-insecurities.github.io/guides/linux-hardening.html # - # also see: nixos/boot/sysctl.nix + # also see: ./sysctl.nix environment.etc.machine-id.text = "b08dfa6083e7567a1921a715000001fb"; # whonix id security = { diff --git a/nixos/profiles/desktop/power-management/cpu-governor.nix b/nixos/profiles/desktop/power-management/cpu-governor.nix deleted file mode 100644 index 94d5f79..0000000 --- a/nixos/profiles/desktop/power-management/cpu-governor.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - powerManagement.cpuFreqGovernor = "performance"; -} diff --git a/nixos/profiles/desktop/power-management/default.nix b/nixos/profiles/desktop/power-management/default.nix deleted file mode 100644 index 9f902d5..0000000 --- a/nixos/profiles/desktop/power-management/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{...}: { - imports = [ - ./cpu-governor.nix - ./system76-scheduler.nix - #./tlp.nix # ] Conflicts with each other, only choose one - ./power-profiles-daemon.nix # ] - ]; -} diff --git a/nixos/profiles/desktop/power-management/power-profiles-daemon.nix b/nixos/profiles/desktop/power-management/power-profiles-daemon.nix deleted file mode 100644 index 3ce5ad7..0000000 --- a/nixos/profiles/desktop/power-management/power-profiles-daemon.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - services.power-profiles-daemon.enable = true; -} diff --git a/nixos/profiles/desktop/power-management/system76-scheduler.nix b/nixos/profiles/desktop/power-management/system76-scheduler.nix deleted file mode 100644 index 3dca8b6..0000000 --- a/nixos/profiles/desktop/power-management/system76-scheduler.nix +++ /dev/null @@ -1,4 +0,0 @@ -{...}: { - # Auto-configure CFS and process priorities for improved desktop responsiveness - services.system76-scheduler.enable = true; -} diff --git a/nixos/profiles/desktop/power-management/tlp.nix b/nixos/profiles/desktop/power-management/tlp.nix deleted file mode 100644 index b8b4c73..0000000 --- a/nixos/profiles/desktop/power-management/tlp.nix +++ /dev/null @@ -1,17 +0,0 @@ -{...}: { - services.tlp = { - enable = true; - settings = { - CPU_SCALING_GOVERNOR_ON_AC = "performance"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - - CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; - CPU_ENERGY_PERF_POLICY_ON_BAT = "powersave"; - - CPU_MIN_PERF_ON_AC = 0; - CPU_MAX_PERF_ON_AC = 100; - CPU_MIN_PERF_ON_BAT = 0; - CPU_MAX_PERF_ON_BAT = 20; - }; - }; -} diff --git a/nixos/profiles/desktop/default.nix b/nixos/profiles/device-type/desktop/default.nix similarity index 64% rename from nixos/profiles/desktop/default.nix rename to nixos/profiles/device-type/desktop/default.nix index 081d94c..e7b36c4 100644 --- a/nixos/profiles/desktop/default.nix +++ b/nixos/profiles/device-type/desktop/default.nix @@ -1,12 +1,11 @@ {pkgs, ...}: { imports = [ - ../core - - ./power-management ./graphical ]; boot.kernelPackages = pkgs.linuxPackages_zen; boot.plymouth.enable = true; networking.stevenblack.enable = true; + services.system76-scheduler.enable = true; + services.power-profiles-daemon.enable = true; } diff --git a/nixos/profiles/desktop/graphical/default.nix b/nixos/profiles/device-type/desktop/graphical/default.nix similarity index 100% rename from nixos/profiles/desktop/graphical/default.nix rename to nixos/profiles/device-type/desktop/graphical/default.nix diff --git a/nixos/profiles/desktop/graphical/display-server.nix b/nixos/profiles/device-type/desktop/graphical/display-server.nix similarity index 100% rename from nixos/profiles/desktop/graphical/display-server.nix rename to nixos/profiles/device-type/desktop/graphical/display-server.nix diff --git a/nixos/profiles/desktop/graphical/gnome-keyring.nix b/nixos/profiles/device-type/desktop/graphical/gnome-keyring.nix similarity index 100% rename from nixos/profiles/desktop/graphical/gnome-keyring.nix rename to nixos/profiles/device-type/desktop/graphical/gnome-keyring.nix diff --git a/nixos/profiles/desktop/graphical/polkit.nix b/nixos/profiles/device-type/desktop/graphical/polkit.nix similarity index 100% rename from nixos/profiles/desktop/graphical/polkit.nix rename to nixos/profiles/device-type/desktop/graphical/polkit.nix diff --git a/nixos/profiles/device-type/laptop/default.nix b/nixos/profiles/device-type/laptop/default.nix new file mode 100644 index 0000000..14a9179 --- /dev/null +++ b/nixos/profiles/device-type/laptop/default.nix @@ -0,0 +1,5 @@ +{...}: { + imports = [ + ../desktop + ]; +} diff --git a/nixos/profiles/server/default.nix b/nixos/profiles/device-type/server/default.nix similarity index 90% rename from nixos/profiles/server/default.nix rename to nixos/profiles/device-type/server/default.nix index 8430781..9e84d6d 100644 --- a/nixos/profiles/server/default.nix +++ b/nixos/profiles/device-type/server/default.nix @@ -3,6 +3,5 @@ { imports = [ (modulesPath + "/profiles/minimal.nix") - ../core ]; } diff --git a/nixos/profiles/desktop/addtional/flatpak.nix b/nixos/profiles/use-cases/flatpak.nix similarity index 100% rename from nixos/profiles/desktop/addtional/flatpak.nix rename to nixos/profiles/use-cases/flatpak.nix diff --git a/nixos/profiles/desktop/addtional/gaming.nix b/nixos/profiles/use-cases/gaming.nix similarity index 100% rename from nixos/profiles/desktop/addtional/gaming.nix rename to nixos/profiles/use-cases/gaming.nix diff --git a/nixos/profiles/core/addtional/boot/legacy-boot.nix b/nixos/profiles/use-cases/legacy-boot.nix similarity index 100% rename from nixos/profiles/core/addtional/boot/legacy-boot.nix rename to nixos/profiles/use-cases/legacy-boot.nix diff --git a/nixos/profiles/core/addtional/networking/systemd-resolved.nix b/nixos/profiles/use-cases/systemd-resolved.nix similarity index 100% rename from nixos/profiles/core/addtional/networking/systemd-resolved.nix rename to nixos/profiles/use-cases/systemd-resolved.nix diff --git a/nixos/profiles/desktop/addtional/virt-manager.nix b/nixos/profiles/use-cases/virt-manager.nix similarity index 100% rename from nixos/profiles/desktop/addtional/virt-manager.nix rename to nixos/profiles/use-cases/virt-manager.nix diff --git a/nixos/profiles/desktop/addtional/virtualbox.nix b/nixos/profiles/use-cases/virtualbox.nix similarity index 100% rename from nixos/profiles/desktop/addtional/virtualbox.nix rename to nixos/profiles/use-cases/virtualbox.nix diff --git a/nixos/profiles/desktop/addtional/wayland.nix b/nixos/profiles/use-cases/wayland.nix similarity index 100% rename from nixos/profiles/desktop/addtional/wayland.nix rename to nixos/profiles/use-cases/wayland.nix diff --git a/nixos/profiles/core/addtional/zram-generator.nix b/nixos/profiles/use-cases/zram-generator.nix similarity index 100% rename from nixos/profiles/core/addtional/zram-generator.nix rename to nixos/profiles/use-cases/zram-generator.nix diff --git a/users/guanranwang/darwin/profiles/desktop/default.nix b/users/guanranwang/darwin/profiles/device-type/desktop/default.nix similarity index 69% rename from users/guanranwang/darwin/profiles/desktop/default.nix rename to users/guanranwang/darwin/profiles/device-type/desktop/default.nix index e3ffcbd..42e1a3f 100644 --- a/users/guanranwang/darwin/profiles/desktop/default.nix +++ b/users/guanranwang/darwin/profiles/device-type/desktop/default.nix @@ -1,10 +1,6 @@ {...}: { - imports = [ - ../core - ]; - ### home-manager - home-manager.users.guanranwang.imports = map (n: ../../../home-manager/${n}) [ + home-manager.users.guanranwang.imports = map (n: ../../../../home-manager/${n}) [ "modules/terms/alacritty.nix" "modules/shell/fish.nix" "modules/shell/bash.nix" diff --git a/users/guanranwang/darwin/profiles/core/addtional/networking/clash-meta-client.nix b/users/guanranwang/darwin/profiles/use-cases/clash-meta-client.nix similarity index 100% rename from users/guanranwang/darwin/profiles/core/addtional/networking/clash-meta-client.nix rename to users/guanranwang/darwin/profiles/use-cases/clash-meta-client.nix diff --git a/users/guanranwang/darwin/profiles/desktop/addtional/misc/gaming.nix b/users/guanranwang/darwin/profiles/use-cases/gaming.nix similarity index 100% rename from users/guanranwang/darwin/profiles/desktop/addtional/misc/gaming.nix rename to users/guanranwang/darwin/profiles/use-cases/gaming.nix diff --git a/users/guanranwang/nixos/profiles/desktop/default.nix b/users/guanranwang/nixos/profiles/device-type/desktop/default.nix similarity index 88% rename from users/guanranwang/nixos/profiles/desktop/default.nix rename to users/guanranwang/nixos/profiles/device-type/desktop/default.nix index 38d59b6..33de45b 100644 --- a/users/guanranwang/nixos/profiles/desktop/default.nix +++ b/users/guanranwang/nixos/profiles/device-type/desktop/default.nix @@ -4,18 +4,16 @@ ... }: { imports = [ - ../core - ### Flakes - ../../../../../nixos/flake-modules/home-manager.nix - ../../../../../nixos/flake-modules/berberman.nix + ../../../../../../nixos/flake-modules/home-manager.nix + ../../../../../../nixos/flake-modules/berberman.nix ]; ### Options myFlake.nixos.boot.noLoaderMenu = lib.mkDefault true; ### home-manager - home-manager.users.guanranwang.imports = map (n: ../../../home-manager/${n}) [ + home-manager.users.guanranwang.imports = map (n: ../../../../home-manager/${n}) [ "profiles/command-line/nixos/fancy-stuff.nix" "profiles/graphical-stuff/nixos" "profiles/media/nixos" diff --git a/users/guanranwang/nixos/profiles/device-type/laptop/default.nix b/users/guanranwang/nixos/profiles/device-type/laptop/default.nix new file mode 100644 index 0000000..d1e8b2e --- /dev/null +++ b/users/guanranwang/nixos/profiles/device-type/laptop/default.nix @@ -0,0 +1,7 @@ +{...}: { + imports = [ + ../desktop + ]; + + home-manager.users.guanranwang.services.batsignal.enable = true; +} diff --git a/users/guanranwang/nixos/profiles/core/addtional/clash-meta-client.nix b/users/guanranwang/nixos/profiles/use-cases/clash-meta-client.nix similarity index 97% rename from users/guanranwang/nixos/profiles/core/addtional/clash-meta-client.nix rename to users/guanranwang/nixos/profiles/use-cases/clash-meta-client.nix index 1e36eca..235ddc9 100644 --- a/users/guanranwang/nixos/profiles/core/addtional/clash-meta-client.nix +++ b/users/guanranwang/nixos/profiles/use-cases/clash-meta-client.nix @@ -7,7 +7,7 @@ etcDirectory = "clash-meta"; in { imports = [ - ../../../../../../nixos/flake-modules/sops-nix.nix + ../../../../../nixos/flake-modules/sops-nix.nix ]; ### sops-nix diff --git a/users/guanranwang/nixos/profiles/desktop/addtional/gaming.nix b/users/guanranwang/nixos/profiles/use-cases/gaming.nix similarity index 54% rename from users/guanranwang/nixos/profiles/desktop/addtional/gaming.nix rename to users/guanranwang/nixos/profiles/use-cases/gaming.nix index 3c21666..375e5d8 100644 --- a/users/guanranwang/nixos/profiles/desktop/addtional/gaming.nix +++ b/users/guanranwang/nixos/profiles/use-cases/gaming.nix @@ -1,5 +1,5 @@ {...}: { home-manager.users.guanranwang.imports = [ - ../../../../home-manager/profiles/gaming/nixos + ../../../home-manager/profiles/gaming/nixos ]; } diff --git a/users/guanranwang/nixos/profiles/core/addtional/hysteria2-server.nix b/users/guanranwang/nixos/profiles/use-cases/hysteria2-server.nix similarity index 100% rename from users/guanranwang/nixos/profiles/core/addtional/hysteria2-server.nix rename to users/guanranwang/nixos/profiles/use-cases/hysteria2-server.nix diff --git a/users/guanranwang/nixos/profiles/core/addtional/juicity-server.nix b/users/guanranwang/nixos/profiles/use-cases/juicity-server.nix similarity index 100% rename from users/guanranwang/nixos/profiles/core/addtional/juicity-server.nix rename to users/guanranwang/nixos/profiles/use-cases/juicity-server.nix diff --git a/users/guanranwang/nixos/profiles/desktop/addtional/torrenting.nix b/users/guanranwang/nixos/profiles/use-cases/torrenting.nix similarity index 52% rename from users/guanranwang/nixos/profiles/desktop/addtional/torrenting.nix rename to users/guanranwang/nixos/profiles/use-cases/torrenting.nix index 3a9cf68..e817bc7 100644 --- a/users/guanranwang/nixos/profiles/desktop/addtional/torrenting.nix +++ b/users/guanranwang/nixos/profiles/use-cases/torrenting.nix @@ -1,5 +1,5 @@ {...}: { home-manager.users.guanranwang.imports = [ - ../../../../home-manager/profiles/torrenting/nixos + ../../../home-manager/profiles/torrenting/nixos ]; }