From f1b559ba065d8a054ac5c5cc58ac7131f8c9b086 Mon Sep 17 00:00:00 2001 From: willifan Date: Sat, 6 Jul 2024 21:33:59 +0200 Subject: [PATCH] Reorganized the repo --- flake.nix | 35 +++++++++++++ hosts/common/default.nix | 16 +----- hosts/default.nix | 3 +- hosts/{common => desktop}/boot.nix | 0 hosts/desktop/default.nix | 17 ++++++ hosts/{common => desktop}/nix-ld.nix | 0 hosts/{common => desktop}/printers.nix | 0 hosts/server/Anton/data.nix | 19 +++++++ hosts/server/Anton/default.nix | 11 ++++ hosts/server/Anton/disko.nix | 52 +++++++++++++++++++ users/willifan/{ => Lenni}/auto-cpufreq.nix | 0 .../{udev.nix => Lenni/backlight.nix} | 0 users/willifan/Lenni/default.nix | 7 +++ users/willifan/Puenktchen/default.nix | 4 ++ users/willifan/common/default.nix | 15 ++++++ users/willifan/{ => common}/envvar.nix | 0 users/willifan/{ => common}/git.nix | 0 users/willifan/{ => common}/hyfetch.nix | 0 users/willifan/{ => common}/locales.nix | 0 users/willifan/{ => common}/ssh.nix | 0 users/willifan/{ => common}/syncthing.nix | 0 users/willifan/{ => common}/user.nix | 0 users/willifan/{ => common}/zsh.nix | 0 users/willifan/default.nix | 31 ++--------- users/willifan/{ => desktop}/applications.nix | 2 - users/willifan/desktop/autologin.nix | 13 +++++ .../{graphical => desktop}/default.nix | 2 + .../{graphical => desktop}/dev/default.nix | 0 .../{graphical => desktop}/dev/embedded.nix | 0 .../dev/logic-analyzer.nix | 0 .../{graphical => desktop}/dev/rust.nix | 0 .../{graphical => desktop}/dev/vscodium.nix | 0 .../games/ROG_Pugio_II_fixes.nix | 0 .../{graphical => desktop}/games/default.nix | 0 .../{graphical => desktop}/games/mangohud.nix | 0 .../games/minecraft.nix | 0 .../{graphical => desktop}/games/steam.nix | 0 .../hyprland/Lenni/default.nix | 0 .../hyprland/Lenni/hypridle.nix | 0 .../hyprland/Lenni/hyprlock.nix | 0 .../hyprland/Lenni/kanshi.nix | 0 .../hyprland/Puenktchen/default.nix | 0 .../hyprland/common/default.nix | 0 .../hyprland/common/hyprland.nix | 0 .../hyprland/common/hyprpaper.nix | 0 .../hyprland/common/mako.nix | 0 .../hyprland/common/pipewire.nix | 0 .../hyprland/common/polkit.nix | 0 .../hyprland/common/utils.nix | 0 .../hyprland/common/wlogout.nix | 0 .../hyprland/common/wofi.nix | 0 .../hyprland/default.nix | 0 .../willifan/{graphical => desktop}/kitty.nix | 0 .../{graphical => desktop}/theme/cursor.nix | 0 .../{graphical => desktop}/theme/default.nix | 0 .../{graphical => desktop}/theme/font.nix | 0 .../{graphical => desktop}/theme/gtk.nix | 0 .../{graphical => desktop}/theme/qt.nix | 0 .../{graphical => desktop}/thunar.nix | 0 .../{graphical => desktop}/web/default.nix | 0 .../{graphical => desktop}/web/firefox.nix | 0 .../web/thunderbird.nix | 0 62 files changed, 182 insertions(+), 45 deletions(-) rename hosts/{common => desktop}/boot.nix (100%) create mode 100644 hosts/desktop/default.nix rename hosts/{common => desktop}/nix-ld.nix (100%) rename hosts/{common => desktop}/printers.nix (100%) create mode 100644 hosts/server/Anton/data.nix create mode 100644 hosts/server/Anton/default.nix create mode 100644 hosts/server/Anton/disko.nix rename users/willifan/{ => Lenni}/auto-cpufreq.nix (100%) rename users/willifan/{udev.nix => Lenni/backlight.nix} (100%) create mode 100644 users/willifan/Lenni/default.nix create mode 100644 users/willifan/Puenktchen/default.nix create mode 100644 users/willifan/common/default.nix rename users/willifan/{ => common}/envvar.nix (100%) rename users/willifan/{ => common}/git.nix (100%) rename users/willifan/{ => common}/hyfetch.nix (100%) rename users/willifan/{ => common}/locales.nix (100%) rename users/willifan/{ => common}/ssh.nix (100%) rename users/willifan/{ => common}/syncthing.nix (100%) rename users/willifan/{ => common}/user.nix (100%) rename users/willifan/{ => common}/zsh.nix (100%) rename users/willifan/{ => desktop}/applications.nix (95%) create mode 100644 users/willifan/desktop/autologin.nix rename users/willifan/{graphical => desktop}/default.nix (75%) rename users/willifan/{graphical => desktop}/dev/default.nix (100%) rename users/willifan/{graphical => desktop}/dev/embedded.nix (100%) rename users/willifan/{graphical => desktop}/dev/logic-analyzer.nix (100%) rename users/willifan/{graphical => desktop}/dev/rust.nix (100%) rename users/willifan/{graphical => desktop}/dev/vscodium.nix (100%) rename users/willifan/{graphical => desktop}/games/ROG_Pugio_II_fixes.nix (100%) rename users/willifan/{graphical => desktop}/games/default.nix (100%) rename users/willifan/{graphical => desktop}/games/mangohud.nix (100%) rename users/willifan/{graphical => desktop}/games/minecraft.nix (100%) rename users/willifan/{graphical => desktop}/games/steam.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/Lenni/default.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/Lenni/hypridle.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/Lenni/hyprlock.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/Lenni/kanshi.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/Puenktchen/default.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/common/default.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/common/hyprland.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/common/hyprpaper.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/common/mako.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/common/pipewire.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/common/polkit.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/common/utils.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/common/wlogout.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/common/wofi.nix (100%) rename users/willifan/{graphical => desktop}/hyprland/default.nix (100%) rename users/willifan/{graphical => desktop}/kitty.nix (100%) rename users/willifan/{graphical => desktop}/theme/cursor.nix (100%) rename users/willifan/{graphical => desktop}/theme/default.nix (100%) rename users/willifan/{graphical => desktop}/theme/font.nix (100%) rename users/willifan/{graphical => desktop}/theme/gtk.nix (100%) rename users/willifan/{graphical => desktop}/theme/qt.nix (100%) rename users/willifan/{graphical => desktop}/thunar.nix (100%) rename users/willifan/{graphical => desktop}/web/default.nix (100%) rename users/willifan/{graphical => desktop}/web/firefox.nix (100%) rename users/willifan/{graphical => desktop}/web/thunderbird.nix (100%) diff --git a/flake.nix b/flake.nix index 6c8ec48..85ed8aa 100644 --- a/flake.nix +++ b/flake.nix @@ -45,10 +45,13 @@ system = "x86_64-linux"; in nixpkgs.lib.nixosSystem { + specialArgs = { hostname = "Lenni"; + type = "desktop"; inherit system; }; + modules = [ attrs.home-manager.nixosModules.home-manager { @@ -60,16 +63,20 @@ ./hosts ./users/willifan ]; + }; Puenktchen = let system = "x86_64-linux"; in nixpkgs.lib.nixosSystem { + specialArgs = { hostname = "Puenktchen"; + type = "desktop"; inherit system; }; + modules = [ attrs.home-manager.nixosModules.home-manager { @@ -84,6 +91,34 @@ ./hosts ./users/willifan ]; + + }; + + Anton = let + system = "x86_64-linux"; + in + nixpkgs.lib.nixosSystem { + + specialArgs = { + hostname = "Anton"; + type = "server"; + inherit system; + }; + + modules = [ + attrs.home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + } + attrs.disko.nixosModules.disko + attrs.nixos-hardware.nixosModules.common-cpu-amd + attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate + attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower + ./hosts + ./users/willifan + ]; + }; }; diff --git a/hosts/common/default.nix b/hosts/common/default.nix index d8784f3..636ca91 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -1,18 +1,4 @@ -{ pkgs, hostname, ... }: +{ pkgs, ... }: { - networking.hostName = hostname; - imports = [ - ./nix-ld.nix - ./boot.nix - ./printers.nix - ]; - - hardware.bluetooth.enable = true; - services.hardware.bolt.enable = true; - - networking.networkmanager.enable = true; - console.keyMap = "de"; - nixpkgs.config.allowUnfree = true; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; system.stateVersion = "23.11"; } \ No newline at end of file diff --git a/hosts/default.nix b/hosts/default.nix index 10ae784..fbe7d2c 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,7 +1,8 @@ -{ pkgs, hostname, ... }: +{ pkgs, hostname, type, ... }: { imports = [ ./common + ./${type} ./${hostname} ]; } \ No newline at end of file diff --git a/hosts/common/boot.nix b/hosts/desktop/boot.nix similarity index 100% rename from hosts/common/boot.nix rename to hosts/desktop/boot.nix diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix new file mode 100644 index 0000000..10453fc --- /dev/null +++ b/hosts/desktop/default.nix @@ -0,0 +1,17 @@ +{ pkgs, hostname, ... }: +{ + networking.hostName = hostname; + imports = [ + ./nix-ld.nix + ./boot.nix + ./printers.nix + ]; + + hardware.bluetooth.enable = true; + services.hardware.bolt.enable = true; + + networking.networkmanager.enable = true; + console.keyMap = "de"; + nixpkgs.config.allowUnfree = true; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; +} \ No newline at end of file diff --git a/hosts/common/nix-ld.nix b/hosts/desktop/nix-ld.nix similarity index 100% rename from hosts/common/nix-ld.nix rename to hosts/desktop/nix-ld.nix diff --git a/hosts/common/printers.nix b/hosts/desktop/printers.nix similarity index 100% rename from hosts/common/printers.nix rename to hosts/desktop/printers.nix diff --git a/hosts/server/Anton/data.nix b/hosts/server/Anton/data.nix new file mode 100644 index 0000000..d747664 --- /dev/null +++ b/hosts/server/Anton/data.nix @@ -0,0 +1,19 @@ +{ pkgs, ... }: +{ + + environment.systemPackages = with pkgs; [ + mergerfs + ]; + + fileSystems."/storage" = { + fsType = "fuse.mergerfs"; + device = "/mnt/disks/*"; + options = ["cache.files=partial" "dropcacheonclose=true" "category.create=mfs"]; + }; + + services.snapraid = { + enable = true; + + }; + +} \ No newline at end of file diff --git a/hosts/server/Anton/default.nix b/hosts/server/Anton/default.nix new file mode 100644 index 0000000..928904d --- /dev/null +++ b/hosts/server/Anton/default.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: +{ + + imports = [ + + ./disko.nix + ./hardware-configuration.nix + + ]; + +} \ No newline at end of file diff --git a/hosts/server/Anton/disko.nix b/hosts/server/Anton/disko.nix new file mode 100644 index 0000000..b7595d0 --- /dev/null +++ b/hosts/server/Anton/disko.nix @@ -0,0 +1,52 @@ +{ + disko.devices = { + disk = { + root-drive = { + type = "disk"; + device = "/dev/disk/by-id/wwn-0x5001b44ebc0b613a"; + content = { + type = "gpt"; + partitions = { + ESP = { + priority = 1; + name = "ESP"; + size = "512M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + }; + }; + root = { + size = "100%"; + content = { + type = "btrfs"; + extraArgs = [ "-f" ]; # Override existing partition + # Subvolumes must set a mountpoint in order to be mounted, + # unless their parent is mounted + subvolumes = { + # Subvolume name is different from mountpoint + "/rootfs" = { + mountOptions = [ "compress=zstd" "noatime" ]; + mountpoint = "/"; + }; + # Subvolume name is the same as the mountpoint + "/home" = { + mountOptions = [ "compress=zstd" "noatime" ]; + mountpoint = "/home"; + }; + # Parent is not mounted so the mountpoint must be set + "/nix" = { + mountOptions = [ "compress=zstd" "noatime" ]; + mountpoint = "/nix"; + }; + }; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/users/willifan/auto-cpufreq.nix b/users/willifan/Lenni/auto-cpufreq.nix similarity index 100% rename from users/willifan/auto-cpufreq.nix rename to users/willifan/Lenni/auto-cpufreq.nix diff --git a/users/willifan/udev.nix b/users/willifan/Lenni/backlight.nix similarity index 100% rename from users/willifan/udev.nix rename to users/willifan/Lenni/backlight.nix diff --git a/users/willifan/Lenni/default.nix b/users/willifan/Lenni/default.nix new file mode 100644 index 0000000..489b782 --- /dev/null +++ b/users/willifan/Lenni/default.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + imports = [ + ./auto-cpufreq.nix + ./backlight.nix + ]; +} \ No newline at end of file diff --git a/users/willifan/Puenktchen/default.nix b/users/willifan/Puenktchen/default.nix new file mode 100644 index 0000000..c7f8b4f --- /dev/null +++ b/users/willifan/Puenktchen/default.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + +} \ No newline at end of file diff --git a/users/willifan/common/default.nix b/users/willifan/common/default.nix new file mode 100644 index 0000000..b30e716 --- /dev/null +++ b/users/willifan/common/default.nix @@ -0,0 +1,15 @@ +{ pkgs, home-manager, ... }: +{ + imports = [ + ./envvar.nix + ./git.nix + ./hyfetch.nix + ./locales.nix + #./ssh.nix + ./syncthing.nix + ./user.nix + #./zsh.nix + ]; + + home-manager.users.willifan.home.stateVersion = "23.11"; +} \ No newline at end of file diff --git a/users/willifan/envvar.nix b/users/willifan/common/envvar.nix similarity index 100% rename from users/willifan/envvar.nix rename to users/willifan/common/envvar.nix diff --git a/users/willifan/git.nix b/users/willifan/common/git.nix similarity index 100% rename from users/willifan/git.nix rename to users/willifan/common/git.nix diff --git a/users/willifan/hyfetch.nix b/users/willifan/common/hyfetch.nix similarity index 100% rename from users/willifan/hyfetch.nix rename to users/willifan/common/hyfetch.nix diff --git a/users/willifan/locales.nix b/users/willifan/common/locales.nix similarity index 100% rename from users/willifan/locales.nix rename to users/willifan/common/locales.nix diff --git a/users/willifan/ssh.nix b/users/willifan/common/ssh.nix similarity index 100% rename from users/willifan/ssh.nix rename to users/willifan/common/ssh.nix diff --git a/users/willifan/syncthing.nix b/users/willifan/common/syncthing.nix similarity index 100% rename from users/willifan/syncthing.nix rename to users/willifan/common/syncthing.nix diff --git a/users/willifan/user.nix b/users/willifan/common/user.nix similarity index 100% rename from users/willifan/user.nix rename to users/willifan/common/user.nix diff --git a/users/willifan/zsh.nix b/users/willifan/common/zsh.nix similarity index 100% rename from users/willifan/zsh.nix rename to users/willifan/common/zsh.nix diff --git a/users/willifan/default.nix b/users/willifan/default.nix index 8d4ed95..fbe7d2c 100644 --- a/users/willifan/default.nix +++ b/users/willifan/default.nix @@ -1,31 +1,8 @@ -{ pkgs, home-manager, ... }: +{ pkgs, hostname, type, ... }: { imports = [ - ./graphical - - ./applications.nix - ./auto-cpufreq.nix - ./envvar.nix - ./git.nix - ./hyfetch.nix - ./locales.nix - #./ssh.nix - ./syncthing.nix - ./udev.nix - ./user.nix - #./zsh.nix + ./common + ./${type} + ./${hostname} ]; - - services.greetd = { - enable = true; - settings = rec { - initial_session = { - command = ''Hyprland''; - user = "willifan"; - }; - default_session = initial_session; - }; - }; - - home-manager.users.willifan.home.stateVersion = "23.11"; } \ No newline at end of file diff --git a/users/willifan/applications.nix b/users/willifan/desktop/applications.nix similarity index 95% rename from users/willifan/applications.nix rename to users/willifan/desktop/applications.nix index dcd8030..e2a4462 100644 --- a/users/willifan/applications.nix +++ b/users/willifan/desktop/applications.nix @@ -7,8 +7,6 @@ jq xorg.xrandr - btop - feh enpass diff --git a/users/willifan/desktop/autologin.nix b/users/willifan/desktop/autologin.nix new file mode 100644 index 0000000..4c67239 --- /dev/null +++ b/users/willifan/desktop/autologin.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + services.greetd = { + enable = true; + settings = rec { + initial_session = { + command = ''Hyprland''; + user = "willifan"; + }; + default_session = initial_session; + }; + }; +} \ No newline at end of file diff --git a/users/willifan/graphical/default.nix b/users/willifan/desktop/default.nix similarity index 75% rename from users/willifan/graphical/default.nix rename to users/willifan/desktop/default.nix index 89c737e..5e00e4b 100644 --- a/users/willifan/graphical/default.nix +++ b/users/willifan/desktop/default.nix @@ -9,6 +9,8 @@ ./theme ./web + ./applications.nix + ./autologin.nix ./kitty.nix ./thunar.nix ]; diff --git a/users/willifan/graphical/dev/default.nix b/users/willifan/desktop/dev/default.nix similarity index 100% rename from users/willifan/graphical/dev/default.nix rename to users/willifan/desktop/dev/default.nix diff --git a/users/willifan/graphical/dev/embedded.nix b/users/willifan/desktop/dev/embedded.nix similarity index 100% rename from users/willifan/graphical/dev/embedded.nix rename to users/willifan/desktop/dev/embedded.nix diff --git a/users/willifan/graphical/dev/logic-analyzer.nix b/users/willifan/desktop/dev/logic-analyzer.nix similarity index 100% rename from users/willifan/graphical/dev/logic-analyzer.nix rename to users/willifan/desktop/dev/logic-analyzer.nix diff --git a/users/willifan/graphical/dev/rust.nix b/users/willifan/desktop/dev/rust.nix similarity index 100% rename from users/willifan/graphical/dev/rust.nix rename to users/willifan/desktop/dev/rust.nix diff --git a/users/willifan/graphical/dev/vscodium.nix b/users/willifan/desktop/dev/vscodium.nix similarity index 100% rename from users/willifan/graphical/dev/vscodium.nix rename to users/willifan/desktop/dev/vscodium.nix diff --git a/users/willifan/graphical/games/ROG_Pugio_II_fixes.nix b/users/willifan/desktop/games/ROG_Pugio_II_fixes.nix similarity index 100% rename from users/willifan/graphical/games/ROG_Pugio_II_fixes.nix rename to users/willifan/desktop/games/ROG_Pugio_II_fixes.nix diff --git a/users/willifan/graphical/games/default.nix b/users/willifan/desktop/games/default.nix similarity index 100% rename from users/willifan/graphical/games/default.nix rename to users/willifan/desktop/games/default.nix diff --git a/users/willifan/graphical/games/mangohud.nix b/users/willifan/desktop/games/mangohud.nix similarity index 100% rename from users/willifan/graphical/games/mangohud.nix rename to users/willifan/desktop/games/mangohud.nix diff --git a/users/willifan/graphical/games/minecraft.nix b/users/willifan/desktop/games/minecraft.nix similarity index 100% rename from users/willifan/graphical/games/minecraft.nix rename to users/willifan/desktop/games/minecraft.nix diff --git a/users/willifan/graphical/games/steam.nix b/users/willifan/desktop/games/steam.nix similarity index 100% rename from users/willifan/graphical/games/steam.nix rename to users/willifan/desktop/games/steam.nix diff --git a/users/willifan/graphical/hyprland/Lenni/default.nix b/users/willifan/desktop/hyprland/Lenni/default.nix similarity index 100% rename from users/willifan/graphical/hyprland/Lenni/default.nix rename to users/willifan/desktop/hyprland/Lenni/default.nix diff --git a/users/willifan/graphical/hyprland/Lenni/hypridle.nix b/users/willifan/desktop/hyprland/Lenni/hypridle.nix similarity index 100% rename from users/willifan/graphical/hyprland/Lenni/hypridle.nix rename to users/willifan/desktop/hyprland/Lenni/hypridle.nix diff --git a/users/willifan/graphical/hyprland/Lenni/hyprlock.nix b/users/willifan/desktop/hyprland/Lenni/hyprlock.nix similarity index 100% rename from users/willifan/graphical/hyprland/Lenni/hyprlock.nix rename to users/willifan/desktop/hyprland/Lenni/hyprlock.nix diff --git a/users/willifan/graphical/hyprland/Lenni/kanshi.nix b/users/willifan/desktop/hyprland/Lenni/kanshi.nix similarity index 100% rename from users/willifan/graphical/hyprland/Lenni/kanshi.nix rename to users/willifan/desktop/hyprland/Lenni/kanshi.nix diff --git a/users/willifan/graphical/hyprland/Puenktchen/default.nix b/users/willifan/desktop/hyprland/Puenktchen/default.nix similarity index 100% rename from users/willifan/graphical/hyprland/Puenktchen/default.nix rename to users/willifan/desktop/hyprland/Puenktchen/default.nix diff --git a/users/willifan/graphical/hyprland/common/default.nix b/users/willifan/desktop/hyprland/common/default.nix similarity index 100% rename from users/willifan/graphical/hyprland/common/default.nix rename to users/willifan/desktop/hyprland/common/default.nix diff --git a/users/willifan/graphical/hyprland/common/hyprland.nix b/users/willifan/desktop/hyprland/common/hyprland.nix similarity index 100% rename from users/willifan/graphical/hyprland/common/hyprland.nix rename to users/willifan/desktop/hyprland/common/hyprland.nix diff --git a/users/willifan/graphical/hyprland/common/hyprpaper.nix b/users/willifan/desktop/hyprland/common/hyprpaper.nix similarity index 100% rename from users/willifan/graphical/hyprland/common/hyprpaper.nix rename to users/willifan/desktop/hyprland/common/hyprpaper.nix diff --git a/users/willifan/graphical/hyprland/common/mako.nix b/users/willifan/desktop/hyprland/common/mako.nix similarity index 100% rename from users/willifan/graphical/hyprland/common/mako.nix rename to users/willifan/desktop/hyprland/common/mako.nix diff --git a/users/willifan/graphical/hyprland/common/pipewire.nix b/users/willifan/desktop/hyprland/common/pipewire.nix similarity index 100% rename from users/willifan/graphical/hyprland/common/pipewire.nix rename to users/willifan/desktop/hyprland/common/pipewire.nix diff --git a/users/willifan/graphical/hyprland/common/polkit.nix b/users/willifan/desktop/hyprland/common/polkit.nix similarity index 100% rename from users/willifan/graphical/hyprland/common/polkit.nix rename to users/willifan/desktop/hyprland/common/polkit.nix diff --git a/users/willifan/graphical/hyprland/common/utils.nix b/users/willifan/desktop/hyprland/common/utils.nix similarity index 100% rename from users/willifan/graphical/hyprland/common/utils.nix rename to users/willifan/desktop/hyprland/common/utils.nix diff --git a/users/willifan/graphical/hyprland/common/wlogout.nix b/users/willifan/desktop/hyprland/common/wlogout.nix similarity index 100% rename from users/willifan/graphical/hyprland/common/wlogout.nix rename to users/willifan/desktop/hyprland/common/wlogout.nix diff --git a/users/willifan/graphical/hyprland/common/wofi.nix b/users/willifan/desktop/hyprland/common/wofi.nix similarity index 100% rename from users/willifan/graphical/hyprland/common/wofi.nix rename to users/willifan/desktop/hyprland/common/wofi.nix diff --git a/users/willifan/graphical/hyprland/default.nix b/users/willifan/desktop/hyprland/default.nix similarity index 100% rename from users/willifan/graphical/hyprland/default.nix rename to users/willifan/desktop/hyprland/default.nix diff --git a/users/willifan/graphical/kitty.nix b/users/willifan/desktop/kitty.nix similarity index 100% rename from users/willifan/graphical/kitty.nix rename to users/willifan/desktop/kitty.nix diff --git a/users/willifan/graphical/theme/cursor.nix b/users/willifan/desktop/theme/cursor.nix similarity index 100% rename from users/willifan/graphical/theme/cursor.nix rename to users/willifan/desktop/theme/cursor.nix diff --git a/users/willifan/graphical/theme/default.nix b/users/willifan/desktop/theme/default.nix similarity index 100% rename from users/willifan/graphical/theme/default.nix rename to users/willifan/desktop/theme/default.nix diff --git a/users/willifan/graphical/theme/font.nix b/users/willifan/desktop/theme/font.nix similarity index 100% rename from users/willifan/graphical/theme/font.nix rename to users/willifan/desktop/theme/font.nix diff --git a/users/willifan/graphical/theme/gtk.nix b/users/willifan/desktop/theme/gtk.nix similarity index 100% rename from users/willifan/graphical/theme/gtk.nix rename to users/willifan/desktop/theme/gtk.nix diff --git a/users/willifan/graphical/theme/qt.nix b/users/willifan/desktop/theme/qt.nix similarity index 100% rename from users/willifan/graphical/theme/qt.nix rename to users/willifan/desktop/theme/qt.nix diff --git a/users/willifan/graphical/thunar.nix b/users/willifan/desktop/thunar.nix similarity index 100% rename from users/willifan/graphical/thunar.nix rename to users/willifan/desktop/thunar.nix diff --git a/users/willifan/graphical/web/default.nix b/users/willifan/desktop/web/default.nix similarity index 100% rename from users/willifan/graphical/web/default.nix rename to users/willifan/desktop/web/default.nix diff --git a/users/willifan/graphical/web/firefox.nix b/users/willifan/desktop/web/firefox.nix similarity index 100% rename from users/willifan/graphical/web/firefox.nix rename to users/willifan/desktop/web/firefox.nix diff --git a/users/willifan/graphical/web/thunderbird.nix b/users/willifan/desktop/web/thunderbird.nix similarity index 100% rename from users/willifan/graphical/web/thunderbird.nix rename to users/willifan/desktop/web/thunderbird.nix