Compare commits
6 commits
3b35135879
...
5e4969dc7b
Author | SHA1 | Date | |
---|---|---|---|
5e4969dc7b | |||
22fb85a881 | |||
e1ae95daef | |||
26ad365df5 | |||
188047dd2b | |||
b6abe3e1ef |
9 changed files with 36 additions and 20 deletions
24
flake.lock
generated
24
flake.lock
generated
|
@ -88,11 +88,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740872218,
|
"lastModified": 1741352980,
|
||||||
"narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=",
|
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "3876f6b87db82f33775b1ef5ea343986105db764",
|
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -206,11 +206,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740845322,
|
"lastModified": 1741579508,
|
||||||
"narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=",
|
"narHash": "sha256-skRbH+UF2ES+msEa+KWi7AQFX73S+QsGlPsyCU6XyE0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d",
|
"rev": "744f749dd6fbc1489591ea370b95156858629cb9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -221,11 +221,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740646007,
|
"lastModified": 1741325094,
|
||||||
"narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=",
|
"narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49",
|
"rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -265,11 +265,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740828860,
|
"lastModified": 1741379970,
|
||||||
"narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
|
"narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
|
"rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -10,9 +10,6 @@ let
|
||||||
inherit (lib.my) getExe getExe';
|
inherit (lib.my) getExe getExe';
|
||||||
|
|
||||||
desktop = osConfig.modules.system.roles.desktop;
|
desktop = osConfig.modules.system.roles.desktop;
|
||||||
term = getExe desktop.terminal;
|
|
||||||
filemanager = getExe desktop.filemanager;
|
|
||||||
cliphistEnabled = osConfig.modules.services.cliphist.enable;
|
|
||||||
in
|
in
|
||||||
mkIf osConfig.programs.hyprland.enable {
|
mkIf osConfig.programs.hyprland.enable {
|
||||||
home.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "auto";
|
home.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "auto";
|
||||||
|
@ -179,8 +176,8 @@ mkIf osConfig.programs.hyprland.enable {
|
||||||
"$mod, down, movefocus, d"
|
"$mod, down, movefocus, d"
|
||||||
|
|
||||||
# Example special workspace (scratchpad)
|
# Example special workspace (scratchpad)
|
||||||
"$mod, D, togglespecialworkspace, magic"
|
"$mod, W, togglespecialworkspace, magic"
|
||||||
"$mod SHIFT, D, movetoworkspace, special:magic"
|
"$mod SHIFT, W, movetoworkspace, special:magic"
|
||||||
"$mod, X, fullscreen, 1"
|
"$mod, X, fullscreen, 1"
|
||||||
"$mod, F, fullscreen, 0"
|
"$mod, F, fullscreen, 0"
|
||||||
"$mod, U, exec, ${pkgs.hyprshot}/bin/hyprshot -o ${config.xdg.userDirs.pictures}/screenshots -m region"
|
"$mod, U, exec, ${pkgs.hyprshot}/bin/hyprshot -o ${config.xdg.userDirs.pictures}/screenshots -m region"
|
||||||
|
|
|
@ -26,6 +26,7 @@ in
|
||||||
group = "rustypaste";
|
group = "rustypaste";
|
||||||
};
|
};
|
||||||
forgejo-runner-token.file = ../../secrets/forgejo-runner-token.age;
|
forgejo-runner-token.file = ../../secrets/forgejo-runner-token.age;
|
||||||
|
acme.file = ../../secrets/acme.age;
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.loader.grub = {
|
boot.loader.grub = {
|
||||||
|
@ -97,6 +98,9 @@ in
|
||||||
acme = {
|
acme = {
|
||||||
defaults.email = "admin@ccnlc.eu";
|
defaults.email = "admin@ccnlc.eu";
|
||||||
acceptTerms = true;
|
acceptTerms = true;
|
||||||
|
dnsProvider = "ovh";
|
||||||
|
environmentFile = config.age.secrets.acme.path;
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,15 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
options = {
|
options = {
|
||||||
enableBookUploading = true;
|
enableBookUploading = true;
|
||||||
|
calibreLibrary = "/mnt/books";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
systemd.services.calibre-web = {
|
||||||
|
after = [ "mnt-books.mount" ];
|
||||||
|
requires = [ "mnt-books.mount" ];
|
||||||
|
};
|
||||||
|
|
||||||
fileSystems."/mnt/books" = {
|
fileSystems."/mnt/books" = {
|
||||||
device = "192.168.178.21:/mnt/Fort/data/books";
|
device = "192.168.178.21:/mnt/Fort/data/books";
|
||||||
fsType = "nfs";
|
fsType = "nfs";
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
file = ../../secrets/freshrss-default-password.age;
|
file = ../../secrets/freshrss-default-password.age;
|
||||||
owner = config.services.freshrss.user;
|
owner = config.services.freshrss.user;
|
||||||
};
|
};
|
||||||
|
acme.file = ../../secrets/acme.age;
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.loader.grub = {
|
boot.loader.grub = {
|
||||||
|
@ -149,7 +150,7 @@
|
||||||
defaults = {
|
defaults = {
|
||||||
email = "contact@ccnlc.eu";
|
email = "contact@ccnlc.eu";
|
||||||
dnsProvider = "ovh";
|
dnsProvider = "ovh";
|
||||||
environmentFile = "/run/secrets/ovh";
|
environmentFile = config.age.secrets.acme.path;
|
||||||
};
|
};
|
||||||
|
|
||||||
certs."ccnlc.eu" = {
|
certs."ccnlc.eu" = {
|
||||||
|
@ -161,7 +162,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
recommendedProxySettings = true;
|
recommendedProxySettings = true;
|
||||||
recommendedTlsSettings = true;
|
recommendedTlsSettings = true;
|
||||||
clientMaxBodySize = "100M";
|
clientMaxBodySize = "2000M";
|
||||||
virtualHosts =
|
virtualHosts =
|
||||||
let
|
let
|
||||||
mkVHLocal = mkVH "http://localhost";
|
mkVHLocal = mkVH "http://localhost";
|
||||||
|
|
|
@ -76,6 +76,9 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.navidrome = {
|
systemd.services.navidrome = {
|
||||||
|
after = mkIf (cfg.library.type == "nfs") [ "mnt-music.mount" ];
|
||||||
|
requires = mkIf (cfg.library.type == "nfs") [ "mnt-music.mount" ];
|
||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Restart = cfg.restartPolicy;
|
Restart = cfg.restartPolicy;
|
||||||
EnvironmentFile = config.age.secrets.navidrome.path;
|
EnvironmentFile = config.age.secrets.navidrome.path;
|
||||||
|
|
BIN
secrets/acme.age
Normal file
BIN
secrets/acme.age
Normal file
Binary file not shown.
|
@ -24,4 +24,9 @@ in
|
||||||
shan
|
shan
|
||||||
ny
|
ny
|
||||||
];
|
];
|
||||||
|
"acme.age".publicKeys = [
|
||||||
|
shan
|
||||||
|
raptus
|
||||||
|
ny
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
Enabled = true;
|
Enabled = true;
|
||||||
};
|
};
|
||||||
GUI = {
|
GUI = {
|
||||||
ApplicationTheme = "auto";
|
ApplicationTheme = "dark";
|
||||||
ColorPasswords = true;
|
ColorPasswords = true;
|
||||||
MinimizeOnClose = true;
|
MinimizeOnClose = true;
|
||||||
MinimizeOnStartup = true;
|
MinimizeOnStartup = true;
|
||||||
|
|
Loading…
Add table
Reference in a new issue