diff --git a/dot_config/flake/home/darkman.nix b/dot_config/flake/home/darkman.nix index f54ff40..325853a 100644 --- a/dot_config/flake/home/darkman.nix +++ b/dot_config/flake/home/darkman.nix @@ -11,7 +11,7 @@ ''; gtk-theme = '' - gsettings set org.gnome.desktop.interface color-scheme prefer-light + dconf write /org/gnome/desktop/interface/color-scheme '"prefer-light"' ''; noctalia = '' @@ -21,7 +21,7 @@ darkModeScripts = { gtk-theme = '' - gsettings set org.gnome.desktop.interface color-scheme prefer-dark + dconf write /org/gnome/desktop/interface/color-scheme '"prefer-dark"' ''; noctalia = '' diff --git a/dot_config/flake/home/gnome.nix b/dot_config/flake/home/gnome.nix index ead08b3..9740ad3 100644 --- a/dot_config/flake/home/gnome.nix +++ b/dot_config/flake/home/gnome.nix @@ -1,10 +1,10 @@ {pkgs, ...}: { - home.packages = with pkgs; [ - gnome-tweaks - ]; + # home.packages = with pkgs; [ + # gnome-tweaks + # ]; programs.gnome-shell = { - enable = true; + enable = false; extensions = [ # {package = pkgs.gnomeExtensions.power-off-options;} {package = pkgs.gnomeExtensions.auto-power-profile;} diff --git a/dot_config/flake/home/gui.nix b/dot_config/flake/home/gui.nix index 49c4f81..22a106a 100644 --- a/dot_config/flake/home/gui.nix +++ b/dot_config/flake/home/gui.nix @@ -1,34 +1,9 @@ {pkgs, ...}: { - imports = [ - ]; - home.packages = with pkgs; [ - adw-gtk3 - discord # Office libreoffice obsidian ]; - - # programs.vscode.enable = true; - - # programs.alacritty = { - # enable = true; - # }; - - # programs.wezterm = { - # enable = false; - # extraConfig = '' - # return { - # font_size=9.25, - # color_scheme="catppuccin-latte", - # hide_tab_bar_if_only_one_tab = true, - # window_frame = { - # font_size = 10 - # }, - # } - # ''; - # }; } diff --git a/dot_config/flake/home/niri.nix b/dot_config/flake/home/niri.nix index 81b269c..ae0264b 100644 --- a/dot_config/flake/home/niri.nix +++ b/dot_config/flake/home/niri.nix @@ -14,43 +14,34 @@ in { noctalia inputs.quickshell.packages.${system}.default + glib + xdg-desktop-portal-gnome + xdg-desktop-portal-gtk gnome-keyring mods.xwayland-satellite wlsunset ]; - # xdg.portal = { - # enable = true; - # extraPortals = [pkgs.xdg-desktop-portal-gnome pkgs.xdg-desktop-portal-gtk]; - # config = { - # niri = { - # default = ["gnome" "gtk"]; - # "org.freedesktop.impl.portal.Access" = ["gtk"]; - # "org.freedesktop.impl.portal.Notification" = ["gtk"]; - # "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"]; - # }; - # }; - # }; - home.shellAliases = { restart-shell = "${noctalia} kill && niri msg action spawn -- \"${noctalia}\""; }; + gtk = { + enable = true; + # theme.name = "Adwaita"; + iconTheme = { + package = pkgs.tela-icon-theme; + name = "Tela"; + }; + }; + programs.niri.settings = { cursor = { size = 12; theme = "Adwaita"; }; - # This config is in the KDL format: https://kdl.dev - # "/-" comments out the following node. - # Check the wiki for a full description of the configuration: - # https://github.com/YaLTeR/niri/wiki/Configuration:-Introduction - - # Input device configuration. - # Find the full list of options on the wiki: - # https://github.com/YaLTeR/niri/wiki/Configuration:-Input input = { # keyboard { # xkb { diff --git a/dot_config/flake/home/stylix.nix b/dot_config/flake/home/stylix.nix index f90bd2f..cc432fc 100644 --- a/dot_config/flake/home/stylix.nix +++ b/dot_config/flake/home/stylix.nix @@ -14,8 +14,8 @@ in { # package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}; # }; - enable = true; - autoEnable = false; + # enable = true; + # autoEnable = false; # targets.alacritty.enable = false; # targets.helix.enable = false; diff --git a/dot_config/flake/machines/wash/configuration.nix b/dot_config/flake/machines/wash/configuration.nix index 8a05b90..faeb3c8 100644 --- a/dot_config/flake/machines/wash/configuration.nix +++ b/dot_config/flake/machines/wash/configuration.nix @@ -9,12 +9,13 @@ ../../modules/nixos/boot.nix - ../../modules/nixos/gnome.nix + # Desktop environment + ../../modules/nixos/niri.nix + + # ../../modules/nixos/gnome.nix # ../../modules/nixos/android-studio.nix # ../../modules/nixos/docker.nix - ../../modules/nixos/podman.nix - - ../../modules/nixos/niri.nix + # ../../modules/nixos/podman.nix ]; nixpkgs = { @@ -36,7 +37,7 @@ trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="]; }; - networking.hostName = "wash"; # Define your hostname. + networking.hostName = "wash"; # Enable networking networking.networkmanager.enable = true; @@ -115,10 +116,9 @@ sqlite vscode.fhs lm_sensors - nautilus - unstable.android-studio - jetbrains.rust-rover + # unstable.android-studio + # jetbrains.rust-rover # jetbrains.rider pre-commit diff --git a/dot_config/flake/machines/wash/home.nix b/dot_config/flake/machines/wash/home.nix index 00c1726..41c547f 100644 --- a/dot_config/flake/machines/wash/home.nix +++ b/dot_config/flake/machines/wash/home.nix @@ -20,7 +20,7 @@ homeDirectory = "/home/tyler"; packages = with pkgs; [ - godot + # godot ]; stateVersion = "23.11"; diff --git a/dot_config/flake/modules/nixos/boot.nix b/dot_config/flake/modules/nixos/boot.nix index 5881e7b..d9fd8b5 100644 --- a/dot_config/flake/modules/nixos/boot.nix +++ b/dot_config/flake/modules/nixos/boot.nix @@ -12,7 +12,7 @@ }; plymouth = { - enable = false; + enable = true; themePackages = [pkgs.catppuccin-plymouth]; theme = "catppuccin-macchiato"; }; diff --git a/dot_config/flake/modules/nixos/gnome.nix b/dot_config/flake/modules/nixos/gnome.nix index 9c4d665..027061c 100644 --- a/dot_config/flake/modules/nixos/gnome.nix +++ b/dot_config/flake/modules/nixos/gnome.nix @@ -1,5 +1,5 @@ {...}: { services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + # services.xserver.desktopManager.gnome.enable = true; services.gnome.gnome-keyring.enable = true; } diff --git a/dot_config/flake/modules/nixos/niri.nix b/dot_config/flake/modules/nixos/niri.nix index a2f09ab..1e3cf6a 100644 --- a/dot_config/flake/modules/nixos/niri.nix +++ b/dot_config/flake/modules/nixos/niri.nix @@ -1,30 +1,17 @@ { - inputs, pkgs, + inputs, ... }: { imports = [ inputs.niri.nixosModules.niri ]; + services.xserver.displayManager.gdm.enable = true; niri-flake.cache.enable = true; programs.niri.enable = true; - # programs.niri.package = pkgs.niri-unstable; - xdg.portal = { - enable = true; - extraPortals = [pkgs.xdg-desktop-portal-gnome pkgs.xdg-desktop-portal-gtk]; - wlr.enable = true; - config = { - sway = { - default = ["gtk"]; - }; - niri = { - default = ["gnome" "gtk"]; - "org.freedesktop.impl.portal.Access" = ["gtk"]; - "org.freedesktop.impl.portal.Notification" = ["gtk"]; - "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"]; - }; - }; - }; + environment.systemPackages = with pkgs; [ + nautilus + ]; }