diff --git a/flake.lock b/flake.lock index 665016e..d90e6e4 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1700436815, - "narHash": "sha256-+txRDmFuI/dW/ZmacfDrqSsKiWTNLmRygej25u2ojNM=", + "lastModified": 1703043529, + "narHash": "sha256-3OCMEA/RPwgdzFfQGXRQyvHlWYKY0tTbrlR5ETBzEYI=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "14b327ca47703c376ebb82ba16dc42ca2baa57d8", + "rev": "56c1ef38d3e04eae9b5867669ed131601fa99a7d", "type": "github" }, "original": { @@ -188,11 +188,11 @@ ] }, "locked": { - "lastModified": 1702937117, - "narHash": "sha256-4GjkL2D01bDg00UZN/SeGrnBZrDVOFeZTbQx6U702Vc=", + "lastModified": 1703072477, + "narHash": "sha256-I2g7o+J26iK3sGk53iuaYiMWryzAYx0zhNQUFzTID/A=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8aaced73ebaf6bfa8e3c6ab0a19cb184bc4d798", + "rev": "433120e47d016c9960dd9c2b1821e97d223a6a39", "type": "github" }, "original": { @@ -222,17 +222,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700419998, - "narHash": "sha256-aXh4adx9x9RlRMSykzR+bY8AOVjcwMEJO1ZeQROwbcE=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12a0ade5e458984675b9789a4b260ebabdd2d1ab", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "12a0ade5e458984675b9789a4b260ebabdd2d1ab", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" } }, @@ -253,11 +253,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1702780907, - "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", + "lastModified": 1702921762, + "narHash": "sha256-O/rP7gulApQAB47u6szEd8Pn8Biw0d84j5iuP2tcxzY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", + "rev": "d02ffbbe834b5599fc5f134e644e49397eb07188", "type": "github" }, "original": { @@ -317,11 +317,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1702830618, - "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -349,11 +349,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1702830618, - "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -404,11 +404,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1702895385, - "narHash": "sha256-xCfbHlBEPbjpecbhd9zJ79xyI9pURW9/BsY75DNIfs4=", + "lastModified": 1703087450, + "narHash": "sha256-wmsdHlhT7M53NEVYSeTpq35/xKMv5kSGTkfh3XtTPhQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "309e5644fc72ce82b31da5290638019f60a0a84b", + "rev": "2463b522504d55a95b9f2050d4cb24791679b4b6", "type": "github" }, "original": { @@ -419,11 +419,11 @@ }, "nur": { "locked": { - "lastModified": 1703011543, - "narHash": "sha256-zCAKHZ8cTT/J+sr16vLhM5Qlc+O7MbML9xgQa8QTjRc=", + "lastModified": 1703090758, + "narHash": "sha256-gYoLxlB+w+N+G4bLeu76MYSoBCZgC00of4kM4dIDI3o=", "owner": "nix-community", "repo": "nur", - "rev": "3df75c4890e142d2e4a25ea714eb364e3f770be7", + "rev": "f133fc54e2a2495d19f6020120717240068ce0f3", "type": "github" }, "original": { diff --git a/home-manager/features/kitty.nix b/home-manager/features/kitty.nix index 00ee613..f9bce83 100644 --- a/home-manager/features/kitty.nix +++ b/home-manager/features/kitty.nix @@ -9,7 +9,7 @@ settings = { wayland_titlebar_color = "system"; background_opacity = "0.82"; - font_size = lib.mkDefault 16; + font_size = lib.mkDefault 12; hide_window_decorations = "no"; linux_display_server = "x11"; confirm_os_window_close = 0; diff --git a/home-manager/noe/hosts/aerial.nix b/home-manager/noe/hosts/aerial.nix index ba1e28c..cfb2a42 100644 --- a/home-manager/noe/hosts/aerial.nix +++ b/home-manager/noe/hosts/aerial.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ pkgs, ... }: { imports = [ ../common ../common/home-user.nix @@ -6,4 +6,10 @@ ../../features/kitty.nix ../../features/vesktop ]; + + home.packages = with pkgs; [ + transmission-gtk + ]; + + programs.kitty.settings.font_size = 12; } diff --git a/nixos/features/xfce.nix b/nixos/features/xfce.nix index 7274ef4..9f0759b 100644 --- a/nixos/features/xfce.nix +++ b/nixos/features/xfce.nix @@ -16,4 +16,9 @@ layout = "us"; xkbVariant = ""; }; + + environment.systemPackages = with pkgs; [ + xfce.xfce4-clipman-plugin + xfce.xfce4-volumed-pulse + ]; } diff --git a/nixos/hosts/aerial/default.nix b/nixos/hosts/aerial/default.nix index b3915c2..a832287 100644 --- a/nixos/hosts/aerial/default.nix +++ b/nixos/hosts/aerial/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ pkgs, ... }: { imports = [ ./hardware-configuration.nix ../../client.nix @@ -12,9 +12,10 @@ home-manager.users.noe = import ../../../home-manager/noe/hosts/aerial.nix; - environment.etc."X11/xorg.conf" = { - source = ./xorg.conf; - }; + # TODO: ??? X11 is angry + #environment.etc."X11/xorg.conf" = { + # source = ./xorg.conf; + #}; networking.hostName = "aerial"; system.stateVersion = "24.05"; @@ -23,4 +24,7 @@ device = "/dev/disk/by-uuid/804c5fa2-cf78-4c18-a956-a5b60ea33619"; fsType = "ext4"; }; + + networking.firewall.allowedTCPPorts = [ 42069 ]; + networking.firewall.allowedUDPPorts = [ 42069 ]; }