From 2aa2a5ecbabe99097fb1aabe460d72c780c94ed4 Mon Sep 17 00:00:00 2001 From: Jan-Bulthuis Date: Thu, 27 Feb 2025 11:13:33 +0100 Subject: [PATCH] Fixed the system keyring --- user-modules/keyring/default.nix | 2 +- user-modules/keyring/systemwide.nix | 6 +- users/jan.nix | 370 ++++++++++++++-------------- 3 files changed, 191 insertions(+), 187 deletions(-) diff --git a/user-modules/keyring/default.nix b/user-modules/keyring/default.nix index 63734fa..d77dfc9 100644 --- a/user-modules/keyring/default.nix +++ b/user-modules/keyring/default.nix @@ -15,9 +15,9 @@ in }; config = mkIf cfg.enable { - # Development packages home.packages = with pkgs; [ seahorse ]; + services.gnome-keyring.enable = true; }; } diff --git a/user-modules/keyring/systemwide.nix b/user-modules/keyring/systemwide.nix index 2068e29..2cb8422 100644 --- a/user-modules/keyring/systemwide.nix +++ b/user-modules/keyring/systemwide.nix @@ -1,7 +1,7 @@ { keyring = { - services.gnome.gnome-keyring = { - enable = true; - }; + services.gnome.gnome-keyring.enable = true; + security.pam.services.greetd.enableGnomeKeyring = true; + security.pam.services.login.enableGnomeKeyring = true; }; } diff --git a/users/jan.nix b/users/jan.nix index 2bd51e8..d4e31fe 100644 --- a/users/jan.nix +++ b/users/jan.nix @@ -23,8 +23,10 @@ freecad-wayland inkscape ente-auth + bitwarden ]; + # desktop.development = "river-light"; desktop.environments = { river-dark = { name = "River Dark"; @@ -57,6 +59,12 @@ }; # 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 = { enable = true; flavor = "mocha"; @@ -94,186 +102,198 @@ }; # 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 = { enable = true; flavor = lib.mkForce "latte"; }; }; }; - cosmic = { - name = "Cosmic"; - type = "custom"; - config = { }; - extraConfig = { - desktop = { - initScript = '' - ${pkgs.dbus}/bin/dbus-run-session ${pkgs.cosmic-session}/bin/cosmic-session - ''; - session = { - type = "wayland"; - desktop = "cosmic"; - }; - }; - home.packages = with pkgs; [ - adwaita-icon-theme - alsa-utils - 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 + # cosmic = { + # name = "Cosmic"; + # type = "custom"; + # config = { }; + # extraConfig = { + # desktop = { + # initScript = '' + # ${pkgs.cosmic-session}/bin/cosmic-session + # ''; + # session = { + # type = "wayland"; + # desktop = "cosmic"; + # }; + # }; + # # TODO: Remove everything below, it is here out of convenience and should be elsewhere + # xdg.portal = { + # enable = true; - # Fonts - fira - noto-fonts - open-sans - ]; + # config.common.default = [ + # "cosmic" + # "gtk" + # ]; - xdg.portal = { - enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-cosmic - xdg-desktop-portal-gtk - ]; - configPackages = lib.mkDefault (with pkgs; [ xdg-desktop-portal-cosmic ]); - }; + # extraPortals = with pkgs; [ + # xdg-desktop-portal-cosmic + # xdg-desktop-portal-gtk + # ]; - }; - }; - gnome = { - name = "Gnome"; - type = "custom"; - config = { }; - extraConfig = { - programs = { - gnome-shell.enable = true; - }; - desktop = { - initScript = '' - ${pkgs.dbus}/bin/dbus-run-session ${pkgs.gnome-session}/bin/gnome-session - ''; - session = { - type = "wayland"; - desktop = "GNOME"; - }; - }; - 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 + # configPackages = lib.mkDefault (with pkgs; [ xdg-desktop-portal-cosmic ]); + # }; + # home.packages = with pkgs; [ + # adwaita-icon-theme + # alsa-utils + # 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 - # 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 + # # Fonts + # fira + # noto-fonts + # open-sans + # ]; + # }; + # }; + # gnome = { + # name = "Gnome"; + # type = "custom"; + # config = { }; + # extraConfig = { + # programs = { + # gnome-shell.enable = true; + # }; + # desktop = { + # initScript = '' + # ${pkgs.gnome-session}/bin/gnome-session + # ''; + # session = { + # type = "wayland"; + # desktop = "GNOME"; + # }; + # }; - # 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 + # # TODO: Remove everything below, it is here out of convenience and should be elsewhere + # xdg.portal = { + # enable = true; - # Fonts - pkgs.cantarell-fonts - pkgs.dejavu_fonts - pkgs.source-code-pro # Default monospace font in 3.32 - pkgs.source-sans + # config.common.default = [ + # "gnome" + # "gtk" + # ]; - # Other stuff - pkgs.gnome-session - # pkgs.gnome-session.sessions - ]; - }; - }; + # extraPortals = with pkgs; [ + # xdg-desktop-portal-gnome + # 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 modules = { # Communication @@ -283,11 +303,11 @@ # Browser firefox = { enable = true; - default = true; + default = false; }; qutebrowser = { enable = true; - default = false; + default = true; }; # Gaming @@ -365,21 +385,5 @@ 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 - ]; - }; - }; }