This commit is contained in:
Till 2026-03-04 19:50:45 +01:00
parent 312d6d63ef
commit 96e5924fb0
17 changed files with 126 additions and 43 deletions

18
flake.lock generated
View file

@ -8,11 +8,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1769054619, "lastModified": 1772596991,
"narHash": "sha256-LCc0gbSgjehdy41Gi1H5WNxEuW9PtRHFVaPXoFzslQU=", "narHash": "sha256-awJJ4ATy9t8Svrx2z0zAftgXnUaGCFb2Ty0u036CnCQ=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "6509620630f68dc02ac3e99f15a67760778444ff", "rev": "cd2d0893966c0a5c27345a9a72d0418b42b7e36d",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -29,11 +29,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767910483, "lastModified": 1772633058,
"narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=", "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c", "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -45,11 +45,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1768028080, "lastModified": 1772598333,
"narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=", "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d03088749a110d52a4739348f39a63f84bb0be14", "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -8,8 +8,8 @@
./firefox.nix ./firefox.nix
./fonts.nix ./fonts.nix
./foot.nix ./foot.nix
./gnome.nix
./media.nix ./media.nix
# ./plasma.nix
./user-dirs.nix ./user-dirs.nix
]; ];

View file

@ -1,7 +1,6 @@
{ config, pkgs, inputs, osConfig, ... }: { config, pkgs, inputs, osConfig, ... }:
{ {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
policies = { policies = {
@ -149,6 +148,7 @@
user_pref("signon.rememberSignons", false); user_pref("signon.rememberSignons", false);
user_pref("toolkit.telemetry.enabled", false); user_pref("toolkit.telemetry.enabled", false);
user_pref("toolkit.telemetry.server", ""); user_pref("toolkit.telemetry.server", "");
user_pref("widget.gtk.libadwaita-colors.enabled", false);
''; '';
}; };
}; };

View file

@ -8,13 +8,13 @@
main = { main = {
shell = "${pkgs.fish}/bin/fish -c 'tmux attach'"; shell = "${pkgs.fish}/bin/fish -c 'tmux attach'";
pad = "34x34"; pad = "34x34";
# font = "JetBrains Mono:size=16"; font = "JetBrains Mono:size=14";
font = "Adwaita Mono:size=17"; # font = "Adwaita Mono:size=17";
font-bold = "Adwaita Mono:size=17:weight=bold"; # font-bold = "Adwaita Mono:size=17:weight=bold";
font-italic = "Adwaita Mono:size=17:slant=italic"; # font-italic = "Adwaita Mono:size=17:slant=italic";
font-bold-italic = "Adwaita Mono:size=17:weight=boldslant=italic"; # font-bold-italic = "Adwaita Mono:size=17:weight=boldslant=italic";
initial-window-mode = "maximized"; # initial-window-mode = "maximized";
initial-color-theme = "dark"; # initial-color-theme = "dark";
}; };
mouse.hide-when-typing = "yes"; mouse.hide-when-typing = "yes";

View file

