Update to 24.11
This commit is contained in:
parent
79310cc53a
commit
81baaf8391
17 changed files with 94 additions and 80 deletions
|
@ -115,18 +115,21 @@ in {
|
|||
commonSettings = {
|
||||
"general.autoScroll" = true;
|
||||
|
||||
"places.history.enabled" = false;
|
||||
|
||||
"font.name.serif.x-western" = config.look.fonts.main;
|
||||
"font.name.sans-serif.x-western" = config.look.fonts.main;
|
||||
"font.name.monospace.x-western" = config.look.fonts.nerd;
|
||||
|
||||
"browser.compactmode.show" = true;
|
||||
"browser.uidensity" = 1;
|
||||
"browser.startup.page" = 3;
|
||||
"browser.compactmode.show" = true;
|
||||
"browser.toolbars.bookmarks.visibility" = "never";
|
||||
"browser.contentblocking.category" = "strict";
|
||||
"browser.helperApps.deleteTempFileOnExit" = true;
|
||||
"browser.newtabpage.enabled" = false;
|
||||
"browser.search.separatePrivateDefault" = false;
|
||||
"browser.download.useDownloadDir" = true;
|
||||
"browser.startup.page" = 3;
|
||||
"browser.newtabpage.enabled" = false;
|
||||
|
||||
"extensions.pocket.enabled" = false;
|
||||
"extensions.autoDisableScopes" = 0;
|
||||
|
@ -145,8 +148,6 @@ in {
|
|||
"privacy.clearOnShutdown_v2.cookiesAndStorage" = false;
|
||||
"privacy.clearOnShutdown_v2.historyFormDataAndDownloads" = true;
|
||||
|
||||
"places.history.enabled" = false;
|
||||
|
||||
"urlclassifier.trackingSkipURLs" = "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com";
|
||||
"urlclassifier.features.socialtracking.skipURLs" = "*.instagram.com, *.twitter.com, *.twimg.com";
|
||||
|
||||
|
@ -162,6 +163,9 @@ in {
|
|||
"gfx.webrender.all" = true;
|
||||
"gfx.x11-egl.force-enabled" = true;
|
||||
|
||||
"clipboard.autocopy" = false;
|
||||
"middlemouse.paste" = false;
|
||||
|
||||
"svg.context-properties.content.enabled" = true;
|
||||
"device.sensors.motion.enabled" = false;
|
||||
"gnomeTheme.hideSingleTab" = true;
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
home = {
|
||||
packages = with pkgs; [
|
||||
pcmanfm-qt
|
||||
gnome.file-roller
|
||||
file-roller
|
||||
];
|
||||
file = {
|
||||
".config/pcmanfm-qt/default/settings.conf".text = ''
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
moonlight-qt
|
||||
rustdesk-flutter
|
||||
#rustdesk-flutter
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
remmina
|
||||
freerdp
|
||||
zoom-us
|
||||
unstable.gpauth
|
||||
gpauth
|
||||
];
|
||||
}
|
||||
|
|
|
@ -11,16 +11,16 @@
|
|||
};
|
||||
shellAliases = {
|
||||
# NixOS aliases
|
||||
flakedate = "doas nix flake update /etc/nixos";
|
||||
nhs = "doas nh os switch -R";
|
||||
nhu = "flakedate && nhs";
|
||||
ns = "nix-shell -p";
|
||||
|
||||
nixclean = "doas nix-store --gc; nix-collect-garbage -d";
|
||||
nixpurge = "doas nix-collect-garbage --delete-old";
|
||||
nixoptimize = "doas nix store optimise";
|
||||
nixscrub = "nixclean; nixpurge; nixoptimize";
|
||||
|
||||
# Flake commands
|
||||
flakedate = "doas nix flake update /etc/nixos";
|
||||
nixswitch = "doas nixos-rebuild switch --flake /etc/nixos";
|
||||
nixdate = "flakedate && nixswitch";
|
||||
|
||||
# Shortcut aliases
|
||||
neo = "clear && fastfetch";
|
||||
ip = "ip -c";
|
||||
|
@ -35,6 +35,7 @@
|
|||
};
|
||||
initExtra = ''
|
||||
source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
|
||||
source ${pkgs.zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh
|
||||
${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin; pfetch
|
||||
setopt HIST_IGNORE_SPACE
|
||||
setopt RM_STAR_WAIT
|
||||
|
|
|
@ -68,7 +68,7 @@
|
|||
"${primeMod}+${secMod}+r" = ''exec rofiscripts --resolutions'';
|
||||
|
||||
# Mod + Key
|
||||
"${primeMod}+s" = ''exec rofi -show drun -modi drun -drun-display-format {name} -show-icons -disable-history'';
|
||||
"${primeMod}+s" = ''exec rofi -show run -p Command'';
|
||||
"${primeMod}+c" = ''exec clipman pick -t rofi'';
|
||||
"${primeMod}+x" = ''exec rofiscripts --power'';
|
||||
"${primeMod}+b" = ''exec pkill -USR1 waybar'';
|
||||
|
@ -77,7 +77,7 @@
|
|||
"${primeMod}+Delete" = ''exec foot ranger /etc/nixos | ${sendNotif} "Nix Config"'';
|
||||
|
||||
# Mod + shift + key
|
||||
"${primeMod}+Shift+s" = ''exec rofi -show run -p Command'';
|
||||
"${primeMod}+Shift+s" = ''exec rofi -show drun -modi drun -drun-display-format {name} -show-icons -disable-history'';
|
||||
"${primeMod}+Shift+t" = ''exec pcmanfm-qt'';
|
||||
"${primeMod}+Shift+e" = ''exec BEMOJI_PICKER_CMD="rofi -dmenu -i -p Emoji" bemoji -n -P 0'';
|
||||
"${primeMod}+Shift+b" = ''exec rofi-bluetooth'';
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
];
|
||||
files = [
|
||||
"/etc/machine-id"
|
||||
"/root/.gitconfig"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
};
|
||||
|
||||
environment = {
|
||||
systemPackages = with pkgs; [ unstable.impala ];
|
||||
systemPackages = with pkgs; [ impala ];
|
||||
persistence."/persist".directories = [ "/var/lib/iwd/" ];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
imports = [ ./nvidia ];
|
||||
imports = [
|
||||
./nvidia
|
||||
./nouveau
|
||||
];
|
||||
|
||||
hardware.opengl = {
|
||||
hardware.graphics = {
|
||||
enable = config.system.desktop.enable;
|
||||
driSupport32Bit = true;
|
||||
enable32Bit = true;
|
||||
extraPackages = with pkgs; [
|
||||
vulkan-loader
|
||||
vulkan-validation-layers
|
||||
|
|
15
modules/system/devices/video/nouveau/default.nix
Normal file
15
modules/system/devices/video/nouveau/default.nix
Normal file
|
@ -0,0 +1,15 @@
|
|||
{ lib, pkgs, config, ... }:
|
||||
{
|
||||
options.system.video.nouveau = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Enable the open-source Nouveau driver";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf config.system.video.nouveau.enable {
|
||||
services.xserver.videoDrivers = [ "nouveau" ];
|
||||
boot.kernelParams = [ "nouveau.config=NvGspRm=1" ];
|
||||
};
|
||||
}
|
|
@ -1,30 +1,14 @@
|
|||
{ lib, pkgs, config, ... }:
|
||||
{
|
||||
options.system.video = {
|
||||
nvidia = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Enable the proprietary Nvidia stack";
|
||||
};
|
||||
};
|
||||
nouveau = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Enable the open-source Nouveau driver";
|
||||
};
|
||||
options.system.video.nvidia = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Enable the proprietary Nvidia stack";
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
# Conditionally set video drivers based on the options
|
||||
services.xserver.videoDrivers =
|
||||
if config.system.video.nvidia.enable then [ "nvidia" ]
|
||||
else if config.system.video.nouveau.enable then [ "nouveau" ]
|
||||
else [];
|
||||
|
||||
# Configure Nvidia settings if Nvidia is enabled
|
||||
config = lib.mkIf config.system.video.nvidia.enable {
|
||||
hardware = {
|
||||
nvidia = lib.mkIf config.system.video.nvidia.enable {
|
||||
modesetting.enable = true;
|
||||
|
@ -32,7 +16,10 @@
|
|||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
open = false;
|
||||
};
|
||||
opengl.extraPackages = with pkgs; [ nvidia-vaapi-driver ];
|
||||
graphics.extraPackages = with pkgs; [ nvidia-vaapi-driver ];
|
||||
};
|
||||
|
||||
boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
./dconf
|
||||
./gaming
|
||||
./git
|
||||
./nh
|
||||
./qt
|
||||
./security
|
||||
./shells
|
||||
|
|
8
modules/system/programs/nh/default.nix
Normal file
8
modules/system/programs/nh/default.nix
Normal file
|
@ -0,0 +1,8 @@
|
|||
{ ... }:
|
||||
{
|
||||
programs.nh = {
|
||||
enable = true;
|
||||
clean.enable = true;
|
||||
flake = "/etc/nixos";
|
||||
};
|
||||
}
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
programs.sway = {
|
||||
enable = config.system.desktop.enable;
|
||||
package = pkgs.unstable.sway;
|
||||
extraPackages = with pkgs; [ swaylock ];
|
||||
};
|
||||
|
||||
|
|
|
@ -8,11 +8,6 @@
|
|||
];
|
||||
auto-optimise-store = true;
|
||||
};
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "--delete-older-than 1w";
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue