update

Signed-off-by: Maximilian Huber <[email protected]>
maxhbr · Dec 15, 2024 · 7dd1839 · 7dd1839
1 parent 5fea604
commit 7dd1839
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 15 deletions.
diff --git a/flake.nix b/flake.nix
@@ -16,6 +16,7 @@
     rel2305.url = "github:nixos/nixpkgs/release-23.05";
     rel2311.url = "github:nixos/nixpkgs/release-23.11";
     rel2405.url = "github:nixos/nixpkgs/release-24.05";
+    rel2411.url = "github:nixos/nixpkgs/release-24.11";
 
     pr244937.url =
       "github:charles-dyfis-net/nixpkgs/freeplane-1_11_4"; # https://github.com/NixOS/nixpkgs/pull/244937
@@ -41,8 +42,6 @@
     emacs.url = "github:nix-community/emacs-overlay";
     doomemacs.url = "github:hlissner/doom-emacs";
     doomemacs.flake = false;
-    # nix-doom-emacs.url = "github:nix-community/nix-doom-emacs";
-    # nix-doom-emacs.inputs.nixpkgs.follows = "nixpkgs";
 
     my-wallpapers.url = "github:maxhbr/wallpapers";
     my-wallpapers.inputs.nixpkgs.follows = "nixpkgs";
@@ -65,9 +64,6 @@
       inputs.hyprland.follows = "hyprland";
     };
 
-    awatcher-src.url = "github:2e3s/awatcher";
-    awatcher-src.flake = false;
-
     river-src.url = "git+https://github.com/riverwm/river?submodules=1";
     river-src.flake = false;
     rivercarro-src.url =
@@ -112,7 +108,9 @@
             home-manager = {
               useUserPackages = true;
               useGlobalPkgs = true;
-              backupFileExtension = "homeManagerBackup";
+              backupFileExtension = let
+                  rev = toString (self.shortRev or self.dirtyShortRev or self.lastModified or "unknown");
+                in "${rev}.homeManagerBackup";
               sharedModules = [
                 ({ pkgs, ... }: {
                   home.stateVersion =
@@ -160,6 +158,7 @@
                   (mkSubPkgsOverlay "nixos-2305" inputs.rel2305)
                   (mkSubPkgsOverlay "nixos-2311" inputs.rel2311)
                   (mkSubPkgsOverlay "nixos-2405" inputs.rel2405)
+                  (mkSubPkgsOverlay "nixos-2411" inputs.rel2411)
                 ];
               };
             })
@@ -225,14 +224,14 @@
                 (myconfig.metadatalib.announceHost "r6c")
               ];
               config = {
-                home-manager.sharedModules = [{
+                home-manager.sharedModules = [({config, ...}: {
                   home.packages = [
-                    (pkgs.writeShellScriptBin "myconfig" ''
-                      set -x
-                      $EDITOR ~/myconfig/myconfig
-                    '')
+                    (pkgs.writeShellScriptBin "myconfig" 
+			(if config.programs.neovide.enable
+				 then "${config.programs.neovide.package}/bin/neovide ~/myconfig/myconfig &disown"
+				 else "$EDITOR  ~/myconfig/myconfig"))
                   ];
-                }];
+                })];
               };
             })
           ] ++ moreModules) metadataOverride);

diff --git a/modules/myconfig.desktop.obs.nix b/modules/myconfig.desktop.obs.nix
@@ -11,8 +11,11 @@ in {
     home-manager.sharedModules = [{
       programs.obs-studio = {
         enable = true;
-        plugins = with pkgs.obs-studio-plugins; [ wlrobs ];
+        plugins = with pkgs.obs-studio-plugins; [ wlrobs obs-ndi ];
       };
+      home.packages = with pkgs; [
+       ndi
+     ];
     }];
   });
 }
diff --git a/modules/programs.neovim/default.nix b/modules/programs.neovim/default.nix
@@ -127,7 +127,29 @@
                 }
               ];
             };
-            home.packages = with pkgs; [ neovide ];
+            programs.neovide = {
+              enable = true;
+
+              settings = {
+                fork = true;
+                frame = "full";
+                idle = true;
+                maximized = false;
+              #   neovim-bin = "${config.programs.neovim.package}/bin/nvim";
+              #   no-multigrid = false;
+              #   # srgb = false;
+                tabs = true;
+              #   theme = "auto";
+              #   title-hidden = true;
+              #   vsync = true;
+              #   wsl = false;
+              #
+              #   font = {
+              #     normal = [];
+              #     size = 14.0;
+              #   };
+              };
+            };
           })
         ];
       })

diff --git a/modules/programs.neovim/neovim.lua b/modules/programs.neovim/neovim.lua
@@ -24,7 +24,7 @@ set termguicolors " 24-bit colors
 " let g:tokyonight_italic_functions = 1
 " colorscheme tokyonight
 " colorscheme sonokai
-colorscheme PaperColor
+"colorscheme PaperColor
 ]])
 
 vim.opt.tabstop = 2