Merge branch 'master' of github.com:mrjones2014/dotfiles

mrjones2014 · Dec 4, 2024 · 223ae18 · 223ae18
2 parents db88dd0 + efc855c
commit 223ae18
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 7 deletions.
diff --git a/home-manager/home.nix b/home-manager/home.nix
@@ -48,6 +48,7 @@
         r2modman
         parsec-bin
         notesnook
+        anytype
         ungoogled-chromium
       ];
     file."${config.home.homeDirectory}/.xprofile".text = ''

diff --git a/hosts/server/default.nix b/hosts/server/default.nix
@@ -42,6 +42,11 @@
     };
   };
 
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+  };
+
   # enable vaapi on OS-level
   nixpkgs.config.packageOverrides = pkgs: {
     vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };

diff --git a/hosts/server/secrets.nix b/hosts/server/secrets.nix
@@ -1,9 +1,9 @@
 {
   age = {
     secrets = {
-      mullvad_wireguard.file = ../../mullvad_wireguard.age;
-      homepage.file = ../../homepage.age;
-      wireguard_server.file = ../../wireguard_server.age;
+      mullvad_wireguard.file = ../../secrets/mullvad_wireguard.age;
+      homepage.file = ../../secrets/homepage.age;
+      wireguard_server.file = ../../secrets/wireguard_server.age;
     };
   };
 }
diff --git a/hosts/server/wireguard.nix b/hosts/server/wireguard.nix
@@ -55,7 +55,7 @@ in {
           }
           {
             publicKey = "0XXP3UgA67bcImCB4UOvyno3fhiBx7v6ufd4y4MH1xE=";
-            allowedIPs = [ "10.0.0.2/28" "fdc9:281f:04d7:9ee9::2/64" ];
+            allowedIPs = [ "10.0.0.16/28" "fdc9:281f:04d7:9ee9::2/64" ];
           }
         ];
       };

diff --git a/nixos-modules/allowed-unfree.nix b/nixos-modules/allowed-unfree.nix
@@ -13,6 +13,7 @@
       "steam-original"
       "steam-unwrapped"
       "parsec-bin"
+      "anytype"
       "libXNVCtrl" # for some NVIDIA driver shit
       # This is required for pkgs.nodePackages_latest.vscode-langservers-extracted on NixOS
       # however VS Code should NOT be installed on this system!

diff --git a/secrets.nix b/secrets.nix
@@ -11,7 +11,7 @@ let
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILUa3f8x3mb2fHF5JXjGKdWF5EUX8GQj7hMhEUn7LffI root@nixos-server"
   ];
 in {
-  "mullvad_wireguard.age".publicKeys = users ++ systems;
-  "homepage.age".publicKeys = users ++ systems;
-  "wireguard_server.age".publicKeys = users ++ systems;
+  "secrets/mullvad_wireguard.age".publicKeys = users ++ systems;
+  "secrets/homepage.age".publicKeys = users ++ systems;
+  "secrets/wireguard_server.age".publicKeys = users ++ systems;
 }
diff --git a/homepage.age → secrets/homepage.age b/homepage.age → secrets/homepage.age
diff --git a/mullvad_wireguard.age → secrets/mullvad_wireguard.age b/mullvad_wireguard.age → secrets/mullvad_wireguard.age
diff --git a/wireguard_server.age → secrets/wireguard_server.age b/wireguard_server.age → secrets/wireguard_server.age
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ in { @@
               }
               {
                 publicKey = "0XXP3UgA67bcImCB4UOvyno3fhiBx7v6ufd4y4MH1xE=";
-                allowedIPs = [ "10.0.0.2/28" "fdc9:281f:04d7:9ee9::2/64" ];
+                allowedIPs = [ "10.0.0.16/28" "fdc9:281f:04d7:9ee9::2/64" ];
               }
             ];
           };
@@ Expand Down @@