diff --git a/flake.lock b/flake.lock index 252b292..0134ee5 100644 --- a/flake.lock +++ b/flake.lock @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1771744638, - "narHash": "sha256-EDLi+YAsEEAmMeZe1v6GccuGRbCkpSZp/+A6g+pivR8=", + "lastModified": 1772633058, + "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=", "owner": "nix-community", "repo": "home-manager", - "rev": "cb6c151f5c9db4df0b69d06894dc8484de1f16a0", + "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865", "type": "github" }, "original": { @@ -226,11 +226,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1771641457, - "narHash": "sha256-TIekRGfeCwuEmYcWex40RTx0Gd46pqmyUtxdFKb5juI=", + "lastModified": 1772592046, + "narHash": "sha256-+Lyl+mGVd0t2nlR6ODK/gvUHzMtF5qLlbTK+x5tCenU=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "c4e2b8969e09067da9d44b6b5762e1e896418f40", + "rev": "483abf9ad6aeac1d61f2a5419ded2879f0c4795e", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1772624091, + "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", "type": "github" }, "original": { @@ -273,11 +273,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1771903837, - "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", + "lastModified": 1772598333, + "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", + "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239", "type": "github" }, "original": { @@ -295,11 +295,11 @@ ] }, "locked": { - "lastModified": 1771943164, - "narHash": "sha256-xsCmSyRH3Qzxoud9ruuNNWb/23qOqJUcmE36xE7bGs8=", + "lastModified": 1772794202, + "narHash": "sha256-APNX2bexfq7qQZwbUWtYdb4Z2YVHHPD/pGrP4iA8a0w=", "owner": "nix-community", "repo": "NUR", - "rev": "771f8e7c9a1a9989cdf89e40111623f4ca5e3b42", + "rev": "14332f81836a2a954f1d794ccc1f2e5c3a201c58", "type": "github" }, "original": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1771943164, - "narHash": "sha256-xsCmSyRH3Qzxoud9ruuNNWb/23qOqJUcmE36xE7bGs8=", + "lastModified": 1772794202, + "narHash": "sha256-APNX2bexfq7qQZwbUWtYdb4Z2YVHHPD/pGrP4iA8a0w=", "owner": "nix-community", "repo": "NUR", - "rev": "771f8e7c9a1a9989cdf89e40111623f4ca5e3b42", + "rev": "14332f81836a2a954f1d794ccc1f2e5c3a201c58", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1771787992, - "narHash": "sha256-Vg4bGwwenNYI8p3nJTl9FRyeIyrjATeZrZr+GyUSDrw=", + "lastModified": 1772296853, + "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", "owner": "danth", "repo": "stylix", - "rev": "30054cca073b49b42a71289edec858f535b27fe9", + "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", "type": "github" }, "original": { diff --git a/home/wm/sway.nix b/home/wm/sway.nix index ffb4556..094fdbc 100644 --- a/home/wm/sway.nix +++ b/home/wm/sway.nix @@ -129,6 +129,9 @@ ]; bars = [ ]; input = { + "type:keyboard" = { + xkb_options = "fkeys:basic_13-24"; + }; "type:touchpad" = { dwt = "enabled"; tap = "enabled"; @@ -149,6 +152,9 @@ }; }; # end input keybindings = { + # Outputs + "F13" = ''exec ${notify} -t 2000 "$(xonsh ~/.nixos_config/util/toggle_mon.xsh)"''; + # Workspaces "${key_mod}+f" = "fullscreen"; "${key_mod}+Shift+f" = "floating toggle"; diff --git a/hosts/common/base.nix b/hosts/common/base.nix index df3c8db..eb73793 100644 --- a/hosts/common/base.nix +++ b/hosts/common/base.nix @@ -127,24 +127,37 @@ }; # end environment virtualisation = { + #spiceUSBRedirection.enable = true; + libvirtd = { + enable = true; + qemu = { + swtpm.enable = true; + }; + }; containers.enable = true; + docker = { + enable = true; + }; podman = { enable = true; - dockerCompat = lib.mkDefault true; + dockerCompat = false; defaultNetwork.settings.dns_enabled = true; }; # end podman oci-containers.backend = "podman"; }; # end virtualisation - users.defaultUserShell = pkgs.bash; - users.users.alisceon = { - isNormalUser = true; - extraGroups = [ "wheel" "networkmanager" "podman" ]; - shell = pkgs.xonsh; - openssh.authorizedKeys.keys = [ - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPN1Cd2UlHo03Jqgi5Yb4io/3gh/X4wCb8LcmKlpAovQa271CKDBtYOUKn+Fts03g6dBMfaWMty6VGPMGDMONmc= alisceon@electra" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCvRYyYjN8z0yoPrHtaTQXY0iEtPl79K6/uXVceuS+31JGjRnqJjuDYg6KxAykGSfhercNdAJ2BTYJRGpMsW0Xn7+iq07TItcjJjERm7rjQZko4vauS62NdnV6BEG+6ktasb9CcepzwoRkLEXQOad3XbLbo0V2sj6uI5Rgq2Cfh6f9x1E1DJ87o6Ngkm+vQzdv4NYeya/O4vuoAw6BNhp4vyr9k+0K+TRLjflYPUwtb8U/agoYI5RoLZMa6eBKdPbLVYyahpMlYjHwr90H4c9veHliILcDSA8h6upcXSDwZiCPyu6cI4zRbzGQVg84iLmIs5ocMWsnuDQbqn5iM3BTV37atnTPI3O2C9WBxuOaGpk4C338V0CAfTo6GG/OSaFzfLBFE29nY6uXcCPH7KiDpig0naVWlpHZhED5OQRoSXBeyu4BgadV6eZ43HOcdbOAqbLcB1nvkKPi52Vj+JqwS8zIjQpipX22Trx2u4ike99ijeK6/XeoTnEAcUS0fcYQ0FDqqfLmr/HuxkEQ2NZF0sFFqVGUlpVJMFblNOH4L8A2kApnsrmlxnlVE+r0tTnnnK5tfCpyou/LPDM+4TzGw2nV2cwsZKbGaHvMM/qIvVva90mTcYfuDvGB10eQ2P9tN1TIjseONVLDVKNjNGzDBFY4RMeMJOWWQy0aBh0FP5Q== user@hannah.afk" - ]; + users = { + defaultUserShell = pkgs.bash; + groups.docker = {}; + users.alisceon = { + isNormalUser = true; + extraGroups = [ "wheel" "networkmanager" "podman" "docker" "libvirtd"]; + shell = pkgs.xonsh; + openssh.authorizedKeys.keys = [ + "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPN1Cd2UlHo03Jqgi5Yb4io/3gh/X4wCb8LcmKlpAovQa271CKDBtYOUKn+Fts03g6dBMfaWMty6VGPMGDMONmc= alisceon@electra" + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCvRYyYjN8z0yoPrHtaTQXY0iEtPl79K6/uXVceuS+31JGjRnqJjuDYg6KxAykGSfhercNdAJ2BTYJRGpMsW0Xn7+iq07TItcjJjERm7rjQZko4vauS62NdnV6BEG+6ktasb9CcepzwoRkLEXQOad3XbLbo0V2sj6uI5Rgq2Cfh6f9x1E1DJ87o6Ngkm+vQzdv4NYeya/O4vuoAw6BNhp4vyr9k+0K+TRLjflYPUwtb8U/agoYI5RoLZMa6eBKdPbLVYyahpMlYjHwr90H4c9veHliILcDSA8h6upcXSDwZiCPyu6cI4zRbzGQVg84iLmIs5ocMWsnuDQbqn5iM3BTV37atnTPI3O2C9WBxuOaGpk4C338V0CAfTo6GG/OSaFzfLBFE29nY6uXcCPH7KiDpig0naVWlpHZhED5OQRoSXBeyu4BgadV6eZ43HOcdbOAqbLcB1nvkKPi52Vj+JqwS8zIjQpipX22Trx2u4ike99ijeK6/XeoTnEAcUS0fcYQ0FDqqfLmr/HuxkEQ2NZF0sFFqVGUlpVJMFblNOH4L8A2kApnsrmlxnlVE+r0tTnnnK5tfCpyou/LPDM+4TzGw2nV2cwsZKbGaHvMM/qIvVva90mTcYfuDvGB10eQ2P9tN1TIjseONVLDVKNjNGzDBFY4RMeMJOWWQy0aBh0FP5Q== user@hannah.afk" + ]; + }; }; # end users programs = { diff --git a/hosts/common/workstation.nix b/hosts/common/workstation.nix index 268c9d1..7207360 100644 --- a/hosts/common/workstation.nix +++ b/hosts/common/workstation.nix @@ -38,10 +38,6 @@ programs = { dconf.enable = true; - steam = { - enable = true; - remotePlay.openFirewall = true; - }; }; # end programs networking.firewall.allowedTCPPorts = [ @@ -79,6 +75,7 @@ pkgs.via pkgs.plymouth pkgs.xorg.xhost + (pkgs.bottles.override { removeWarningPopup = true;}) ]; # end systemPackages sessionVariables.NIXOS_OZONE_WL = "1"; }; # end environment diff --git a/hosts/tower/configuration.nix b/hosts/tower/configuration.nix index c83268c..67b7c93 100644 --- a/hosts/tower/configuration.nix +++ b/hosts/tower/configuration.nix @@ -63,12 +63,15 @@ pkgs.efibootmgr pkgs.prismlauncher pkgs.nvtopPackages.nvidia + pkgs.gamescope ]; }; programs = { gamemode.enable = true; steam = { enable = true; + remotePlay.openFirewall = true; + extraCompatPackages = [ pkgs.proton-ge-bin ]; package = pkgs.steam.override { extraPkgs = (pkgs: [ pkgs.gamemode diff --git a/util/get_emoji.py b/util/get_emoji.py index 0e9b6a9..4538ba9 100644 --- a/util/get_emoji.py +++ b/util/get_emoji.py @@ -7,12 +7,11 @@ EMOJI = { "grr": "๐Ÿ˜ก", "blush": "๐Ÿ˜Š", "clown": "๐Ÿคก", - "vorp": "๐Ÿ˜•", + "aw": "๐Ÿ˜•", "drool": "๐Ÿคค", "mindblow": "๐Ÿคฏ", "blegh": "๐Ÿคฎ", - "huh": "๐Ÿคจ", - "fearful": "๐Ÿ˜จ", + "vorp": "๐Ÿคจ", "relaxed": "โ˜บ", "boomerlol": "๐Ÿคฃ", "scream": "๐Ÿ˜ฑ", diff --git a/util/open_dailies.xsh b/util/open_dailies.xsh index 1d0ae87..dacbfde 100644 --- a/util/open_dailies.xsh +++ b/util/open_dailies.xsh @@ -13,6 +13,7 @@ dailies = [ "https://games.oec.world/en/tradle/", "https://oec.world/en/games/connectrade/", "https://geoconnections.net/", + "https://maptap.gg", "https://travle.earth/", "https://worldle.teuteuf.fr/", "https://globle-game.com/game/", diff --git a/util/toggle_mon.xsh b/util/toggle_mon.xsh new file mode 100644 index 0000000..4d18e23 --- /dev/null +++ b/util/toggle_mon.xsh @@ -0,0 +1,17 @@ +import json + +status = json.loads($(swaymsg -t get_outputs --raw)) + +monitors = [mon["name"] for mon in status] +focused = [mon["name"] for mon in status if mon.get("focused", False)][0] +disabled = [mon["name"] for mon in status if not mon["active"]] + +if disabled: + for mon in disabled: + print("enabling " + mon) + swaymsg output @(mon) enable +else: + for mon in monitors: + if mon != focused: + print("disabling " + mon) + swaymsg output @(mon) disable