materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: materus:fe49e00096ce728ed36f6bd9857492be3617671a
Branches Tags
materus:master
materus:experimental
materus:inputs
...
compare: materus:91c694193c66688bfe67205c6a18319906d32a79
Branches Tags
materus:experimental
materus:master
materus:inputs

5 Commits
fe49e00096 ... 91c694193c

Author SHA1 Message Date
Mateusz Słodkowicz 91c694193c
valkyrie: add 404 error page 2024-04-03 14:28:48 +02:00
Mateusz Słodkowicz 75906dd151
flake: update lock 2024-04-03 11:08:59 +02:00
Mateusz Słodkowicz aff6076875
os-config: use brave as default browser 2024-04-03 11:08:02 +02:00
Mateusz Słodkowicz 6b5b53956b
waffentrager: make auth emtpy 2024-04-03 10:52:20 +02:00
Mateusz Słodkowicz 12cba54eee
materusPC: remove some comments 2024-04-03 10:45:17 +02:00
9 changed files with 82 additions and 69 deletions
Show Stats Expand all files Collapse all files

10
configurations/host/materusPC/tmp.nix
View File

@ -103,13 +103,9 @@
"libvirtd" "libvirtd"
"podman" "podman"
"lxd" "lxd"
]; # Enable ‘sudo’ for the user. ];
shell = pkgs.zsh; shell = pkgs.zsh;
description = "Mateusz Słodkowicz"; description = "Mateusz Słodkowicz";
# packages = with pkgs; [
# firefox
# thunderbird
# ];
}; };
environment.sessionVariables = { environment.sessionVariables = {
@ -173,7 +169,7 @@
dconf.enable = true; dconf.enable = true;
}; };
materus.profile.browser.enable = true;
@ -283,7 +279,7 @@
binutils binutils
config.materus.profile.packages.firefox
]; ];

BIN
configurations/host/valkyrie/secrets/private/default.nix
View File

Binary file not shown.

13
configurations/host/waffentrager/services/auth.nix
View File

@ -10,18 +10,5 @@
waffentragerService.elements.enable = true; waffentragerService.elements.enable = true;
waffentragerService.nginx.enable = true; waffentragerService.nginx.enable = true;
services.postgresql.enable = true;
services.postgresql.package = pkgs."postgresql_${cfg.version}";
services.postgresql.dataDir = "${config.waffentragerService.elements.postgresqlDir}/${cfg.version}";
services.postgresql.enableJIT = true;
services.postgresql.authentication = pkgs.lib.mkOverride 10 ''
local all all trust
host all all 127.0.0.1/32 scram-sha-256
'';
systemd.services.postgresql = {
partOf = [ "elements-mount.service" ];
requires = [ "elements-mount.service" ];
after = [ "elements-mount.service" ];
};
}; };
} }

2
configurations/profile/home/browser.nix
View File

@ -17,7 +17,7 @@ in
(lib.mkIf cfg.firefox.enable config.materus.profile.packages.firefox) (lib.mkIf cfg.firefox.enable config.materus.profile.packages.firefox)
(lib.mkIf cfg.vivaldi.enable pkgs.vivaldi) (lib.mkIf cfg.vivaldi.enable pkgs.vivaldi)
(lib.mkIf cfg.brave.enable pkgs.brave) (lib.mkIf cfg.brave.enable pkgs.brave)
]; ] ++ [ (lib.mkIf (osConfig != null && osConfig.materus.profile.browser.enable) osConfig.materus.profile.browser.package)];
} }
]; ];

1
configurations/profile/os/default.nix
View File

@ -6,6 +6,7 @@
./shell ./shell
./games ./games
./desktop
]; ];
} }

24
configurations/profile/os/desktop/browser.nix Normal file
View File

@ -0,0 +1,24 @@
{ materusArg, config, pkgs, lib, ... }:
let
cfg = config.materus.profile.browser;
in
{
options.materus.profile.browser.enable = materusArg.pkgs.lib.mkBoolOpt false "Enable materus default browser config";
options.materus.profile.browser.default = lib.mkOption {
type = lib.types.enum [ "firefox" "brave" "vivaldi" ];
example = "vivaldi";
default = "brave";
};
options.materus.profile.browser.package = materusArg.pkgs.lib.mkPrivateVar
(if (cfg.default == "firefox") then config.materus.profile.packages.firefox else
if (cfg.default == "vivaldi") then pkgs.vivaldi else
if (cfg.default == "brave") then pkgs.brave else { });
config = lib.mkIf cfg.enable {
environment.systemPackages = [
config.materus.profile.browser.package
];
};
}

6
configurations/profile/os/desktop/default.nix Normal file
View File

@ -0,0 +1,6 @@
{
imports = [
./browser.nix
];
}

1
configurations/profile/os/games/steam.nix
View File

