trying to fix autologin keyring stuff
This commit is contained in:
parent
7ac4a11588
commit
6adf12b5de
10 changed files with 66 additions and 60 deletions
48
flake.lock
generated
48
flake.lock
generated
|
|
@ -88,11 +88,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747931129,
|
||||
"narHash": "sha256-kiZHNTbdMRdKFZlBcx1PI5hBu8Hounl/JQdueAoufqM=",
|
||||
"lastModified": 1748017501,
|
||||
"narHash": "sha256-9kCYqXpjaQkXpOrc1b/hac2Wzx8b/3zzajpO1ei7N00=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "67fa10fdfd0e958dceb60ce893956aad1ed6bce4",
|
||||
"rev": "d7ab9d00bc840fec8a76375634ae36d406ab0513",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -376,11 +376,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747955385,
|
||||
"narHash": "sha256-AKoBFaEGN02tGvBlkwVIDOGXouHvrTTfOUcvBDGxkxQ=",
|
||||
"lastModified": 1747978958,
|
||||
"narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "a868570581f0dbdef7e33c8c9bb34b735dfcbacf",
|
||||
"rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -785,11 +785,11 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747929338,
|
||||
"narHash": "sha256-qGMrtBvWWKPElGpQ4ZPZVGN8HLC+laJHkwcsJB7wwGs=",
|
||||
"lastModified": 1747980132,
|
||||
"narHash": "sha256-jdQZZDMYl9JBtWupRRneP1NLDylf2KPUu8z72tJVBJI=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "5b5c0cc698a19c5a10ef1aee487cae238a4aac1e",
|
||||
"rev": "d5ccd8c5e6198bdac760ea65dd6c46e83a55b6f6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -818,11 +818,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747926317,
|
||||
"narHash": "sha256-EBGfaeZ53SNBtsB8dnvBWfjwp+dRDCEkfYyRfwTdbls=",
|
||||
"lastModified": 1747977864,
|
||||
"narHash": "sha256-BEXi6zHNguEsBD3TIUk/2EMOh5c4Z664UaDeUYpWDhw=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "8347cc20dc87049b398ab655565d468c5c4427a0",
|
||||
"rev": "7fdb918cd04076b173a38f026dc5c27ac830b028",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -988,11 +988,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1747676747,
|
||||
"narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=",
|
||||
"lastModified": 1747862697,
|
||||
"narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "72841a4a8761d1aed92ef6169a636872c986c76d",
|
||||
"rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1004,11 +1004,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1747676747,
|
||||
"narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=",
|
||||
"lastModified": 1747862697,
|
||||
"narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "72841a4a8761d1aed92ef6169a636872c986c76d",
|
||||
"rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1036,11 +1036,11 @@
|
|||
},
|
||||
"nixpkgs-stable_4": {
|
||||
"locked": {
|
||||
"lastModified": 1747676747,
|
||||
"narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=",
|
||||
"lastModified": 1747862697,
|
||||
"narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "72841a4a8761d1aed92ef6169a636872c986c76d",
|
||||
"rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1659,11 +1659,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747952334,
|
||||
"narHash": "sha256-3vviUKy/BmqdVtvPHsVXDxmeb7zI3AL41MFx8yqk4+s=",
|
||||
"lastModified": 1747998984,
|
||||
"narHash": "sha256-G5UvtOKD3fmVTnVTh1XCZVoD0HsKO8QI18sMWlYxjLs=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "d621ed2616531c072f7b29ea93ef39cbc46bc79c",
|
||||
"rev": "e48b7105d570f5e66e1891292525e585eeffa58d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -62,9 +62,10 @@ in
|
|||
LSP_USE_PLISTS = "true";
|
||||
GDK_BACKEND= "wayland";
|
||||
NH_FLAKE = "\${HOME}/source/nixos-config";
|
||||
GTRASH_PUT_RM_MODE = "true";
|
||||
};
|
||||
|
||||
stateVersion = "24.05";
|
||||
stateVersion = "24.11";
|
||||
};
|
||||
|
||||
sops = {
|
||||
|
|
|
|||
|
|
@ -148,6 +148,7 @@
|
|||
win-virtio
|
||||
win-spice
|
||||
xwayland-satellite
|
||||
vulkan-tools
|
||||
openrazer-daemon
|
||||
openrgb-with-all-plugins
|
||||
xdg-desktop-portal-termfilechooser
|
||||
|
|
@ -227,8 +228,12 @@
|
|||
graphics = {
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
extraPackages = [
|
||||
pkgs.rocmPackages.clr.icd
|
||||
extraPackages = with pkgs; [
|
||||
rocmPackages.clr.icd
|
||||
amdvlk
|
||||
];
|
||||
extraPackages32 = with pkgs.driversi686Linux; [
|
||||
amdvlk
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -260,7 +265,7 @@
|
|||
#reverseSync.enable = true;
|
||||
#sync.enable = true;
|
||||
};
|
||||
nvidiaSettings = true;
|
||||
# nvidiaSettings = true;
|
||||
};
|
||||
|
||||
brillo.enable = true;
|
||||
|
|
@ -318,6 +323,7 @@
|
|||
pkgs.openrgb-with-all-plugins
|
||||
|
||||
pkgs.gnome-settings-daemon
|
||||
pkgs.gnome-keyring
|
||||
|
||||
(pkgs.writeTextFile {
|
||||
name = "on-battery";
|
||||
|
|
@ -365,9 +371,9 @@
|
|||
|
||||
pam = {
|
||||
services = {
|
||||
swaylock = { };
|
||||
hyprlock = { };
|
||||
hyprlock = { enableGnomeKeyring = true; };
|
||||
greetd.enableGnomeKeyring = true;
|
||||
niri.enableGnomeKeyring = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -386,15 +392,11 @@
|
|||
"2620:fe::fe"
|
||||
"2620:fe::9"
|
||||
];
|
||||
# wireless.iwd = {
|
||||
# enable = true;
|
||||
# };
|
||||
networkmanager = {
|
||||
enable = true;
|
||||
# wifi = {
|
||||
# powersave = true;
|
||||
# backend = "iwd";
|
||||
# };
|
||||
wifi = {
|
||||
powersave = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -413,10 +415,13 @@
|
|||
enable = true;
|
||||
settings = {
|
||||
default_session = {
|
||||
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --sessions /${config.services.displayManager.sessionData.desktops}/share/wayland-sessions --remember --remember-user-session --user-menu --window-padding 5 --asterisks --asterisks-char ^ --greeting '<~welcome~>' --theme 'button=yellow'";
|
||||
# --theme 'border=magenta;prompt=green;time=red;action=blue;button=yellow;container=black;input=red'";
|
||||
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --sessions /${config.services.displayManager.sessionData.desktops}/share/wayland-sessions --remember-user-session --user-menu --window-padding 5 --asterisks --asterisks-char ^ --greeting '<~welcome~>' --theme 'button=yellow'";
|
||||
user = "greeter";
|
||||
};
|
||||
initial_session = {
|
||||
user = "emenel";
|
||||
command = "/run/current-system/sw/bin/niri-session";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -425,8 +430,12 @@
|
|||
# services.xserver.desktopManager.gnome.enable = true;
|
||||
|
||||
services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu.
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
services.gnome.gnome-settings-daemon.enable = true;
|
||||
services.gnome = {
|
||||
gnome-keyring.enable = true;
|
||||
gnome-settings-daemon.enable = true;
|
||||
evolution-data-server.enable = true;
|
||||
gnome-online-accounts.enable = true;
|
||||
};
|
||||
|
||||
services.picom = {
|
||||
enable = true;
|
||||
|
|
@ -530,7 +539,6 @@
|
|||
];
|
||||
|
||||
services.accounts-daemon.enable = true;
|
||||
services.gnome.gnome-online-accounts.enable = true;
|
||||
|
||||
# programs.virt-manager.enable = true;
|
||||
# systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware" ];
|
||||
|
|
@ -617,6 +625,6 @@
|
|||
|
||||
|
||||
#do not change
|
||||
system.stateVersion = "24.05";
|
||||
system.stateVersion = "24.11";
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -238,10 +238,6 @@
|
|||
name = "rmpc (music player)";
|
||||
exec = "/home/emenel/.local/bin/wezapp rmpc";
|
||||
};
|
||||
ncmpcpp = {
|
||||
name = "ncmpcpp (music player)";
|
||||
exec = "/home/emenel/.local/bin/wezapp ncmpcpp";
|
||||
};
|
||||
isd = {
|
||||
name = "isd (interactive systemd)";
|
||||
exec = "/home/emenel/.local/bin/wezapp isd";
|
||||
|
|
@ -265,10 +261,6 @@
|
|||
name = "bluetui (bluetooth manager)";
|
||||
exec = "/home/emenel/.local/bin/wezapp bluetui";
|
||||
};
|
||||
gtrash = {
|
||||
name = "gtrash";
|
||||
exec = "/home/emenel/.local/bin/wezapp gtrash r";
|
||||
};
|
||||
color-picker-clip = {
|
||||
name = "wl color picker (clipboard)";
|
||||
exec = "${pkgs.wl-color-picker}/bin/wl-color-picker clipboard";
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
procs
|
||||
|
||||
jre
|
||||
jdk
|
||||
|
||||
tree-sitter
|
||||
(tree-sitter.withPlugins (_: tree-sitter.allGrammars))
|
||||
|
|
|
|||
|
|
@ -103,6 +103,7 @@
|
|||
"em" = "emacsclient -n -r";
|
||||
"mkdir" = "mkdir -pv";
|
||||
"gt" = "gtrash";
|
||||
"rm" = "gtrash put";
|
||||
};
|
||||
interactiveShellInit = ''
|
||||
bind --erase \ct
|
||||
|
|
|
|||
|
|
@ -84,8 +84,8 @@ ${shared-alias}
|
|||
(deflayer navigation
|
||||
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prtsc
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = \ del home
|
||||
tab q w e r t y u i o p [ ] bspc end
|
||||
@supesc a s d f g left down up right ; ' ret pgup
|
||||
tab q w e r t home pgdn pgup end p [ ] bspc end
|
||||
caps a s d f g left down up right ; ' ret pgup
|
||||
@sp-lsft z x c v b n m , . / @sp-rsft up pgdn
|
||||
lmet @controls lalt lctrl _ rctrl ralt rmet left down right)
|
||||
|
||||
|
|
|
|||
|
|
@ -37,5 +37,7 @@
|
|||
gst_all_1.gst-plugins-base
|
||||
glib
|
||||
alsa-lib
|
||||
jdk
|
||||
vulkan-loader
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
|
|||
harfbuzz
|
||||
libglvnd
|
||||
libjack2
|
||||
# libjpeg8 is required for converting jpeg's to colour palettes
|
||||
libjpeg
|
||||
libxcb
|
||||
libXcursor
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchzip,
|
||||
fetchFromGitHub,
|
||||
openssl,
|
||||
pkg-config,
|
||||
installShellFiles,
|
||||
|
|
@ -24,14 +24,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rbw-latest";
|
||||
version = "1.13.2";
|
||||
version = "latest";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz";
|
||||
hash = "sha256-ebLbdIF+BybK7ssNtZacGWmAEwdNZh8b94QYgvcwzmM=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "doy";
|
||||
repo = "rbw";
|
||||
rev = "HEAD";
|
||||
hash = "sha256-ZgUjsfUZbvD4aJLS62sGIObzQZgdZg27sccTFvQFerk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xDb4shDHCbd0yuTSAt80i1aqyuhpkfd/fYF98CfXdcM=";
|
||||
cargoHash = "sha256-0LRDFT2ElhKtmSCrAeJ4YMUiVe7Ph1EGlmjqpn2GfXw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue