emmet/nixos-config
0
1
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Various fixes and updates

Browse Source
This commit is contained in:
Emmet
2025-07-05 12:16:16 -05:00
parent d510889f2e
commit ca02e3c1b4
4 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock generated
View File

@ -1075,11 +1075,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750789796, "lastModified": 1751731349,
"narHash": "sha256-SULb7v2sci2mt8XQeMPlbQLH0gBimfULO0whkSE5JFI=", "narHash": "sha256-8TsOqyBfEzwJFLnGnS3d3maEI8jp6VkwLzSzv0uoFvE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e9f09e66faf9f521dd031dcb2d48f507fdc4c785", "rev": "a9ee39a25bfe96c957a09182437d23b9e62c3d6e",
"revCount": 30, "revCount": 31,
"type": "git", "type": "git",
"url": "file://path:/etc/nixos.secrets" "url": "file://path:/etc/nixos.secrets"
}, },

14
modules/user/emacs/default.nix
View File

@ -76,7 +76,19 @@ in {
extension = ".el"; extension = ".el";
}; };
home.file.".config/emacs/sysvars.el".text = '' home.file.".config/emacs/sysvars.el".text = ''
(setq systemOpacity ${builtins.toString config.userSettings.emacs.opacity}) ;;; sysvars.el --- imported variables from nixos config -*- lexical-binding: t; no-byte-compile: t; -*-
;;
;; Author: Emmet K <https://gitlab.com/librephoenix>
;; Maintainer: Emmet K <https://gitlab.com/librephoenix>
;;
;;; Commentary:
;;
;; Emacs variables imported from my NixOS config.
;;
;;; Code:
(setq systemOpacity ${builtins.toString config.userSettings.emacs.opacity})
;;; sysvars.el ends here
''; '';
wayland.windowManager.hyprland.settings.exec-once = lib.optionals config.wayland.windowManager.hyprland.enable [ "emacs --daemon" ]; wayland.windowManager.hyprland.settings.exec-once = lib.optionals config.wayland.windowManager.hyprland.enable [ "emacs --daemon" ];
}; };

2
modules/user/emacs/init.el
View File

