diff --git a/flake.lock b/flake.lock index 7be76c2..a0f11aa 100644 --- a/flake.lock +++ b/flake.lock @@ -146,28 +146,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", - "qois-infrastructure": "qois-infrastructure", - "threema": "threema" - } - }, - "threema": { - "inputs": { - "nixpkgs-unstable": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1649761393, - "narHash": "sha256-tqHVp5iIZpv5r+oT8N9GYDOdDPxUtD532aJuV4GZeVQ=", - "ref": "main", - "rev": "ed32144ca2c2ec82fe88fadfebcc98732bc52364", - "revCount": 3, - "type": "git", - "url": "file:///etc/nixos/defaults/threema" - }, - "original": { - "type": "git", - "url": "file:///etc/nixos/defaults/threema" + "qois-infrastructure": "qois-infrastructure" } } }, diff --git a/flake.nix b/flake.nix index 7aec25c..a9e0d35 100644 --- a/flake.nix +++ b/flake.nix @@ -6,14 +6,14 @@ home-manager.url = "github:nix-community/home-manager/release-21.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs-stable"; qois-infrastructure.url = "git+file:///etc/nixos/qois-infrastructure"; - threema.url = "git+file:///etc/nixos/defaults/threema"; - threema.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable"; + #threema.url = "git+file:///etc/nixos/defaults/threema"; + #threema.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable"; fabianhauser-etaxes-sg.url = "github:fabianhauser/etaxes-sg-nix"; fabianhauser-etaxes-sg.inputs.nixpkgs.follows = "nixpkgs-stable"; }; outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager - , qois-infrastructure, fabianhauser-etaxes-sg, nixos-hardware, threema, ... + , qois-infrastructure, fabianhauser-etaxes-sg, nixos-hardware, ...#threema, ... }@inputs: let system = "x86_64-linux"; @@ -35,7 +35,7 @@ # `nix build .#nixosConfigurations..config.system.build.toplevel nixosConfigurations = let sharedSpecialArgs = { - threemaModules = threema.nixosModules; + #threemaModules = threema.nixosModules; inherit pkgsUnstable; }; diff --git a/home/fhauser/default.nix b/home/fhauser/default.nix index 78ae766..6217fab 100644 --- a/home/fhauser/default.nix +++ b/home/fhauser/default.nix @@ -1,11 +1,11 @@ -{ config, pkgs, lib, threemaModules, nixosConfig, ... }: { +{ config, pkgs, lib, /*threemaModules,*/ nixosConfig, ... }: { imports = [ ./multimedia.nix ./applications ./mimetypes.nix ./games.nix - threemaModules.home + # threemaModules.home ]; home.stateVersion = nixosConfig.system.stateVersion; systemd.user.targets.tray = {