From 164dc2758a30e3477ed2220ade204db6e154a6da Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Thu, 26 Dec 2024 23:50:53 -0800 Subject: [PATCH] feat: overhaul cassini configuration --- reference/hosts/cassini/configuration.nix | 68 ++++++------------- reference/hosts/cassini/default.nix | 26 ++----- .../cassini/home-manager-extras/default.nix | 3 - reference/hosts/cassini/home.nix | 7 ++ 4 files changed, 31 insertions(+), 73 deletions(-) delete mode 100644 reference/hosts/cassini/home-manager-extras/default.nix create mode 100644 reference/hosts/cassini/home.nix diff --git a/reference/hosts/cassini/configuration.nix b/reference/hosts/cassini/configuration.nix index b76877d..f8c1e2b 100755 --- a/reference/hosts/cassini/configuration.nix +++ b/reference/hosts/cassini/configuration.nix @@ -3,37 +3,31 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { pkgs, - lib, + inputs, ... }: { networking.hostName = "cassini"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + liminalOS = { + flakeLocation = "/home/youwen/.config/liminalOS"; + defaultEditor = inputs.viminal.packages.${pkgs.system}.default; + formFactor = "desktop"; + 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.enable = false; + }; + wsl.enable = true; + }; # Set your time zone. time.timeZone = "America/Los_Angeles"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - - # Configure keymap in X11 - services.xserver = { - xkb.layout = "us"; - xkb.variant = ""; - }; - # Define a user account. Don't forget to set a password with ‘passwd’. users.users.youwen = { isNormalUser = true; @@ -47,31 +41,7 @@ ]; }; - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - wget - git - curl - ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - programs.dconf.enable = true; - - programs.fish.enable = true; - users.users.youwen.shell = pkgs.fish; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + nixpkgs.hostPlatform = "x86_64-linux"; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/reference/hosts/cassini/default.nix b/reference/hosts/cassini/default.nix index a359f9a..921b554 100644 --- a/reference/hosts/cassini/default.nix +++ b/reference/hosts/cassini/default.nix @@ -1,34 +1,18 @@ { inputs, + self, ... }: { imports = [ ./configuration.nix - ../../modules/linux/core - ../../modules/linux/stylix - ../../overlays - ../../modules/linux/wsl + self.nixosModules.default { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.extraSpecialArgs = { - inherit inputs; - }; home-manager.users.youwen = { - imports = - [ - ./home-manager-extras - ../../users/youwen/common - ../../users/youwen/linux/theming - ../../users/youwen/linux/home.nix - (import ../../users/youwen/common/fastfetch { kitty = false; }) - ] - ++ (with inputs; [ - nix-index-database.hmModules.nix-index - ]); + imports = [ + self.homeManagerModules.default + ]; }; } ] diff --git a/reference/hosts/cassini/home-manager-extras/default.nix b/reference/hosts/cassini/home-manager-extras/default.nix deleted file mode 100644 index 6e5b8c3..0000000 --- a/reference/hosts/cassini/home-manager-extras/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ pkgs, ... }: -{ -} diff --git a/reference/hosts/cassini/home.nix b/reference/hosts/cassini/home.nix new file mode 100644 index 0000000..0c98f20 --- /dev/null +++ b/reference/hosts/cassini/home.nix @@ -0,0 +1,7 @@ +{ + imports = [ + ../../users/youwen + ]; + + home.stateVersion = "24.05"; +}