From 449af98892452b22f5688789f27ed7546557121d Mon Sep 17 00:00:00 2001
From: vorboyvo <mrsirofvibe@outlook.com>
Date: Wed, 26 Jun 2024 10:06:40 -0400
Subject: [PATCH] Did things I think.

---
 hosts/de-lacadie/configuration.nix |   7 +-
 hosts/de-lacadie/home.nix          | 122 ++++++++++++++---------------
 2 files changed, 61 insertions(+), 68 deletions(-)

diff --git a/hosts/de-lacadie/configuration.nix b/hosts/de-lacadie/configuration.nix
index 8557483..8dc071b 100644
--- a/hosts/de-lacadie/configuration.nix
+++ b/hosts/de-lacadie/configuration.nix
@@ -124,11 +124,8 @@
   # Enable x server
   services.xserver = {
     enable = true;
-    windowManager.i3.enable = true;
-  };
-
-  services.displayManager = {
-    defaultSession = "none+i3";
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
   };
 
   # Enable dconf; necessary for some programs
diff --git a/hosts/de-lacadie/home.nix b/hosts/de-lacadie/home.nix
index 752f24e..aa4a6af 100644
--- a/hosts/de-lacadie/home.nix
+++ b/hosts/de-lacadie/home.nix
@@ -39,16 +39,16 @@ in {
   #     enable = true;
   # };
 
-  # Configure gammastep (night shift)
-  services.gammastep = {
-    enable = true;
-    temperature.day = 6500;
-    temperature.night = 4000;
-    # boul robert-bourassa/boul rené-lévesque : 45.498743909804354, -73.5703457606738
-    latitude = 45.4987;
-    longitude = -73.5703;
-    # tray = true;
-  };
+  # # Configure gammastep (night shift)
+  # services.gammastep = {
+  #   enable = true;
+  #   temperature.day = 6500;
+  #   temperature.night = 4000;
+  #   # boul robert-bourassa/boul rené-lévesque : 45.498743909804354, -73.5703457606738
+  #   latitude = 45.4987;
+  #   longitude = -73.5703;
+  #   # tray = true;
+  # };
 
   # Install packages
   home.packages = with pkgs;
@@ -90,11 +90,6 @@ in {
     ++ # Personalized selection of command-line (CLI/TUI) apps
     [ terminal ] ++ # Terminal emulator
     [
-      qutebrowser
-      cinnamon.nemo
-      gnome.file-roller
-      cinnamon.nemo-fileroller
-      evince
       imv
       vlc
       pavucontrol
@@ -116,7 +111,7 @@ in {
       bitwarden
     ] ++ # Personalized selection of graphical apps
     [ mons shticker-book-unwritten ] ++ # Games
-    [ bemenu j4-dmenu-desktop wl-clipboard wl-clipboard-x11 ] ++ # i3 and x11 related packages
+    [ bemenu j4-dmenu-desktop xclip ] ++ # i3 and x11 related packages
     [
       noto-fonts
       redhat-official-fonts
@@ -162,48 +157,49 @@ in {
   #    command = "${pkgs.lib.getExe pkgs.swaylock} -f";
   #  }];
   #};
+  #
 
-  xsession = let
-    term = terminal;
-    dmenuCommand = builtins.readFile "${scripts}/dmenu.sh";
-  in {
-    enable = true;
-    windowManager.i3 = {
-      enable = true;
-      config = rec {
-        terminal = "${pkgs.lib.getExe term}";
-        modifier = "Mod4";
-        fonts = {
-            names = [ "Red Hat Display" ];
-            style = "Regular";
-            size = 12.0;
-        };
-        # input = {
-        #   "type:keyboard" = {
-        #     xkb_layout = "ca,ca";
-        #     xkb_variant = ",eng";
-        #   };
-        # };
-        # leaving bars out for now
-        # bars = ...
-        window = {
-          border = 2;
-          titlebar = true;
-        };
-        menu = "j4-dmenu-desktop --no-generic --term=${pkgs.lib.getExe term} --dmenu='${dmenuCommand}'";
-        focus.followMouse = false;
-        # keybindings and extraConfig go here
-      };
-    };
-  };
+  # xsession = let
+  #   term = terminal;
+  #   dmenuCommand = builtins.readFile "${scripts}/dmenu.sh";
+  # in {
+  #   enable = true;
+  #   windowManager.i3 = {
+  #     enable = true;
+  #     config = rec {
+  #       terminal = "${pkgs.lib.getExe term}";
+  #       modifier = "Mod4";
+  #       fonts = {
+  #           names = [ "Red Hat Display" ];
+  #           style = "Regular";
+  #           size = 12.0;
+  #       };
+  #       # input = {
+  #       #   "type:keyboard" = {
+  #       #     xkb_layout = "ca,ca";
+  #       #     xkb_variant = ",eng";
+  #       #   };
+  #       # };
+  #       # leaving bars out for now
+  #       # bars = ...
+  #       window = {
+  #         border = 2;
+  #         titlebar = true;
+  #       };
+  #       menu = "j4-dmenu-desktop --no-generic --term=${pkgs.lib.getExe term} --dmenu='${dmenuCommand}'";
+  #       focus.followMouse = false;
+  #       # keybindings and extraConfig go here
+  #     };
+  #   };
+  # };
 
   # Fixes electron apps
   # home.sessionVariables = { NIXOS_OZONE_WL = "1"; };
 
   # configure fonts correctly
-  fonts.fontconfig.enable = true;
-  xdg.configFile."fontconfig/conf.d/20-default.fonts.conf".source =
-    "${extra}/20-default-fonts.conf";
+  # fonts.fontconfig.enable = true;
+  # xdg.configFile."fontconfig/conf.d/5-default.fonts.conf".source =
+  #   "${extra}/20-default-fonts.conf";
 
   # terminal emulator
   programs.alacritty.enable = true;
@@ -247,17 +243,17 @@ in {
   programs.pandoc = { enable = true; };
 
   # Configure notifications
-  services.dunst = {
-    enable = true;
-    settings = {
-      global = {
-        font = "Red Hat Display 12";
-        mouse_left_click = "do_action, close_current";
-        mouse_middle_click = "close_all";
-        mouse_right_click = "close_current";
-      };
-    };
-  };
+  # services.dunst = {
+  #   enable = true;
+  #   settings = {
+  #     global = {
+  #       font = "Red Hat Display 12";
+  #       mouse_left_click = "do_action, close_current";
+  #       mouse_middle_click = "close_all";
+  #       mouse_right_click = "close_current";
+  #     };
+  #   };
+  # };
 
   programs.firefox = import ../../programs/firefox.nix { inherit pkgs; };