From 414ecc1a332b1c654b2fd01323ce33f7f69e8d2d Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Thu, 26 Dec 2024 01:28:34 -0800 Subject: [PATCH] feat: update callisto reference system --- flake.nix | 10 +++++++--- reference/hosts/callisto/configuration.nix | 23 +++++++++++++++------- reference/hosts/callisto/default.nix | 5 ++--- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 0300468..291944c 100755 --- a/flake.nix +++ b/flake.nix @@ -133,9 +133,13 @@ ./reference/hosts/demeter ]; }; - callisto = buildLiminalOS { - inherit nixpkgs inputs; - systemModule = ./reference/hosts/callisto; + callisto = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs self; + }; + modules = [ + ./reference/hosts/callisto + ]; }; adrastea = buildLiminalOS { inherit inputs nixpkgs; diff --git a/reference/hosts/callisto/configuration.nix b/reference/hosts/callisto/configuration.nix index 3a8828a..c647215 100755 --- a/reference/hosts/callisto/configuration.nix +++ b/reference/hosts/callisto/configuration.nix @@ -14,7 +14,16 @@ liminalOS = { flakeLocation = "/home/youwen/.config/liminalOS"; + config.allowUnfree = false; + defaultEditor = inputs.viminal.packages.${pkgs.system}.default; formFactor = "laptop"; + theming = { + wallpaper = "${inputs.wallpapers}/aesthetic/afterglow_city_skyline_at_night.png"; + # if you don't manually set polarity when using manual colorscheme, GTK + # apps won't respect colorscheme + base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml"; + polarity = "dark"; + }; system = { networking = { firewallPresets.vite = true; @@ -23,6 +32,13 @@ }; }; + users.users.youwen = { + isNormalUser = true; + description = "Youwen Wu"; + extraGroups = [ "wheel" ]; + shell = pkgs.fish; + }; + boot = { loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = false; @@ -43,13 +59,6 @@ inputs.vesktop-bin.overlays.default ]; - users.users.youwen = { - isNormalUser = true; - description = "Youwen Wu"; - extraGroups = [ "wheel" ]; - shell = pkgs.fish; - }; - nix.settings = { trusted-users = [ "youwen" diff --git a/reference/hosts/callisto/default.nix b/reference/hosts/callisto/default.nix index 163d0c3..1e772a9 100644 --- a/reference/hosts/callisto/default.nix +++ b/reference/hosts/callisto/default.nix @@ -1,14 +1,13 @@ { + self, inputs, - system, ... }: { imports = [ ./configuration.nix - ../../../modules/linux - ../../../overlays + self.nixosModules.liminalOS { home-manager.users.youwen = { imports = [ ./home.nix ];