@ -30,7 +30,7 @@
;; Transparent background ;; Transparent background
(set-frame-parameter nil 'alpha-background systemOpacity) (set-frame-parameter nil 'alpha-background systemOpacity)
(add-to-list 'default-frame-alist '(alpha-background . systemOpacity)) (add-to-list 'default-frame-alist `(alpha-background . ,systemOpacity))
;;(add-to-list 'default-frame-alist '(inhibit-double-buffering . t)) ;;(add-to-list 'default-frame-alist '(inhibit-double-buffering . t))
;; I want declarative config, no custom ;; I want declarative config, no custom

38
modules/user/hyprland/default.nix
View File

@ -119,7 +119,7 @@ in
general = { general = {
layout = "master"; layout = "master";
border_size = 3; border_size = 3;
"col.active_border" = if config.userSettings.hyprland.performanceOptimizations then "0xff${config.lib.stylix.colors.base0B}" else "0xff${config.lib.stylix.colors.base08} 0xff${config.lib.stylix.colors.base09} 0xff${config.lib.stylix.colors.base0A} 0xff${config.lib.stylix.colors.base0B} 0xff${config.lib.stylix.colors.base0C} 0xff${config.lib.stylix.colors.base0D} 0xff${config.lib.stylix.colors.base0E} 0xff${config.lib.stylix.colors.base0F} 270deg"; "col.active_border" = if performance then "0xff${config.lib.stylix.colors.base0B}" else "0xff${config.lib.stylix.colors.base08} 0xff${config.lib.stylix.colors.base09} 0xff${config.lib.stylix.colors.base0A} 0xff${config.lib.stylix.colors.base0B} 0xff${config.lib.stylix.colors.base0C} 0xff${config.lib.stylix.colors.base0D} 0xff${config.lib.stylix.colors.base0E} 0xff${config.lib.stylix.colors.base0F} 270deg";
"col.inactive_border" = "0xff${config.lib.stylix.colors.base02}"; "col.inactive_border" = "0xff${config.lib.stylix.colors.base02}";
resize_on_border = true; resize_on_border = true;
gaps_in = 6; gaps_in = 6;
@ -138,20 +138,20 @@ in
decoration = { decoration = {
shadow = { shadow = {
enabled = (!config.userSettings.hyprland.performanceOptimizations); enabled = (!performance);
}; };
rounding = 8; rounding = 8;
dim_special = 0.0; dim_special = 0.0;
blur = { blur = {
enabled = (!config.userSettings.hyprland.performanceOptimizations); enabled = (!performance);
size = 5; size = 5;
passes = 2; passes = 2;
ignore_opacity = true; ignore_opacity = true;
contrast = 1.17; contrast = 1.17;
brightness = (if (config.stylix.polarity == "dark") then "0.65" else "1.45"); brightness = (if (config.stylix.polarity == "dark") then "0.65" else "1.45");
xray = (!config.userSettings.hyprland.performanceOptimizations); xray = (!performance);
special = (!config.userSettings.hyprland.performanceOptimizations); special = (!performance);
popups = (!config.userSettings.hyprland.performanceOptimizations); popups = (!performance);
}; };
}; };
@ -170,7 +170,7 @@ in
focus_on_activate = true; focus_on_activate = true;
}; };
bezier = lib.optionals (!config.userSettings.hyprland.performanceOptimizations) [ bezier = lib.optionals (!performance) [
"wind, 0.05, 0.9, 0.1, 1.05" "wind, 0.05, 0.9, 0.1, 1.05"
"winIn, 0.1, 1.1, 0.1, 1.0" "winIn, 0.1, 1.1, 0.1, 1.0"
"winOut, 0.3, -0.3, 0, 1" "winOut, 0.3, -0.3, 0, 1"
@ -179,8 +179,8 @@ in
]; ];
animations = { animations = {
enabled = (!config.userSettings.hyprland.performanceOptimizations); enabled = (!performance);
animation = lib.optionals (!config.userSettings.hyprland.performanceOptimizations) [ animation = lib.optionals (!performance) [
"windowsIn, 1, 6, winIn, popin" "windowsIn, 1, 6, winIn, popin"
"windowsOut, 1, 5, winOut, popin" "windowsOut, 1, 5, winOut, popin"
"windowsMove, 1, 5, wind, slide" "windowsMove, 1, 5, wind, slide"
@ -224,12 +224,6 @@ in
"SUPERSHIFT,T,exec,screenshot-ocr" "SUPERSHIFT,T,exec,screenshot-ocr"
"CTRLALT,Delete,exec,hyprctl kill" "CTRLALT,Delete,exec,hyprctl kill"
"SUPERSHIFT,K,exec,hyprctl kill" "SUPERSHIFT,K,exec,hyprctl kill"
",code:172,exec,mpc toggle"
",code:208,exec,mpc toggle"
",code:209,exec,mpc toggle"
",code:174,exec,mpc stop"
",code:171,exec,mpc next"
",code:173,exec,mpc prev"
"SUPER,R,pass,^(com\.obsproject\.Studio)$" "SUPER,R,pass,^(com\.obsproject\.Studio)$"
"SUPERSHIFT,R,pass,^(com\.obsproject\.Studio)$" "SUPERSHIFT,R,pass,^(com\.obsproject\.Studio)$"
"SUPER,RETURN,exec,${term}" "SUPER,RETURN,exec,${term}"
@ -373,7 +367,7 @@ in
"center,title:(Resource)" "center,title:(Resource)"
"tile,title:(Godot)" "tile,title:(Godot)"
"suppressevent maximize,class:^(steam)$" "suppressevent maximize,class:^(steam)$"
] ++ lib.optionals (!config.userSettings.hyprland.performanceOptimizations) [ ] ++ lib.optionals (!performance) [
"opacity 0.80,class:^(org.pulseaudio.pavucontrol)$" "opacity 0.80,class:^(org.pulseaudio.pavucontrol)$"
"opacity 1.0,class:^(org.qutebrowser.qutebrowser),fullscreen:1" "opacity 1.0,class:^(org.qutebrowser.qutebrowser),fullscreen:1"
"opacity 0.85,class:^(Element)$" "opacity 0.85,class:^(Element)$"
@ -389,7 +383,7 @@ in
]; ];
layerrule = lib.optionals (!config.userSettings.hyprland.performanceOptimizations) [ layerrule = lib.optionals (!performance) [
"blur,waybar" "blur,waybar"
"blur,ashell-main-layer" "blur,ashell-main-layer"
"blur,launcher # fuzzel" "blur,launcher # fuzzel"
@ -405,7 +399,7 @@ in
"animation popin 80%, ashell-main-layer" "animation popin 80%, ashell-main-layer"
]; ];
blurls = lib.optionals (!config.userSettings.hyprland.performanceOptimizations) [ blurls = lib.optionals (!performance) [
"waybar" "waybar"
"launcher # fuzzel" "launcher # fuzzel"
"~nwggrid" "~nwggrid"
@ -467,7 +461,6 @@ in
pkill -STOP syncthing; pkill -STOP syncthing;
pkill -STOP emacs; pkill -STOP emacs;
pkill -STOP emacsclient; pkill -STOP emacsclient;
systemctl --user stop mpd;
systemctl --user stop nextcloud-client; systemctl --user stop nextcloud-client;
pkill ashell; pkill ashell;
pkill hypridle; pkill hypridle;
@ -485,7 +478,6 @@ in
pkill -CONT syncthing; pkill -CONT syncthing;
pkill -CONT emacs; pkill -CONT emacs;
pkill -CONT emacsclient; pkill -CONT emacsclient;
systemctl --user start mpd;
systemctl --user start nextcloud-client; systemctl --user start nextcloud-client;
WGPU_BACKEND=gl ashell & disown; WGPU_BACKEND=gl ashell & disown;
hypridle & disown; hypridle & disown;
@ -607,7 +599,7 @@ vpn_more_cmd = "nm-connection-editor"
bluetooth_more_cmd = "blueman-manager" bluetooth_more_cmd = "blueman-manager"
[appearance] [appearance]
style = "Solid" style = "Solid"
opacity = ${if config.userSettings.hyprland.performanceOptimizations then "1.0" else "0.7"} opacity = ${if performance then "1.0" else "0.7"}
background_color = "#${config.lib.stylix.colors.base00}88" background_color = "#${config.lib.stylix.colors.base00}88"
primary_color = "#${config.lib.stylix.colors.base0B}" primary_color = "#${config.lib.stylix.colors.base0B}"
secondary_color = "#${config.lib.stylix.colors.base01}" secondary_color = "#${config.lib.stylix.colors.base01}"
@ -617,7 +609,7 @@ text_color = "#${config.lib.stylix.colors.base07}"
workspace_colors = [ "#${config.lib.stylix.colors.base0B}", "#${config.lib.stylix.colors.base0B}" ] workspace_colors = [ "#${config.lib.stylix.colors.base0B}", "#${config.lib.stylix.colors.base0B}" ]
specialWorkspaceColors = [ "#${config.lib.stylix.colors.base0B}", "#${config.lib.stylix.colors.base0B}" ] specialWorkspaceColors = [ "#${config.lib.stylix.colors.base0B}", "#${config.lib.stylix.colors.base0B}" ]
[appearance.menu] [appearance.menu]
opacity = ${if config.userSettings.hyprland.performanceOptimizations then "1.0" else "0.7"} opacity = ${if performance then "1.0" else "0.7"}
backdrop = 0.0 backdrop = 0.0
''; '';
home.file.".config/hypr/hypridle.conf".text = '' home.file.".config/hypr/hypridle.conf".text = ''
@ -726,7 +718,7 @@ backdrop = 0.0
terminal = "${pkgs.alacritty}/bin/alacritty"; terminal = "${pkgs.alacritty}/bin/alacritty";
}; };
colors = { colors = {
background = config.lib.stylix.colors.base00 + "bf"; background = config.lib.stylix.colors.base00 + (if performance then "ff" else "bf");
text = config.lib.stylix.colors.base07 + "ff"; text = config.lib.stylix.colors.base07 + "ff";
match = config.lib.stylix.colors.base05 + "ff"; match = config.lib.stylix.colors.base05 + "ff";
selection = config.lib.stylix.colors.base08 + "ff"; selection = config.lib.stylix.colors.base08 + "ff";