From c85a19aafde45e1e3bb2c7189f0ba5cbb90edae1 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Sun, 14 Dec 2025 15:35:13 -0500 Subject: [PATCH] modify structure --- flake.nix | 8 ++--- hardware/{alien.nix => alien/default.nix} | 0 hardware/{peach.nix => peach/default.nix} | 0 .../default.nix} | 0 home/{all.nix => default.nix} | 0 home/hosts/{alien.nix => alien/default.nix} | 0 home/hosts/{peach.nix => peach/default.nix} | 0 .../default.nix} | 0 home/kde/{plasma.nix => default.nix} | 18 +++++++++++ home/kde/other.nix | 21 ------------- home/tiling/niri/default.nix | 4 +++ .../{bing-wallpaper.nix => default.nix} | 0 system/all.nix | 31 +++++++++---------- 13 files changed, 40 insertions(+), 42 deletions(-) rename hardware/{alien.nix => alien/default.nix} (100%) rename hardware/{peach.nix => peach/default.nix} (100%) rename hardware/{vm-aarch64.nix => vm-aarch64/default.nix} (100%) rename home/{all.nix => default.nix} (100%) rename home/hosts/{alien.nix => alien/default.nix} (100%) rename home/hosts/{peach.nix => peach/default.nix} (100%) rename home/hosts/{vm-aarch64.nix => vm-aarch64/default.nix} (100%) rename home/kde/{plasma.nix => default.nix} (94%) delete mode 100644 home/kde/other.nix rename home/tiling/wallpaper/{bing-wallpaper.nix => default.nix} (100%) diff --git a/flake.nix b/flake.nix index 4b8c044..84dacd9 100644 --- a/flake.nix +++ b/flake.nix @@ -87,11 +87,11 @@ ]; } ./system/all.nix - ./system/widevine/default.nix + ./system/widevine ./system/shell/fish.nix - ./system/tailscale/default.nix - ./system/hosts/${hostname}/default.nix - ./hardware/${hostname}.nix + ./system/tailscale + ./system/hosts/${hostname} + ./hardware/${hostname} catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager noctalia.nixosModules.default diff --git a/hardware/alien.nix b/hardware/alien/default.nix similarity index 100% rename from hardware/alien.nix rename to hardware/alien/default.nix diff --git a/hardware/peach.nix b/hardware/peach/default.nix similarity index 100% rename from hardware/peach.nix rename to hardware/peach/default.nix diff --git a/hardware/vm-aarch64.nix b/hardware/vm-aarch64/default.nix similarity index 100% rename from hardware/vm-aarch64.nix rename to hardware/vm-aarch64/default.nix diff --git a/home/all.nix b/home/default.nix similarity index 100% rename from home/all.nix rename to home/default.nix diff --git a/home/hosts/alien.nix b/home/hosts/alien/default.nix similarity index 100% rename from home/hosts/alien.nix rename to home/hosts/alien/default.nix diff --git a/home/hosts/peach.nix b/home/hosts/peach/default.nix similarity index 100% rename from home/hosts/peach.nix rename to home/hosts/peach/default.nix diff --git a/home/hosts/vm-aarch64.nix b/home/hosts/vm-aarch64/default.nix similarity index 100% rename from home/hosts/vm-aarch64.nix rename to home/hosts/vm-aarch64/default.nix diff --git a/home/kde/plasma.nix b/home/kde/default.nix similarity index 94% rename from home/kde/plasma.nix rename to home/kde/default.nix index 5412f48..63328b9 100644 --- a/home/kde/plasma.nix +++ b/home/kde/default.nix @@ -1,6 +1,24 @@ { config, pkgs, ... }: { + programs.ghostwriter = { + enable = true; + font = { + family = config.userOptions.fontSans.name; + pointSize = config.userOptions.fontSans.size; + }; + }; + + programs.kate = { + enable = true; + editor = { + font = { + family = config.userOptions.fontMono.name; + pointSize = config.userOptions.fontMono.size; + }; + }; + }; + programs.plasma = { enable = true; overrideConfig = true; diff --git a/home/kde/other.nix b/home/kde/other.nix deleted file mode 100644 index cb8646a..0000000 --- a/home/kde/other.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, ... }: - -{ - programs.ghostwriter = { - enable = true; - font = { - family = config.userOptions.fontSans.name; - pointSize = config.userOptions.fontSans.size; - }; - }; - - programs.kate = { - enable = true; - editor = { - font = { - family = config.userOptions.fontMono.name; - pointSize = config.userOptions.fontMono.size; - }; - }; - }; -} diff --git a/home/tiling/niri/default.nix b/home/tiling/niri/default.nix index 750ee11..fb92dc3 100644 --- a/home/tiling/niri/default.nix +++ b/home/tiling/niri/default.nix @@ -9,6 +9,10 @@ let }; in { + imports = [ + ./niri.nix + ./noctalia.nix + ]; home.packages = with pkgs; [ xdg-desktop-portal brightnessctl diff --git a/home/tiling/wallpaper/bing-wallpaper.nix b/home/tiling/wallpaper/default.nix similarity index 100% rename from home/tiling/wallpaper/bing-wallpaper.nix rename to home/tiling/wallpaper/default.nix diff --git a/system/all.nix b/system/all.nix index 8eba616..64c1c14 100755 --- a/system/all.nix +++ b/system/all.nix @@ -53,23 +53,20 @@ home-manager.useUserPackages = true; home-manager.users.sckova = { imports = [ - ../home/all.nix - ../home/browsers/firefox/default.nix - ../home/tiling/niri/default.nix - ../home/tiling/niri/niri.nix - ../home/tiling/niri/noctalia.nix - ../home/tiling/quickshell/default.nix - ../home/tiling/wallpaper/bing-wallpaper.nix - ../home/tiling/waybar/default.nix - ../home/systemd/default.nix - ../home/terminal/btop/default.nix - ../home/terminal/fish/default.nix - ../home/terminal/kitty/default.nix - ../home/terminal/nvim/default.nix - ../home/kde/plasma.nix - ../home/kde/other.nix - ../home/vscode/default.nix - ../home/hosts/${config.networking.hostName}.nix + ../home + ../home/browsers/firefox + ../home/tiling/niri + ../home/tiling/quickshell + ../home/tiling/wallpaper + ../home/tiling/waybar + ../home/systemd + ../home/terminal/btop + ../home/terminal/fish + ../home/terminal/kitty + ../home/terminal/nvim + ../home/kde + ../home/vscode + ../home/hosts/${config.networking.hostName} ]; };