fabianhauser/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity Actions

TODO: Temp. disable threema modules

Browse source
This commit is contained in:
Fabian Hauser 2022-04-17 10:20:06 +02:00
parent 729bbb35f2
commit 71c29737fe
3 changed files with 7 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

23
flake.lock generated
View file

@ -146,28 +146,7 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"qois-infrastructure": "qois-infrastructure", "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"
} }
} }
}, },

8
flake.nix
View file

@ -6,14 +6,14 @@
home-manager.url = "github:nix-community/home-manager/release-21.11"; home-manager.url = "github:nix-community/home-manager/release-21.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs-stable"; home-manager.inputs.nixpkgs.follows = "nixpkgs-stable";
qois-infrastructure.url = "git+file:///etc/nixos/qois-infrastructure"; qois-infrastructure.url = "git+file:///etc/nixos/qois-infrastructure";
threema.url = "git+file:///etc/nixos/defaults/threema"; #threema.url = "git+file:///etc/nixos/defaults/threema";
threema.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable"; #threema.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable";
fabianhauser-etaxes-sg.url = "github:fabianhauser/etaxes-sg-nix"; fabianhauser-etaxes-sg.url = "github:fabianhauser/etaxes-sg-nix";
fabianhauser-etaxes-sg.inputs.nixpkgs.follows = "nixpkgs-stable"; fabianhauser-etaxes-sg.inputs.nixpkgs.follows = "nixpkgs-stable";
}; };
outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager 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: }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
@ -35,7 +35,7 @@
# `nix build .#nixosConfigurations.<hostname>.config.system.build.toplevel # `nix build .#nixosConfigurations.<hostname>.config.system.build.toplevel
nixosConfigurations = let nixosConfigurations = let
sharedSpecialArgs = { sharedSpecialArgs = {
threemaModules = threema.nixosModules; #threemaModules = threema.nixosModules;
inherit pkgsUnstable; inherit pkgsUnstable;
}; };

4
home/fhauser/default.nix
View file

@ -1,11 +1,11 @@
{ config, pkgs, lib, threemaModules, nixosConfig, ... }: { { config, pkgs, lib, /*threemaModules,*/ nixosConfig, ... }: {
imports = [ imports = [
./multimedia.nix ./multimedia.nix
./applications ./applications
./mimetypes.nix ./mimetypes.nix
./games.nix ./games.nix
threemaModules.home # threemaModules.home
]; ];
home.stateVersion = nixosConfig.system.stateVersion; home.stateVersion = nixosConfig.system.stateVersion;
systemd.user.targets.tray = { systemd.user.targets.tray = {