From 1d803ad57ebecef402aa988cb7e745b4d3c3e94d Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Sun, 29 Sep 2024 01:13:48 -0400
Subject: [PATCH] config

---
 flake.lock    | 60 ---------------------------------------------------
 flake.nix     | 10 ++++-----
 home/home.nix | 15 +++++++++----
 3 files changed, 16 insertions(+), 69 deletions(-)

diff --git a/flake.lock b/flake.lock
index 88c4b69..9f169e3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,47 +1,5 @@
 {
   "nodes": {
-    "affinity-nix": {
-      "inputs": {
-        "elemental-wine-source": "elemental-wine-source",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "winetricks-source": "winetricks-source"
-      },
-      "locked": {
-        "lastModified": 1726286596,
-        "narHash": "sha256-3ibDdGv2ns2N7ol3qVpfpPtPAf7QJleIg1xfKT3E+i0=",
-        "owner": "mrshmllow",
-        "repo": "affinity-nix",
-        "rev": "13ab0d6b33c5d7ba556f51a523d84ba6d2acba5a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mrshmllow",
-        "ref": "main",
-        "repo": "affinity-nix",
-        "type": "github"
-      }
-    },
-    "elemental-wine-source": {
-      "flake": false,
-      "locked": {
-        "host": "gitlab.winehq.org",
-        "lastModified": 1693121664,
-        "narHash": "sha256-eMN4SN8980yteYODN2DQIVNEJMsGQE8OIdPs/7DbvqQ=",
-        "owner": "ElementalWarrior",
-        "repo": "wine",
-        "rev": "c12ed1469948f764817fa17efd2299533cf3fe1c",
-        "type": "gitlab"
-      },
-      "original": {
-        "host": "gitlab.winehq.org",
-        "owner": "ElementalWarrior",
-        "ref": "c12ed1469948f764817fa17efd2299533cf3fe1c",
-        "repo": "wine",
-        "type": "gitlab"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -172,7 +130,6 @@
     },
     "root": {
       "inputs": {
-        "affinity-nix": "affinity-nix",
         "home-manager": "home-manager",
         "kmonad": "kmonad",
         "musnix": "musnix",
@@ -181,23 +138,6 @@
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable"
       }
-    },
-    "winetricks-source": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1704453875,
-        "narHash": "sha256-YTEgb19aoM54KK8/IjrspoChzVnWAEItDlTxpfpS52w=",
-        "owner": "winetricks",
-        "repo": "winetricks",
-        "rev": "bc91718a5cad45e9f33de9b351a5960d5395bed5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "winetricks",
-        "ref": "20240105",
-        "repo": "winetricks",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 3fa2d3d..aee2b35 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,10 +13,11 @@
 
     nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch. Use github:gmodena/nix-flatpak/?ref=<tag> to pin releases.
 
-    affinity-nix = {
-      url = "github:mrshmllow/affinity-nix/main";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # affinity-nix = {
+    #   url = "github:mrshmllow/affinity-nix/main";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    #   flake = true;
+    # };
 
     kmonad = {
       url = "git+https://github.com/kmonad/kmonad?submodules=1&dir=nix";
@@ -48,7 +49,6 @@
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         modules = [
           nix-flatpak.homeManagerModules.nix-flatpak
-          #nixos-hardware
           ./home/home.nix
         ];
       };
diff --git a/home/home.nix b/home/home.nix
index 383c878..428cb18 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -54,6 +54,7 @@
       wezterm 
       lazygit
       nnn
+      icloudpd
       jetbrains-mono
 
       fishPlugins.foreign-env
@@ -74,6 +75,7 @@
       gnomeExtensions.pano
       gnome-software
       gnome-tweaks
+      gnome-photos
       colloid-gtk-theme
       colloid-icon-theme
       whitesur-gtk-theme
@@ -84,6 +86,7 @@
       papers
       newsflash
 
+      nyxt
       librewolf
       ungoogled-chromium
       obsidian
@@ -103,6 +106,10 @@
       zotero_7
       handbrake
       renoise
+      yabridge
+      yabridgectl
+      ansel
+      rawtherapee
     ];
 
     username = "emenel";
@@ -146,9 +153,9 @@
   };
 
   dconf.settings = {
-    "org/gnome/desktop/wm/keybindings" = {
-      shift-overview-up = "";
-      shift-overview-down = "";
+    "org/gnome/shell/keybindings" = {
+      shift-overview-up = ["disabled"];
+      shift-overview-down = ["disabled"];
     };
   };
 
@@ -183,7 +190,7 @@
   xdg.configFile."starship.toml".source = ../dotfiles/dot_config/starship.toml;
   xdg.configFile."wezterm".source = ../dotfiles/dot_config/wezterm;
 
-  xdg.configFile."fish/functions" = {
+  home.file.".config/fish/functions" = {
     source = ../dotfiles/dot_config/fish/functions;
     recursive = true;
   };