toplevel,steveej-x13s,sj-srv1: bump to nixos 25.05
This commit is contained in:
parent
a1df9205d5
commit
08817d93bc
16 changed files with 154 additions and 279 deletions
|
@ -131,7 +131,7 @@ in
|
|||
# FIXME: depends on insecure openssl 1.1.1t
|
||||
# kotatogram-desktop
|
||||
pkgsUnstable.tdesktop
|
||||
pkgsUnstable.signal-desktop-source
|
||||
pkgsUnstable.signal-desktop
|
||||
|
||||
# Virtualization
|
||||
virt-manager
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
# Hidden=true
|
||||
# '';
|
||||
|
||||
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
|
||||
services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
|
||||
|
||||
dconf.settings =
|
||||
let
|
||||
|
|
|
@ -39,7 +39,7 @@ in
|
|||
enable = true;
|
||||
};
|
||||
|
||||
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
|
||||
services.gpg-agent.pinentry.package = pkgs.pinentry-gnome3;
|
||||
|
||||
home.packages = [
|
||||
pkgs.swayidle
|
||||
|
|
|
@ -40,14 +40,20 @@ let
|
|||
|
||||
search = {
|
||||
force = true;
|
||||
default = "DuckDuckGo";
|
||||
privateDefault = "DuckDuckGo";
|
||||
default = "ddg";
|
||||
privateDefault = "ddg";
|
||||
|
||||
order = [
|
||||
"ddg"
|
||||
"ecosia"
|
||||
"google"
|
||||
];
|
||||
};
|
||||
|
||||
mkProfile =
|
||||
override:
|
||||
lib.recursiveUpdate {
|
||||
extensions = ryceeAddons ++ customAddons;
|
||||
extensions.packages = ryceeAddons ++ customAddons;
|
||||
inherit search;
|
||||
|
||||
settings = {
|
||||
|
@ -321,7 +327,7 @@ in
|
|||
};
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
package = pkgs.firefox-esr;
|
||||
package = pkgs.firefox;
|
||||
|
||||
profiles = mkProfiles {
|
||||
"personal" = mkProfile {
|
||||
|
@ -377,8 +383,33 @@ in
|
|||
id = 12;
|
||||
color = colors.pink;
|
||||
};
|
||||
"tech-research" = mkProfile {
|
||||
id = 13;
|
||||
color = colors.purple;
|
||||
};
|
||||
};
|
||||
|
||||
# policies = {
|
||||
# # search via policy. the other one doesn't always work because of schema version mismatch
|
||||
# SearchEngines = {
|
||||
# Default = "Qwant";
|
||||
# PreventInstalls = true;
|
||||
|
||||
# Add = [
|
||||
# {
|
||||
# Method = "GET";
|
||||
# Alias = "qwant";
|
||||
# Description = "Description";
|
||||
# # PostData= "name=value&q={searchTerms}";
|
||||
|
||||
# Name = "Qwant";
|
||||
# SuggestURLTemplate = "https://api.qwant.com/api/suggest/?q={searchTerms}";
|
||||
# URLTemplate = "https://www.qwant.com/?q={searchTerms}";
|
||||
# }
|
||||
# ];
|
||||
# };
|
||||
# };
|
||||
|
||||
};
|
||||
|
||||
# create one desktop entry for each profile
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
enableScDaemon = !osConfig.services.pcscd.enable;
|
||||
enableSshSupport = true;
|
||||
grabKeyboardAndMouse = true;
|
||||
pinentryPackage = lib.mkDefault pkgs.pinentry-gtk2;
|
||||
pinentry.package = lib.mkDefault pkgs.pinentry-gtk2;
|
||||
extraConfig = ''
|
||||
no-allow-external-cache
|
||||
'';
|
||||
|
|
|
@ -68,6 +68,8 @@
|
|||
|
||||
# This plugin trims trailing whitespace and lines.
|
||||
trim.enable = true;
|
||||
|
||||
web-devicons.enable = true;
|
||||
};
|
||||
|
||||
# plugins = with pkgs;
|
||||
|
|
|
@ -5,12 +5,13 @@
|
|||
# home.sessionVariables.PASSWORD_STORE_ENABLE_EXTENSIONS = "true";
|
||||
# programs.browserpass.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
gnupg
|
||||
home.packages = [
|
||||
pkgs.gnupg
|
||||
|
||||
# broken on wayland
|
||||
# rofi-pass
|
||||
|
||||
repoFlake.packages.${pkgs.system}.prs
|
||||
(pkgs.callPackage repoFlake.lib.prsFn {
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@ in
|
|||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgsVscodium.vscodium;
|
||||
extensions =
|
||||
profiles.default.extensions =
|
||||
with pkgsVscodium.vscode-extensions;
|
||||
[
|
||||
eamodio.gitlens
|
||||
|
|
|
@ -48,8 +48,8 @@ in
|
|||
|
||||
# will be called again by oh-my-zsh
|
||||
enableCompletion = false;
|
||||
enableAutosuggestions = true;
|
||||
initExtra =
|
||||
autosuggestion.enable = true;
|
||||
initContent =
|
||||
let
|
||||
inNixShell = ''$([[ -n "$IN_NIX_SHELL" ]] && printf " 🐚")'';
|
||||
in
|
||||
|
|
|
@ -66,7 +66,6 @@
|
|||
services.dovecot2 = {
|
||||
enable = true;
|
||||
|
||||
modules = [ pkgs.dovecot_pigeonhole ];
|
||||
protocols = [ "sieve" ];
|
||||
|
||||
enableImap = true;
|
||||
|
@ -98,6 +97,10 @@
|
|||
'';
|
||||
};
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.dovecot_pigeonhole
|
||||
];
|
||||
|
||||
environment.etc."dovecot/users".source = config.sops.secrets.email_dovecot_steveej.path;
|
||||
|
||||
systemd.services.steveej-getmail-stefanjunker = {
|
||||
|
|
|
@ -17,6 +17,7 @@ in
|
|||
|
||||
${nodeName} = {
|
||||
deployment.targetHost = "${nodeName}.dmz.internal";
|
||||
# deployment.targetHost = "www.stefanjunker.de";
|
||||
deployment.replaceUnknownProfiles = false;
|
||||
|
||||
imports = [
|
||||
|
|
8
nix/os/devices/steveej-x13s/flake.lock
generated
8
nix/os/devices/steveej-x13s/flake.lock
generated
|
@ -317,11 +317,11 @@
|
|||
"x13s-bt-linux-firmware": "x13s-bt-linux-firmware"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747744086,
|
||||
"narHash": "sha256-0LrtJ8neM2t4aDEBsARQiLPIOTjJYiishSPGyMag6a8=",
|
||||
"lastModified": 1748099804,
|
||||
"narHash": "sha256-InLtMaIZdbAvLM/q3xgaCAdgf6dWQxZD0CIVZTixENI=",
|
||||
"ref": "bump",
|
||||
"rev": "e1bba11447f2322dbfcc81f64e70c6b0acf87c92",
|
||||
"revCount": 149,
|
||||
"rev": "077e9017236b6a7d9f6e658060099892628863d3",
|
||||
"revCount": 150,
|
||||
"type": "git",
|
||||
"url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git"
|
||||
},
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
# hardware related services
|
||||
services.pcscd.enable = true;
|
||||
hardware.opengl.enable = true;
|
||||
hardware.graphics.enable = true;
|
||||
|
||||
services.udev.packages = [
|
||||
pkgs.libu2f-host
|
||||
|
|
|
@ -16,7 +16,7 @@ in
|
|||
Option "OffTime" "0"
|
||||
'';
|
||||
|
||||
hardware.opengl.enable = true;
|
||||
hardware.graphics.enable = true;
|
||||
|
||||
services.gvfs = {
|
||||
enable = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue