Julia/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up now-broken modules

Browse source
This commit is contained in:
Julia Lange 2025-11-19 09:14:08 -08:00
parent bcb09055f8
commit 836da8b798
Signed by: Julia
SSH key fingerprint: SHA256:5DJcfxa5/fKCYn57dcabJa2vN2e6eT0pBerYi5SUbto
5 changed files with 254 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

14
flake.nix
View file

@ -21,17 +21,17 @@
flake = { flake = {
homeConfigurations = let homeConfigurations = let
userConfig = extraModules: userConfig = system: extraModules:
inputs.home-manager.lib.homeManagerConfiguration { inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs; extraSpecialArgs = { inherit inputs; };
modules = extraModules; pkgs = inputs.nixpkgs.legacyPackages.${system};
modules = [ ./hmModules ] ++ extraModules;
}; };
in { in {
"pan@juri" = userConfig [ ./users/juri ]; "pan@juri" = userConfig "x86_64-linux" [ ./users/juri ];
"pan@jibril" = userConfig [ ./users/jibril ]; "pan@jibril" = userConfig "x86_64-linux" [ ./users/jibril ];
"pan@onizuka" = userConfig [ ./users/onizuka ]; "pan@onizuka" = userConfig "x86_64-linux" [ ./users/onizuka ];
}; };
homeModules = { my-modules = ./hmModules; };
}; };
}; };

436
hmModules/apps/hypr/app.nix
View file

