From ccf140835214b39724f5541e118e85148c099972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christopher=20M=C3=BChl?= Date: Tue, 13 Jan 2026 10:32:10 +0100 Subject: [PATCH] Move everything to correct places --- .../email.nix => home/communication.nix | 3 ++ .../home/toph@endurance => home}/config.nix | 0 .../config/appearance.nix | 0 .../toph@endurance => home}/config/bin.nix | 0 .../toph@endurance => home}/config/cron.nix | 0 .../toph@endurance => home}/config/dev.nix | 23 ++++++++++++++ .../toph@endurance => home}/config/fonts.nix | 0 .../toph@endurance => home}/config/git.nix | 0 .../config/radicle.nix | 0 .../default-applications.nix | 0 .../home/toph@endurance => home}/default.nix | 2 +- .../home/toph@endurance => home}/gaming.nix | 0 .../toph@endurance => home}/gpg/default.nix | 0 .../toph@endurance => home}/misc/browser.nix | 0 .../misc/creativity.nix | 0 .../misc/everything.nix | 2 -- .../toph@endurance => home}/misc/launcher.nix | 0 .../toph@endurance => home}/misc/onedrive.nix | 0 .../misc/recording.nix | 0 .../niri/autostart.nix | 0 .../toph@endurance => home}/niri/default.nix | 0 .../toph@endurance => home}/niri/keybinds.nix | 0 .../toph@endurance => home}/niri/settings.nix | 0 .../toph@endurance => home}/niri/shell.nix | 2 +- .../niri/window-rules.nix | 0 .../per-host/aepplet}/default.nix | 0 .../default.nix => home/per-host/fram.nix | 0 .../default.nix => home/per-host/vasa.nix | 0 .../home/toph@endurance => home}/ssh.nix | 0 .../home/toph@endurance => home}/stylix.nix | 0 .../wallpapers/cat-vibes.webp | Bin .../wallpapers/chill-room.webp | Bin .../wallpapers/evening-ambience-cafe.webp | Bin .../wallpapers/sources.md | 0 .../wallpapers/sunny-cityscape.webp | Bin .../wallpapers/yellow-bedroom.webp | Bin .../nixos => hosts}/aepplet/default.nix | 0 .../nixos => hosts}/aepplet/disko.nix | 0 .../nixos => hosts}/aepplet/hardware.nix | 0 .../nixos => hosts}/endurance/default.nix | 0 .../nixos => hosts}/endurance/disko.nix | 0 .../nixos => hosts}/endurance/hardware.nix | 0 .../nixos => hosts}/endurance/metrics.nix | 0 .../darwin => hosts}/vasa/default.nix | 0 modules/flake/homes.nix | 4 ++- modules/flake/hosts.nix | 2 +- modules/nixos/profiles/graphical/wm.nix | 29 +++++++++++++++--- modules/nixos/users.nix | 1 + overlays/default.nix | 10 +++--- overlays/spacedrive.nix | 12 ++++++++ packages/solidtime-desktop/package.nix | 5 --- 51 files changed, 76 insertions(+), 19 deletions(-) rename configurations/home/toph@endurance/email.nix => home/communication.nix (96%) rename {configurations/home/toph@endurance => home}/config.nix (100%) rename {configurations/home/toph@endurance => home}/config/appearance.nix (100%) rename {configurations/home/toph@endurance => home}/config/bin.nix (100%) rename {configurations/home/toph@endurance => home}/config/cron.nix (100%) rename {configurations/home/toph@endurance => home}/config/dev.nix (81%) rename {configurations/home/toph@endurance => home}/config/fonts.nix (100%) rename {configurations/home/toph@endurance => home}/config/git.nix (100%) rename {configurations/home/toph@endurance => home}/config/radicle.nix (100%) rename {configurations/home/toph@endurance => home}/default-applications.nix (100%) rename {configurations/home/toph@endurance => home}/default.nix (99%) rename {configurations/home/toph@endurance => home}/gaming.nix (100%) rename {configurations/home/toph@endurance => home}/gpg/default.nix (100%) rename {configurations/home/toph@endurance => home}/misc/browser.nix (100%) rename {configurations/home/toph@endurance => home}/misc/creativity.nix (100%) rename {configurations/home/toph@endurance => home}/misc/everything.nix (93%) rename {configurations/home/toph@endurance => home}/misc/launcher.nix (100%) rename {configurations/home/toph@endurance => home}/misc/onedrive.nix (100%) rename {configurations/home/toph@endurance => home}/misc/recording.nix (100%) rename {configurations/home/toph@endurance => home}/niri/autostart.nix (100%) rename {configurations/home/toph@endurance => home}/niri/default.nix (100%) rename {configurations/home/toph@endurance => home}/niri/keybinds.nix (100%) rename {configurations/home/toph@endurance => home}/niri/settings.nix (100%) rename {configurations/home/toph@endurance => home}/niri/shell.nix (93%) rename {configurations/home/toph@endurance => home}/niri/window-rules.nix (100%) rename {configurations/home/toph@aepplet => home/per-host/aepplet}/default.nix (100%) rename configurations/home/toph@fram/default.nix => home/per-host/fram.nix (100%) rename configurations/home/toph@vasa/default.nix => home/per-host/vasa.nix (100%) rename {configurations/home/toph@endurance => home}/ssh.nix (100%) rename {configurations/home/toph@endurance => home}/stylix.nix (100%) rename {configurations/home/toph@endurance => home}/wallpapers/cat-vibes.webp (100%) rename {configurations/home/toph@endurance => home}/wallpapers/chill-room.webp (100%) rename {configurations/home/toph@endurance => home}/wallpapers/evening-ambience-cafe.webp (100%) rename {configurations/home/toph@endurance => home}/wallpapers/sources.md (100%) rename {configurations/home/toph@endurance => home}/wallpapers/sunny-cityscape.webp (100%) rename {configurations/home/toph@endurance => home}/wallpapers/yellow-bedroom.webp (100%) rename {configurations/nixos => hosts}/aepplet/default.nix (100%) rename {configurations/nixos => hosts}/aepplet/disko.nix (100%) rename {configurations/nixos => hosts}/aepplet/hardware.nix (100%) rename {configurations/nixos => hosts}/endurance/default.nix (100%) rename {configurations/nixos => hosts}/endurance/disko.nix (100%) rename {configurations/nixos => hosts}/endurance/hardware.nix (100%) rename {configurations/nixos => hosts}/endurance/metrics.nix (100%) rename {configurations/darwin => hosts}/vasa/default.nix (100%) create mode 100644 overlays/spacedrive.nix delete mode 100644 packages/solidtime-desktop/package.nix diff --git a/configurations/home/toph@endurance/email.nix b/home/communication.nix similarity index 96% rename from configurations/home/toph@endurance/email.nix rename to home/communication.nix index 1936f4b..8cdb26b 100644 --- a/configurations/home/toph@endurance/email.nix +++ b/home/communication.nix @@ -68,6 +68,9 @@ in { home.packages = with pkgs; [ reader tdf + slack + telegram-desktop + vesktop # Discord client ]; accounts.email = { diff --git a/configurations/home/toph@endurance/config.nix b/home/config.nix similarity index 100% rename from configurations/home/toph@endurance/config.nix rename to home/config.nix diff --git a/configurations/home/toph@endurance/config/appearance.nix b/home/config/appearance.nix similarity index 100% rename from configurations/home/toph@endurance/config/appearance.nix rename to home/config/appearance.nix diff --git a/configurations/home/toph@endurance/config/bin.nix b/home/config/bin.nix similarity index 100% rename from configurations/home/toph@endurance/config/bin.nix rename to home/config/bin.nix diff --git a/configurations/home/toph@endurance/config/cron.nix b/home/config/cron.nix similarity index 100% rename from configurations/home/toph@endurance/config/cron.nix rename to home/config/cron.nix diff --git a/configurations/home/toph@endurance/config/dev.nix b/home/config/dev.nix similarity index 81% rename from configurations/home/toph@endurance/config/dev.nix rename to home/config/dev.nix index e1ed607..3979f03 100644 --- a/configurations/home/toph@endurance/config/dev.nix +++ b/home/config/dev.nix @@ -101,6 +101,29 @@ Do not include a `Co-authored-by`. ''; }; + + mcpServers = { + fetch = { + args = ["-y" "@modelcontextprotocol/server-fetch"]; + command = "npx"; + type = "stdio"; + }; + playwright = { + args = ["-y" "@modelcontextprotocol/server-playwright"]; + command = "npx"; + type = "stdio"; + }; + stackexchange = { + args = ["-y" "mcp-server-stackexchange"]; + command = "npx"; + type = "stdio"; + }; + arxiv = { + args = ["-y" "mcp-server-arxiv"]; + command = "npx"; + type = "stdio"; + }; + }; }; }; } diff --git a/configurations/home/toph@endurance/config/fonts.nix b/home/config/fonts.nix similarity index 100% rename from configurations/home/toph@endurance/config/fonts.nix rename to home/config/fonts.nix diff --git a/configurations/home/toph@endurance/config/git.nix b/home/config/git.nix similarity index 100% rename from configurations/home/toph@endurance/config/git.nix rename to home/config/git.nix diff --git a/configurations/home/toph@endurance/config/radicle.nix b/home/config/radicle.nix similarity index 100% rename from configurations/home/toph@endurance/config/radicle.nix rename to home/config/radicle.nix diff --git a/configurations/home/toph@endurance/default-applications.nix b/home/default-applications.nix similarity index 100% rename from configurations/home/toph@endurance/default-applications.nix rename to home/default-applications.nix diff --git a/configurations/home/toph@endurance/default.nix b/home/default.nix similarity index 99% rename from configurations/home/toph@endurance/default.nix rename to home/default.nix index 56299dd..cb2f15f 100644 --- a/configurations/home/toph@endurance/default.nix +++ b/home/default.nix @@ -10,7 +10,7 @@ # inputs.ovos.homeManagerModules.default ./gaming.nix ./ssh.nix - ./email.nix + ./communication.nix ./gpg ./niri ./stylix.nix diff --git a/configurations/home/toph@endurance/gaming.nix b/home/gaming.nix similarity index 100% rename from configurations/home/toph@endurance/gaming.nix rename to home/gaming.nix diff --git a/configurations/home/toph@endurance/gpg/default.nix b/home/gpg/default.nix similarity index 100% rename from configurations/home/toph@endurance/gpg/default.nix rename to home/gpg/default.nix diff --git a/configurations/home/toph@endurance/misc/browser.nix b/home/misc/browser.nix similarity index 100% rename from configurations/home/toph@endurance/misc/browser.nix rename to home/misc/browser.nix diff --git a/configurations/home/toph@endurance/misc/creativity.nix b/home/misc/creativity.nix similarity index 100% rename from configurations/home/toph@endurance/misc/creativity.nix rename to home/misc/creativity.nix diff --git a/configurations/home/toph@endurance/misc/everything.nix b/home/misc/everything.nix similarity index 93% rename from configurations/home/toph@endurance/misc/everything.nix rename to home/misc/everything.nix index 3777766..a504d79 100644 --- a/configurations/home/toph@endurance/misc/everything.nix +++ b/home/misc/everything.nix @@ -27,8 +27,6 @@ cider-2 # Apple music player fractal # Matrix client gomuks # Matrix client TUI - telegram-desktop - vesktop # Discord client filezilla # FTP Client mochi # SRS flashcards ]; diff --git a/configurations/home/toph@endurance/misc/launcher.nix b/home/misc/launcher.nix similarity index 100% rename from configurations/home/toph@endurance/misc/launcher.nix rename to home/misc/launcher.nix diff --git a/configurations/home/toph@endurance/misc/onedrive.nix b/home/misc/onedrive.nix similarity index 100% rename from configurations/home/toph@endurance/misc/onedrive.nix rename to home/misc/onedrive.nix diff --git a/configurations/home/toph@endurance/misc/recording.nix b/home/misc/recording.nix similarity index 100% rename from configurations/home/toph@endurance/misc/recording.nix rename to home/misc/recording.nix diff --git a/configurations/home/toph@endurance/niri/autostart.nix b/home/niri/autostart.nix similarity index 100% rename from configurations/home/toph@endurance/niri/autostart.nix rename to home/niri/autostart.nix diff --git a/configurations/home/toph@endurance/niri/default.nix b/home/niri/default.nix similarity index 100% rename from configurations/home/toph@endurance/niri/default.nix rename to home/niri/default.nix diff --git a/configurations/home/toph@endurance/niri/keybinds.nix b/home/niri/keybinds.nix similarity index 100% rename from configurations/home/toph@endurance/niri/keybinds.nix rename to home/niri/keybinds.nix diff --git a/configurations/home/toph@endurance/niri/settings.nix b/home/niri/settings.nix similarity index 100% rename from configurations/home/toph@endurance/niri/settings.nix rename to home/niri/settings.nix diff --git a/configurations/home/toph@endurance/niri/shell.nix b/home/niri/shell.nix similarity index 93% rename from configurations/home/toph@endurance/niri/shell.nix rename to home/niri/shell.nix index e63d3d9..4ef9687 100644 --- a/configurations/home/toph@endurance/niri/shell.nix +++ b/home/niri/shell.nix @@ -52,7 +52,7 @@ wallpaper = { enabled = true; overviewEnabled = false; - directory = "/nix/harbor/desktops/configurations/home/toph@endurance/wallpapers"; + directory = "/nix/harbor/desktops/home/wallpapers"; recursiveSearch = false; randomEnabled = true; }; diff --git a/configurations/home/toph@endurance/niri/window-rules.nix b/home/niri/window-rules.nix similarity index 100% rename from configurations/home/toph@endurance/niri/window-rules.nix rename to home/niri/window-rules.nix diff --git a/configurations/home/toph@aepplet/default.nix b/home/per-host/aepplet/default.nix similarity index 100% rename from configurations/home/toph@aepplet/default.nix rename to home/per-host/aepplet/default.nix diff --git a/configurations/home/toph@fram/default.nix b/home/per-host/fram.nix similarity index 100% rename from configurations/home/toph@fram/default.nix rename to home/per-host/fram.nix diff --git a/configurations/home/toph@vasa/default.nix b/home/per-host/vasa.nix similarity index 100% rename from configurations/home/toph@vasa/default.nix rename to home/per-host/vasa.nix diff --git a/configurations/home/toph@endurance/ssh.nix b/home/ssh.nix similarity index 100% rename from configurations/home/toph@endurance/ssh.nix rename to home/ssh.nix diff --git a/configurations/home/toph@endurance/stylix.nix b/home/stylix.nix similarity index 100% rename from configurations/home/toph@endurance/stylix.nix rename to home/stylix.nix diff --git a/configurations/home/toph@endurance/wallpapers/cat-vibes.webp b/home/wallpapers/cat-vibes.webp similarity index 100% rename from configurations/home/toph@endurance/wallpapers/cat-vibes.webp rename to home/wallpapers/cat-vibes.webp diff --git a/configurations/home/toph@endurance/wallpapers/chill-room.webp b/home/wallpapers/chill-room.webp similarity index 100% rename from configurations/home/toph@endurance/wallpapers/chill-room.webp rename to home/wallpapers/chill-room.webp diff --git a/configurations/home/toph@endurance/wallpapers/evening-ambience-cafe.webp b/home/wallpapers/evening-ambience-cafe.webp similarity index 100% rename from configurations/home/toph@endurance/wallpapers/evening-ambience-cafe.webp rename to home/wallpapers/evening-ambience-cafe.webp diff --git a/configurations/home/toph@endurance/wallpapers/sources.md b/home/wallpapers/sources.md similarity index 100% rename from configurations/home/toph@endurance/wallpapers/sources.md rename to home/wallpapers/sources.md diff --git a/configurations/home/toph@endurance/wallpapers/sunny-cityscape.webp b/home/wallpapers/sunny-cityscape.webp similarity index 100% rename from configurations/home/toph@endurance/wallpapers/sunny-cityscape.webp rename to home/wallpapers/sunny-cityscape.webp diff --git a/configurations/home/toph@endurance/wallpapers/yellow-bedroom.webp b/home/wallpapers/yellow-bedroom.webp similarity index 100% rename from configurations/home/toph@endurance/wallpapers/yellow-bedroom.webp rename to home/wallpapers/yellow-bedroom.webp diff --git a/configurations/nixos/aepplet/default.nix b/hosts/aepplet/default.nix similarity index 100% rename from configurations/nixos/aepplet/default.nix rename to hosts/aepplet/default.nix diff --git a/configurations/nixos/aepplet/disko.nix b/hosts/aepplet/disko.nix similarity index 100% rename from configurations/nixos/aepplet/disko.nix rename to hosts/aepplet/disko.nix diff --git a/configurations/nixos/aepplet/hardware.nix b/hosts/aepplet/hardware.nix similarity index 100% rename from configurations/nixos/aepplet/hardware.nix rename to hosts/aepplet/hardware.nix diff --git a/configurations/nixos/endurance/default.nix b/hosts/endurance/default.nix similarity index 100% rename from configurations/nixos/endurance/default.nix rename to hosts/endurance/default.nix diff --git a/configurations/nixos/endurance/disko.nix b/hosts/endurance/disko.nix similarity index 100% rename from configurations/nixos/endurance/disko.nix rename to hosts/endurance/disko.nix diff --git a/configurations/nixos/endurance/hardware.nix b/hosts/endurance/hardware.nix similarity index 100% rename from configurations/nixos/endurance/hardware.nix rename to hosts/endurance/hardware.nix diff --git a/configurations/nixos/endurance/metrics.nix b/hosts/endurance/metrics.nix similarity index 100% rename from configurations/nixos/endurance/metrics.nix rename to hosts/endurance/metrics.nix diff --git a/configurations/darwin/vasa/default.nix b/hosts/vasa/default.nix similarity index 100% rename from configurations/darwin/vasa/default.nix rename to hosts/vasa/default.nix diff --git a/modules/flake/homes.nix b/modules/flake/homes.nix index be0e330..145ddb4 100644 --- a/modules/flake/homes.nix +++ b/modules/flake/homes.nix @@ -3,7 +3,9 @@ mkHome = user: host: { imports = [ - (self + "/configurations/home/${user}@${host}") + (self + "/home") + # TODO: Import this conditionally! + # (self + "/home/by-host/${host}") (self + "/modules/home") ]; }; diff --git a/modules/flake/hosts.nix b/modules/flake/hosts.nix index 98d79c3..44e359f 100644 --- a/modules/flake/hosts.nix +++ b/modules/flake/hosts.nix @@ -3,7 +3,7 @@ mkHost = hostname: config: { - path = ../../configurations/nixos/${hostname}; + path = ../../hosts/${hostname}; deployable = true; specialArgs = {inherit inputs hostname;}; } diff --git a/modules/nixos/profiles/graphical/wm.nix b/modules/nixos/profiles/graphical/wm.nix index de6a761..76791bd 100644 --- a/modules/nixos/profiles/graphical/wm.nix +++ b/modules/nixos/profiles/graphical/wm.nix @@ -1,11 +1,16 @@ { - inputs, pkgs, lib, config, ... }: let inherit (lib) mkIf; + + sddmTheme = pkgs.sddm-astronaut.override { + embeddedTheme = "japanese_aesthetic"; + themeConfig = { + }; + }; in { imports = [ #inputs.niri.nixosModules.niri @@ -18,6 +23,8 @@ in { libsForQt5.qtstyleplugin-kvantum xwayland-satellite nautilus + sddmTheme + kdePackages.qtmultimedia # required for our sddm theme ]; programs.niri = { @@ -26,14 +33,28 @@ in { }; services = { - xserver.enable = true; + xserver = { + enable = true; + displayManager.setupCommands = '' + /run/current-system/sw/bin/xrandr --output HDMI-A-1 --primary + /run/current-system/sw/bin/xrandr --output DP-3 --right-of HDMI-A-1 --rotate left + ''; + }; displayManager = { defaultSession = "niri"; - sddm = { + sddm = let + theme = "sddm-astronaut-theme"; + in { enable = true; - wayland.enable = true; + package = pkgs.kdePackages.sddm; + + # wayland.enable = true; + + inherit theme; + extraPackages = [sddmTheme]; + settings.Theme.Current = theme; }; }; }; diff --git a/modules/nixos/users.nix b/modules/nixos/users.nix index 49e8d25..062f368 100644 --- a/modules/nixos/users.nix +++ b/modules/nixos/users.nix @@ -27,6 +27,7 @@ users = { users.toph = { isNormalUser = true; + uid = 1000; initialPassword = "wheel"; # hashedPasswordFile = config.age.secrets.tophPassword.path; shell = pkgs.fish; diff --git a/overlays/default.nix b/overlays/default.nix index bb4e800..aae2a0a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -8,10 +8,11 @@ # wrapper that provides channels arg to each overlay withChannels = overlayFn: final: prev: let # Import channels with the same config as the main nixpkgs - importChannel = input: import input { - system = final.stdenv.hostPlatform.system; - config = final.config; - }; + importChannel = input: + import input { + system = final.stdenv.hostPlatform.system; + config = final.config; + }; in overlayFn { inherit inputs; @@ -31,4 +32,5 @@ in [ (withChannels (import ./lix.nix)) (withChannels (import ./packages.nix)) (withChannels (import ./unstable.nix)) + (withChannels (import ./spacedrive.nix)) ] diff --git a/overlays/spacedrive.nix b/overlays/spacedrive.nix new file mode 100644 index 0000000..45bc4bf --- /dev/null +++ b/overlays/spacedrive.nix @@ -0,0 +1,12 @@ +{ + channels, + lib, + ... +}: final: prev: { + spacedrive_v2 = channels.unstable.spacedrive.overrideAttrs (old: { + src = prev.fetchurl { + url = "https://github.com/spacedriveapp/spacedrive/releases/download/v2.0.0-alpha.1/Spacedrive-linux-x86_64.deb"; + hash = lib.fakeHash; + }; + }); +} diff --git a/packages/solidtime-desktop/package.nix b/packages/solidtime-desktop/package.nix deleted file mode 100644 index 1fc8da2..0000000 --- a/packages/solidtime-desktop/package.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: -pkgs.writeShellApplication { - name = "connect-to-mercury"; - text = builtins.readFile ./connect-to-mercury; -}