fix eval of linux
This commit is contained in:
parent
4dae02f06e
commit
a2904ffd76
12 changed files with 81 additions and 87 deletions
|
@ -57,6 +57,10 @@ creation_rules:
|
|||
- age:
|
||||
- *rainbow-resort
|
||||
- *lotte
|
||||
- path_regex: secrets/devterm\.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
- *lotte
|
||||
- path_regex: secrets/kubernetes\.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
|
|
|
@ -13,15 +13,20 @@
|
|||
fi
|
||||
'';
|
||||
in {
|
||||
imports = [
|
||||
./services/pipewire.nix
|
||||
./desktop-secrets.nix
|
||||
./services/cups.nix
|
||||
./services/docker.nix
|
||||
./services/cifs.nix
|
||||
./programs/virtualbox.nix
|
||||
./kde.nix
|
||||
];
|
||||
imports =
|
||||
[
|
||||
./services/pipewire.nix
|
||||
./desktop-secrets.nix
|
||||
./services/cups.nix
|
||||
./services/docker.nix
|
||||
./services/cifs.nix
|
||||
./kde.nix
|
||||
]
|
||||
++ (
|
||||
if system == "x86_64-linux"
|
||||
then [./programs/virtualbox.nix]
|
||||
else []
|
||||
);
|
||||
fonts = {
|
||||
fontDir.enable = true;
|
||||
fontconfig = {
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
};
|
||||
deviceTree = {
|
||||
enable = true;
|
||||
filter = "*rpi-4-*.dtb";
|
||||
#filter = "*rpi-4-*.dtb";
|
||||
};
|
||||
};
|
||||
console.enable = false;
|
||||
|
|
|
@ -2,6 +2,7 @@ args: {
|
|||
pkgs,
|
||||
nixpkgs,
|
||||
nix-gaming,
|
||||
system,
|
||||
...
|
||||
}: let
|
||||
wine = nix-gaming.packages.x86_64-linux.wine-ge.overrideAttrs (super: {
|
||||
|
@ -19,11 +20,18 @@ args: {
|
|||
];
|
||||
});
|
||||
in {
|
||||
home.packages = [
|
||||
pkgs.xivlauncher
|
||||
pkgs.prismlauncher
|
||||
pkgs.mgba
|
||||
wine
|
||||
nix-gaming.packages.x86_64-linux.osu-lazer-bin
|
||||
];
|
||||
home.packages =
|
||||
[
|
||||
pkgs.prismlauncher
|
||||
pkgs.mgba
|
||||
]
|
||||
++ (
|
||||
if system == "x86_64-linux"
|
||||
then [
|
||||
pkgs.xivlauncher
|
||||
nix-gaming.packages.x86_64-linux.osu-lazer-bin
|
||||
wine
|
||||
]
|
||||
else []
|
||||
);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
...
|
||||
}: {
|
||||
programs.firefox = {
|
||||
package = firefox.packages.${pkgs.system}.firefox-nightly-bin;
|
||||
enable = true;
|
||||
profiles = {
|
||||
unhardened = {
|
||||
|
|
|
@ -1,9 +1,20 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
(element-desktop.override (_: {
|
||||
electron = pkgs.electron-bin;
|
||||
}))
|
||||
twinkle
|
||||
discord
|
||||
];
|
||||
{
|
||||
system,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
(element-desktop.override (_: {
|
||||
electron = pkgs.electron-bin;
|
||||
}))
|
||||
twinkle
|
||||
]
|
||||
++ (
|
||||
if system == "x86_64-linux"
|
||||
then [
|
||||
pkgs.discord
|
||||
]
|
||||
else []
|
||||
);
|
||||
}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
programs.thunderbird = {
|
||||
package = pkgs.thunderbird-bin;
|
||||
enable = true;
|
||||
profiles.main = {
|
||||
withExternalGnupg = true;
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
x86_64-linux-pkgs = import nixpkgs {system = "x86_64-linux";};
|
||||
in {
|
||||
home.packages = with pkgs; [
|
||||
anki-bin
|
||||
anki
|
||||
mdcat
|
||||
gimp
|
||||
krita
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
virtualisation.virtualbox.host.enable = true;
|
||||
users.extraGroups.vboxusers.members = ["user-with-access-to-virtualbox"];
|
||||
users.extraGroups.vboxusers.members = ["darkkirb"];
|
||||
}
|
||||
|
|
49
flake.lock
49
flake.lock
|
@ -278,38 +278,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"firefox": {
|
||||
"inputs": {
|
||||
"cachix": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"flake-compat": [
|
||||
"flake-compat"
|
||||
],
|
||||
"lib-aggregate": [
|
||||
"lib-aggregate"
|
||||
],
|
||||
"mozilla": [
|
||||
"mozilla"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717975029,
|
||||
"narHash": "sha256-wN4CJc3bgmbCS3/+KZ0SxynUI6HXanBrMmzT7xqtqqM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-firefox-nightly",
|
||||
"rev": "12e9e043bb4ba19493f82c5d905e63af9eb6230c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-firefox-nightly",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
|
@ -681,21 +649,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mozilla": {
|
||||
"locked": {
|
||||
"lastModified": 1704373101,
|
||||
"narHash": "sha256-+gi59LRWRQmwROrmE1E2b3mtocwueCQqZ60CwLG+gbg=",
|
||||
"owner": "mozilla",
|
||||
"repo": "nixpkgs-mozilla",
|
||||
"rev": "9b11a87c0cc54e308fa83aac5b4ee1816d5418a2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "mozilla",
|
||||
"repo": "nixpkgs-mozilla",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -882,7 +835,6 @@
|
|||
"devshell": "devshell",
|
||||
"dns": "dns",
|
||||
"element-web": "element-web",
|
||||
"firefox": "firefox",
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-utils": "flake-utils_2",
|
||||
|
@ -895,7 +847,6 @@
|
|||
"lix-module": "lix-module",
|
||||
"matrix-js-sdk": "matrix-js-sdk",
|
||||
"matrix-react-sdk": "matrix-react-sdk",
|
||||
"mozilla": "mozilla",
|
||||
"naersk": "naersk",
|
||||
"nix-gaming": "nix-gaming",
|
||||
"nix-neovim": "nix-neovim",
|
||||
|
|
|
@ -69,14 +69,6 @@ rec {
|
|||
inputs.devshell.follows = "devshell";
|
||||
inputs.flake-compat.follows = "flake-compat";
|
||||
};
|
||||
firefox = {
|
||||
url = "github:nix-community/flake-firefox-nightly";
|
||||
inputs.cachix.follows = "nixpkgs";
|
||||
inputs.flake-compat.follows = "flake-compat";
|
||||
inputs.lib-aggregate.follows = "lib-aggregate";
|
||||
inputs.mozilla.follows = "mozilla";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
flake-compat = {
|
||||
url = "github:edolstra/flake-compat";
|
||||
flake = false;
|
||||
|
@ -135,7 +127,6 @@ rec {
|
|||
inputs.devshell.follows = "devshell";
|
||||
inputs.flake-compat.follows = "flake-compat";
|
||||
};
|
||||
mozilla.url = "github:mozilla/nixpkgs-mozilla";
|
||||
naersk = {
|
||||
url = "github:nix-community/naersk/master";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
26
secrets/devterm.yaml
Normal file
26
secrets/devterm.yaml
Normal file
|
@ -0,0 +1,26 @@
|
|||
email:
|
||||
lotte@chir.rs: ENC[AES256_GCM,data:g2+amJkqJ0NdkbINffz5OKTRKQ==,iv:z0qPNdq08I8TFef3qsWIa+7DV5/XpljOMiaCRuNMgVk=,tag:pSiRCLITD5anTu2I9rNdfw==,type:str]
|
||||
mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:nCTMUQRrHeDxZ7wBUTzYKoOBBZDzsEPGtBDcN8cwnDyq0e53lV9qZB1fgf7oAbqvgJA66iYo+D6xDfjL9tn0Ig==,iv:NWb1g/7MR1RVZtyn/6D/ikoGWo1fBh8KSNSev+GbyX0=,tag:7cyvHTO3ibzAAm7umkZ6sw==,type:str]
|
||||
password:
|
||||
root: ENC[AES256_GCM,data:iqe4ZXY8eAESm+Hnb418tWUF1Zj/uFZkr4R8a0hCXcynZjY4zzxMqiO+pTg/RPZT6LIwtd9wSuAF6Ir2BjmRiPx+dQnKOxIYwIB847GbD+PhIviAy4da3jle6KYA3goj0XXULU9KxVhx4g==,iv:CdEBYaAiiA0kKawaiek9uhwLKE5EtNoOoKdwbjJiYe8=,tag:8Fk5BEfWzPzLqyqN7okGMA==,type:str]
|
||||
darkkirb: ENC[AES256_GCM,data:T7YfuKVDSsH1WFre2cwr478jviwjhefRc5n4ks6zZ35/uZgPEEz3cEtl0zNGAb5yVpAiS/rZj+meTDiDh+iDhtuNpOVmUzoxIvhgH6EXb5Pm7TN9K3oC0ruww0dQt5T24OSxKHEkdxY/qQ==,iv:Z4n80AoueAhZkuHn3/fuqEMP+dq7CTW/IZHDT5lmQ3k=,tag:lGfsZpJ8d22EWfQysDp+xw==,type:str]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
azure_kv: []
|
||||
hc_vault: []
|
||||
age:
|
||||
- recipient: age1tltjgexkp5fz3rum4j0k66ty5q4u8ptvkgkepumd20zal24g2qfs5xgw76
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOWWJJRlRJQ2tlMldhTFNv
|
||||
NlJLSmRrYmg2VWdFMnhvL1RYaTFUbzVTRlRrCk05Q2d0emNzR3I2VzR6SFdMNERl
|
||||
UVVpS2VLMFB2aWMweGRaTzJWWExjSW8KLS0tIEZlSFZhRnd1Wk5Vd29LY2hRSnVu
|
||||
ZG5yVGhDcmYvRlZQT0ZwQ0NJNTdhVE0KKEA6CGGV6lcgTnm5KTiNTkh7ct17pZ6O
|
||||
bdzdZksQIJ7+nrMZlYZbMupMm1dGHYHKaCTs7ZgG75gfzekYmrIFDQ==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-06-17T19:25:31Z"
|
||||
mac: ENC[AES256_GCM,data:F6XLIbk3W06LtYMn1QQu7JdFdCbh6fN9mBSM+TBvjRa3qIhoeETT5SRXktRITk7lDzvdwgAXmcWnGSBLPc5YrjT/93n1ferMwQdyAtAZUBjT2eMKSG/N5pY6hoDIP9+CbY+lVgcU1vw8SGUhy1xDPK/uOq2fK0y3vz8TVtdKqmE=,iv:vbUPbfvrXQ4hDXWei46xY1ONt5ddxU9+ZVGbP0dTobI=,tag:+B37FS/TQK6/5nnrhVYs9g==,type:str]
|
||||
pgp: []
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.8.1
|
Loading…
Reference in a new issue