Jan
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the system keyring

This commit is contained in:
Jan-Bulthuis 2025-02-27 11:13:33 +01:00
parent c4326f1aba
commit 2aa2a5ecba
3 changed files with 191 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
user-modules/keyring/default.nix
View File

@ -15,9 +15,9 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
# Development packages
home.packages = with pkgs; [ home.packages = with pkgs; [
seahorse seahorse
]; ];
services.gnome-keyring.enable = true;
}; };
} }

6
user-modules/keyring/systemwide.nix
View File

@ -1,7 +1,7 @@
{ {
keyring = { keyring = {
services.gnome.gnome-keyring = { services.gnome.gnome-keyring.enable = true;
enable = true; security.pam.services.greetd.enableGnomeKeyring = true;
}; security.pam.services.login.enableGnomeKeyring = true;
}; };
} }

370
users/jan.nix
View File

@ -23,8 +23,10 @@
freecad-wayland freecad-wayland
inkscape inkscape
ente-auth ente-auth
bitwarden
]; ];
# desktop.development = "river-light";
desktop.environments = { desktop.environments = {
river-dark = { river-dark = {
name = "River Dark"; name = "River Dark";
@ -57,6 +59,12 @@
}; };
# Color scheme # Color scheme
desktop.theming.background = {
# path = "unsorted/a_group_of_mountains_with_a_building_in_the_background.jpg";
path = "anime/a_colorful_buildings_with_power_lines.jpg";
themed = true;
invert = false;
};
desktop.theming.themes.catppuccin = { desktop.theming.themes.catppuccin = {
enable = true; enable = true;
flavor = "mocha"; flavor = "mocha";
@ -94,186 +102,198 @@
}; };
# Color scheme # Color scheme
desktop.theming.background = {
# path = "unsorted/a_group_of_mountains_with_a_building_in_the_background.jpg";
path = "anime/a_cartoon_of_a_street_with_buildings.jpeg";
themed = true;
invert = false;
};
desktop.theming.themes.catppuccin = { desktop.theming.themes.catppuccin = {
enable = true; enable = true;
flavor = lib.mkForce "latte"; flavor = lib.mkForce "latte";
}; };
}; };
}; };
cosmic = { # cosmic = {
name = "Cosmic"; # name = "Cosmic";
type = "custom"; # type = "custom";
config = { }; # config = { };
extraConfig = { # extraConfig = {
desktop = { # desktop = {
initScript = '' # initScript = ''
${pkgs.dbus}/bin/dbus-run-session ${pkgs.cosmic-session}/bin/cosmic-session # ${pkgs.cosmic-session}/bin/cosmic-session
''; # '';
session = { # session = {
type = "wayland"; # type = "wayland";
desktop = "cosmic"; # desktop = "cosmic";
}; # };
}; # };
home.packages = with pkgs; [ # # TODO: Remove everything below, it is here out of convenience and should be elsewhere
adwaita-icon-theme # xdg.portal = {
alsa-utils # enable = true;
cosmic-applets
cosmic-applibrary
cosmic-bg
(cosmic-comp.override {
useXWayland = false;
})
cosmic-edit
cosmic-files
cosmic-greeter
cosmic-icons
cosmic-idle
cosmic-launcher
cosmic-notifications
cosmic-osd
cosmic-panel
cosmic-player
cosmic-randr
cosmic-screenshot
cosmic-session
cosmic-settings
cosmic-settings-daemon
cosmic-term
cosmic-wallpapers
cosmic-workspaces-epoch
hicolor-icon-theme
playerctl
pop-icon-theme
pop-launcher
xdg-user-dirs
xwayland
cosmic-store
# Fonts # config.common.default = [
fira # "cosmic"
noto-fonts # "gtk"
open-sans # ];
];
xdg.portal = { # extraPortals = with pkgs; [
enable = true; # xdg-desktop-portal-cosmic
extraPortals = with pkgs; [ # xdg-desktop-portal-gtk
xdg-desktop-portal-cosmic # ];
xdg-desktop-portal-gtk
];
configPackages = lib.mkDefault (with pkgs; [ xdg-desktop-portal-cosmic ]);
};
}; # configPackages = lib.mkDefault (with pkgs; [ xdg-desktop-portal-cosmic ]);
}; # };
gnome = { # home.packages = with pkgs; [
name = "Gnome"; # adwaita-icon-theme
type = "custom"; # alsa-utils
config = { }; # cosmic-applets
extraConfig = { # cosmic-applibrary
programs = { # cosmic-bg
gnome-shell.enable = true; # (cosmic-comp.override {
}; # useXWayland = false;
desktop = { # })
initScript = '' # cosmic-edit
${pkgs.dbus}/bin/dbus-run-session ${pkgs.gnome-session}/bin/gnome-session # cosmic-files
''; # cosmic-greeter
session = { # cosmic-icons
type = "wayland"; # cosmic-idle
desktop = "GNOME"; # cosmic-launcher
}; # cosmic-notifications
}; # cosmic-osd
home.packages = [ # cosmic-panel
# Core utilities # cosmic-player
pkgs.baobab # cosmic-randr
pkgs.epiphany # cosmic-screenshot
pkgs.gnome-text-editor # cosmic-session
pkgs.gnome-calculator # cosmic-settings
pkgs.gnome-calendar # cosmic-settings-daemon
pkgs.gnome-characters # cosmic-term
pkgs.gnome-clocks # cosmic-wallpapers
pkgs.gnome-console # cosmic-workspaces-epoch
pkgs.gnome-contacts # hicolor-icon-theme
pkgs.gnome-font-viewer # playerctl
pkgs.gnome-logs # pop-icon-theme
pkgs.gnome-maps # pop-launcher
pkgs.gnome-music # xdg-user-dirs
pkgs.gnome-system-monitor # xwayland
pkgs.gnome-weather # cosmic-store
pkgs.loupe
pkgs.nautilus
pkgs.gnome-connections
pkgs.simple-scan
pkgs.snapshot
pkgs.totem
pkgs.yelp
# Optional packages # # Fonts
pkgs.adwaita-icon-theme # fira
pkgs.gnome-backgrounds # noto-fonts
pkgs.gnome-bluetooth # open-sans
pkgs.gnome-color-manager # ];
pkgs.gnome-control-center # };
pkgs.gnome-shell-extensions # };
pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. # gnome = {
pkgs.gnome-user-docs # name = "Gnome";
pkgs.glib # for gsettings program # type = "custom";
pkgs.gnome-menus # config = { };
pkgs.gtk3.out # for gtk-launch program # extraConfig = {
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ # programs = {
pkgs.xdg-user-dirs-gtk # Used to create the default bookmarks # gnome-shell.enable = true;
# };
# desktop = {
# initScript = ''
# ${pkgs.gnome-session}/bin/gnome-session
# '';
# session = {
# type = "wayland";
# desktop = "GNOME";
# };
# };
# Games # # TODO: Remove everything below, it is here out of convenience and should be elsewhere
pkgs.aisleriot # xdg.portal = {
pkgs.atomix # enable = true;
pkgs.five-or-more
pkgs.four-in-a-row
pkgs.gnome-2048
pkgs.gnome-chess
pkgs.gnome-klotski
pkgs.gnome-mahjongg
pkgs.gnome-mines
pkgs.gnome-nibbles
pkgs.gnome-robots
pkgs.gnome-sudoku
pkgs.gnome-taquin
pkgs.gnome-tetravex
pkgs.hitori
pkgs.iagno
pkgs.lightsoff
pkgs.quadrapassel
pkgs.swell-foop
pkgs.tali
# Fonts # config.common.default = [
pkgs.cantarell-fonts # "gnome"
pkgs.dejavu_fonts # "gtk"
pkgs.source-code-pro # Default monospace font in 3.32 # ];
pkgs.source-sans
# Other stuff # extraPortals = with pkgs; [
pkgs.gnome-session # xdg-desktop-portal-gnome
# pkgs.gnome-session.sessions # xdg-desktop-portal-gtk
]; # ];
}; # };
}; # home.packages = [
# # Core utilities
# pkgs.baobab
# pkgs.epiphany
# pkgs.gnome-text-editor
# pkgs.gnome-calculator
# pkgs.gnome-calendar
# pkgs.gnome-characters
# pkgs.gnome-clocks
# pkgs.gnome-console
# pkgs.gnome-contacts
# pkgs.gnome-font-viewer
# pkgs.gnome-logs
# pkgs.gnome-maps
# pkgs.gnome-music
# pkgs.gnome-system-monitor
# pkgs.gnome-weather
# pkgs.loupe
# pkgs.nautilus
# pkgs.gnome-connections
# pkgs.simple-scan
# pkgs.snapshot
# pkgs.totem
# pkgs.yelp
# # Optional packages
# pkgs.adwaita-icon-theme
# pkgs.gnome-backgrounds
# pkgs.gnome-bluetooth
# pkgs.gnome-color-manager
# pkgs.gnome-control-center
# pkgs.gnome-shell-extensions
# pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
# pkgs.gnome-user-docs
# pkgs.glib # for gsettings program
# pkgs.gnome-menus
# pkgs.gtk3.out # for gtk-launch program
# pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
# pkgs.xdg-user-dirs-gtk # Used to create the default bookmarks
# # Games
# pkgs.aisleriot
# pkgs.atomix
# pkgs.five-or-more
# pkgs.four-in-a-row
# pkgs.gnome-2048
# pkgs.gnome-chess
# pkgs.gnome-klotski
# pkgs.gnome-mahjongg
# pkgs.gnome-mines
# pkgs.gnome-nibbles
# pkgs.gnome-robots
# pkgs.gnome-sudoku
# pkgs.gnome-taquin
# pkgs.gnome-tetravex
# pkgs.hitori
# pkgs.iagno
# pkgs.lightsoff
# pkgs.quadrapassel
# pkgs.swell-foop
# pkgs.tali
# # Fonts
# pkgs.cantarell-fonts
# pkgs.dejavu_fonts
# pkgs.source-code-pro # Default monospace font in 3.32
# pkgs.source-sans
# # Other stuff
# pkgs.gnome-session
# # pkgs.gnome-session.sessions
# ];
# };
# };
}; };
# Desktop environments
# desktop.environments =
# let
# in
# [
# {
# name = "river";
# type = "custom";
# config = { };
# extraConfig = {
# home.packages = with pkgs; [ cowsay ];
# };
# }
# ];
# Enabled modules # Enabled modules
modules = { modules = {
# Communication # Communication
@ -283,11 +303,11 @@
# Browser # Browser
firefox = { firefox = {
enable = true; enable = true;
default = true; default = false;
}; };
qutebrowser = { qutebrowser = {
enable = true; enable = true;
default = false; default = true;
}; };
# Gaming # Gaming
@ -365,21 +385,5 @@
flavor = "mocha"; flavor = "mocha";
}; };
}; };
# TODO: Remove everything below, it is here out of convenience and should be elsewhere
xdg.portal = {
enable = true;
config.common.default = [
"wlr"
"gtk"
];
extraPortals = with pkgs; [
xdg-desktop-portal-gtk
xdg-desktop-portal-wlr
];
};
}; };
} }