niri fixes

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 = ''

dot_config/flake/home/gnome.nix

@@ -1,10 +1,10 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [
+  # home.packages = with pkgs; [
-    gnome-tweaks
+  # gnome-tweaks
-  ];
+  # ];
 
   programs.gnome-shell = {
-    enable = true;
+    enable = false;
     extensions = [
       # {package = pkgs.gnomeExtensions.power-off-options;}
       {package = pkgs.gnomeExtensions.auto-power-profile;}

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
-  #       },
-  #     }
-  #   '';
-  # };
 }

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 {

dot_config/flake/home/stylix.nix

@@ -14,8 +14,8 @@ in {
       # package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
     # };
 
-    enable = true;
+    # enable = true;
-    autoEnable = false;
+    # autoEnable = false;
 
     # targets.alacritty.enable = false;
     # targets.helix.enable = false;

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/podman.nix
-
-    ../../modules/nixos/niri.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
+    # unstable.android-studio
-    jetbrains.rust-rover
+    # jetbrains.rust-rover
     # jetbrains.rider
 
     pre-commit

dot_config/flake/machines/wash/home.nix

@@ -20,7 +20,7 @@
     homeDirectory = "/home/tyler";
 
     packages = with pkgs; [
-      godot
+      # godot
     ];
 
     stateVersion = "23.11";

dot_config/flake/modules/nixos/boot.nix

@@ -12,7 +12,7 @@
     };
 
     plymouth = {
-      enable = false;
+      enable = true;
       themePackages = [pkgs.catppuccin-plymouth];
       theme = "catppuccin-macchiato";
     };

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;
 }

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 = {
+  environment.systemPackages = with pkgs; [
-    enable = true;
+    nautilus
-    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"];
-      };
-    };
-  };
 }