@ -1,5 +1,5 @@
{ config, inputs, pkgs, lib, ... }: { config, lib, ... }:
let rootPath = ./.; in # let rootPath = ./.; in
{ {
options.hypr = { options.hypr = {
enable = lib.mkEnableOption "Enables hyprland"; enable = lib.mkEnableOption "Enables hyprland";
@ -34,220 +34,224 @@ let rootPath = ./.; in
polkit.enable = lib.mkEnableOption "Enables polkit agent"; polkit.enable = lib.mkEnableOption "Enables polkit agent";
screenshot.enable = lib.mkEnableOption "Enables Screenshotting"; screenshot.enable = lib.mkEnableOption "Enables Screenshotting";
}; };
config.warnings = lib.mkIf config.hypr.enable [''
hypr.* has been deprecated to allow the removal of hyprland from flake inputs.
''];
imports = [ inputs.hyprland.homeManagerModules.default ]; # imports = [ inputs.hyprland.homeManagerModules.default ];
config = let # config = let
lopts = lib.lists.optionals; # lopts = lib.lists.optionals;
in { # in {
nix.settings = { # nix.settings = {
substituters = ["https://hyprland.cachix.org"]; # substituters = ["https://hyprland.cachix.org"];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; # trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
}; # };
} // lib.mkIf config.hypr.enable { # } // lib.mkIf config.hypr.enable {
wayland.windowManager.hyprland = let # wayland.windowManager.hyprland = let
mod = config.hypr.mod_key; # mod = config.hypr.mod_key;
# p-s = let # # p-s = let
# chw = config.hypr.workspace; # # chw = config.hypr.workspace;
# findDefaultWs = id: if (builtins.hasAttr id chw.workspaces) # # findDefaultWs = id: if (builtins.hasAttr id chw.workspaces)
# then (builtins.head (builtins.getAttr id chw.workspaces)) # # then (builtins.head (builtins.getAttr id chw.workspaces))
# else ""; # # else "";
# in with config.hypr.workspace; lib.mkIf primary-secondary.enable { # # in with config.hypr.workspace; lib.mkIf primary-secondary.enable {
# primaryWs = findDefaultWs primary-secondary.primary; # # primaryWs = findDefaultWs primary-secondary.primary;
# secondaryWs = findDefaultWs primary-secondary.secondary; # # secondaryWs = findDefaultWs primary-secondary.secondary;
# }; # # };
in { # in {
enable = true; # enable = true;
settings = { # settings = {
monitor = config.hypr.monitor.details; # monitor = config.hypr.monitor.details;
workspace = let # workspace = let
wsMonitor = monitor: wrksps: map (ws: # wsMonitor = monitor: wrksps: map (ws:
if ws == (builtins.head wrksps) # if ws == (builtins.head wrksps)
then "name:"+ws+", monitor:"+monitor+", persistent:true, default:true" # then "name:"+ws+", monitor:"+monitor+", persistent:true, default:true"
else "name:"+ws+", monitor:"+monitor+", persistent:true" # else "name:"+ws+", monitor:"+monitor+", persistent:true"
) wrksps; # ) wrksps;
makeRules = wsAttr: builtins.concatLists (builtins.attrValues ( # makeRules = wsAttr: builtins.concatLists (builtins.attrValues (
builtins.mapAttrs wsMonitor wsAttr # builtins.mapAttrs wsMonitor wsAttr
)); # ));
in makeRules config.hypr.workspace.workspaces # in makeRules config.hypr.workspace.workspaces
++ [ # ++ [
"w[t1], gapsout:0, gapsin:0" # "w[t1], gapsout:0, gapsin:0"
"w[tg1], gapsout:0, gapsin:0" # "w[tg1], gapsout:0, gapsin:0"
"f[1], gapsout:0, gapsin:0" # "f[1], gapsout:0, gapsin:0"
] # ]
++ lopts config.hypr.workspace.scratchpad.enable [ # ++ lopts config.hypr.workspace.scratchpad.enable [
"special:scratch, on-created-empty: [float; size 50% 50%; center] ${config.defaultApps.terminal}" # "special:scratch, on-created-empty: [float; size 50% 50%; center] ${config.defaultApps.terminal}"
]; # ];
input = { # input = {
accel_profile = "flat"; # accel_profile = "flat";
sensitivity = config.hypr.mouse.sensitivity; # sensitivity = config.hypr.mouse.sensitivity;
}; # };
general = { # general = {
gaps_in = 3; # gaps_in = 3;
gaps_out = 3; # gaps_out = 3;
border_size = 2; # border_size = 2;
"col.active_border" = "rgb(F5C2E7)"; # "col.active_border" = "rgb(F5C2E7)";
"col.inactive_border" = "rgb(1E1D2F)"; # "col.inactive_border" = "rgb(1E1D2F)";
layout = "master"; # layout = "master";
}; # };
decoration = { # decoration = {
rounding = 2; # rounding = 2;
blur = { # blur = {
enabled = true; # enabled = true;
size = 12; # size = 12;
passes = 2; # passes = 2;
special = true; # special = true;
}; # };
}; # };
animation = [ # animation = [
"windows, 1, 4, default, popin 50%" # "windows, 1, 4, default, popin 50%"
"windowsOut, 1, 4, default, popin 50%" # "windowsOut, 1, 4, default, popin 50%"
"windowsMove, 1, 3, default" # "windowsMove, 1, 3, default"
"border, 1, 3, default" # "border, 1, 3, default"
"fade, 1, 3, default" # "fade, 1, 3, default"
"workspaces, 1, 3, default" # "workspaces, 1, 3, default"
]; # ];
master = { # master = {
mfact = config.hypr.master.mfact; # mfact = config.hypr.master.mfact;
}; # };
misc = { # misc = {
focus_on_activate = true; # focus_on_activate = true;
}; # };
#
exec-once = lopts config.hypr.polkit.enable [ # exec-once = lopts config.hypr.polkit.enable [
"${pkgs.kdePackages.polkit-kde-agent-1}/bin/libexec/polkit-kde-authentication-agent-1" # "${pkgs.kdePackages.polkit-kde-agent-1}/bin/libexec/polkit-kde-authentication-agent-1"
] ++ lopts config.hypr.background.enable [ # ] ++ lopts config.hypr.background.enable [
"${pkgs.swww}/bin/swww-daemon" # "${pkgs.swww}/bin/swww-daemon"
"${pkgs.swww}/bin/swww img ${config.hypr.background.path}" # "${pkgs.swww}/bin/swww img ${config.hypr.background.path}"
] ++ lopts config.ags.enable [ # ] ++ lopts config.ags.enable [
"ags" # "ags"
] ++ lopts config.beeper.enable [ # ] ++ lopts config.beeper.enable [
"[workspace name:chat silent] Beeper" # "[workspace name:chat silent] Beeper"
]; # ];
#
env = with config.hypr; [ # env = with config.hypr; [
# "HYPR_MON_PRIMARY, ${workspace.primary-secondary.primary}" # # "HYPR_MON_PRIMARY, ${workspace.primary-secondary.primary}"
# "HYPR_MON_SECONDARY, ${workspace.primary-secondary.secondary}" # # "HYPR_MON_SECONDARY, ${workspace.primary-secondary.secondary}"
"HYPR_WORK_DB, ${config.xdg.cacheHome}/hypr/workspace.db" # "HYPR_WORK_DB, ${config.xdg.cacheHome}/hypr/workspace.db"
] ++ lopts cursor.enable [ # ] ++ lopts cursor.enable [
"HYPRCURSOR_THEME,${cursor.theme}" # "HYPRCURSOR_THEME,${cursor.theme}"
"HYPRCURSOR_SIZE,${cursor.size}" # "HYPRCURSOR_SIZE,${cursor.size}"
] ++ lopts config.nvidia.enable [ # ] ++ lopts config.nvidia.enable [
"LIBVA_DRIVER_NAME,nvidia" # "LIBVA_DRIVER_NAME,nvidia"
"XDG_SESSION_TYPE,wayland" # "XDG_SESSION_TYPE,wayland"
"GBM_BACKEND,nvidia-drm" # "GBM_BACKEND,nvidia-drm"
"__GLX_VENDOR_LIBRARY_NAME,nvidia" # "__GLX_VENDOR_LIBRARY_NAME,nvidia"
"WLR_RENDERER_ALLOW_SOFTWARE,1" # "WLR_RENDERER_ALLOW_SOFTWARE,1"
"WLR_DRM_DEVICES,/dev/dri/card1" # "WLR_DRM_DEVICES,/dev/dri/card1"
]; # ];
#
windowrulev2 = let # windowrulev2 = let
workspaceDefaults = wsname: applist: map ( # workspaceDefaults = wsname: applist: map (
app: "workspace " + wsname + ", " + app # app: "workspace " + wsname + ", " + app
) applist; # ) applist;
allDefault = wsAttr: builtins.concatLists (builtins.attrValues ( # allDefault = wsAttr: builtins.concatLists (builtins.attrValues (
builtins.mapAttrs workspaceDefaults wsAttr # builtins.mapAttrs workspaceDefaults wsAttr
)); # ));
in allDefault config.hypr.workspace.defaults # in allDefault config.hypr.workspace.defaults
++ [ # ++ [
"bordersize 0, floating:0, onworkspace:w[t1]" # "bordersize 0, floating:0, onworkspace:w[t1]"
"rounding 0, floating:0, onworkspace:w[t1]" # "rounding 0, floating:0, onworkspace:w[t1]"
"bordersize 0, floating:0, onworkspace:w[tg1]" # "bordersize 0, floating:0, onworkspace:w[tg1]"
"rounding 0, floating:0, onworkspace:w[tg1]" # "rounding 0, floating:0, onworkspace:w[tg1]"
"bordersize 0, floating:0, onworkspace:f[1]" # "bordersize 0, floating:0, onworkspace:f[1]"
"rounding 0, floating:0, onworkspace:f[1]" # "rounding 0, floating:0, onworkspace:f[1]"
] # ]
++ lopts config.hypr.xwayland.videobridge.enable [ # ++ lopts config.hypr.xwayland.videobridge.enable [
"opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$" # "opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$"
"noanim,class:^(xwaylandvideobridge)$" # "noanim,class:^(xwaylandvideobridge)$"
"noinitialfocus,class:^(xwaylandvideobridge)$" # "noinitialfocus,class:^(xwaylandvideobridge)$"
"maxsize 1 1,class:^(xwaylandvideobridge)$" # "maxsize 1 1,class:^(xwaylandvideobridge)$"
"noblur,class:^(xwaylandvideobridge)$" # "noblur,class:^(xwaylandvideobridge)$"
] ++ map (id: "opacity 1 override, " + id) config.hypr.windows.opaque # ] ++ map (id: "opacity 1 override, " + id) config.hypr.windows.opaque
++ [ # ++ [
"opacity 0.94 fullscreen:0" # "opacity 0.94 fullscreen:0"
"opacity 0.79 override, class:^(${config.defaultApps.terminal})$" # "opacity 0.79 override, class:^(${config.defaultApps.terminal})$"
]; # ];
#
# 1, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh home # # 1, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh home
# 2, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh web # # 2, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh web
# 3, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh med # # 3, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh med
# 4, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh game # # 4, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh game
# 5, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh etc # # 5, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh etc
# _, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh hell # # _, exec, $XDG_CONFIG_HOME/hypr/scripts/changeprimary.xsh hell
# TAB, exec, $XDG_CONFIG_HOME/hypr/scripts/changesecondary.xsh # # TAB, exec, $XDG_CONFIG_HOME/hypr/scripts/changesecondary.xsh
# # #
# SHIFT, 1, movetoworkspacesilent, name:home # # SHIFT, 1, movetoworkspacesilent, name:home
# SHIFT, 2, movetoworkspacesilent, name:web # # SHIFT, 2, movetoworkspacesilent, name:web
# SHIFT, 3, movetoworkspacesilent, name:med # # SHIFT, 3, movetoworkspacesilent, name:med
# SHIFT, 4, movetoworkspacesilent, name:game # # SHIFT, 4, movetoworkspacesilent, name:game
# SHIFT, TAB, movetoworkspacesilent, r-1 # # SHIFT, TAB, movetoworkspacesilent, r-1
#
bind = let # bind = let
modPrefix = kb: if (lib.strings.hasPrefix "&" kb) # modPrefix = kb: if (lib.strings.hasPrefix "&" kb)
then ("${mod}" + kb) # then ("${mod}" + kb)
else ("${mod}, " + kb); # else ("${mod}, " + kb);
in map modPrefix ([ # in map modPrefix ([
"Return, exec, ${config.defaultApps.terminal}" # "Return, exec, ${config.defaultApps.terminal}"
"&SHIFT, Q, exit" # "&SHIFT, Q, exit"
"h, focusmonitor, l" # "h, focusmonitor, l"
"l, focusmonitor, r" # "l, focusmonitor, r"
"j, cyclenext," # "j, cyclenext,"
"k, cyclenext, prev" # "k, cyclenext, prev"
"&SHIFT, h, movecurrentworkspacetomonitor, -1" # "&SHIFT, h, movecurrentworkspacetomonitor, -1"
"&SHIFT, l, movecurrentworkspacetomonitor, +1" # "&SHIFT, l, movecurrentworkspacetomonitor, +1"
"&SHIFT, j, swapnext," # "&SHIFT, j, swapnext,"
"&SHIFT, k, swapnext, prev" # "&SHIFT, k, swapnext, prev"
"c, killactive" # "c, killactive"
"f, togglefloating" # "f, togglefloating"
"&SHIFT, f, fullscreen" # "&SHIFT, f, fullscreen"
] ++ (let # ] ++ (let
workspaces = builtins.concatLists ( # workspaces = builtins.concatLists (
builtins.attrValues config.hypr.workspace.workspaces); # builtins.attrValues config.hypr.workspace.workspaces);
wsBinds = with builtins; wrksps: depth: if depth > (length wrksps) # wsBinds = with builtins; wrksps: depth: if depth > (length wrksps)
then [] # then []
else let ws = builtins.elemAt wrksps (depth -1); in [ # else let ws = builtins.elemAt wrksps (depth -1); in [
"${toString depth}, workspace, name:${ws}" # "${toString depth}, workspace, name:${ws}"
"&SHIFT, ${toString depth}, movetoworkspacesilent, name:${ws}" # "&SHIFT, ${toString depth}, movetoworkspacesilent, name:${ws}"
] ++ wsBinds wrksps (depth + 1); # ] ++ wsBinds wrksps (depth + 1);
in wsBinds workspaces 1) ++ lopts config.rofi.enable [ # in wsBinds workspaces 1) ++ lopts config.rofi.enable [
"&SHIFT, return, exec, ${pkgs.rofi}/bin/rofi -show run" # "&SHIFT, return, exec, ${pkgs.rofi}/bin/rofi -show run"
] ++ lopts config.hypr.screenshot.enable [ # ] ++ lopts config.hypr.screenshot.enable [
"P, exec, ${pkgs.grimblast}/bin/grimblast --freeze copy area" # "P, exec, ${pkgs.grimblast}/bin/grimblast --freeze copy area"
"&SHIFT, P, exec, ${pkgs.grimblast}/bin/grimblast --freeze copysave area" # "&SHIFT, P, exec, ${pkgs.grimblast}/bin/grimblast --freeze copysave area"
] ++ lopts config.hypr.workspace.scratchpad.enable [ # ] ++ lopts config.hypr.workspace.scratchpad.enable [
"i, togglespecialworkspace, scratch" # "i, togglespecialworkspace, scratch"
]); # ]);
#
bindm = map (kb: "${mod}, " + kb) [ # bindm = map (kb: "${mod}, " + kb) [
"mouse:272, movewindow" # "mouse:272, movewindow"
"mouse:273, movewindow" # "mouse:273, movewindow"
]; # ];
}; # };
}; # };
#
home.packages = with pkgs; [ # home.packages = with pkgs; [
wlr-randr # Xrandr for wayland # wlr-randr # Xrandr for wayland
wl-clipboard # Clipboard manager for wayland # wl-clipboard # Clipboard manager for wayland
] ++ lopts config.hypr.xwayland.videobridge.enable [ # ] ++ lopts config.hypr.xwayland.videobridge.enable [
kdePackages.xwaylandvideobridge # kdePackages.xwaylandvideobridge
] ++ lopts config.hypr.cursor.enable [ # ] ++ lopts config.hypr.cursor.enable [
hyprcursor # hyprcursor
] ++ lopts config.hypr.screenshot.enable [ # ] ++ lopts config.hypr.screenshot.enable [
hyprpicker # Colorpicker, needed for screenshot tool # hyprpicker # Colorpicker, needed for screenshot tool
inputs.hyprland-contrib.packages.${pkgs.system}.grimblast # inputs.hyprland-contrib.packages.${pkgs.system}.grimblast
]; # ];
#
xdg.configFile."hypr-scripts" = { # xdg.configFile."hypr-scripts" = {
source = rootPath + "/scripts"; # source = rootPath + "/scripts";
target = "hypr/scripts"; # target = "hypr/scripts";
executable = true; # executable = true;
}; # };
#
xdg.dataFile."hypr-icons" = lib.mkIf config.hypr.cursor.enable { # xdg.dataFile."hypr-icons" = lib.mkIf config.hypr.cursor.enable {
source = rootPath + "/icons"; # source = rootPath + "/icons";
target = "icons/"; # target = "icons/";
recursive = true; # recursive = true;
}; # };
}; # };
} }

