From 364945f5f6751cd9505dd5954f5ee2a2e37468e5 Mon Sep 17 00:00:00 2001
From: "Alexander \"PapaTutuWawa" <papatutuwawa@polynom.me>
Date: Wed, 12 Jan 2022 17:35:17 +0100
Subject: [PATCH] lol

---
 flake.lock                         | 40 ++++++++++++------------------
 hosts/nishimiya.nix                |  6 +++--
 modules/programs/gnome/default.nix |  1 +
 modules/users/alexander.nix        |  2 +-
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9baf930..fc2cd79 100644
--- a/flake.lock
+++ b/flake.lock
@@ -84,10 +84,7 @@
     },
     "home-manager_2": {
       "inputs": {
-        "nixpkgs": [
-          "ostylk",
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1638281721,
@@ -121,7 +118,7 @@
     },
     "naersk": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1639947939,
@@ -229,17 +226,15 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1638698569,
-        "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
-        "path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
-        "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
+        "lastModified": 1639347265,
+        "narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=",
+        "path": "/nix/store/swl04xiyn1a153n5lbaak903fysp6p0f-source",
+        "rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada",
         "type": "path"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixos-21.05",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "type": "indirect"
       }
     },
     "nixpkgs_5": {
@@ -260,10 +255,10 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1638698569,
-        "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
-        "path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
-        "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
+        "lastModified": 1639347265,
+        "narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=",
+        "path": "/nix/store/swl04xiyn1a153n5lbaak903fysp6p0f-source",
+        "rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada",
         "type": "path"
       },
       "original": {
@@ -273,11 +268,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1640929225,
-        "narHash": "sha256-JcnGLghuMWCApRr1Rer5EnIGhQUdAfyAVpdZNH2LL2A=",
+        "lastModified": 1641734288,
+        "narHash": "sha256-/7YwWbvkjinc4uu5aUQMRw3xAthhOVH/esm4tCXPzIQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "932ec35ff8ac0fef5667ad2b0db4a009440255a9",
+        "rev": "df123677560db3b0db7c19d71981b11091fbeaf6",
         "type": "github"
       },
       "original": {
@@ -330,10 +325,7 @@
     "rnix-lsp": {
       "inputs": {
         "naersk": "naersk",
-        "nixpkgs": [
-          "ostylk",
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_7",
         "utils": "utils"
       },
       "locked": {
diff --git a/hosts/nishimiya.nix b/hosts/nishimiya.nix
index dcbbb9c..0524624 100644
--- a/hosts/nishimiya.nix
+++ b/hosts/nishimiya.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 {
   imports = with inputs.nixos-hardware.nixosModules; [
@@ -20,7 +20,8 @@
     initrd = {
       availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci"
                                  # NOTE: See https://github.com/NixOS/nixos-hardware/blob/master/common/pc/laptop/acpi_call.nix
-                                 "acpi_call" ];
+                                 #"acpi_call" ];
+			 	];
       kernelModules = [ "dm-snapshot" ];
       luks.devices = {
         cryptroot = {
@@ -52,6 +53,7 @@
       office.enable = true;
     };
     services = {
+      gnome.enable = true;
       kanshi = let
         horizontal = "Samsung Electric Company C27F398 H4ZR101145";
 
diff --git a/modules/programs/gnome/default.nix b/modules/programs/gnome/default.nix
index ecbe0fc..903d2d1 100644
--- a/modules/programs/gnome/default.nix
+++ b/modules/programs/gnome/default.nix
@@ -22,6 +22,7 @@ in {
         gnomeExtensions.tray-icons-reloaded
         gnomeExtensions.gsconnect
         gnomeExtensions.blur-my-shell
+        gnomeExtensions.forge
         gnome.eog
         gnome.nautilus
         gnome.evince
diff --git a/modules/users/alexander.nix b/modules/users/alexander.nix
index 317b4c3..fb5b89b 100644
--- a/modules/users/alexander.nix
+++ b/modules/users/alexander.nix
@@ -54,7 +54,7 @@
       # TODO: Maybe move this somewhere else
       services.gpg-agent = {
         enable = true;
-        pinentryFlavor = "qt";
+        pinentryFlavor = "gnome3";
       };
     };    
   };