@ -6,12 +6,14 @@
pinentry-all pinentry-all
]; ];
services.gpg-agent = { # moved to system
enable = true;
pinentry.package = pkgs.pinentry-gnome3; # services.gpg-agent = {
pinentry.program = "pinentry-gnome3"; # enable = true;
enableSshSupport = true; # pinentry.package = pkgs.pinentry-all;
}; # pinentry.program = "pinentry";
# # enableSshSupport = true;
# };
programs.gpg = { programs.gpg = {
enable = true; enable = true;

7
home/hyprland.nix Normal file
View file

@ -0,0 +1,7 @@
{ ... }:
{
wayland.windowManager.hyprland = {
systemd.enable = false;
};
}

View file

@ -51,6 +51,7 @@ let
multipart; xdg-open %s multipart; xdg-open %s
text/html; firefox %s; description=HTML Text; nametemplate=%s.html; needsterminal text/html; firefox %s; description=HTML Text; nametemplate=%s.html; needsterminal
text/html; w3m -v -F -T text/html -dump %s; copiousoutput text/html; w3m -v -F -T text/html -dump %s; copiousoutput
text/calendar; khal import %s
text; neomutt %s text; neomutt %s
application; xdg-open %s application; xdg-open %s
image; xdg-open %s image; xdg-open %s
@ -216,13 +217,13 @@ in
binds = [ binds = [
{ key = "m"; map = [ "index" "pager" ]; action = "noop"; } { key = "m"; map = [ "index" "pager" ]; action = "noop"; }
{ key = "k"; map = "pager"; action = "previous-entry"; } { key = "k"; map = [ "pager" ]; action = "previous-entry"; }
{ key = "j"; map = "pager"; action = "next-entry"; } { key = "j"; map = [ "pager" ]; action = "next-entry"; }
{ key = "<return>"; map = "index"; action = "display-message"; } { key = "<return>"; map = [ "index" ]; action = "display-message"; }
{ key = "<space>"; map = "index"; action = "entire-thread"; } { key = "<space>"; map = "index"; action = "entire-thread"; }
{ key = "gf"; map = [ "index" "pager" ]; action = "change-folder"; } { key = "gf"; map = [ "index" "pager" ]; action = "change-folder"; }
{ key = "<Tab>"; map = "editor"; action = "complete-query"; } { key = "<Tab>"; map = [ "editor" ]; action = "complete-query"; }
{ key = "P"; map = "compose"; action = "pgp-menu"; } { key = "P"; map = [ "compose" ]; action = "pgp-menu"; }
{ key = "p"; map = [ "compose" ]; action = "postpone-message"; } { key = "p"; map = [ "compose" ]; action = "postpone-message"; }
]; ];

View file

@ -50,6 +50,8 @@ onoremap <silent> al :normal val<return>
xnoremap i% GoggV xnoremap i% GoggV
onoremap <silent> i% :normal vi%<return> onoremap <silent> i% :normal vi%<return>
" highlight Normal guibg=NONE
function CreateNote(title) function CreateNote(title)
execute "VimwikiIndex" execute "VimwikiIndex"
execute "VimwikiGoto " . a:title execute "VimwikiGoto " . a:title

View file

@ -136,7 +136,7 @@
{ {
plugin = papercolor-theme; plugin = papercolor-theme;
config = '' config = ''
set background=light " set background=light
colorscheme PaperColor colorscheme PaperColor
''; '';
} }

View file

@ -1,8 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
services.gnome-keyring.enable = false;
programs.password-store = { programs.password-store = {
enable = true; enable = true;
settings = { settings = {
@ -14,14 +12,12 @@
pkgs.passff-host pkgs.passff-host
]; ];
services.gnome-keyring.enable = false;
services.pass-secret-service = { services.pass-secret-service = {
enable = true; enable = true;
}; };
home.packages = with pkgs; [
pinentry-all
];
xdg.configFile."scdaemon" = { xdg.configFile."scdaemon" = {
text = '' text = ''
disable-ccid disable-ccid
@ -29,4 +25,5 @@
''; '';
target = "../.gnupg/scdaemon.conf"; target = "../.gnupg/scdaemon.conf";
}; };
} }

5
home/plasma.nix Normal file
View file

@ -0,0 +1,5 @@
{ ... }:
{
services.kdeconnect.enable = true;
}

View file

@ -9,9 +9,12 @@
../../users/guest/system.nix ../../users/guest/system.nix
../../system ../../system
../../system/desktop ../../system/desktop
../../system/desktop/gnome.nix
# ../../system/desktop/cast.nix
../../system/desktop/ergodox-udev.nix ../../system/desktop/ergodox-udev.nix
# ../../system/desktop/gnome.nix
# ../../system/desktop/hyprland.nix
# ../../system/desktop/cast.nix
# ../../system/desktop/plasma.nix
../../system/desktop/cosmic.nix
../../system/desktop/steam.nix ../../system/desktop/steam.nix
../../system/desktop/yubikey-pam.nix ../../system/desktop/yubikey-pam.nix
]; ];

14
system/desktop/cosmic.nix Normal file
View file

@ -0,0 +1,14 @@
{ lib, ... }:
{
services.desktopManager.cosmic.enable = true;
services.displayManager.cosmic-greeter.enable = true;
services.system76-scheduler.enable = true;
services.gnome.gnome-keyring.enable = lib.mkForce false;
programs.firefox.preferences = {
"widget.gtk.libadwaita-colors.enabled" = false;
};
}

View file

@ -51,4 +51,9 @@
programs.virt-manager.enable = true; programs.virt-manager.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;
programs.gnupg.agent = {
enable = true;
pinentryPackage = pkgs.pinentry-all;
# pinentry.program = "pinentry";
};
} }

View file

@ -4,10 +4,10 @@
{ {
services.desktopManager.gnome.enable = true; services.desktopManager.gnome.enable = true;
services.displayManager = { # services.displayManager = {
gdm.enable = true; # gdm.enable = true;
defaultSession = "gnome"; # defaultSession = "gnome";
}; # };
environment.gnome.excludePackages = with pkgs; [ environment.gnome.excludePackages = with pkgs; [
gnome-tour gnome-tour

View file

@ -0,0 +1,29 @@
{ pkgs, ... }:
{
programs.hyprland = {
enable = true;
withUWSM = true;
# xwayland.enable = true;
};
# programs.regreet = {
# enable = true;
# # For this example you'd need to have a version of Adwaita and the font Cantarell installed
# theme.name = "Adwaita";
# font = {
# name = "Cantarell";
# size = 16;
# };
# cursorTheme.name = "Adwaita";
# };
environment.systemPackages = with pkgs; [
ashell
kitty
mako
tofi
];
}

18
system/desktop/plasma.nix Normal file
View file

@ -0,0 +1,18 @@
{ ... }:
{
services.desktopManager.plasma6.enable = true;
programs.kdeconnect.enable = true;
networking.firewall = rec {
allowedTCPPortRanges = [ { from = 1714; to = 1764; } ];
allowedUDPPortRanges = allowedTCPPortRanges;
};
services.displayManager.sddm = {
enable = true;
wayland.enable = true;
settings.General.DisplayServer = "wayland";
};
}