diff --git a/home/bars/bar-rs.ini b/home/bars/bar-rs.ini index 254f98b..34edb5f 100644 --- a/home/bars/bar-rs.ini +++ b/home/bars/bar-rs.ini @@ -9,20 +9,20 @@ left = media center = cpu right = time, volume, memory, disk_usage -[style] -spacing = 10 20 5 -padding = 0 10 -background = rgba(0, 0, 0, 0) -width = 2540 -height = 30 -margin = 7 - [module_style] font_size = 17 icon_size = 20 text_color = white icon_color = white +[style] +spacing = 10 20 5 +padding = 0 10 +background = rgba(0, 0, 0, 0) +margin = 7 +width = 1920 +height = 30 + [module:time] background = rgba(0, 36, 40, 1) border_color = rgba(0, 146, 148, 1) @@ -73,4 +73,3 @@ padding = 3 border_radius = 7 max_length = 50 max_title_length = 50 - diff --git a/home/default.nix b/home/default.nix index d4b7a08..c346243 100644 --- a/home/default.nix +++ b/home/default.nix @@ -11,7 +11,11 @@ file = { ".config/waybar/config".source = (if osConfig.var.username == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/bars/cyberhack" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/bars/modern"); ".config/waybar/style.css".source = (if osConfig.var.username == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/bars/cyberhack.css" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/bars/modern.css"); - ".config/bar-rs/bar-rs.ini".source = config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/bars/bar-rs.ini"; + ".config/bar-rs/bar-rs.ini".text = builtins.readFile ./bars/bar-rs.ini + (if osConfig.var.hostname == "absolution" then '' + [style] + width = 2540 + '' else ''''); + }; pointerCursor = { gtk.enable = true; @@ -40,27 +44,33 @@ }; }; - xdg.configFile."openxr/1/active_runtime.json".source = (if osConfig.var.hostname == "apalapucia" then "${pkgs.monado}/share/openxr/1/openxr_monado.json" else if osConfig.var.username == "fenix" then "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json" else null); + xdg.configFile."openxr/1/active_runtime.json" = { + source = if osConfig.var.hostname == "apalapucia" then "${pkgs.monado}/share/openxr/1/openxr_monado.json" else "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json"; + enable = (osConfig.var.hostname == "apalapucia" || osConfig.var.hostname == "fenix"); + }; - xdg.configFile."openvr/openvrpaths.vrpath".text = (if osConfig.var.hostname == "apalapucia" || osConfig.var.hostname == "fenix" then '' - { - "config" : - [ - "${config.xdg.dataHome}/Steam/config" - ], - "external_drivers" : null, - "jsonid" : "vrpathreg", - "log" : - [ - "${config.xdg.dataHome}/Steam/logs" - ], - "runtime" : - [ - "${pkgs.xrizer}/lib/xrizer" - ], - "version" : 1 - } -'' else null); + xdg.configFile."openvr/openvrpaths.vrpath" = { + text = '' + { + "config" : + [ + "${config.xdg.dataHome}/Steam/config" + ], + "external_drivers" : null, + "jsonid" : "vrpathreg", + "log" : + [ + "${config.xdg.dataHome}/Steam/logs" + ], + "runtime" : + [ + "${pkgs.xrizer}/lib/xrizer" + ], + "version" : 1 + } + ''; + enable = (osConfig.var.hostname == "apalapucia" || osConfig.var.hostname == "fenix"); + }; programs.home-manager.enable = true; programs.foot = { @@ -163,7 +173,10 @@ wayland.windowManager.mango.systemd.enable = true; wayland.windowManager.mango.settings = '' source=~/.config/nixos/home/wms/mango - ''; + '' + (if osConfig.var.hostname == "calufrax" then '' + xkb_rules_layout=gb + xkb_rules_variant=colemak + '' else ''''); services.kanshi = { enable = true;