2
hmModules/apps/lf/app.nix
View file

@ -33,7 +33,7 @@
relativenumber = true; relativenumber = true;
}; };
commands = { commands = {
dragon-out = ''%${pkgs.xdragon}/bin/xdragon -a -x "$fx"''; dragon-out = ''%${pkgs.dragon-drop}/bin/dragon-drop -a -x "$fx"'';
trash = lib.mkIf config.trash.enable '' trash = lib.mkIf config.trash.enable ''
%${pkgs.trash-cli}/bin/trash "$fx" %${pkgs.trash-cli}/bin/trash "$fx"
''; '';

10
hmModules/automatic/default.nix
View file

@ -1,4 +1,4 @@
{ config, lib, usernameAtHostname, ... }: { config, lib, ... }:
{ {
options = { options = {
@ -9,17 +9,15 @@
browser = lib.mkOption { default = ""; }; browser = lib.mkOption { default = ""; };
}; };
}; };
config = let config = {
st = lib.strings;
in {
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
home.stateVersion = "23.05"; home.stateVersion = "23.05";
home = { home = {
username = builtins.elemAt (st.splitString "@" usernameAtHostname) 0; username = "pan";
homeDirectory = "/home/" + config.home.username; homeDirectory = "/home/pan";
packages = config.extraPkgs; packages = config.extraPkgs;
}; };

39
hmModules/services/widgets/ags/default.nix
View file

@ -1,25 +1,30 @@
{ config, inputs, pkgs, lib, ... }: { config, lib, ... }:
{ {
options.ags = { options.ags = {
enable = lib.mkEnableOption "Enable ags"; enable = lib.mkEnableOption "Enable ags";
}; };
config.warnings = lib.mkIf config.ags.enable [''
ags.enable has been deprecated to allow the removal of ags from flake
inputs.
''];
imports = [ inputs.ags.homeManagerModules.default ]; # imports = [ inputs.ags.homeManagerModules.default ];
config = lib.mkIf config.ags.enable { # config = lib.mkIf config.ags.enable {
home.packages = with pkgs; [ # home.packages = with pkgs; [
libnotify # Notifications through ags # libnotify # Notifications through ags
]; # ];
programs.ags = { # programs.ags = {
enable = true; # enable = true;
configDir = ./config; # configDir = ./config;
#
extraPackages = with pkgs; [ # extraPackages = with pkgs; [
gtksourceview # gtksourceview
webkitgtk # webkitgtk
accountsservice # accountsservice
]; # ];
}; # };
}; # };
} }