From a9bd54974152101f479aad47fb4bb2685b8d336d Mon Sep 17 00:00:00 2001
From: Gabriel <faktenlord@gmail.com>
Date: Thu, 1 Sep 2022 19:48:22 +0200
Subject: [PATCH] jfkdajfasklfmaslj

---
 flake.lock                     | 12 +++++-----
 flake.nix                      |  4 +++-
 modules/default.nix            |  5 ++++-
 modules/desktop.nix            |  4 ++--
 modules/terminal.nix           | 41 ++++++++++++++++++++++++++++++++++
 potatobook-g/configuration.nix | 34 ++++++++++++++++++++++++++--
 6 files changed, 88 insertions(+), 12 deletions(-)
 create mode 100644 modules/terminal.nix

diff --git a/flake.lock b/flake.lock
index a022399..a489eae 100644
--- a/flake.lock
+++ b/flake.lock
@@ -52,16 +52,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1661984032,
-        "narHash": "sha256-IG9bSw8FLe8Ztms+lOb/Vn2bIqxwj6/a9T1xU5Wc8Y0=",
-        "owner": "NixOS",
+        "lastModified": 1661595788,
+        "narHash": "sha256-m87mpIxqALkxpXMQdowHPquUF1SiqCufjnKZK9tFZcs=",
+        "owner": "kekrby",
         "repo": "nixpkgs",
-        "rev": "034175e4bea4e4b735d35fd06e04213f0777d4ff",
+        "rev": "a5fe34678f40ef37ca295da014db7d9aaea43a36",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
+        "owner": "kekrby",
+        "ref": "add-fetchpartial",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 0fbcbca..4a3ed2d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,12 +2,14 @@
   description = "home manager config apparently";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
+    # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
+    nixpkgs.url = "github:kekrby/nixpkgs/add-fetchpartial";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpks.follows = "nixpkgs";
     };
     nixos-hardware.url = "github:kekrby/nixos-hardware";
+    # nixpkgs-fetchpartial.url = "github:kekrby/nixpkgs";
   };
 
   outputs = { self, nixpkgs, home-manager, nixos-hardware, ... }: {
diff --git a/modules/default.nix b/modules/default.nix
index 9de6814..1b2fbd4 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,4 +1,7 @@
 { ... }:
 {
-  imports = [ ./desktop.nix ];
+  imports = [ 
+    ./desktop.nix
+    ./terminal.nix
+  ];
 }
diff --git a/modules/desktop.nix b/modules/desktop.nix
index dcac476..4ec45bf 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -278,7 +278,7 @@ in with lib; {
               width = "100%";
               height = "24px";
               radius = 0;
-              tray-position = "enter";
+              tray-position = "center";
               background = "\${colors.background}";
               foreground = "\${colors.foreground}";
               line-size = "4px";
@@ -288,7 +288,7 @@ in with lib; {
               module-margin = 1;
               separator = "|";
               separator-foreground = "\${colors.disabled}";
-              font-0 = "FiraMono Nerd Font";
+              font-0 = "FiraCode Nerd Font";
               modules-left = "xworkspaces xwindow";
               modules-right = "memory cpu wlan battery date";
               cursor-click = "pointer";
diff --git a/modules/terminal.nix b/modules/terminal.nix
new file mode 100644
index 0000000..e544f1c
--- /dev/null
+++ b/modules/terminal.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.jade.terminal;
+in with lib; {
+  options.jade.terminal = {
+    enable = mkEnableOption "Enable Kitty";
+  };
+  config = mkIf cfg.enable {
+    home-manager.users.jade = { pkgs, ...} : {
+      programs.kitty = {
+        enable = true;
+        font = {
+          name = "FiraCode Nerd Font Mono";
+          size = 11;
+        };
+        settings = {
+	  adjust_column_width = "75%";
+          color0 = "#282828";
+          color8 = "#928374";
+          color1 = "#cc241d";
+          color9 = "#fb4934";
+          color2 = "#98971a";
+          color10 = "#b8bb26";
+          color3 = "#d79921";
+          color11 = "#fabd2f";
+          color4 = "#458588";
+          color12 = "#83a598";
+          color5 = "#b16286";
+          color13 = "#d3869b";
+          color6 = "#689d6a";
+          color14 = "#8ec07c";
+          color7 = "#a89984";
+          color15 = "#ebdbb2";
+
+	  foreground = "#ebdbb2";
+	  background = "#282828";
+        };
+      };
+    };
+  };
+}
diff --git a/potatobook-g/configuration.nix b/potatobook-g/configuration.nix
index 4645f74..68de6f6 100644
--- a/potatobook-g/configuration.nix
+++ b/potatobook-g/configuration.nix
@@ -21,6 +21,7 @@
   jade = {
     desktop.enable = true;
     desktop.compositing = true;
+    terminal.enable = true;
   };
 
   boot.loader.systemd-boot.enable = true;
@@ -30,12 +31,41 @@
 
   networking.hostName = "potatobook-g";
 
-  services.xserver.layout = "us";
-  services.xserver.xkbVariant = "altgr-intl";
+
+  services.xserver = {
+    resolutions = [ { x = 1920; y = 1200; } ];
+    # dpi = 180;
+    layout = "us";
+    xkbVariant = "altgr-intl";
+    libinput = {
+      enable = true;
+    };
+  };
+
+  services.autorandr = {
+    enable = true;
+    profiles = {
+      "default" = {
+        config = {
+	  "eDP-1" = {
+	    enable = true;
+	    mode = "1920x1200";
+	  };
+	};
+      };
+    };
+  };
+
+  # environment.variables = {
+  #   GDK_SCALE = "2";
+  #   GDK_DPI_SCALE = "0.5";
+  #   _JAVA_OPTIONS = "-Dsun.java2d.uiScale=2";
+  # };
 
   hardware.bluetooth.enable = true;
   hardware.keyboard.uhk.enable = true;
 
+
   # missing: menu-qalc picom-jonaburg
   environment.systemPackages = with pkgs; [
     # TODO: clean up.