From 146a2de0ec980af0652ffd67e6f933a8fb7e9ec4 Mon Sep 17 00:00:00 2001 From: roxwize Date: Mon, 23 Jun 2025 15:28:25 -0400 Subject: [PATCH] ~ Signed-off-by: roxwize --- configs/neovim.lua | 4 ++++ configs/openbox/autostart | 4 +++- configs/openbox/rc.xml | 4 ++-- nixos/home/mozilla.nix | 8 +++++++- nixos/hosts/ioides/configuration.nix | 2 +- nixos/hosts/ioides/packages.nix | 1 + nixos/modules/system/default.nix | 4 +++- nixos/modules/system/home.nix | 19 +++++++++++++++++++ 8 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 nixos/modules/system/home.nix diff --git a/configs/neovim.lua b/configs/neovim.lua index 26a0bb1..86c0e45 100644 --- a/configs/neovim.lua +++ b/configs/neovim.lua @@ -95,6 +95,10 @@ lc.clangd.setup { capabilities = caps, cmd = { "clangd" } } +lc.jsonls.setup { + capabilities = caps, + cmd = { "vscode-json-languageserver", "--stdio" } +} lc.lua_ls.setup { capabilities = caps } lc.mesonlsp.setup { capabilities = caps } lc.nil_ls.setup { diff --git a/configs/openbox/autostart b/configs/openbox/autostart index c5778d4..820b94a 100644 --- a/configs/openbox/autostart +++ b/configs/openbox/autostart @@ -4,7 +4,8 @@ log=$(mktemp /tmp/wmas-openbox-XXXXXXXX.txt) echo "Openbox autostart file" > $log echo -e "Executed @ $(date)\n" >> $log -hsetroot -cover ~/.dotfiles/assets/wallpapers/current >> $log 2>&1 +#hsetroot -cover ~/.dotfiles/assets/wallpapers/current >> $log 2>&1 +hsetroot -cover %WALLPAPER% >> $log 2>&1 xcompmgr >> $log 2>&1 & soteria >> $log 2>&1 & @@ -15,3 +16,4 @@ sleep 1 yambar >> $log 2>&1 & sleep 1 kill $temp + diff --git a/configs/openbox/rc.xml b/configs/openbox/rc.xml index cdfe4f4..81732bb 100644 --- a/configs/openbox/rc.xml +++ b/configs/openbox/rc.xml @@ -214,12 +214,12 @@ - + diff --git a/nixos/home/mozilla.nix b/nixos/home/mozilla.nix index 7825519..6a90004 100644 --- a/nixos/home/mozilla.nix +++ b/nixos/home/mozilla.nix @@ -16,7 +16,7 @@ FirefoxHome = { SponsoredTopSites = false; Highlights = false; - Pocket = false; + Pocket = false; # rip bozo SponsoredPocket = false; }; FirefoxSuggest = { @@ -61,6 +61,7 @@ "browser.startup.page" = 3; "browser.tabs.closeWindowWithLastTab" = false; "browser.tabs.insertAfterCurrent" = true; + "devtools.editor.tabsize" = 4; "datareporting.healthreport.uploadEnabled" = false; "extensions.pocket.enabled" = false; "extensions.pocket.showHome" = false; @@ -149,6 +150,11 @@ ]; }]; }; + "ArchWiki" = { + urls = [{ + template = "https://wiki.archlinux.org/index.php?title=Special:Search&search={searchTerms}"; + }]; + }; "Bing".metaData.hidden = true; "Google".metaData.hidden = true; diff --git a/nixos/hosts/ioides/configuration.nix b/nixos/hosts/ioides/configuration.nix index 257b236..77409a3 100644 --- a/nixos/hosts/ioides/configuration.nix +++ b/nixos/hosts/ioides/configuration.nix @@ -74,7 +74,7 @@ # }; networking = { - firewall.allowedTCPPorts = [ 80 443 8080 19132 25565 ]; + firewall.allowedTCPPorts = [ 80 443 5900 8080 19132 25565 ]; hosts = { "10.0.0.2" = [ "near" "near.local" ]; }; diff --git a/nixos/hosts/ioides/packages.nix b/nixos/hosts/ioides/packages.nix index 2c983a9..b367f01 100644 --- a/nixos/hosts/ioides/packages.nix +++ b/nixos/hosts/ioides/packages.nix @@ -21,6 +21,7 @@ python313 # High-level dynamically-typed programming language vala # Compiler for GObject type system ## language servers + nodePackages.vscode-json-languageserver # JSON lua-language-server # Lua mesonlsp # Meson nil # Nix diff --git a/nixos/modules/system/default.nix b/nixos/modules/system/default.nix index 08da683..7cb96da 100644 --- a/nixos/modules/system/default.nix +++ b/nixos/modules/system/default.nix @@ -1,12 +1,14 @@ { pkgs, lib, config, ... }: let cfg = config.r5e.system; in with lib; { + imports = [ ./home.nix ]; + options.r5e.system = { graphics = { display.x11 = { enable = mkEnableOption "X11"; windowManagers = mkOption { - type = types.listOf types.str; + type = types.listOf types.str; default = [ "twm" ]; }; displayManager = { diff --git a/nixos/modules/system/home.nix b/nixos/modules/system/home.nix new file mode 100644 index 0000000..d042e88 --- /dev/null +++ b/nixos/modules/system/home.nix @@ -0,0 +1,19 @@ +# TODO unimplemented +{ pkgs, config, lib, ... }: let + cfg = config.r5e.home; +in with lib; { + options.r5e.home = mkOption { + type = types.attrsOf { + wallpaper = mkOption { + type = types.str; + default = /home/rae/.dotfiles/assets/wallpapers/current; + }; + }; + default = {}; + }; + + config = { + + }; +} +