diff --git a/.config/i3/config b/.config/i3/config index 705b213..1554e43 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -361,7 +361,7 @@ exec --no-startup-id /usr/bin/env dunst #exec --no-startup-id sleep 2 && xfce4-terminal #exec --no-startup-id sleep 7 && firefox https://github.com/endeavouros-team/endeavouros-i3wm-setup/blob/main/force-knowledge.md #exec --no-startup-id sleep 3 && thunar -exec --no-startup-id i3-msg workspace $ws9; exec discord +exec --no-startup-id i3-msg workspace $ws9; exec discordcanary exec --no-startup-id i3-msg workspace $ws10; exec firefox ############### diff --git a/flake.lock b/flake.lock index 2f94e35..107992f 100644 --- a/flake.lock +++ b/flake.lock @@ -548,11 +548,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730943699, - "narHash": "sha256-Z1atKXmCKjniZkF1Wn8amNHbMmsVO24r5psLp9XnUbo=", + "lastModified": 1733339972, + "narHash": "sha256-6Ocb/x/7Y8mEjZU/xuxDZNX7EIQ5O0hKpzcYvH7+XdM=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "77f7a41adaf314680d322a8303f12b180b33961c", + "rev": "368e94ef348c45ec800f5f4a6939a397c024f984", "type": "github" }, "original": { @@ -653,27 +653,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -792,11 +792,11 @@ ] }, "locked": { - "lastModified": 1730860036, - "narHash": "sha256-u0sfA4B65Q9cRO3xpIkQ4nldB8isfdIb3rWtsnRZ+Iw=", + "lastModified": 1732933841, + "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b8eb3aeb21629cbe14968a5e3b1cbaefb0d1b260", + "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", "type": "github" }, "original": { diff --git a/home-manager/hyprland/default.nix b/home-manager/hyprland/default.nix index f44b507..b9be43b 100644 --- a/home-manager/hyprland/default.nix +++ b/home-manager/hyprland/default.nix @@ -1,7 +1,7 @@ { imports = [ ./hyprland-settings.nix - ./hyprland-xwaylandvideobridge.nix + #./hyprland-xwaylandvideobridge.nix not needed anymore ./waybar.nix ./hyprlock.nix ]; diff --git a/modules/graphical/code.nix b/modules/graphical/code.nix index 3fcdfcc..50d7523 100644 --- a/modules/graphical/code.nix +++ b/modules/graphical/code.nix @@ -12,7 +12,6 @@ in documentation.dev.enable = true; environment.systemPackages = with pkgs; [ man-pages - kate jetbrains.idea-ultimate typescript #jetbrains.clion diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix index c48a63a..7fdf689 100644 --- a/modules/graphical/shared.nix +++ b/modules/graphical/shared.nix @@ -65,7 +65,7 @@ in { environment.systemPackages = with pkgs; [ keepassxc discord - vesktop + #vesktop gvfs remmina thunderbird @@ -83,7 +83,7 @@ in { pinta # paint #qalculate-qt # calculator TODO build broken #libsForQt5.kcalc - syncthingtray #doesnt work with socket yet + #syncthingtray #doesnt work with socket yet v4l-utils logseq # notes xarchiver # archive tool diff --git a/systems/amd-server/configuration.nix b/systems/amd-server/configuration.nix index 052b8ec..098d240 100644 --- a/systems/amd-server/configuration.nix +++ b/systems/amd-server/configuration.nix @@ -40,19 +40,11 @@ mainUser.variant = "us"; networking = { - useNetworkd = true; # Ensure networkd is used, as it handles bridging well - defaultGateway.interface = "br0"; # Set the default gateway - defaultGateway.address = "192.168.0.1"; useDHCP = false; + defaultGateway.address = "192.168.0.1"; nameservers = [ "192.168.0.10" "1.1.1.1" ]; - interfaces.enp6s0 = { - name = "eth0"; - ipv4.addresses = []; - }; - bridges.br0 = { - interfaces = [ "eth0" ]; # Add eth0 to the bridge - }; + bridges.br0 = { interfaces = [ "enp6s0" ]; }; interfaces.br0 = { ipv4.addresses = [{ address = "192.168.0.20";