@ -23,7 +23,6 @@ let
steamPkg = pkgs.steam.override { steamPkg = pkgs.steam.override {
extraPkgs = pkgs: [ extraPkgs = pkgs: [
#config.materus.profile.packages.firefox
#optHip #for blender #optHip #for blender
pkgs.libdecor pkgs.libdecor
pkgs.obs-studio-plugins.obs-vkcapture pkgs.obs-studio-plugins.obs-vkcapture

94
flake.lock
View File

@ -167,11 +167,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1711530423, "lastModified": 1712108714,
"narHash": "sha256-Z7JxlKxbhGWLOvypllSMGhDMWd/A2Hv8zRKJY3a9TTY=", "narHash": "sha256-QzrcwGuuAP1octIcUw/d+Yi5BEXYt1NOwNLpeUrqKTk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "9f6f38ce57d29b78cc6db45cf87813ae631641ec", "rev": "5d0a10938c32f3cb95d1f1f18127948d239c6720",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,11 +194,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1711530423, "lastModified": 1712108714,
"narHash": "sha256-Z7JxlKxbhGWLOvypllSMGhDMWd/A2Hv8zRKJY3a9TTY=", "narHash": "sha256-QzrcwGuuAP1octIcUw/d+Yi5BEXYt1NOwNLpeUrqKTk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "9f6f38ce57d29b78cc6db45cf87813ae631641ec", "rev": "5d0a10938c32f3cb95d1f1f18127948d239c6720",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -359,11 +359,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711133180, "lastModified": 1712093955,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "rev": "80546b220e95a575c66c213af1b09fe255299438",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,10 +378,10 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1710974515, "lastModified": 1711133180,
"narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"path": "/nix/store/nmp0zfvczcinq4k9x919k7yrazza2yvw-source", "path": "/nix/store/vk0zfmxpm3m8lzf0wf3jm7v6mizx7fh8-source",
"rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -493,11 +493,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1711124224, "lastModified": 1711668574,
"narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "56528ee42526794d413d6f244648aaee4a7b56c0", "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -509,11 +509,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1711233294, "lastModified": 1711819797,
"narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=", "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68", "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -525,11 +525,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1711124224, "lastModified": 1711668574,
"narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "56528ee42526794d413d6f244648aaee4a7b56c0", "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -541,11 +541,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1711233294, "lastModified": 1711819797,
"narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=", "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68", "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -557,11 +557,11 @@
}, },
"nixpkgs-stable_5": { "nixpkgs-stable_5": {
"locked": { "locked": {
"lastModified": 1711124224, "lastModified": 1711668574,
"narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "56528ee42526794d413d6f244648aaee4a7b56c0", "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -573,11 +573,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1711333969, "lastModified": 1711703276,
"narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -602,11 +602,11 @@
}, },
"nur_2": { "nur_2": {
"locked": { "locked": {
"lastModified": 1711532663, "lastModified": 1712133822,
"narHash": "sha256-Y0I1/ENnkXvrgK3xLKaRkPZSfbgQkcWu2ctqbwU4Fb0=", "narHash": "sha256-MMoHOnX4GSzFTsUb/0FGEHWcduz4K/Vx7yHB+6vGarI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "f7a87cffaf22af88cfeda2951de842aa919e2fdd", "rev": "319e516a81bb0bd5187487710394b3f5c4f96600",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -631,11 +631,11 @@
}, },
"nur_4": { "nur_4": {
"locked": { "locked": {
"lastModified": 1711532663, "lastModified": 1712133822,
"narHash": "sha256-Y0I1/ENnkXvrgK3xLKaRkPZSfbgQkcWu2ctqbwU4Fb0=", "narHash": "sha256-MMoHOnX4GSzFTsUb/0FGEHWcduz4K/Vx7yHB+6vGarI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "f7a87cffaf22af88cfeda2951de842aa919e2fdd", "rev": "319e516a81bb0bd5187487710394b3f5c4f96600",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -647,10 +647,10 @@
}, },
"nur_5": { "nur_5": {
"locked": { "locked": {
"lastModified": 1711043201, "lastModified": 1711532663,
"narHash": "sha256-jxx3+oFnKKtL26uq3vlHxbWmS3kqif2F6CVErMMzy3w=", "narHash": "sha256-Y0I1/ENnkXvrgK3xLKaRkPZSfbgQkcWu2ctqbwU4Fb0=",
"path": "/nix/store/sr2qvyjjrp7d3qmdqj9141b97hyg8gd2-source", "path": "/nix/store/rnz6ahf0g4kd052iiz1f3y0jrg3iv1w0-source",
"rev": "ef102b2c8fa81a28f1da791930042696cafd6bda", "rev": "f7a87cffaf22af88cfeda2951de842aa919e2fdd",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -695,11 +695,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1711249319, "lastModified": 1711855048,
"narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=", "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "405987a66cce9a4a82f321f11b205982a7127c88", "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -718,11 +718,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1711249319, "lastModified": 1711855048,
"narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=", "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "405987a66cce9a4a82f321f11b205982a7127c88", "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10",
"type": "github" "type": "github"
}, },
"original": { "original": {