diff --git a/flake.lock b/flake.lock index b06ee97..5eaee06 100644 --- a/flake.lock +++ b/flake.lock @@ -1049,7 +1049,6 @@ "sobercookie": "sobercookie", "sops-nix": "sops-nix", "stylix": "stylix", - "umu": "umu", "vpn-confinement": "vpn-confinement" } }, @@ -1336,28 +1335,6 @@ "type": "github" } }, - "umu": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "packaging/nix", - "lastModified": 1733509971, - "narHash": "sha256-KVpe03nlfvYnZo5EphvOjS4T3CcpQIUcFHGrY6J8Frs=", - "owner": "Open-Wine-Components", - "repo": "umu-launcher", - "rev": "562e3900eebde0fb276dd2f425c097c8b44ccb92", - "type": "github" - }, - "original": { - "dir": "packaging/nix", - "owner": "Open-Wine-Components", - "repo": "umu-launcher", - "type": "github" - } - }, "vpn-confinement": { "locked": { "lastModified": 1731209328, diff --git a/flake.nix b/flake.nix index 2984952..bd95e8f 100644 --- a/flake.nix +++ b/flake.nix @@ -62,10 +62,6 @@ microvm.url = "github:astro/microvm.nix"; vpn-confinement.url = "github:Maroka-chan/VPN-Confinement"; sobercookie.url = "github:xunuwu/sobercookie"; - umu = { - url = "github:Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1"; - inputs.nixpkgs.follows = "nixpkgs"; - }; haumea = { url = "github:nix-community/haumea"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-modules/xun/gaming/default.nix b/home-modules/xun/gaming/default.nix index ef0e80e..d8bf3df 100644 --- a/home-modules/xun/gaming/default.nix +++ b/home-modules/xun/gaming/default.nix @@ -11,12 +11,8 @@ in { options.xun.gaming = { krunker.enable = lib.mkEnableOption "krunker"; roblox.sobercookie.enable = lib.mkEnableOption "sobercookie"; - umu.enable = lib.mkEnableOption "umu-launcher"; }; config = lib.mkMerge [ - (lib.mkIf cfg.umu.enable { - home.packages = [inputs.umu.packages.${pkgs.system}.umu]; - }) (lib.mkIf cfg.krunker.enable { home.packages = [ self.packages.${pkgs.system}.krunker diff --git a/home/profiles/nixdesk/default.nix b/home/profiles/nixdesk/default.nix index 6240b69..d1e0231 100644 --- a/home/profiles/nixdesk/default.nix +++ b/home/profiles/nixdesk/default.nix @@ -5,7 +5,7 @@ }: { imports = [ self.homeManagerModules.xun - ./kanshi.nix + # ./kanshi.nix ./defaults.nix ../../secrets @@ -50,6 +50,7 @@ ../../programs/misc/krita.nix #../../programs/misc/ardour.nix ../../programs/misc/foliate.nix + ../../programs/misc/blender.nix ../../programs/misc/obsidian.nix ../../programs/misc/pwvucontrol.nix ../../programs/misc/qpwgraph.nix @@ -69,7 +70,8 @@ # ../../programs/games/krunker.nix #../../programs/games/ludusavi.nix - ./dark.nix + # ./dark.nix + # ./xundark.nix # media services ../../services/media/playerctl.nix @@ -101,7 +103,6 @@ }; gaming = { krunker = enabled; - umu = enabled; roblox.sobercookie = enabled; }; # school.geogebra = enabled; diff --git a/home/profiles/nixdesk/xundark.nix b/home/profiles/nixdesk/xundark.nix new file mode 100644 index 0000000..370ddb7 --- /dev/null +++ b/home/profiles/nixdesk/xundark.nix @@ -0,0 +1,11 @@ +{pkgs, ...}: { + gtk = { + enable = true; + iconTheme = { + name = "WhiteSur-dark"; + package = pkgs.whitesur-icon-theme; + }; + }; + + qt.enable = true; +} diff --git a/home/programs/browsers/chromium.nix b/home/programs/browsers/chromium.nix index 4104d51..d85e272 100644 --- a/home/programs/browsers/chromium.nix +++ b/home/programs/browsers/chromium.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { programs.chromium = { enable = true; - package = pkgs.ungoogled-chromium; + # package = pkgs.ungoogled-chromium; extensions = [ {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # ublock origin ]; diff --git a/home/programs/browsers/firefox/userChrome.css b/home/programs/browsers/firefox/userChrome.css index 4b19eff..9de41ba 100644 --- a/home/programs/browsers/firefox/userChrome.css +++ b/home/programs/browsers/firefox/userChrome.css @@ -17,8 +17,3 @@ #navigator-toolbox { border-bottom: none !important; } - -/* Hide shield thing since i never ever change those settings */ -#tracking-protection-icon-container { - visibility: collapse; -} diff --git a/home/programs/desktop/sway/default.nix b/home/programs/desktop/sway/default.nix index 092a4d7..e57224c 100644 --- a/home/programs/desktop/sway/default.nix +++ b/home/programs/desktop/sway/default.nix @@ -10,6 +10,7 @@ ../common/wob.nix ../common/wl-clipboard.nix ./waybar.nix + ./headless-remote.nix ]; services.cliphist = { @@ -53,6 +54,16 @@ ''; config = { modifier = "Mod4"; + output = { + "DP-3" = { + mode = "1920x1080@165Hz"; + position = "1920 0"; + allow_tearing = "yes"; + }; + "HDMI-A-1" = { + position = "0 0"; + }; + }; # output = { # "*".bg = "${config.xdg.userDirs.pictures}/wallpaper fill"; # }; @@ -88,6 +99,7 @@ in lib.mkOptionDefault ( { + "${mod}+m" = "exec ${pkgs.nwg-launchers}/bin/nwggrid"; "${mod}+n" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -t"; "${mod}+Shift+v" = "exec ${lib.getExe pkgs.cliphist} list | ${lib.getExe pkgs.wofi} --dmenu | ${lib.getExe pkgs.cliphist} decode | ${pkgs.wl-clipboard}/bin/wl-copy"; "${mod}+Ctrl+${dir.left}" = "focus output left"; @@ -105,6 +117,7 @@ "${mod}+Shift+Backspace" = "exec systemctl suspend"; "${mod}+Shift+s" = "exec ${lib.getExe pkgs.wayfreeze} --after-freeze-cmd '${lib.getExe pkgs.sway-contrib.grimshot} copy anything && pkill wayfreeze'"; "${mod}+Ctrl+Shift+s" = "exec ${lib.getExe pkgs.wayfreeze} --after-freeze-cmd '${lib.getExe pkgs.sway-contrib.grimshot} savecopy anything && pkill wayfreeze'"; + "${mod}+Alt+s" = "exec ${lib.getExe pkgs.wayfreeze} --after-freeze-cmd '${lib.getExe pkgs.sway-contrib.grimshot} save anything - | ${lib.getExe pkgs.tesseract} -l eng - - | wl-copy && pkill wayfreeze'"; "${mod}+Shift+p" = "exec ${pauseApp}"; "${mod}+period" = "exec ${lib.getExe pkgs.bemoji}"; diff --git a/home/programs/desktop/sway/headless-remote.nix b/home/programs/desktop/sway/headless-remote.nix new file mode 100644 index 0000000..82643a0 --- /dev/null +++ b/home/programs/desktop/sway/headless-remote.nix @@ -0,0 +1,41 @@ +{pkgs, ...}: { + ## TODO MAKE THIS REMOVE ALL PREV HEADLESS MONITORS + home.packages = [ + (pkgs.writeShellApplication { + name = "xun-start-headless"; + runtimeInputs = [pkgs.sway pkgs.wayvnc pkgs.jq]; + text = '' + headless_numbers() { + swaymsg -t get_outputs | jq -r '.[].name | select (. | startswith("HEADLESS-")) | ltrimstr("HEADLESS-")' + } + + new_lines() { + diff <(echo "$1") <(echo "$2") | grep -E "^>" | cut -c3- || true + } + + create_output() { + outputs1=$(headless_numbers) + swaymsg create_output >/dev/null + outputs2=$(headless_numbers) + new_lines "$outputs1" "$outputs2" + } + + remove_outputs() { + for n in $(headless_numbers); do + swaymsg output "HEADLESS-$n" unplug + done + } + + remove_outputs + + outputid=$(create_output) + + swaymsg output "HEADLESS-$outputid" scale 2 + swaymsg output "HEADLESS-$outputid" mode "2400x1080@30Hz" + swaymsg output "HEADLESS-$outputid" position "0 1080" # below primary monitor + + wayvnc --gpu -o "HEADLESS-$outputid" 0.0.0.0 + ''; + }) + ]; +} diff --git a/home/programs/misc/blender.nix b/home/programs/misc/blender.nix new file mode 100644 index 0000000..ba4e97a --- /dev/null +++ b/home/programs/misc/blender.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = with pkgs; [blender]; +} diff --git a/home/programs/misc/discord.nix b/home/programs/misc/discord.nix index ee95bf8..a1427ad 100644 --- a/home/programs/misc/discord.nix +++ b/home/programs/misc/discord.nix @@ -5,5 +5,5 @@ withOpenASAR = true; }) ]; - # services.arrpc.enable = true; # RPC with vesktop (disabled since it uses way more cpu than is reasonable for such a program) + services.arrpc.enable = true; # RPC with vesktop (has issues with cpu usage sometimes ime) } diff --git a/nix/machines/default.nix b/nix/machines/default.nix index 677f245..55a5b6a 100644 --- a/nix/machines/default.nix +++ b/nix/machines/default.nix @@ -106,8 +106,10 @@ in { # programs.qt programs.adb programs.kanidm + programs.openrgb programs.tools programs.thunar + programs.corectrl services.default services.pipewire @@ -122,6 +124,7 @@ in { desktop.x11.nosleep themes.dark + # themes.xundark programs.gamemode programs.gamescope diff --git a/nix/machines/hopper/hardware.nix b/nix/machines/hopper/hardware.nix index 43228df..d7aae9d 100644 --- a/nix/machines/hopper/hardware.nix +++ b/nix/machines/hopper/hardware.nix @@ -11,7 +11,7 @@ boot = { blacklistedKernelModules = [ - # "xhci_pci" # was causing issues (100% udevd cpu usage) + "xhci_pci" # was causing issues (100% udevd cpu usage) ]; initrd = { availableKernelModules = [ diff --git a/nix/machines/hopper/newlab.nix b/nix/machines/hopper/newlab.nix index 056b5de..86af800 100644 --- a/nix/machines/hopper/newlab.nix +++ b/nix/machines/hopper/newlab.nix @@ -48,12 +48,10 @@ in { ## make sure vpn connection is reasonably fast ## god, there has to be a proper, not horrible way of doing this - ## TODO fix this and uhh make sure it works and stuff # systemd.services."wg-speedcheck" = { - # requires = ["wg.service"]; - # enable = false; # serviceConfig = { # Type = "oneshot"; + # ExecCondition = "${config.systemd.package}/bin/systemctl is-active wg.service"; # horrible, horrible hack, theres 100% a better way # ExecStart = pkgs.writers.writeBash "wg-speedcheck.sh" '' # echo "running test in netns" # vpn_result=$( ${pkgs.iproute2}/bin/ip netns exec wg ${pkgs.speedtest-cli}/bin/speedtest --json ) @@ -78,6 +76,14 @@ in { # }; # }; + # systemd.timers."wg-speedcheck" = { + # wantedBy = ["timers.target"]; + # timerConfig = { + # OnCalendar = "0/2:00:00"; + # Unit = "wg-speedcheck.service"; + # }; + # }; + vpnNamespaces."wg" = { enable = true; wireguardConfigFile = config.sops.secrets.wireguard.path; diff --git a/nix/machines/nixdesk/default.nix b/nix/machines/nixdesk/default.nix index 04c651f..5ce9eed 100644 --- a/nix/machines/nixdesk/default.nix +++ b/nix/machines/nixdesk/default.nix @@ -19,7 +19,7 @@ #]; nixpkgs.config = { - rocmSupport = true; + # rocmSupport = true; # TODO enable once nixpkgs fixes their shit and llvm libc doesnt fail to compile (https://github.com/NixOS/nixpkgs/issues/368672) allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam" diff --git a/nix/systemProfiles/core/deploy.nix b/nix/systemProfiles/core/deploy.nix index 62e998c..b9fd07b 100644 --- a/nix/systemProfiles/core/deploy.nix +++ b/nix/systemProfiles/core/deploy.nix @@ -7,7 +7,8 @@ users.groups.deploy = {}; users.users.deploy = { - isSystemUser = true; + isSystemUser = false; + isNormalUser = true; # i want a home directory for some things useDefaultShell = true; group = "deploy"; extraGroups = ["wheel"]; diff --git a/nix/systemProfiles/programs/corectrl.nix b/nix/systemProfiles/programs/corectrl.nix new file mode 100644 index 0000000..9cebc26 --- /dev/null +++ b/nix/systemProfiles/programs/corectrl.nix @@ -0,0 +1,4 @@ +{ + programs.corectrl.enable = true; + users.users.xun.extraGroups = ["corectrl"]; +} diff --git a/nix/systemProfiles/programs/openrgb.nix b/nix/systemProfiles/programs/openrgb.nix new file mode 100644 index 0000000..1adde54 --- /dev/null +++ b/nix/systemProfiles/programs/openrgb.nix @@ -0,0 +1,3 @@ +{ + services.hardware.openrgb.enable = true; +} diff --git a/nix/systemProfiles/programs/tools.nix b/nix/systemProfiles/programs/tools.nix index d966def..ab21520 100644 --- a/nix/systemProfiles/programs/tools.nix +++ b/nix/systemProfiles/programs/tools.nix @@ -23,5 +23,6 @@ openssl # for generating passwords yt-dlp inotify-tools + dig ]; } diff --git a/nix/systemProfiles/themes/xundark.nix b/nix/systemProfiles/themes/xundark.nix new file mode 100644 index 0000000..3d31d01 --- /dev/null +++ b/nix/systemProfiles/themes/xundark.nix @@ -0,0 +1,2 @@ +_: {pkgs, ...}: { +} diff --git a/readme.md b/readme.md deleted file mode 100644 index 1ace4a5..0000000 --- a/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -config files for my puters - -nixdesk - main desktop\ -hopper - server\ -kidney - wsl diff --git a/readme.txt b/readme.txt new file mode 100644 index 0000000..091c6f9 --- /dev/null +++ b/readme.txt @@ -0,0 +1,9 @@ +config files for my puters + +nixdesk - main desktop +hopper - server +kidney - wsl + +TODO: + +drop stylix, or at least use it less