diff --git a/flake.lock b/flake.lock index 894e1e10..80f9fb0b 100644 --- a/flake.lock +++ b/flake.lock @@ -510,7 +510,7 @@ "crane_5": { "inputs": { "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_11", "nixpkgs": [ "music-player", "nixpkgs" @@ -769,6 +769,27 @@ "type": "github" } }, + "eilmeldung": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1766408482, + "narHash": "sha256-15J11D/U40wCb9CW9Nt5YM5hBlOD5xboiz1AKPmOLrU=", + "owner": "christo-auer", + "repo": "eilmeldung", + "rev": "c0e0517ba2caeb28189752c7ab1d9c870d86b3e0", + "type": "github" + }, + "original": { + "owner": "christo-auer", + "repo": "eilmeldung", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -1241,11 +1262,11 @@ "systems": "systems_14" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -1277,11 +1298,11 @@ "systems": "systems_16" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -1309,6 +1330,24 @@ } }, "flake-utils_14": { + "inputs": { + "systems": "systems_18" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_15": { "inputs": { "systems": [ "nixpkgs-xr", @@ -1329,9 +1368,9 @@ "type": "github" } }, - "flake-utils_15": { + "flake-utils_16": { "inputs": { - "systems": "systems_20" + "systems": "systems_21" }, "locked": { "lastModified": 1731533236, @@ -1347,21 +1386,6 @@ "type": "github" } }, - "flake-utils_16": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_17": { "locked": { "lastModified": 1644229661, @@ -1378,15 +1402,12 @@ } }, "flake-utils_18": { - "inputs": { - "systems": "systems_24" - }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -1397,14 +1418,14 @@ }, "flake-utils_19": { "inputs": { - "systems": "systems_26" + "systems": "systems_25" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -1435,6 +1456,24 @@ "inputs": { "systems": "systems_27" }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_21": { + "inputs": { + "systems": "systems_28" + }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -1559,7 +1598,7 @@ }, "flake-utils_9": { "inputs": { - "systems": "systems_13" + "systems": "systems_11" }, "locked": { "lastModified": 1731533236, @@ -1610,7 +1649,7 @@ "ghostty": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_2", "zig": "zig", "zon2nix": "zon2nix" @@ -1727,7 +1766,7 @@ }, "handoff": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs" ] @@ -1765,7 +1804,7 @@ "headplane": { "inputs": { "devshell": "devshell", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_9", "nixpkgs": [ "nixpkgs" ] @@ -1948,7 +1987,7 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_11", + "systems": "systems_12", "xdph": "xdph" }, "locked": { @@ -2103,7 +2142,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_12" + "systems": "systems_13" }, "locked": { "lastModified": 1765358139, @@ -2121,7 +2160,7 @@ }, "hyprmonitors": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_10", "nixpkgs": [ "nixpkgs" ], @@ -2416,7 +2455,7 @@ "advisory-db": "advisory-db_4", "crane": "crane_5", "fenix": "fenix_2", - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_12", "nixpkgs": [ "nixpkgs" ] @@ -2544,7 +2583,7 @@ }, "nix-auth": { "inputs": { - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_13", "nixpkgs": [ "nixpkgs" ] @@ -2709,7 +2748,7 @@ "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_13", + "flake-utils": "flake-utils_14", "nixpkgs": "nixpkgs_5" }, "locked": { @@ -2894,11 +2933,11 @@ "nixpkgs-xr": { "inputs": { "flake-compat": "flake-compat_9", - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_15", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_18", + "systems": "systems_19", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -3092,7 +3131,7 @@ "inputs": { "flake-parts": "flake-parts_6", "nixpkgs": "nixpkgs_8", - "systems": "systems_19" + "systems": "systems_20" }, "locked": { "lastModified": 1765532309, @@ -3110,7 +3149,7 @@ }, "nno": { "inputs": { - "flake-utils": "flake-utils_15", + "flake-utils": "flake-utils_16", "neorg": "neorg", "neorg-telescope": "neorg-telescope", "nixpkgs": [ @@ -3136,7 +3175,7 @@ "norg": { "inputs": { "flake-compat": "flake-compat_10", - "flake-utils": "flake-utils_16", + "flake-utils": "flake-utils_17", "nixpkgs": "nixpkgs_9" }, "locked": { @@ -3157,7 +3196,7 @@ "norg-meta": { "inputs": { "flake-compat": "flake-compat_11", - "flake-utils": "flake-utils_17", + "flake-utils": "flake-utils_18", "nixpkgs": "nixpkgs_10" }, "locked": { @@ -3249,7 +3288,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_21" + "systems": "systems_22" }, "locked": { "lastModified": 1756860511, @@ -3373,7 +3412,8 @@ "ddcbacklight": "ddcbacklight", "deploy-rs": "deploy-rs", "disko": "disko", - "flake-utils": "flake-utils_5", + "eilmeldung": "eilmeldung", + "flake-utils": "flake-utils_6", "ghostty": "ghostty", "guihua": "guihua", "handoff": "handoff", @@ -3708,7 +3748,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_22", + "systems": "systems_23", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -3742,7 +3782,7 @@ "nixpkgs-stable" ], "nur": "nur_3", - "systems": "systems_23", + "systems": "systems_24", "tinted-foot": "tinted-foot_2", "tinted-kitty": "tinted-kitty_2", "tinted-schemes": "tinted-schemes_2", @@ -3796,16 +3836,16 @@ }, "systems_11": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -3826,16 +3866,16 @@ }, "systems_13": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -3900,21 +3940,6 @@ } }, "systems_18": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_19": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -3929,6 +3954,21 @@ "type": "github" } }, + "systems_19": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -4064,6 +4104,21 @@ "type": "github" } }, + "systems_28": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -4335,7 +4390,7 @@ "inputs": { "advisory-db": "advisory-db_5", "crane": "crane_6", - "flake-utils": "flake-utils_18", + "flake-utils": "flake-utils_19", "nix-github-actions": "nix-github-actions_4", "nixpkgs": [ "nixpkgs" @@ -4516,7 +4571,7 @@ "vicinae": { "inputs": { "nixpkgs": "nixpkgs_12", - "systems": "systems_25" + "systems": "systems_26" }, "locked": { "lastModified": 1765272078, @@ -4651,7 +4706,7 @@ "inputs": { "advisory-db": "advisory-db_6", "crane": "crane_7", - "flake-utils": "flake-utils_19", + "flake-utils": "flake-utils_20", "nix-github-actions": "nix-github-actions_5", "nixpkgs": [ "nixpkgs" @@ -4704,7 +4759,7 @@ "zjstatus": { "inputs": { "crane": "crane_8", - "flake-utils": "flake-utils_20", + "flake-utils": "flake-utils_21", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index db3aecb9..8c91b1d2 100644 --- a/flake.nix +++ b/flake.nix @@ -243,6 +243,10 @@ url = "github:uttarayan21/wivrn?submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; }; + eilmeldung = { + url = "github:christo-auer/eilmeldung"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { diff --git a/home/programs/default.nix b/home/programs/default.nix index 12b8369d..22827377 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -44,6 +44,7 @@ ./yazi.nix ./yt-dlp.nix ./zoxide.nix + ./eilmeldung.nix # ./goread.nix # ./helix.nix diff --git a/home/programs/eilmeldung.nix b/home/programs/eilmeldung.nix new file mode 100644 index 00000000..bb9fbb3a --- /dev/null +++ b/home/programs/eilmeldung.nix @@ -0,0 +1,37 @@ +{inputs, ...}: { + imports = [ + inputs.eilmeldung.homeManager.default + ]; + programs.eilmeldung = { + enable = true; + + settings = { + refresh_fps = 60; + article_scope = "unread"; + + theme = { + color_palette = { + background = "#1e1e2e"; + # // ... + }; + }; + + input_config.mappings = { + "q" = "quit"; + "j" = "down"; + "k" = "up"; + "g g" = "gotofirst"; + "G" = "gotolast"; + "o" = ["open" "read" "nextunread"]; + }; + + feed_list = [ + "query: \"Today Unread\" today unread" + "query: \"Today Marked\" today marked" + "feeds" + "* categories" + "tags" + ]; + }; + }; +} diff --git a/home/services/default.nix b/home/services/default.nix index aee90e8e..364be63c 100644 --- a/home/services/default.nix +++ b/home/services/default.nix @@ -12,6 +12,7 @@ ./hyprmon.nix ./hyprland.nix ./hyprpaper.nix + ./remmina.nix # ./wallpaperengine.nix ]; } diff --git a/home/services/gui.nix b/home/services/gui.nix index ea8a1c5a..b3d20b37 100644 --- a/home/services/gui.nix +++ b/home/services/gui.nix @@ -28,7 +28,7 @@ # polkit_gnome seahorse signal-desktop - # sony-headphones-client + sony-headphones-client spotify steam-run wl-clipboard diff --git a/home/services/remmina.nix b/home/services/remmina.nix new file mode 100644 index 00000000..d8a566d9 --- /dev/null +++ b/home/services/remmina.nix @@ -0,0 +1,7 @@ +{...}: { + services.remmina = { + enable = true; + systemdService.enable = true; + addRdpMimeTypeAssoc = true; + }; +} diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix index e8c48f61..cd81875e 100644 --- a/nixos/ryu/configuration.nix +++ b/nixos/ryu/configuration.nix @@ -187,14 +187,37 @@ hostId = "1349f9f0"; # Enable networking networkmanager.enable = true; - - # Open ports in the firewall. - # firewall.allowedTCPPorts = [ ... ]; - # firewall.allowedUDPPorts = [ ... ]; - # firewall.enable = false; - nftables.enable = true; + nftables = { + # Open ports in the firewall. + # firewall.allowedTCPPorts = [ ... ]; + # firewall.allowedUDPPorts = [ ... ]; + # firewall.enable = false; + enable = true; + flushRuleset = true; + tables = { + "mullvad_tailscale" = { + enable = true; + family = "inet"; + content = '' + chain output { + type route hook output priority 0; policy accept; + ip daddr 100.64.0.0/10 ct mark set 0x00000f41 meta mark set 0x6d6f6c65; + } + ''; + }; + }; + # ruleset = '' + # table inet mullvad_tailscale { + # chain output { + # type route hook output priority 0; policy accept; + # ip daddr 100.64.0.0/10 ct mark set 0x00000f41 meta mark set 0x6d6f6c65; + # } + # } + # + # ''; + }; firewall = { - enable = false; + enable = true; trustedInterfaces = [ "tailscale0" ]; @@ -202,7 +225,10 @@ 9 # Wake on LAN 4950 # Warframe 4955 # Warframe - 3113 # Other + ]; + allowedTCPPorts = [ + 3113 # Hyprmonitors + 11345 # lmstudio ]; allowedTCPPortRanges = [ { @@ -216,14 +242,6 @@ to = 1764; } ]; - # extraInputRules = '' - # table inet mullvad_tailscale { - # chain output { - # type route hook output priority 0; policy accept; - # ip daddr 100.64.0.0/10 ct mark set 0x00000f41 meta mark set 0x6d6f6c65; - # } - # } - # ''; }; }; diff --git a/nixos/ryu/ryu.nix b/nixos/ryu/ryu.nix index dd12295f..93b9e492 100644 --- a/nixos/ryu/ryu.nix +++ b/nixos/ryu/ryu.nix @@ -127,11 +127,11 @@ options = ["nofail"]; }; - fileSystems."/volumes/windows-games" = { - device = "/dev/disk/by-partuuid/56359fb7-7d33-44d2-bebd-b0c53daeeb73"; - fsType = "ntfs3"; - options = ["nofail"]; - }; + # fileSystems."/volumes/windows-games" = { + # device = "/dev/disk/by-partuuid/56359fb7-7d33-44d2-bebd-b0c53daeeb73"; + # fsType = "ntfs3"; + # options = ["nofail"]; + # }; swapDevices = []; diff --git a/nixos/tako/configuration.nix b/nixos/tako/configuration.nix index b8b281a9..80db085f 100644 --- a/nixos/tako/configuration.nix +++ b/nixos/tako/configuration.nix @@ -159,6 +159,7 @@ # Open ports in the firewall. networking.firewall.allowedTCPPorts = [22 80 443]; + networking.firewall.allowedUDPPorts = [8766 27016 9700]; # Copy the NixOS configuration file and link it from the resulting system # (/run/current-system/configuration.nix). This is useful in case you diff --git a/nixos/tako/services/games/default.nix b/nixos/tako/services/games/default.nix index 3559484b..9ddf910e 100644 --- a/nixos/tako/services/games/default.nix +++ b/nixos/tako/services/games/default.nix @@ -1,7 +1,12 @@ -{...}: { +{pkgs, ...}: { imports = [ # ./minecraft.nix # ./satisfactory.nix ./terraria.nix ]; + + environment.systemPackages = with pkgs; [ + steamcmd + steam-tui + ]; } diff --git a/overlays.nix b/overlays.nix index dbb3ff5f..b8f5f299 100644 --- a/overlays.nix +++ b/overlays.nix @@ -286,6 +286,7 @@ in inputs.handoff.overlays.default inputs.headplane.overlays.default inputs.vicinae.overlays.default + inputs.eilmeldung.overlays.default jellyfin libfprint misc-applications