From d77ea32928e7b11f4e591536ef1bce6516be33b3 Mon Sep 17 00:00:00 2001
From: Gabriella Bere <contact@gabbie.blue>
Date: Sat, 24 Aug 2024 17:01:53 +0100
Subject: [PATCH] remove environment.nix and moved variables to nh config and
 home.nix as this makes more sense

---
 home-manager/home.nix   | 76 ++++-------------------------------------
 modules/environment.nix |  8 -----
 2 files changed, 7 insertions(+), 77 deletions(-)
 delete mode 100644 modules/environment.nix

diff --git a/home-manager/home.nix b/home-manager/home.nix
index 9f25b38..48448ef 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -1,8 +1,6 @@
 { config, pkgs, lib, inputs, ... }:
 
 {
-  # Home Manager needs a bit of information about you and the paths it should
-  # manage.
   home.username = "blue";
   home.homeDirectory = "/home/blue";
 
@@ -10,79 +8,19 @@
     inputs.anyrun.homeManagerModules.default
   ];
 
-  # This value determines the Home Manager release that your configuration is
-  # compatible with. This helps avoid breakage when a new Home Manager release
-  # introduces backwards incompatible changes.
-  #
-  # You should not change this value, even if you update Home Manager. If you do
-  # want to update the value, then make sure to first check the Home Manager
-  # release notes.
-  home.stateVersion = "24.05"; # Please read the comment before changing.
-
-  # The home.packages option allows you to install Nix packages into your
-  # environment.
+  # States home manager version that config was originally compatible with, do not change without reading all patch notes since this version and altering as needed
+  home.stateVersion = "24.05";
+  
+  # General use home packages that dont require a separate module
   home.packages = [
-    # add grimblast screenshot tool
+    # Add grimblast screenshot tool
     pkgs.grimblast
-    pkgs.hyprpaper
-    # # It is sometimes useful to fine-tune packages, for example, by applying
-    # # overrides. You can do that directly here, just don't forget the
-    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
-    # # fonts?
-    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
-
-    # # You can also create simple shell scripts directly inside your
-    # # configuration. For example, this adds a command 'my-hello' to your
-    # # environment:
-    # (pkgs.writeShellScriptBin "my-hello" ''
-    #   echo "Hello, ${config.home.username}!"
-    # '')
   ];
 
-  # Home Manager is pretty good at managing dotfiles. The primary way to manage
-  # plain files is through 'home.file'.
-  home.file = {
-    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
-    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
-    # # symlink to the Nix store copy.
-    # ".screenrc".source = dotfiles/screenrc;
-
-    # # You can also set the file content immediately.
-    # ".gradle/gradle.properties".text = ''
-    #   org.gradle.console=verbose
-    #   org.gradle.daemon.idletimeout=3600000
-    # '';
-  };
-
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. These will be explicitly sourced when using a
-  # shell provided by Home Manager. If you don't want to manage your shell
-  # through Home Manager then you have to manually source 'hm-session-vars.sh'
-  # located at either
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/blue/etc/profile.d/hm-session-vars.sh
-  #
   home.sessionVariables = {
-    # EDITOR = "emacs";
+    EDITOR = "nano";
+    DEFAULT_BROWSER = "${lib.getExe pkgs.firefox}"
   };
-#  xdg.mimeApps = {
-#    enable = true;
-#    defaultApplications = {
-#      "text/html" = "firefox.desktop";
-#      "x-scheme-handler/http" = "firefox.desktop";
-#      "x-scheme-handler/https" = "firefox.desktop";
-#      "x-scheme-handler/about" = "firefox.desktop";
-#      "x-scheme-handler/unknown" = "firefox.desktop";
-#    };
-#  };
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
diff --git a/modules/environment.nix b/modules/environment.nix
deleted file mode 100644
index 506c210..0000000
--- a/modules/environment.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, lib, ...}: {
-  environment.sessionVariables = {
-    # Set FLAKE variable for use with nh
-    FLAKE = "/home/blue/nixos";
-    # Set default browser variable for electron apps (mainly discord)
-    DEFAULT_BROWSER = "${lib.getExe pkgs.firefox}";
-  };
-}