diff --git a/flake.lock b/flake.lock index e673df9..da8f8a5 100644 --- a/flake.lock +++ b/flake.lock @@ -268,11 +268,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1775147763, - "narHash": "sha256-VY+Vemh6/KcOquICLIzM/WPoBWNgp0issGO0ytXydU0=", + "lastModified": 1774974715, + "narHash": "sha256-MedIMPnP5IthRI9TDrWRYFQimlZmap1VxLg3GZD0yZs=", "owner": "cachix", "repo": "devenv", - "rev": "ad4d771adec17a35c347f0eef2419de642db3db4", + "rev": "70ef95b7ec36f93874253de27d227943689f2cb1", "type": "github" }, "original": { @@ -592,11 +592,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -720,11 +720,11 @@ ] }, "locked": { - "lastModified": 1775036584, - "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=", + "lastModified": 1774959120, + "narHash": "sha256-Pzk6UbueeWy9WFiDY6iA1aHid+2AMzkS6gg2x2cSkz4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735", + "rev": "c06f90f1eb6569bdaf6a4a10cb7e66db4454ac2a", "type": "github" }, "original": { @@ -1011,11 +1011,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1775012637, - "narHash": "sha256-Now9n+9BD37KilctvSOy3GzAdvQLZtPfCcGnxmxtaig=", + "lastModified": 1774967351, + "narHash": "sha256-uZ3BkiV9LJCB71RoYoe5RlN/UzJmWAxaY2DVlQSEmKc=", "owner": "helix-editor", "repo": "helix", - "rev": "daac117bbb4348a496bdf851a9a5c1d9612a2938", + "rev": "c54eb33656c5456b02d53f14e510fab59c374c10", "type": "github" }, "original": { @@ -1031,11 +1031,11 @@ ] }, "locked": { - "lastModified": 1775143651, - "narHash": "sha256-S0RqAyDPMTcv9vASMaE8eY1QexFysAOdnxUxFHIPOyE=", + "lastModified": 1774969509, + "narHash": "sha256-LCmfWlT3tlGVj0Q20TKqs5PBwdH3vnNsxJEhqt0wH1o=", "owner": "nix-community", "repo": "home-manager", - "rev": "d166a078541982a76f14d3e06e9665fa5c9ed85e", + "rev": "a7d2aca3f0dd952b01d8ed5c45536b40af3841eb", "type": "github" }, "original": { @@ -1053,11 +1053,11 @@ ] }, "locked": { - "lastModified": 1774991950, - "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", + "lastModified": 1773422513, + "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", + "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "type": "github" }, "original": { @@ -1094,11 +1094,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1774988212, - "narHash": "sha256-yrXQPx6ExBxm4n1ETUuaX9ptoURiICEYmgyWzoQvfkU=", + "lastModified": 1774976768, + "narHash": "sha256-ngjdJOKQUOoVmNYoj0sexuzJFqBJ4JPYzQq9FCW6CmI=", "owner": "NixOS", "repo": "hydra", - "rev": "c8b96dad2f85210c1dcee451e04c4c815bd97176", + "rev": "68086440ca2ef5bbd93a4961720de4c9103605ed", "type": "github" }, "original": { @@ -1213,11 +1213,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1775082056, - "narHash": "sha256-rC0fWLlXNnZe+SjrCUqnX9QSrGiwLhTjR+y14onv+J4=", + "lastModified": 1774971547, + "narHash": "sha256-a5yiW4unGah5y/DfgUvVVmEozsPKYvwAxG0tPQ9XFwg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "529f72249c2cf4cefc824a612aeddf2d5f858f54", + "rev": "ccdfa4070ee56232fbcd20595e3ba047756cce4d", "type": "github" }, "original": { @@ -1680,11 +1680,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1775089852, - "narHash": "sha256-zcX3hf2cTOQ06kRP+FCYbuaWhy+FLruLFp+D79Enjo4=", + "lastModified": 1774921404, + "narHash": "sha256-oHqaEduwYqXx3itq7ckP+iuC9nU6DzfCVery4YhUjAU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "cfa91d98691d91cc604ab8f4e224819524c496ad", + "rev": "3d02f5c53d09af97a7d66065b8c058d0599bc547", "type": "github" }, "original": { @@ -1775,11 +1775,11 @@ ] }, "locked": { - "lastModified": 1775098068, - "narHash": "sha256-9L2LEBXJYhYeO+cx8rYAFdWMEApM0bLQykgoCgL6Ssg=", + "lastModified": 1774839512, + "narHash": "sha256-1b3R3cCujPtSwc90gZjlCUinWo585QQTNjIQ7jlzLxM=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "4d81dcca59d7a6bfe01f3ad764e0c7890836e255", + "rev": "f3396cbc8dc9c9fd4e024ca450f0adb1f560b7ba", "type": "github" }, "original": { @@ -1991,11 +1991,11 @@ }, "nixpkgs-latest-factorio": { "locked": { - "lastModified": 1775152264, - "narHash": "sha256-F7V6WIo34Og7JQcxNisDaahsufi35yDdEcg15qwoqPA=", + "lastModified": 1774977170, + "narHash": "sha256-qQU1LBMGuEyo8B+okWgeu1Zzoh/JTdJ+31UoD3ymWpw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa6e86b58219167431eccd1706d4a8d2d117d5fd", + "rev": "90c93f32066ca8fdcb0ee5b568363b7e10c52eaf", "type": "github" }, "original": { @@ -2007,11 +2007,11 @@ }, "nixpkgs-latest-minecraft": { "locked": { - "lastModified": 1775152264, - "narHash": "sha256-F7V6WIo34Og7JQcxNisDaahsufi35yDdEcg15qwoqPA=", + "lastModified": 1774977170, + "narHash": "sha256-qQU1LBMGuEyo8B+okWgeu1Zzoh/JTdJ+31UoD3ymWpw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa6e86b58219167431eccd1706d4a8d2d117d5fd", + "rev": "90c93f32066ca8fdcb0ee5b568363b7e10c52eaf", "type": "github" }, "original": { @@ -2023,11 +2023,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "type": "github" }, "original": { @@ -2053,11 +2053,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1775152264, - "narHash": "sha256-F7V6WIo34Og7JQcxNisDaahsufi35yDdEcg15qwoqPA=", + "lastModified": 1774977170, + "narHash": "sha256-qQU1LBMGuEyo8B+okWgeu1Zzoh/JTdJ+31UoD3ymWpw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa6e86b58219167431eccd1706d4a8d2d117d5fd", + "rev": "90c93f32066ca8fdcb0ee5b568363b7e10c52eaf", "type": "github" }, "original": { @@ -2102,11 +2102,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1775002709, - "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", + "lastModified": 1774799055, + "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", + "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a", "type": "github" }, "original": { @@ -2118,11 +2118,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1775002709, - "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", + "lastModified": 1774799055, + "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", + "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a", "type": "github" }, "original": { @@ -2150,11 +2150,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1774709303, + "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", "type": "github" }, "original": { @@ -2198,11 +2198,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1773389992, + "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", "type": "github" }, "original": { @@ -2313,11 +2313,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1774709303, + "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", "type": "github" }, "original": { @@ -2540,11 +2540,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1774999302, - "narHash": "sha256-KJfDmGLMVO8Hr4TrTwOAQpOykLLOSgk9dxkaf2dHzFU=", + "lastModified": 1774966690, + "narHash": "sha256-wFXUweEOI9IDBISjsUy+x5TrxOWY1ELHOo1oG/T9zG4=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "493f0ff8a7571cc4ddd190babfa447489f41c752", + "rev": "f18985058ed473a46915c22dad0006c808785c2f", "type": "gitlab" }, "original": { @@ -2680,11 +2680,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1775125835, - "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", + "lastModified": 1773297127, + "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "75925962939880974e3ab417879daffcba36c4a3", + "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", "type": "github" }, "original": { @@ -2773,11 +2773,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1775106234, - "narHash": "sha256-ZCHEj7dvqaguQy2yOHELkrkgPRAbnno+Lg9PAAiBv44=", + "lastModified": 1774848370, + "narHash": "sha256-Esm+aiabP563BcUFfFUCIOlFaTxKUXPp6jw0LMAV7ik=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0118405698718bd82343050d4419072fffd0df54", + "rev": "712c476500e96df74276be99bb3fa9631f494f3a", "type": "github" }, "original": { @@ -2795,11 +2795,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1775090918, - "narHash": "sha256-RI7BPlDASdIYP6xAKslHYrJ0kZ3a5ChZLvgKmerLTUE=", + "lastModified": 1774918257, + "narHash": "sha256-QeBH2VZT47d85PEGM36tjxL3XaucYKVBAnQDeHSlob4=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "a924ef131b7dbbb37c535a92d4aece587190465f", + "rev": "45e0b47fe7fd6eb4df727d71b33ebf5cc92f6a68", "type": "github" }, "original": { diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix index 8a9a3ac..bea3f1b 100644 --- a/modules/desktop/niri.nix +++ b/modules/desktop/niri.nix @@ -220,6 +220,15 @@ open-on-output = "DP-1"; } + { + matches = [ + { + app-id = "zen-beta"; + } + ]; + + open-on-workspace = "01-zen"; + } { matches = [ { @@ -233,7 +242,9 @@ { matches = [ { - app-id = "obsidian"; + app-id = "electron"; + title = "Obsidian"; + at-startup = true; } { app-id = "teams-for-linux"; @@ -258,8 +269,6 @@ open-on-workspace = "02-games"; default-column-width.proportion = 1.0; default-window-height.proportion = 1.0; - min-width = 3440; - min-height = 1440; } { matches = [ @@ -267,7 +276,7 @@ app-id = "Element"; } { - app-id = "discord"; + app-id = "vesktop"; } { app-id = "steam"; @@ -296,7 +305,7 @@ app-id = "1Password"; } { - app-id = "discord"; + app-id = "vesktop"; } { app-id = "Element"; @@ -421,6 +430,7 @@ "Mod+R".action = actions.switch-preset-column-width; "Mod+Shift+R".action = actions.switch-preset-window-height; "Mod+Ctrl+R".action = actions.reset-window-height; + "Mod+G".action = actions.toggle-window-floating; "Mod+F".action = actions.maximize-column; "Mod+Shift+F".action = actions.fullscreen-window; "Mod+Ctrl+F".action = actions.expand-column-to-available-width; @@ -442,7 +452,8 @@ spawn-at-startup = [ { argv = [ "zen-beta" ]; } { argv = [ "obsidian" ]; } - { argv = [ "discord" ]; } + { argv = [ "element-desktop" ]; } + { argv = [ "vesktop" ]; } { argv = [ "1password" ]; } { sh = "sleep 1 && steam"; } ]; diff --git a/modules/games/communication.nix b/modules/games/communication.nix index cb65ff2..3f4b407 100644 --- a/modules/games/communication.nix +++ b/modules/games/communication.nix @@ -3,7 +3,7 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ - discord + vesktop teamspeak6-client element-desktop ]; diff --git a/modules/hosts/yggdrasil/hardware.nix b/modules/hosts/yggdrasil/hardware.nix index 238a1fa..ebd32d8 100644 --- a/modules/hosts/yggdrasil/hardware.nix +++ b/modules/hosts/yggdrasil/hardware.nix @@ -44,7 +44,10 @@ "usb_storage" "sd_mod" ]; - kernelModules = [ "kvm-amd" ]; + kernelModules = [ + "kvm-amd" + "ntsync" + ]; };