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

Remove threema from flake.nix

Browse source
This commit is contained in:
Fabian Hauser 2024-01-03 13:20:24 +08:00
parent 21dc8425e2
commit 5ffa47cb44
6 changed files with 6 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
flake.lock generated
View file

@ -94,28 +94,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable"
"threema": "threema"
}
},
"threema": {
"inputs": {
"nixpkgs-unstable": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1659736371,
"narHash": "sha256-X2DbyWtlk810SMx5I+rW5OHJWHFXf2wvwNvuQPS14Gs=",
"ref": "refs/heads/master",
"rev": "70fb60fabf3e454d2d131ae21db1f13c1b45ab12",
"revCount": 18,
"type": "git",
"url": "file:///etc/nixos/defaults/threema"
},
"original": {
"type": "git",
"url": "file:///etc/nixos/defaults/threema"
} }
} }
}, },

5
flake.nix
View file

@ -9,8 +9,6 @@
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs-stable"; home-manager.inputs.nixpkgs.follows = "nixpkgs-stable";
threema.url = "git+file:///etc/nixos/defaults/threema";
threema.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable";
fcc-unlock = { fcc-unlock = {
url = "git+file:///etc/nixos/fcc-unlock"; url = "git+file:///etc/nixos/fcc-unlock";
inputs.nixos-stable.follows = "nixpkgs-stable"; inputs.nixos-stable.follows = "nixpkgs-stable";
@ -19,7 +17,7 @@
}; };
outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager
, nixos-hardware, threema, fcc-unlock, ... }@inputs: , nixos-hardware, fcc-unlock, ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgsUnstable = import nixpkgs-unstable { pkgsUnstable = import nixpkgs-unstable {
@ -40,7 +38,6 @@
# `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;
inherit pkgsUnstable; inherit pkgsUnstable;
pkgFccUnlock = fcc-unlock.packages.${system}.default; pkgFccUnlock = fcc-unlock.packages.${system}.default;

4
home/fhauser/default.nix
View file

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

4
host/hummelberg/default.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, threemaModules, ... }: { { config, pkgs, ... }: {
imports = [ imports = [
./filesystems.nix ./filesystems.nix
@ -11,8 +11,6 @@
../../defaults/desktop ../../defaults/desktop
../../defaults/hardware/thinkpad-p14s.nix ../../defaults/hardware/thinkpad-p14s.nix
#../../defaults/printing #../../defaults/printing
threemaModules.openvpn
]; ];
#TODO: Clean up next section #TODO: Clean up next section

4
host/ochsenchopf/default.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, threemaModules, ... }: { { config, pkgs, ... }: {
imports = [ imports = [
./filesystems.nix ./filesystems.nix
@ -9,8 +9,6 @@
../../defaults/base ../../defaults/base
../../defaults/cifs-auth-fix ../../defaults/cifs-auth-fix
../../defaults/desktop ../../defaults/desktop
threemaModules.openvpn
]; ];
virtualisation = { # TODO: This should probably be somewhere else. virtualisation = { # TODO: This should probably be somewhere else.

4
host/speer/default.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, threemaModules, ... }: { { config, pkgs, ... }: {
imports = [ imports = [
./filesystems.nix ./filesystems.nix
@ -12,8 +12,6 @@
../../defaults/hardware/amd-board.nix ../../defaults/hardware/amd-board.nix
../../defaults/hardware/ecc-memory.nix ../../defaults/hardware/ecc-memory.nix
#../../defaults/printing #../../defaults/printing
threemaModules.openvpn
]; ];
virtualisation = { # TODO: This should probably be somewhere else. virtualisation = { # TODO: This should probably be somewhere else.