diff --git a/flake.lock b/flake.lock index 537288979..65540dc81 100644 --- a/flake.lock +++ b/flake.lock @@ -981,17 +981,17 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1694116212, - "narHash": "sha256-55XlSIUlUHkRSySKB4jpJRBmU9i4AZlksN3K6YcbOTE=", + "lastModified": 1709082145, + "narHash": "sha256-NoDUjGCp2fW3cdJzQ0cf8ZcHQZ/vflPoPmFddEcectI=", "owner": "daeuniverse", "repo": "flake.nix", - "rev": "e16931c97e18eddd6a36b182687701cd6d03b284", + "rev": "1e5f8828b1d665dafa1b1b0a6c46629a27edbf74", "type": "github" }, "original": { "owner": "daeuniverse", + "ref": "exp", "repo": "flake.nix", - "rev": "e16931c97e18eddd6a36b182687701cd6d03b284", "type": "github" } }, @@ -6089,22 +6089,6 @@ "type": "github" } }, - "nixpkgs-dae_2": { - "locked": { - "lastModified": 1703592166, - "narHash": "sha256-y6q8zVECbzKaqVa93ozQWiQhFDgiSQarJH0+V3SR8jY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c43c81954dee4f0b383a6c4ee3f3c66384146d42", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c43c81954dee4f0b383a6c4ee3f3c66384146d42", - "type": "github" - } - }, "nixpkgs-for-bootstrap": { "locked": { "lastModified": 1686921029, @@ -7910,7 +7894,7 @@ "nixpkgs" ], "nixpkgs-22": "nixpkgs-22_2", - "nixpkgs-dae": "nixpkgs-dae_2", + "nixpkgs-dae": "nixpkgs-dae", "nixpkgs-master": "nixpkgs-master_2", "nixpkgs-rebuild": "nixpkgs-rebuild_2", "nixpkgs-wayland": "nixpkgs-wayland_2", @@ -9076,7 +9060,6 @@ "nixified-ai": "nixified-ai", "nixpkgs": "nixpkgs_26", "nixpkgs-22": "nixpkgs-22", - "nixpkgs-dae": "nixpkgs-dae", "nixpkgs-master": "nixpkgs-master", "nixpkgs-rebuild": "nixpkgs-rebuild", "nixpkgs-wayland": "nixpkgs-wayland", diff --git a/flake.nix b/flake.nix index 69ebf7daa..eddf20ad3 100755 --- a/flake.nix +++ b/flake.nix @@ -85,7 +85,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nixpkgs-22.url = "github:NixOS/nixpkgs?rev=c91d0713ac476dfb367bbe12a7a048f6162f039c"; - nixpkgs-dae.url = "github:NixOS/nixpkgs?rev=c43c81954dee4f0b383a6c4ee3f3c66384146d42"; nixpkgs-rebuild.url = "github:SuperSandro2000/nixpkgs?rev=449114c6240520433a650079c0b5440d9ecf6156"; niri.url = "github:sodiboo/niri-flake"; # niri.inputs.niri-src.url = "github:YaLTeR/niri"; @@ -137,7 +136,7 @@ url = "github:tadfisher/android-nixpkgs"; }; # path:/home/riro/Src/flake.nix - dae.url = "github:daeuniverse/flake.nix?rev=e16931c97e18eddd6a36b182687701cd6d03b284"; + dae.url = "github:daeuniverse/flake.nix/exp"; # nixyDomains.url = "/home/elen/nixyDomains"; nixyDomains.url = "github:oluceps/nixyDomains"; nixyDomains.flake = false; diff --git a/home/programs/foot/default.nix b/home/programs/foot/default.nix index 90e4b3721..2093c84d3 100644 --- a/home/programs/foot/default.nix +++ b/home/programs/foot/default.nix @@ -5,7 +5,7 @@ server.enable = false; settings = { main = { - font = "Maple Mono SC NF:size=15.5:style=Regular"; + font = "Maple Mono SC NF:size=13.5:style=Regular"; dpi-aware = "yes"; term = "foot"; pad = "8x12"; @@ -14,8 +14,8 @@ }; colors = { - alpha = "0.85"; - background = "35333c"; + alpha = "0.9"; + background = "0f0d0e"; bright0 = "a7a8bd"; bright1 = "f38ba8"; bright2 = "a6e3a1"; diff --git a/home/programs/sway/default.nix b/home/programs/sway/default.nix index 688cd0beb..abc5fab4d 100755 --- a/home/programs/sway/default.nix +++ b/home/programs/sway/default.nix @@ -182,7 +182,7 @@ "XF86AudioLowerVolume" = "exec pamixer -d 5"; "XF86MonBrightnessUp" = "exec brightnessctl set +3%"; "XF86MonBrightnessdown" = "exec brightnessctl set 3%-"; - "${modifier}+Return" = "exec ${lib.getExe systemd-run-app} ${lib.getExe alacritty}"; + "${modifier}+Return" = "exec ${lib.getExe systemd-run-app} ${lib.getExe foot}"; "${modifier}+d" = "exec ${lib.getExe fuzzel} ${fuzzelArgs}"; "${modifier}+space" = "floating toggle"; "${modifier}+Shift+space" = null; diff --git a/hosts/hastur/default.nix b/hosts/hastur/default.nix index 9e47ceddb..efa828970 100644 --- a/hosts/hastur/default.nix +++ b/hosts/hastur/default.nix @@ -28,7 +28,7 @@ "android-nixpkgs" "agenix-rekey" "misskey" - # "nixpkgs-wayland" + "nixpkgs-wayland" ]); }; specialArgs = lib.base // { diff --git a/hosts/kaambl/default.nix b/hosts/kaambl/default.nix index 46396ebd4..a18e476cf 100644 --- a/hosts/kaambl/default.nix +++ b/hosts/kaambl/default.nix @@ -25,7 +25,7 @@ "nuenv" "android-nixpkgs" "agenix-rekey" - "nixpkgs-wayland" + # "nixpkgs-wayland" ]) ++ (import ../../overlays.nix inputs); }; specialArgs = lib.base // { inherit lib; user = "elen"; }; diff --git a/hosts/kaambl/spec.nix b/hosts/kaambl/spec.nix index de9faa001..1c7b74d89 100644 --- a/hosts/kaambl/spec.nix +++ b/hosts/kaambl/spec.nix @@ -36,6 +36,18 @@ (n: importService n) ) // { + + beesd.filesystems = { + os = { + spec = "/nix"; + hashTableSizeMB = 512; # 256 *2 *2 + verbosity = "crit"; + extraOptions = [ + "--loadavg-target" + "2.0" + ]; + }; + }; snapy.instances = [ { name = "persist"; diff --git a/misc.nix b/misc.nix index 40c802238..f874f8677 100755 --- a/misc.nix +++ b/misc.nix @@ -315,7 +315,7 @@ lib.mkMerge [ adb.enable = true; mosh.enable = true; nix-ld.enable = true; - command-not-found.enable = false; + command-not-found.enable = true; steam = { enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play diff --git a/overlays.nix b/overlays.nix index 505219820..c0637b7d1 100755 --- a/overlays.nix +++ b/overlays.nix @@ -111,22 +111,22 @@ let system = "x86_64-linux"; in [ # sha256 = "sha256-nYA8W7iabaepiIsxDrCkG/WIFNrVdubk/AtFhIvYJB8="; # }; # }); - # sway-unwrapped = inputs.; - sway-unwrapped = prev.callPackage "${inputs.RyanGibb}/pkgs/sway-im/package.nix" { - libdrm = final.libdrm; - wlroots = prev.callPackage "${inputs.RyanGibb}/pkgs/wlroots/default.nix" { - # for libdrm >=2.4.120 - mesa = final.mesa; - wayland-protocols = prev.wayland-protocols.overrideAttrs (old: rec { - pname = "wayland-protocols"; - version = "1.33"; - src = prev.fetchurl { - url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; - hash = "sha256-lPDFCwkNbmGgP2IEhGexmrvoUb5OEa57NvZfi5jDljo="; - }; - }); - }; - }; + sway-unwrapped = inputs.nixpkgs-wayland.packages.${system}.sway-unwrapped; + # sway-unwrapped = prev.callPackage "${inputs.RyanGibb}/pkgs/sway-im/package.nix" { + # libdrm = final.libdrm; + # wlroots = prev.callPackage "${inputs.RyanGibb}/pkgs/wlroots/default.nix" { + # # for libdrm >=2.4.120 + # mesa = final.mesa; + # wayland-protocols = prev.wayland-protocols.overrideAttrs (old: rec { + # pname = "wayland-protocols"; + # version = "1.33"; + # src = prev.fetchurl { + # url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; + # hash = "sha256-lPDFCwkNbmGgP2IEhGexmrvoUb5OEa57NvZfi5jDljo="; + # }; + # }); + # }; + # }; # sway-unwrapped = @@ -189,8 +189,8 @@ let system = "x86_64-linux"; in [ src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; - rev = "8ee97eaab798401207ab3af2f9372b7ad9928518"; - hash = "sha256-O59MaK0/kxjUZ/Wf1eyZJs921f1vxu5kFHIE0TG4Jrk="; + rev = "16dfabc93596d4036c0c8418789a7b114bf61619"; + hash = "sha256-Ya/M0/bx8O50kqdHO14mPz56FfW4xXDu7rYLjlB3OZc="; fetchSubmodules = true; };