Compare commits

..

2 Commits

Author SHA1 Message Date
5911da7f99 various fixes 2026-01-28 10:05:29 +00:00
d1949310c5 change(server): traefik rules 2026-01-28 10:05:29 +00:00
7 changed files with 74 additions and 33 deletions

View File

@@ -98,30 +98,30 @@
}; };
}); });
}) })
( # (
final: prev: # final: prev:
let # let
system = prev.stdenv.hostPlatform.system; # system = prev.stdenv.hostPlatform.system;
pkgs_gamescope = import inputs.nixpkgs-gamescope { # pkgs_gamescope = import inputs.nixpkgs-gamescope {
inherit system; # inherit system;
config = { # config = {
allow_unfree = true; # allow_unfree = true;
}; # };
}; # };
packageNix = "${inputs.nixpkgs-gamescope}/pkgs/by-name/ga/gamescope/package.nix"; # packageNix = "${inputs.nixpkgs-gamescope}/pkgs/by-name/ga/gamescope/package.nix";
in # in
{ # {
gamescope = pkgs_gamescope.callPackage packageNix { }; # gamescope = pkgs_gamescope.callPackage packageNix { };
} # }
) # )
(self: super: { # (self: super: {
intel-npu-driver = super.intel-npu-driver.overrideAttrs (oldAttrs: rec { # intel-npu-driver = super.intel-npu-driver.overrideAttrs (oldAttrs: rec {
installPhase = '' # installPhase = ''
mkdir -p $out/lib/firmware # mkdir -p $out/lib/firmware
${oldAttrs.installPhase} # ${oldAttrs.installPhase}
''; # '';
}); # });
}) # })
(final: prev: { (final: prev: {
vesktop = prev.vesktop.overrideAttrs (old: { vesktop = prev.vesktop.overrideAttrs (old: {
preBuild = '' preBuild = ''

View File

@@ -61,6 +61,9 @@ in
"doloro" "doloro"
]; ];
}; };
services.gnome.gnome-keyring.enable = true;
hardware = { hardware = {
firmware = [ pkgs.intel-npu-driver ]; firmware = [ pkgs.intel-npu-driver ];
cpu.intel = { cpu.intel = {
@@ -149,6 +152,7 @@ in
# tlp-pd # tlp-pd
brightnessctl brightnessctl
nvtopPackages.intel nvtopPackages.intel
seahorse
]; ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are

View File

@@ -31,6 +31,8 @@ in
services.resolved.enable = true; services.resolved.enable = true;
services.gnome.gnome-keyring.enable = true;
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
@@ -234,7 +236,7 @@ in
programs = { programs = {
ssh = { ssh = {
# enable = true; # enable = true;
startAgent = true; # startAgent = true;
}; };
fish.enable = true; fish.enable = true;
@@ -272,6 +274,7 @@ in
wget wget
killall killall
sops sops
seahorse
]; ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are

View File

@@ -29,13 +29,27 @@ in
staticConfigOptions = { staticConfigOptions = {
entryPoints = { entryPoints = {
web = { web = {
address = "0.0.0.0:80"; address = ":80";
http.redirections.entrypoint = {
to = "websecure";
scheme = "https";
};
asDefault = true; asDefault = true;
}; };
websecure = {
address = ":443";
asDefault = true;
http.tls.certResolver = "letsencrypt";
};
traefik = { traefik = {
address = ":8081"; address = ":8081";
}; };
}; };
certificatesResolvers.letsencrypt.acme = {
email = "doloroo@proton.me";
storage = "${config.services.traefik.dataDir}/acme.json";
httpChallenge.entryPoint = "web";
};
api.dashboard = true; api.dashboard = true;
api.insecure = true; api.insecure = true;
}; };

View File

@@ -37,8 +37,8 @@ in
package = pkgs-unstable.mesa; package = pkgs-unstable.mesa;
# if you also want 32-bit support (e.g for Steam) # if you also want 32-bit support (e.g for Steam)
enable32Bit = true; # enable32Bit = true;
package32 = pkgs-unstable.pkgsi686Linux.mesa; # package32 = pkgs-unstable.pkgsi686Linux.mesa;
}; };
}; };
} }

View File

@@ -1,11 +1,31 @@
{ inputs, pkgs, ... }: { inputs, pkgs, ... }:
let
config = pkgs.writeTextFile {
name = "config";
text = ''
width = 100%
height = 100%
border-width = 0
outline-width = 0
padding-left = 35%
padding-top = 35%
result-spacing = 25
num-results = 5
font = monospace
background-color = #000A
'';
};
script = pkgs.writeShellScript "mreow" ''
exec $(tofi-drun -c ${config})
'';
in
{ {
home.packages = [ home.packages = [
pkgs.kickoff pkgs.tofi
]; ];
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
bind = [ bind = [
"$mainMod, R, exec, kickoff" "$mainMod, R, exec, ${script}"
]; ];
}; };
# systemd.user.services.hyprlauncher-deamon = { # systemd.user.services.hyprlauncher-deamon = {

View File

@@ -143,9 +143,9 @@ in
]; ];
windowrule = [ windowrule = [
"match:class .*, suppress_event maximize" "match:class .*, suppress_event maximize"
"match:class ^(gamescope)$, workspace 5" "match:class gamescope, workspace 5"
"match:class ^(gamescope)$, fullscreen true" "match:class gamescope, fullscreen true"
"match:class ^(gamescope)$, immediate true" "match:class gamescope, immediate true"
"match:class ^(steam)$, workspace 6 silent" "match:class ^(steam)$, workspace 6 silent"
"match:class ^(vesktop)$, workspace 8 silent" "match:class ^(vesktop)$, workspace 8 silent"
"match:class ^(org.telegram.desktop)$, workspace 8 silent" "match:class ^(org.telegram.desktop)$, workspace 8 silent"