From 40ffd48739e80abf82e0641d84ce979bfa74020f Mon Sep 17 00:00:00 2001
From: Aria Nolan <aria@chytrid.xyz>
Date: Fri, 29 Sep 2023 22:39:34 -0400
Subject: [PATCH] a working graphical environment!

---
 configuration.nix | 33 +++++++++++++++--
 home.nix.bk       | 93 ++++++++---------------------------------------
 2 files changed, 44 insertions(+), 82 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 6871d4c..72b5cec 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,6 +10,8 @@
       ./hardware-configuration.nix
 			./secrets.nix
       <home-manager/nixos>
+      <nixos-hardware/dell/xps/15-9520>
+      <nixos-hardware/common/gpu/nvidia/disable.nix>
     ];
 
   # Enable Flakes and the new command-line tool
@@ -41,8 +43,10 @@
     home = "/home/tacocat";
     description = "Aria Nolan";
     extraGroups = [ "wheel" "networkmanager" "audio" "video" "bluetooth" "kvm" ];
-		# shell = "/bin/bash";
-		packages = with pkgs; [
+  };
+
+  home-manager.users.tacocat = { pkgs, ... }: {
+    home.packages = with pkgs; [ 
 			firefox
 			thunderbird
 			vim
@@ -54,15 +58,35 @@
 			river
 			git
       gcc
-		];
+    ];
+    home.stateVersion = "23.11";
+    home.username = "tacocat";
+    home.homeDirectory = "/home/tacocat";
+
+    programs.bash = {
+      enable = true;
+      enableCompletion = true;
+    };
+
+    programs.git = {
+      enable = true;
+      userName = "Aria Nolan";
+      userEmail = "aria@chytrid.xyz";
+    };
+
+    programs.kitty = {
+      enable = true;
+      font.name = "DejaVu Sans Mono";
+      font.package = pkgs.dejavu_fonts;
+    };
   };
+  
 	nix.settings.trusted-users = [ "tacocat" ];
 
 
   environment = {
     systemPackages = with pkgs; [
 			fish
-			bash
     ];
     defaultPackages = with pkgs; [
       perl
@@ -84,6 +108,7 @@
       xdg-desktop-portal-gtk
     ];
   };
+  hardware.opengl.enable = true;
 
   # List services that you want to enable:
   # Enable the OpenSSH daemon.
diff --git a/home.nix.bk b/home.nix.bk
index e1af1e7..aca56ea 100644
--- a/home.nix.bk
+++ b/home.nix.bk
@@ -1,6 +1,9 @@
 { config, pkgs, ... }:
 
 {
+
+  imports = [ <home-manager/nixos> ];
+
   # TODO please change the username & home direcotry to your own
   home.username = "tacocat";
   home.homeDirectory = "/home/tacocat";
@@ -29,85 +32,19 @@
 
   # Packages that should be installed to the user profile.
   home.packages = with pkgs; [
-    # here is some command line tools I use frequently
-    # feel free to add your own or remove some of them
-
-    # archives
-    zip
-    unzip
-    p7zip
-
-    # utils
-    exa # A modern replacement for ‘ls’
-    fzf # A command-line fuzzy finder
-
-    # networking tools
-    aria2 # A lightweight multi-protocol & multi-source command-line download utility
-
-    # misc
-    file
-    which
-    tree
-    gnused
-    gnutar
-    gawk
-    zstd
-    gnupg
-
-    # nix related
-    #
-    # it provides the command `nom` works just like `nix`
-    # with more details log output
-    nix-output-monitor
-
-    # productivity
-    hugo # static site generator
-    glow # markdown previewer in terminal
-
-    btop  # replacement of htop/nmon
-    iotop # io monitoring
-    iftop # network monitoring
-
-    # system call monitoring
-    strace # system call monitoring
-    ltrace # library call monitoring
-    lsof # list open files
-
-    # system tools
-    sysstat
-    lm_sensors # for `sensors` command
-    ethtool
-    pciutils # lspci
-    usbutils # lsusb
+			firefox
+			thunderbird
+			vim
+			neovim
+			kitty
+			wget
+			tmux
+			helix
+			river
+			git
+      gcc
   ];
 
-  # starship - an customizable prompt for any shell
-  # programs.starship = {
-  #   enable = true;
-  #   # custom settings
-  #   settings = {
-  #     add_newline = false;
-  #     aws.disabled = true;
-  #     gcloud.disabled = true;
-  #     line_break.disabled = true;
-  #   };
-  # };
-
-  # alacritty - a cross-platform, GPU-accelerated terminal emulator
-  # programs.alacritty = {
-  #   enable = true;
-  #   # custom settings
-  #   settings = {
-  #     env.TERM = "xterm-256color";
-  #     font = {
-  #       size = 12;
-  #       draw_bold_text_with_bright_colors = true;
-  #     };
-  #     scrolling.multiplier = 5;
-  #     selection.save_to_clipboard = true;
-  #   };
-  # };
-
   programs.bash = {
     enable = true;
     enableCompletion = true;
@@ -129,7 +66,7 @@
   # You can update home Manager without changing this value. See
   # the home Manager release notes for a list of state version
   # changes in each release.
-  home.stateVersion = "23.05";
+  home.stateVersion = "23.11";
 
   # Let home Manager install and manage itself.
   programs.home-manager.enable = true;