From d506427f015c71bf297889c4708d055f5d89ec5e Mon Sep 17 00:00:00 2001
From: Martin Benonisen <m.s.benonisen@usit.uio.no>
Date: Sun, 13 Oct 2024 21:11:45 +0200
Subject: [PATCH] a

---
 flake.lock                           | 48 ----------------------------
 system/programs.nix                  | 16 ----------
 system/services.nix                  |  1 +
 user/packages/default.nix            | 10 +++---
 user/programs/obs-studio/default.nix |  5 +++
 user/programs/vscode/default.nix     |  1 -
 6 files changed, 11 insertions(+), 70 deletions(-)
 delete mode 100644 flake.lock

diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index 5762d62..0000000
--- a/flake.lock
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "nodes": {
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1726222338,
-        "narHash": "sha256-KuA8ciNR8qCF3dQaCaeh0JWyQUgEwkwDHr/f49Q5/e8=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "503af483e1b328691ea3a434d331995595fb2e3d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1726062873,
-        "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/system/programs.nix b/system/programs.nix
index ff4d3f5..57bf7d2 100644
--- a/system/programs.nix
+++ b/system/programs.nix
@@ -7,22 +7,6 @@
       pkgs.proton-ge-bin
     ];
 
-    # fix gamescope inside steam
-    package = pkgs.steam.override {
-      extraPkgs = pkgs:
-        with pkgs; [
-          keyutils
-          libkrb5
-          libpng
-          libpulseaudio
-          libvorbis
-          stdenv.cc.cc.lib
-          xorg.libXcursor
-          xorg.libXi
-          xorg.libXinerama
-          xorg.libXScrnSaver
-        ];
-    };
   };
   programs.thunar.enable = true;
   programs.gnupg.agent = {
diff --git a/system/services.nix b/system/services.nix
index 5b8cc18..5ab1881 100644
--- a/system/services.nix
+++ b/system/services.nix
@@ -2,6 +2,7 @@
 
   security.rtkit.enable = true;
   networking.firewall.enable = false;
+  programs.dconf.enable = true;
   services.gnome.gnome-keyring.enable = true;
   security.pam.services.i3.enableGnomeKeyring = true;
   environment.extraInit = ''
diff --git a/user/packages/default.nix b/user/packages/default.nix
index 30ccfc0..050711b 100644
--- a/user/packages/default.nix
+++ b/user/packages/default.nix
@@ -6,6 +6,7 @@
     jellyfin-media-player
     firefox-bin
     pdfpc
+    terminator
     openssl
     qpwgraph
     mixxx
@@ -100,16 +101,15 @@
         mypy
         pydantic
         poetry-core
+        ruff
+        maturin
       ]
     ))
 
-
-    ruff
-
     # Rust
-    rustc
-    cargo
+    rustup
     gcc
+    gnumake
 
 
   ];
diff --git a/user/programs/obs-studio/default.nix b/user/programs/obs-studio/default.nix
index c7ba16e..3ca02e2 100644
--- a/user/programs/obs-studio/default.nix
+++ b/user/programs/obs-studio/default.nix
@@ -16,7 +16,12 @@
   programs.obs-studio = {
     enable = true;
     plugins = with pkgs.obs-studio-plugins; [
+      wlrobs
       obs-backgroundremoval
+      obs-pipewire-audio-capture
+      obs-vkcapture
+      obs-nvfbc
+
     ];
     #plugins = [ obs-backgroundremoval_1_1_10 ];
   };
diff --git a/user/programs/vscode/default.nix b/user/programs/vscode/default.nix
index fc91de6..cf2ae9a 100644
--- a/user/programs/vscode/default.nix
+++ b/user/programs/vscode/default.nix
@@ -9,7 +9,6 @@
       catppuccin.catppuccin-vsc-icons
       golang.go
       vscodevim.vim
-      ms-python.python
       ms-vscode-remote.remote-ssh
       bbenoist.nix
       github.copilot