back to nix

3 files changed, 13 insertions, 15 deletions

diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix
index 659dd0e..c6eba58 100644
--- a/modules/desktop-software.nix
+++ b/modules/desktop-software.nix
@@ -5,7 +5,6 @@
     dino
     ffmpeg-full
     firefox-wayland
-    fluffychat
     gimp
     inkscape
     kicad
diff --git a/modules/devtools.nix b/modules/devtools.nix
index a0d9f25..eec05e7 100644
--- a/modules/devtools.nix
+++ b/modules/devtools.nix
@@ -10,12 +10,12 @@
     clang_15
     clang-tools_15
     direnv
-    (nix-direnv.override { enableFlakes = true; })
+    # (nix-direnv.override { enableFlakes = true; })
     sops
     # rust
-    (inputs.fenix.packages."x86_64-linux".stable.toolchain)
+    # (inputs.fenix.packages."x86_64-linux".stable.toolchain)
     # nix
-    rnix-lsp
+    # rnix-lsp
     nil
     nixpkgs-fmt
     nix-index
@@ -30,7 +30,7 @@
     enable = true;
     package = pkgs.wireshark;
   };
-  users.users.grue.extraGroups = [ "wireshark" ];
+  users.users."0xa".extraGroups = [ "wireshark" ];
 
   ## Julia
   environment.variables = {
diff --git a/modules/gnome.nix b/modules/gnome.nix
index 787d489..4de125f 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -8,17 +8,16 @@
     celluloid
     gnome-console
     gnome-obfuscate
-    gnome.gnome-boxes
-    gnome.gnome-tweaks
+    gnome-boxes
+    gnome-tweaks
     nextcloud-client
     qbittorrent
   ];
 
   environment.gnome.excludePackages = with pkgs; [
-    gnome.totem
-    gnome.geary
-    gnome.gnome-music
-    gnome-console
+    totem
+    geary
+    gnome-music
   ];
 
 
@@ -30,7 +29,7 @@
 
   programs = {
     seahorse.enable = true;
-    gnupg.agent.pinentryFlavor = "gnome3";
+    gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;
     evolution = {
       enable = true;
       plugins = [ pkgs.evolution-ews ];
@@ -70,7 +69,7 @@
   programs.zsh.vteIntegration = true;
   programs.bash.vteIntegration = true;
 
-  fonts.fonts = with pkgs; [
+  fonts.packages = with pkgs; [
     monoid
     font-awesome
     dejavu_fonts
@@ -87,7 +86,7 @@
     hack-font
     liberation_ttf
     noto-fonts
-    noto-fonts-cjk
+    noto-fonts-cjk-sans
     noto-fonts-emoji
     noto-fonts-extra
     proggyfonts
@@ -98,7 +97,7 @@
     iosevka-bin
   ];
 
-  fonts.enableDefaultFonts = true;
+  fonts.enableDefaultPackages = true;
   fonts.fontconfig = {
     enable = true;
     allowBitmaps = true;