From 77857511fad3cb7ab7b498b7ff928dc20b0778bc Mon Sep 17 00:00:00 2001
From: Martin Benonisen <m.s.benonisen@usit.uio.no>
Date: Wed, 24 Jul 2024 07:11:35 +0200
Subject: [PATCH] nix

---
 flake.lock                      | 12 ++++++------
 system/hardware.nix             |  2 +-
 system/programs.nix             |  1 +
 system/services.nix             |  1 -
 user/default.nix                |  2 +-
 user/packages/default.nix       |  2 +-
 user/services/gnome-keyring.nix |  5 -----
 user/zsh/default.nix            |  2 +-
 8 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100644 user/services/gnome-keyring.nix

diff --git a/flake.lock b/flake.lock
index 3f1ef15..488ce5a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720327769,
-        "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=",
+        "lastModified": 1721714663,
+        "narHash": "sha256-ZDW5+rlROxaOuoEfIQM7Gqhoa+WALEYdYIiZhyJjAu0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71",
+        "rev": "7560dc942a6fbd37ebd1310b3dbda513de2d4b82",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1720031269,
-        "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
+        "lastModified": 1721562059,
+        "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
+        "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
         "type": "github"
       },
       "original": {
diff --git a/system/hardware.nix b/system/hardware.nix
index d7bd7a2..fe0133f 100644
--- a/system/hardware.nix
+++ b/system/hardware.nix
@@ -25,7 +25,7 @@
       powerManagement.finegrained = false;
       open = false;
       nvidiaSettings = true;
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
     };
     pulseaudio.enable = false;
   };
diff --git a/system/programs.nix b/system/programs.nix
index c9a13fc..f79bf74 100644
--- a/system/programs.nix
+++ b/system/programs.nix
@@ -1,4 +1,5 @@
 { config, pkgs, ... }: {
+  services.flatpak.enable = true;
   programs.steam = {
     enable = true;
 
diff --git a/system/services.nix b/system/services.nix
index 6367dd8..1020d9c 100644
--- a/system/services.nix
+++ b/system/services.nix
@@ -1,6 +1,5 @@
 { config, pkgs, ... }: {
 
-  sound.enable = true;
   security.rtkit.enable = true;
   networking.firewall.enable = false;
   security.polkit.enable = true;
diff --git a/user/default.nix b/user/default.nix
index 68453dd..3d28a6d 100644
--- a/user/default.nix
+++ b/user/default.nix
@@ -19,7 +19,6 @@
         ./packages
         ./ssh
         ./services/ssh-office.nix
-        ./services/gnome-keyring.nix
       ];
       tmux.enable = true;
       firefox.enable = true;
@@ -32,6 +31,7 @@
           vsync = true;
         };
       };
+      services.gnome-keyring.enable = true;
       home = {
         username = "${user}";
         homeDirectory = "/home/${user}";
diff --git a/user/packages/default.nix b/user/packages/default.nix
index e047450..ee2ec1e 100644
--- a/user/packages/default.nix
+++ b/user/packages/default.nix
@@ -18,7 +18,7 @@
     vlc
     expat
     xdeltaUnstable
-    transmission-gtk
+    transmission_4-gtk
     alacritty
     btop
     bzip2
diff --git a/user/services/gnome-keyring.nix b/user/services/gnome-keyring.nix
deleted file mode 100644
index 95363ca..0000000
--- a/user/services/gnome-keyring.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{pkgs, config, ...}:{
-  services.gnome-keyring = {
-    enable = true;
-  };
-}
\ No newline at end of file
diff --git a/user/zsh/default.nix b/user/zsh/default.nix
index d33c8c9..ae3e7aa 100644
--- a/user/zsh/default.nix
+++ b/user/zsh/default.nix
@@ -7,7 +7,7 @@
     enableCompletion = true;
     syntaxHighlighting.enable = true;
     shellAliases = {
-      nrebuild = "sudo nixos-rebuild switch --flake /home/${user}/git/nixos && nvd diff $(ls -d1v /nix/var/nix/profiles/system-*-link|tail -n 2) && source ~/.zshrc";
+      nrebuild = "nix flake update /home/mbeno/git/nixos && sudo nixos-rebuild switch --flake /home/${user}/git/nixos && nvd diff $(ls -d1v /nix/var/nix/profiles/system-*-link|tail -n 2) && source ~/.zshrc";
       nlog = ''
         revpath="/nix/var/nix/profiles";
         lastrev=$(ls -d1v $revpath/system-*-link|cut -d "-" -f2 | tail -n1);