From 2bc0ad7338f192ce4f2a5cc43870a3f69592d6ac Mon Sep 17 00:00:00 2001
From: zoe <ZoeOosting@outlook.com>
Date: Tue, 21 Feb 2023 21:58:09 +0100
Subject: [PATCH] add hideous green color oh god oh fuck o

---
 configuration.nix |  4 +++-
 defaults.nix      | 17 +++++++++++++++++
 home.nix          | 12 +++++++++++-
 i3/config.nix     |  7 ++++---
 i3/mainbar.nix    | 17 ++++++++++-------
 services.nix      |  2 ++
 sync.sh           |  2 +-
 user.nix          |  4 ++--
 variables.nix     | 11 +++++++++++
 9 files changed, 61 insertions(+), 15 deletions(-)
 create mode 100644 defaults.nix
 create mode 100644 variables.nix

diff --git a/configuration.nix b/configuration.nix
index 4ded813..d898d87 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -14,6 +14,8 @@
       ./services.nix
       ./programs.nix
       ./disks.nix
+      ./defaults.nix
+      ./variables.nix
     ];
 
   # kernel
@@ -53,7 +55,7 @@
   xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-gtk];
 
   # hostname
-  networking.hostName = "cat"; # Define your hostname.
+  networking.hostName = "bat"; # Define your hostname.
 
   # Enable networking
   networking.networkmanager.enable = true;
diff --git a/defaults.nix b/defaults.nix
new file mode 100644
index 0000000..4966643
--- /dev/null
+++ b/defaults.nix
@@ -0,0 +1,17 @@
+{ ... }:
+let
+  # /etc/profiles/per-user/<username>/share/applications/
+  browser = "firefox.desktop";
+  image_viewer = "org.gnome.eog.desktop";
+  video_player = "mpv.desktop";
+  file_browser = "org.gnome.Nautilus.desktop";
+  pdf_viewer = "org.gnome.Evince.desktop";
+in
+{
+  xdg.mime.defaultApplications = {
+    "text/html" = browser;
+    "inode/directory" = file_browser;
+    "application/pdf" = pdf_viewer;
+    "image/*" = image_viewer;
+  };
+}
\ No newline at end of file
diff --git a/home.nix b/home.nix
index 5500798..b61202b 100644
--- a/home.nix
+++ b/home.nix
@@ -10,7 +10,9 @@ let
   helixCustom = import ./helix/settings.nix;
 in
 {
-  home-manager.users.zoe = { pkgs, ... }: {
+  imports = [ ./variables.nix  ];
+  home-manager.users.zoe = { pkgs, config, ... }:
+  {
     home.stateVersion = "22.11";
     programs.kitty = kittyCustom pkgs;
     programs.neovim = nvimCustom pkgs;
@@ -33,6 +35,14 @@ in
       save-position-on-quit = true;
     };
     
+    services.picom = {
+      enable = true;
+      package = pkgs.picom-jonaburg;
+      fade = true;
+      fadeDelta = 2;
+      extraArgs = ["--experimental-backends"];
+    };
+    
     programs.ssh.enable = true;
     programs.ssh.matchBlocks = {
       "cookie" = {
diff --git a/i3/config.nix b/i3/config.nix
index ba25ad8..48c42d2 100644
--- a/i3/config.nix
+++ b/i3/config.nix
@@ -120,8 +120,8 @@ in
     border = 4;
   };
   gaps = {
-    inner = 0;
-    outer = 0;
+    inner = 4;
+    outer = 4;
   };
 
   bars = [
@@ -160,7 +160,8 @@ in
   ];
 
   startup = [
-    { command = "--no-startup-id autotiling"; always = true; }
     { command = "--no-startup-id feh --bg-scale /etc/nixos/wallpaper.png"; always = true; }
+    { command = "picom --experimental-backends"; always = true;}
+    { command = "--no-startup-id autotiling"; always = true; }
   ];
 }
diff --git a/i3/mainbar.nix b/i3/mainbar.nix
index 00adbce..515c213 100644
--- a/i3/mainbar.nix
+++ b/i3/mainbar.nix
@@ -1,5 +1,7 @@
-{ ... }:
+{ config, ... }:
 {
+  imports = [ ../variables.nix ];
+
   blocks = [
     # music
     {
@@ -58,12 +60,13 @@
       overrides = {
         separator = "";
         # background
-        good_bg = "#f9f5d7";
-        critical_bg = "#f9f5d7";
-        idle_bg = "#f9f5d7";
-        info_bg = "#f9f5d7";
-        seperator_bg = "#f9f5d7";
-        warning_bg = "#f9f5d7";
+        good_bg = config.color.zero;
+        critical_bg = config.color.zero;
+        idle_bg = config.color.zero;
+        info_bg = config.color.zero;
+        seperator_bg = config.color.zero;
+        warning_bg = config.color.zero;
+
         # foreground
         critical_fg = "#9d0006";
         good_fg = "#79740e";
diff --git a/services.nix b/services.nix
index 233e2a6..d898e97 100644
--- a/services.nix
+++ b/services.nix
@@ -4,6 +4,8 @@
     syncthing.enable = true;
     mullvad-vpn.enable = true;
     udisks2.enable = true;
+    gnome.sushi.enable = true;
     getty.autologinUser = "zoe";
+    gvfs.enable = true;
   };
 }
diff --git a/sync.sh b/sync.sh
index df4e361..4e78c63 100755
--- a/sync.sh
+++ b/sync.sh
@@ -7,7 +7,7 @@ git pull
 # cp -r /etc/nixos/ ./backup
 
 # copy over all the files to /etc/nixos/
-sudo cp -ru ./configuration.nix ./wallpaper.png ./dunst ./helix ./rofi ./i3 ./fish ./kitty ./nvim/ ./disks.nix ./programs.nix ./packages.nix ./home.nix ./services.nix ./user.nix /etc/nixos/
+sudo cp -ru ./configuration.nix ./wallpaper.png ./dunst ./helix ./rofi ./i3 ./fish ./kitty ./nvim/ ./disks.nix ./variables.nix ./programs.nix ./defaults.nix ./packages.nix ./home.nix ./services.nix ./user.nix /etc/nixos/
 
 cp -u ./.xinitrc $HOME
 cp -ur ./cursors $HOME/.local/share/icons
diff --git a/user.nix b/user.nix
index c9f8e2f..4af0899 100644
--- a/user.nix
+++ b/user.nix
@@ -29,7 +29,7 @@ in
 
       # files and partitions
       gnome.gnome-disk-utility
-      pcmanfm
+      gnome.nautilus
       p7zip
       xarchiver
       tree
@@ -50,7 +50,7 @@ in
 
       # images
       feh
-      viewnior
+      gnome.eog
       gimp
       krita
       gnome.cheese
diff --git a/variables.nix b/variables.nix
new file mode 100644
index 0000000..8fd9ec5
--- /dev/null
+++ b/variables.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, lib, ...}:
+with lib;
+{
+  options = {
+    color.zero = mkOption {
+      type = types.str;
+      description = "background";
+      default = "#00ff00";
+    };
+  };
+}
\ No newline at end of file