Compare commits

..

No commits in common. "5e4969dc7bf8cf3b666694401523f5355e432828" and "3b35135879e3336875b77adc462756a98684a94d" have entirely different histories.

9 changed files with 20 additions and 36 deletions

24
flake.lock generated
View file

@ -88,11 +88,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741352980, "lastModified": 1740872218,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "rev": "3876f6b87db82f33775b1ef5ea343986105db764",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,11 +206,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741579508, "lastModified": 1740845322,
"narHash": "sha256-skRbH+UF2ES+msEa+KWi7AQFX73S+QsGlPsyCU6XyE0=", "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "744f749dd6fbc1489591ea370b95156858629cb9", "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -221,11 +221,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1741325094, "lastModified": 1740646007,
"narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -265,11 +265,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1741379970, "lastModified": 1740828860,
"narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -10,6 +10,9 @@ 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";
@ -176,8 +179,8 @@ mkIf osConfig.programs.hyprland.enable {
"$mod, down, movefocus, d" "$mod, down, movefocus, d"
# Example special workspace (scratchpad) # Example special workspace (scratchpad)
"$mod, W, togglespecialworkspace, magic" "$mod, D, togglespecialworkspace, magic"
"$mod SHIFT, W, movetoworkspace, special:magic" "$mod SHIFT, D, 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"

View file

@ -26,7 +26,6 @@ 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 = {
@ -98,9 +97,6 @@ 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;
}; };
}; };

View file

@ -4,15 +4,9 @@
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";

View file

@ -27,7 +27,6 @@
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 = {
@ -150,7 +149,7 @@
defaults = { defaults = {
email = "contact@ccnlc.eu"; email = "contact@ccnlc.eu";
dnsProvider = "ovh"; dnsProvider = "ovh";
environmentFile = config.age.secrets.acme.path; environmentFile = "/run/secrets/ovh";
}; };
certs."ccnlc.eu" = { certs."ccnlc.eu" = {
@ -162,7 +161,7 @@
enable = true; enable = true;
recommendedProxySettings = true; recommendedProxySettings = true;
recommendedTlsSettings = true; recommendedTlsSettings = true;
clientMaxBodySize = "2000M"; clientMaxBodySize = "100M";
virtualHosts = virtualHosts =
let let
mkVHLocal = mkVH "http://localhost"; mkVHLocal = mkVH "http://localhost";

View file

@ -76,9 +76,6 @@ 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;

Binary file not shown.

View file

@ -24,9 +24,4 @@ in
shan shan
ny ny
]; ];
"acme.age".publicKeys = [
shan
raptus
ny
];
} }

View file

@ -11,7 +11,7 @@
Enabled = true; Enabled = true;
}; };
GUI = { GUI = {
ApplicationTheme = "dark"; ApplicationTheme = "auto";
ColorPasswords = true; ColorPasswords = true;
MinimizeOnClose = true; MinimizeOnClose = true;
MinimizeOnStartup = true; MinimizeOnStartup = true;