Merge branch 'master' of https://git.dodsorf.as/Dandellion/nix-dotfiles into master

machines/desktop.nix

@@ -14,6 +14,6 @@
 
   programs.home-manager = {
     enable = true;
-    path = "https://github.com/rycee/home-manager/archive/release-20.03.tar.gz";
+    path = "https://github.com/rycee/home-manager/archive/release-20.09.tar.gz";
   };
 }

profiles/base/default.nix

@@ -65,7 +65,7 @@ in {
       kdeFrameworks.kio
       kdeApplications.kio-extras
 
-      dan.rank_photos
+      #dan.rank_photos
 
 #      ***REMOVED***
 
@@ -87,13 +87,13 @@ in {
       kdenlive
       frei0r
       
-      geogebra
+      #geogebra
     ];
 
     programs.firefox = {
       enable = config.profiles.gui.enable;
 
-      package = pkgs.firefox.override { extraNativeMessagingHosts = [ pkgs.dan.radical-native ]; };    
+#      package = pkgs.firefox.override { extraNativeMessagingHosts = [ pkgs.dan.radical-native ]; };    
     };
 
     programs.obs-studio = {
@@ -105,7 +105,9 @@ in {
       enable = true;
       userEmail = "daniel.olsen99@gmail.com";
       userName = "Daniel Olsen";
-
+      extraConfig = {
+         pull.rebase = true;
+      };
 #      delta.enable = true;
     
     };

profiles/xsession/audio.nix

@@ -9,11 +9,11 @@
       pkgs.qjackctl
     ];
 
-    home.file.pulse = {
-      target = ".config/pulse/client.conf";
-      text = ''
-        daemon-binary=/var/run/current-system/sw/bin/pulseaudio
-      '';
-    };
+#    home.file.pulse = {
+#      target = ".config/pulse/client.conf";
+#      text = ''
+#        daemon-binary=/var/run/current-system/sw/bin/pulseaudio
+#      '';
+#    };
   };
 }

profiles/xsession/default.nix

@@ -24,6 +24,8 @@ in
       interval = "30m";
     };
 
+    services.dunst.enable = false;
+
     xsession = {
       enable = true;
 

profiles/xsession/polybar.nix

@@ -33,6 +33,7 @@ in
           height = 27;
 
           font-0 = "MesloLGS NF:fontformat=truetype:pixelsize=11;1";
+          font-1 = "Kozuka Mincho Pro:pixelsize=11;1";
 
           background = "\${colors.background}";
           foreground = "\${colors.foreground}";
@@ -117,6 +118,7 @@ in
           interval = 25;
 
           mount-0 = "/";
+          mount-1 = "/mnt/henning";
 
           label-mounted = "%{F#0a81f5}%mountpoint%%{F-}: %free%";
           label-unmounted = "%mountpoint% not mounted";
@@ -183,3 +185,4 @@ in
     };
   };
 }
+