diff --git a/iso/configuration.nix b/iso/configuration.nix index 7461131..e002625 100644 --- a/iso/configuration.nix +++ b/iso/configuration.nix @@ -20,19 +20,31 @@ vscodium firefox kitty + gnome-disk-utility ]; networking = { wireless.enable = false; networkmanager.enable = true; }; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; - services.greetd = { - enable = true; - settings = { - initial_session = { - command = "${pkgs.hyprland}/bin/Hyprland"; - user = "nixos"; + # gnome is a good default that works with every gpu and doesn't require knowledge about custom keybinds. + services = { + xserver = { + enable = true; + displayManager = { + gdm.enable = true; }; + desktopManager = { + gnome.enable = true; + }; + }; + displayManager.autoLogin = { + enable = true; + user = "nixos"; }; }; diff --git a/modules/programs/base_packages.nix b/modules/programs/base_packages.nix index 690af93..c0bd40f 100644 --- a/modules/programs/base_packages.nix +++ b/modules/programs/base_packages.nix @@ -9,7 +9,6 @@ { options.mods = { base_packages = { - default_base_packages = { enable = lib.mkOption { default = true; example = false; @@ -26,16 +25,15 @@ Additional packages to install. Note that these are installed even if base packages is disabled, e.g. you can also use this as the only packages to install. ''; - }; }; }; }; config = ( lib.optionalAttrs (options ? environment.systemPackages) { - environment.systemPackages = config.mods.base_packages.default_base_packages.additional_packages; + environment.systemPackages = config.mods.base_packages.additional_packages; } - // (lib.mkIf config.mods.base_packages.default_base_packages.enable ( + // (lib.mkIf config.mods.base_packages.enable ( lib.optionalAttrs (options ? environment.systemPackages) { environment.systemPackages = with pkgs; [ adwaita-icon-theme diff --git a/modules/programs/coding.nix b/modules/programs/coding.nix index fb5dff7..b1a6ca4 100644 --- a/modules/programs/coding.nix +++ b/modules/programs/coding.nix @@ -394,11 +394,10 @@ d-spy tmux tmate - #editors - neovide #fallback vscodium ]; + font_family = "${config.mods.stylix.fonts.monospace.name}"; in lib.mkIf config.mods.coding.enable ( lib.optionalAttrs (options ? home.packages) { @@ -406,9 +405,35 @@ enable = true; colorscheme = config.mods.stylix.colorscheme; }; + xdg.configFile."neovide/config.toml".source = lib.mkIf config.mods.coding.dashvim ( + (pkgs.formats.toml { }).generate "neovide" { + font = { + size = 12; + normal = { + family = font_family; + style = ""; + }; + bold = { + family = font_family; + style = "ExtraBold"; + }; + italic = { + family = font_family; + style = "Italic"; + }; + bold_italic = { + family = font_family; + style = "Bold Italic"; + }; + }; + } + ); home.packages = with pkgs; - [ (lib.mkIf config.mods.coding.jetbrains jetbrains-toolbox) ] + [ + (lib.mkIf config.mods.coding.dashvim neovide) + (lib.mkIf config.mods.coding.jetbrains jetbrains-toolbox) + ] ++ config.mods.coding.additionalPackages ++ (lib.lists.optionals config.mods.coding.useDefaultPackages basePackages) ++ (lib.lists.optionals config.mods.coding.languages.haskell.enable config.mods.coding.languages.haskell.packages) diff --git a/result b/result index f3888e2..921200f 120000 --- a/result +++ b/result @@ -1 +1 @@ -/nix/store/9snhsj18w6vyi4f25sq93az859yigcdp-DashNix.iso \ No newline at end of file +/nix/store/kh29b973hk8qhkkmnswr7cld66kyyjk6-DashNix.iso \ No newline at end of file