nix: start keyring as service to fix issues, add packages

This commit is contained in:
Julian Mutter 2023-03-23 14:41:25 +01:00
parent 18b670ceec
commit b10652b0bb
5 changed files with 78 additions and 8 deletions

View File

@ -264,11 +264,11 @@ exec --no-startup-id nextcloud --background
# exec --no-startup-id xfce4-screensaver
# Authentication agent
exec --no-startup-id /usr/bin/env gnome-keyring-daemon --start
{{#if dotter.packages.nix}}
exec --no-startup-id /etc/manual-links/polkit-gnome-authentication-agent-1
{{else}}
exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec --no-startup-id /usr/bin/env gnome-keyring-daemon --start
{{/if}}
# Notify about software updates

View File

@ -154,6 +154,10 @@
xdg.portal.enable = true;
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
services.emacs.enable = true;
services.gnome.gnome-keyring.enable = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
@ -168,8 +172,14 @@
git
dotter
mc
broot
rnr # renaming tool in rust
doublecmd
mucommander
tree
alacritty
wezterm
kitty
starship
zsh
bat
@ -186,12 +196,15 @@
pciutils # lspci
nixfmt
gnome.gnome-keyring
gnome.seahorse
polkit_gnome
nix-index
python3
black
libnotify
# unstable.tor-browser-bundle-bin
libclang
libreoffice
killall
findutils
xorg.xkill
@ -217,6 +230,8 @@
julia-bin
xdg-desktop-portal-gtk
discord
lnav # log analyzing tool
fdupes # find and delete duplicate files
];
nixpkgs.overlays = [

60
nix/flake.lock generated
View File

@ -1,17 +1,51 @@
{
"nodes": {
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"nix-matlab": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1678978893,
"narHash": "sha256-fJTi5rqDGmb5AnfcZBVLsXJ5jkEW8h16nkRqD1/Ll6Y=",
"owner": "doronbehar",
"repo": "nix-matlab",
"rev": "3775c69ddda960114131e6492484c025ae3873f3",
"type": "gitlab"
},
"original": {
"owner": "doronbehar",
"repo": "nix-matlab",
"type": "gitlab"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1678872516,
"narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
"lastModified": 1678875422,
"narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
"rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-22.11",
"type": "indirect"
}
},
@ -30,9 +64,25 @@
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1678872516,
"narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-22.11",
"type": "indirect"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs",
"nix-matlab": "nix-matlab",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable"
}
}

View File

@ -2,9 +2,10 @@
inputs.nixpkgs.url = "nixpkgs/nixos-22.11";
inputs.nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
inputs.nix-matlab.url = "gitlab:doronbehar/nix-matlab";
# inputs.home-manager.url = "github:nix-community/home-manager";
outputs = { self, nixpkgs, nixpkgs-unstable, ... }@attrs:
outputs = { self, nixpkgs, nixpkgs-unstable, nix-matlab, ... }@attrs:
let
system = "x86_64-linux";
overlay-unstable = final: prev: {
@ -21,7 +22,9 @@
specialArgs = attrs;
modules = [
# Overlays-module makes "pkgs.unstable" available in configuration.nix
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
({ config, pkgs, ... }: {
nixpkgs.overlays = [ overlay-unstable nix-matlab.overlay ];
})
./configuration.nix
];
};

View File

@ -135,3 +135,5 @@ fi
if type direnv &> /dev/null; then
eval "$(direnv hook zsh)"
fi
source /home/julian/.config/broot/launcher/bash/br