removed unneeded 'config'
This commit is contained in:
parent
98730fbfee
commit
331c1b5d81
@ -1,5 +1,5 @@
|
||||
{...}: {
|
||||
config.programs.bash = {
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
|
||||
initExtra = ''
|
||||
|
@ -1,5 +1,5 @@
|
||||
{...}: {
|
||||
config.programs.direnv = {
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
|
||||
nix-direnv.enable = true;
|
||||
|
@ -1,5 +1,5 @@
|
||||
{config, ...}: {
|
||||
config.programs.firefox = {
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
|
||||
profiles.kristian = {
|
||||
|
@ -1,9 +1,7 @@
|
||||
{pkgs, ...}: {
|
||||
config = {
|
||||
fonts.fontconfig.enable = true;
|
||||
fonts.fontconfig.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
nerdfonts
|
||||
];
|
||||
};
|
||||
home.packages = with pkgs; [
|
||||
nerdfonts
|
||||
];
|
||||
}
|
||||
|
@ -1,13 +1,15 @@
|
||||
{...}: {
|
||||
config.programs.git = rec {
|
||||
programs.git = rec {
|
||||
enable = true;
|
||||
|
||||
userName = "Kristian Krsnik";
|
||||
userEmail = "git@krsnik.at";
|
||||
|
||||
signing = {
|
||||
key = userEmail;
|
||||
signByDefault = true;
|
||||
};
|
||||
|
||||
extraConfig = {
|
||||
init.defaultBranch = "main";
|
||||
};
|
||||
|
158
common/gnome.nix
158
common/gnome.nix
@ -3,99 +3,97 @@
|
||||
wallpaper,
|
||||
...
|
||||
}: {
|
||||
config = {
|
||||
home.packages = with pkgs.gnomeExtensions; [
|
||||
quick-settings-audio-panel
|
||||
tray-icons-reloaded
|
||||
espresso
|
||||
pano
|
||||
];
|
||||
home.packages = with pkgs.gnomeExtensions; [
|
||||
quick-settings-audio-panel
|
||||
tray-icons-reloaded
|
||||
espresso
|
||||
pano
|
||||
];
|
||||
|
||||
dconf.settings = {
|
||||
# Use `dconf watch /` to track stateful changes you are doing, then set them here.
|
||||
"org/gnome/shell" = {
|
||||
disable-user-extensions = false;
|
||||
enabled-extensions = [
|
||||
"quick-settings-audio-panel@rayzeq.github.io"
|
||||
"places-menu@gnome-shell-extensions.gcampax.github.com"
|
||||
"launch-new-instance@gnome-shell-extensions.gcampax.github.com"
|
||||
"trayIconsReloaded@selfmade.pl"
|
||||
"espresso@coadmunkee.github.com"
|
||||
"pano@elhan.io"
|
||||
];
|
||||
};
|
||||
dconf.settings = {
|
||||
# Use `dconf watch /` to track stateful changes you are doing, then set them here.
|
||||
"org/gnome/shell" = {
|
||||
disable-user-extensions = false;
|
||||
enabled-extensions = [
|
||||
"quick-settings-audio-panel@rayzeq.github.io"
|
||||
"places-menu@gnome-shell-extensions.gcampax.github.com"
|
||||
"launch-new-instance@gnome-shell-extensions.gcampax.github.com"
|
||||
"trayIconsReloaded@selfmade.pl"
|
||||
"espresso@coadmunkee.github.com"
|
||||
"pano@elhan.io"
|
||||
];
|
||||
};
|
||||
|
||||
"org/gnome/desktop/interface" = {
|
||||
color-scheme = "prefer-dark";
|
||||
gtk-theme = "Adwaita-dark";
|
||||
};
|
||||
"org/gnome/desktop/interface" = {
|
||||
color-scheme = "prefer-dark";
|
||||
gtk-theme = "Adwaita-dark";
|
||||
};
|
||||
|
||||
"org/gnome/desktop/background" = let
|
||||
width = 3840;
|
||||
height = 2160;
|
||||
in {
|
||||
picture-uri = "file://${wallpaper.override {
|
||||
preset = "nord-snow-aurora";
|
||||
inherit width;
|
||||
inherit height;
|
||||
}}/share/wallpapers/nixos-wallpaper.png";
|
||||
"org/gnome/desktop/background" = let
|
||||
width = 3840;
|
||||
height = 2160;
|
||||
in {
|
||||
picture-uri = "file://${wallpaper.override {
|
||||
preset = "nord-snow-aurora";
|
||||
inherit width;
|
||||
inherit height;
|
||||
}}/share/wallpapers/nixos-wallpaper.png";
|
||||
|
||||
picture-uri-dark = "file://${wallpaper.override {
|
||||
preset = "nord-night-aurora";
|
||||
inherit width;
|
||||
inherit height;
|
||||
}}/share/wallpapers/nixos-wallpaper.png";
|
||||
};
|
||||
picture-uri-dark = "file://${wallpaper.override {
|
||||
preset = "nord-night-aurora";
|
||||
inherit width;
|
||||
inherit height;
|
||||
}}/share/wallpapers/nixos-wallpaper.png";
|
||||
};
|
||||
|
||||
"org/gnome/desktop/wm/keybindings" = {
|
||||
switch-to-workspace-left = ["<Alt>1"];
|
||||
switch-to-workspace-right = ["<Alt>2"];
|
||||
move-to-workspace-left = ["<Shift><Alt>1"];
|
||||
move-to-workspace-right = ["<Shift><Alt>2"];
|
||||
};
|
||||
"org/gnome/desktop/wm/keybindings" = {
|
||||
switch-to-workspace-left = ["<Alt>1"];
|
||||
switch-to-workspace-right = ["<Alt>2"];
|
||||
move-to-workspace-left = ["<Shift><Alt>1"];
|
||||
move-to-workspace-right = ["<Shift><Alt>2"];
|
||||
};
|
||||
|
||||
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
|
||||
binding = "<Shift><Alt>a";
|
||||
command = "kgx";
|
||||
name = "Console";
|
||||
};
|
||||
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
|
||||
binding = "<Shift><Alt>a";
|
||||
command = "kgx";
|
||||
name = "Console";
|
||||
};
|
||||
|
||||
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
|
||||
binding = "<Shift><Alt>f";
|
||||
command = "nautilus";
|
||||
name = "File Manager";
|
||||
};
|
||||
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
|
||||
binding = "<Shift><Alt>f";
|
||||
command = "nautilus";
|
||||
name = "File Manager";
|
||||
};
|
||||
|
||||
"org/gnome/settings-daemon/plugins/media-keys" = {
|
||||
custom-keybindings = [
|
||||
"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
|
||||
"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/"
|
||||
];
|
||||
};
|
||||
"org/gnome/settings-daemon/plugins/media-keys" = {
|
||||
custom-keybindings = [
|
||||
"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
|
||||
"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/"
|
||||
];
|
||||
};
|
||||
|
||||
"org/gnome/mutter" = {
|
||||
edge-tiling = true;
|
||||
dynamic-workspaces = true;
|
||||
};
|
||||
"org/gnome/mutter" = {
|
||||
edge-tiling = true;
|
||||
dynamic-workspaces = true;
|
||||
};
|
||||
|
||||
"org/gnome/Console" = {
|
||||
theme = "auto";
|
||||
};
|
||||
"org/gnome/Console" = {
|
||||
theme = "auto";
|
||||
};
|
||||
|
||||
"org/gnome/simple-scan" = {
|
||||
text-dpi = 300;
|
||||
};
|
||||
"org/gnome/simple-scan" = {
|
||||
text-dpi = 300;
|
||||
};
|
||||
|
||||
"org/gnome/shell/extensions/pano" = {
|
||||
play-audio-on-copy = false;
|
||||
# This solves the stuttering issue for me.
|
||||
# https://github.com/oae/gnome-shell-pano/issues/79
|
||||
send-notification-on-copy = false;
|
||||
};
|
||||
"org/gnome/shell/extensions/pano" = {
|
||||
play-audio-on-copy = false;
|
||||
# This solves the stuttering issue for me.
|
||||
# https://github.com/oae/gnome-shell-pano/issues/79
|
||||
send-notification-on-copy = false;
|
||||
};
|
||||
|
||||
"org/gnome/shell/extensions/espresso" = {
|
||||
show-notifications = false;
|
||||
};
|
||||
"org/gnome/shell/extensions/espresso" = {
|
||||
show-notifications = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -1,29 +1,28 @@
|
||||
{...}: {
|
||||
config = {
|
||||
programs.gpg.enable = true;
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
programs.gpg.enable = true;
|
||||
|
||||
enableSshSupport = true;
|
||||
sshKeys = ["A0B5D579ECACC45C51B2B38E317D346182083CD8"];
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
|
||||
# The amount of time a key is kept in the cache before it is removed.
|
||||
# The timer is reset after each use within that window.
|
||||
defaultCacheTtl = 86400; # 1 Day
|
||||
defaultCacheTtlSsh = 86400; # 1 Day
|
||||
enableSshSupport = true;
|
||||
sshKeys = ["A0B5D579ECACC45C51B2B38E317D346182083CD8"];
|
||||
|
||||
# The maximum amount after which the passphrase has to be retyped,
|
||||
# even if the key is still cached.
|
||||
maxCacheTtl = 86400; # 1 Day
|
||||
maxCacheTtlSsh = 86400; # 1 Day
|
||||
};
|
||||
# The amount of time a key is kept in the cache before it is removed.
|
||||
# The timer is reset after each use within that window.
|
||||
defaultCacheTtl = 86400; # 1 Day
|
||||
defaultCacheTtlSsh = 86400; # 1 Day
|
||||
|
||||
# Disable gnome-keyring-ssh for gpg-agent to work
|
||||
# https://github.com/NixOS/nixpkgs/issues/101616
|
||||
xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = ''
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Hidden=true
|
||||
'';
|
||||
# The maximum amount after which the passphrase has to be retyped,
|
||||
# even if the key is still cached.
|
||||
maxCacheTtl = 86400; # 1 Day
|
||||
maxCacheTtlSsh = 86400; # 1 Day
|
||||
};
|
||||
|
||||
# Disable gnome-keyring-ssh for gpg-agent to work
|
||||
# https://github.com/NixOS/nixpkgs/issues/101616
|
||||
xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = ''
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Hidden=true
|
||||
'';
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
{...}: {
|
||||
config.programs.mpv = {
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
bindings = let
|
||||
volume-step = "5";
|
||||
|
@ -3,7 +3,7 @@
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
config.nixpkgs.config = {
|
||||
nixpkgs.config = {
|
||||
allowUnfree = false;
|
||||
|
||||
allowUnfreePredicate = pkg:
|
||||
@ -15,7 +15,7 @@
|
||||
];
|
||||
};
|
||||
|
||||
config.home.packages = with pkgs; [
|
||||
home.packages = with pkgs; [
|
||||
# Basic utils
|
||||
unzip
|
||||
magic-wormhole
|
||||
|
@ -1,5 +1,5 @@
|
||||
{...}: {
|
||||
config.programs.thunderbird = {
|
||||
programs.thunderbird = {
|
||||
enable = true;
|
||||
|
||||
profiles.kristian = {
|
||||
|
@ -1,5 +1,5 @@
|
||||
{pkgs, ...}: {
|
||||
config.programs.vscode = {
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
|
||||
enableUpdateCheck = false;
|
||||
|
@ -1,11 +1,11 @@
|
||||
{...}: {
|
||||
config.targets.genericLinux.enable = false;
|
||||
targets.genericLinux.enable = false;
|
||||
|
||||
config.programs.bash.shellAliases = {
|
||||
programs.bash.shellAliases = {
|
||||
hms = "home-manager switch --flake $HOME/.config/home-manager#laptop";
|
||||
};
|
||||
|
||||
config.dconf.settings = {
|
||||
dconf.settings = {
|
||||
"org/gnome/settings-daemon/plugins/power" = {
|
||||
sleep-inactive-ac-type = "suspend";
|
||||
power-button-action = "hibernate";
|
||||
|
@ -1,11 +1,11 @@
|
||||
{...}: {
|
||||
config.targets.genericLinux.enable = false;
|
||||
targets.genericLinux.enable = false;
|
||||
|
||||
config.programs.bash.shellAliases = {
|
||||
programs.bash.shellAliases = {
|
||||
hms = "home-manager switch --flake $HOME/.config/home-manager#pc";
|
||||
};
|
||||
|
||||
config.dconf.settings = {
|
||||
dconf.settings = {
|
||||
"org/gnome/settings-daemon/plugins/power" = {
|
||||
sleep-inactive-ac-type = "nothing"; # Automatic suspend/hibernation creates a suspend/hibernation loop
|
||||
power-button-action = "suspend";
|
||||
|
Loading…
Reference in New Issue
Block a user