diff --git a/flake.lock b/flake.lock index 07a9e90..692fb92 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,20 @@ { "nodes": { + "catppuccin-vsc": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1713966373, + "narHash": "sha256-8bMRH+z426e6zWcS15QZsQ8moSAKbEDjtBnAE10+DW8=", + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/vscode/%2A.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/catppuccin/vscode/%2A.tar.gz" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -97,15 +112,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715288647, - "narHash": "sha256-/vno6oUIZDSLpqS/WOqNTHwVIakrNR7R+UutJVmfohs=", - "owner": "auxolotl", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb0bb336c1365f5ab5250df84cb1406337f7d9d9", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { - "owner": "auxolotl", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -128,6 +143,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1715288647, + "narHash": "sha256-/vno6oUIZDSLpqS/WOqNTHwVIakrNR7R+UutJVmfohs=", + "owner": "auxolotl", + "repo": "nixpkgs", + "rev": "fb0bb336c1365f5ab5250df84cb1406337f7d9d9", + "type": "github" + }, + "original": { + "owner": "auxolotl", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1715413075, "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=", @@ -145,16 +176,17 @@ }, "root": { "inputs": { + "catppuccin-vsc": "catppuccin-vsc", "home-manager": "home-manager", "lix": "lix", "lix-module": "lix-module", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { diff --git a/flake.nix b/flake.nix index 98ef7c0..0ab5745 100644 --- a/flake.nix +++ b/flake.nix @@ -23,9 +23,9 @@ url = "github:Mic92/sops-nix"; }; - # catppuccin-vsc = { - # url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz"; - # }; + catppuccin-vsc = { + url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz"; + }; # solaar = { # url = "github:Svenum/Solaar-Flake/latest"; diff --git a/modules/common/applications/default.nix b/modules/common/applications/default.nix index 4df01ce..a585c8f 100644 --- a/modules/common/applications/default.nix +++ b/modules/common/applications/default.nix @@ -3,5 +3,6 @@ imports = [ ./discord.nix ./firefox.nix + ./netbird.nix ]; } diff --git a/modules/common/applications/element.nix b/modules/common/applications/element.nix new file mode 100644 index 0000000..e69de29 diff --git a/modules/common/applications/netbird.nix b/modules/common/applications/netbird.nix new file mode 100644 index 0000000..03afa3b --- /dev/null +++ b/modules/common/applications/netbird.nix @@ -0,0 +1,28 @@ +{ config, pkgs, lib, ... }: +{ + options = { + netbird = { + enable = lib.mkEnableOption { + description = "Enable Netbird"; + default = false; + }; + }; + }; + config = lib.mkIf (config.netbird.enable) + (lib.mkMerge [ + (lib.mkIf (config.gui.enable) { + home-manager.users.${config.user} = { + home.packages = [ + pkgs.netbird-ui + ]; + }; + }) + (lib.mkIf (!config.gui.enable) { + home-manager.users.${config.user} = { + home.packages = [ + pkgs.netbird + ]; + }; + }) + ]); +} diff --git a/modules/common/applications/prusa-slicer.nix b/modules/common/applications/prusa-slicer.nix new file mode 100644 index 0000000..e69de29 diff --git a/modules/common/programming/vscode.nix b/modules/common/programming/vscode.nix index b593daf..2848e88 100644 --- a/modules/common/programming/vscode.nix +++ b/modules/common/programming/vscode.nix @@ -15,7 +15,7 @@ enable = true; extensions = with pkgs.vscode-extensions; [ bbenoist.nix - # catppuccin.catpuccin-vsc + catppuccin.catpuccin-vsc ]; }; };