diff --git a/nix/etcnixos/common.nix b/nix/etcnixos/common.nix index 6fbebc8..fb91147 100644 --- a/nix/etcnixos/common.nix +++ b/nix/etcnixos/common.nix @@ -196,6 +196,8 @@ dmidecode (inputs.agenix.packages.${pkgs.system}.default.override { ageBin = "${pkgs.rage}/bin/rage"; }) + + qemu_full ]; #wayland with electron/chromium applications diff --git a/nix/etcnixos/flake.lock b/nix/etcnixos/flake.lock index 213f4cc..2c5fe96 100644 --- a/nix/etcnixos/flake.lock +++ b/nix/etcnixos/flake.lock @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1726454253, - "narHash": "sha256-ikQs0QZGmCfk5cJ2N5nTT6oULMvWgxN6ebk4WsOq9io=", + "lastModified": 1726489388, + "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b9ab7e57c5d1d456cdeef252d345f3bca9c55851", + "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", "type": "github" }, "original": { diff --git a/nix/etcnixos/system-mreow.nix b/nix/etcnixos/system-mreow.nix index d5e574f..fc52462 100644 --- a/nix/etcnixos/system-mreow.nix +++ b/nix/etcnixos/system-mreow.nix @@ -4,7 +4,6 @@ lib, username, system, - cpu_arch, ... }: { @@ -35,7 +34,6 @@ }; services = { - #using btrfs, so lets scrub! btrfs.autoScrub = { enable = true; @@ -61,6 +59,7 @@ enable = true; pkiBundle = "/etc/secureboot"; }; + # Bootloader. loader = { /* @@ -103,15 +102,8 @@ environment.systemPackages = with pkgs; [ distrobox niri - mangohud ]; - # programs.steam.gamescopeSession.enable = true; - # programs.gamescope = { - # enable = true; - # capSysNice = true; - # }; - #weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work #if I move to another lock screen program, i will have to replace `swaylock` security.pam.services.swaylock = { }; diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 43fd11f..fb32c9c 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -381,15 +381,15 @@ ] }, "locked": { - "lastModified": 1726001766, - "narHash": "sha256-ADvEWfo0AuHR06ah1nnzOyhsG05/b5QpUc7vFNbiEfM=", - "owner": "MarceColl", + "lastModified": 1726505190, + "narHash": "sha256-cJ2h68WZ1dlPjwBfWxo8+uKUiW6ANOQNtA2gD88u/7c=", + "owner": "clementpoiret", "repo": "zen-browser-flake", - "rev": "06505a088396e2c0b9ad100302502783a6bcdb40", + "rev": "34b874e80aa2d1e5b08fbce376f4d398971b6d74", "type": "github" }, "original": { - "owner": "MarceColl", + "owner": "clementpoiret", "repo": "zen-browser-flake", "type": "github" } diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix index 783ae42..3794242 100644 --- a/nix/home-manager/flake.nix +++ b/nix/home-manager/flake.nix @@ -31,7 +31,8 @@ }; zen-browser = { - url = "github:MarceColl/zen-browser-flake"; + # url = "github:MarceColl/zen-browser-flake"; + url = "github:clementpoiret/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/nix/home-manager/progs/alacritty.nix b/nix/home-manager/progs/alacritty.nix index 45071f5..50cadaf 100644 --- a/nix/home-manager/progs/alacritty.nix +++ b/nix/home-manager/progs/alacritty.nix @@ -55,62 +55,68 @@ }; #color scheme - colors = { - primary = { - background = "0x131621"; - foreground = "0xa6accd"; - }; - - cursor = { - text = "CellBackground"; - cursor = "CellForeground"; - }; - - search = { - matches = { - foreground = "0x1b1e28"; - background = "0xadd7ff"; + colors = + let + normal = { + black = "0x1b1e28"; + red = "0xd0679d"; + green = "0x5de4c7"; + yellow = "0xfffac2"; + blue = "#435c89"; + magenta = "0xfcc5e9"; + cyan = "0xadd7ff"; + white = "0xffffff"; }; - focused_match = { - foreground = "0x1b1e28"; - background = "0xadd7ff"; + bright = { + black = "0xa6accd"; + red = normal.red; + green = normal.green; + yellow = normal.yellow; + blue = normal.cyan; + magenta = "0xfae4fc"; + cyan = "0x89ddff"; + white = normal.white; + }; + in + { + inherit normal bright; + primary = { + background = "0x131621"; + foreground = bright.black; + }; + + cursor = { + text = "CellBackground"; + cursor = "CellForeground"; + }; + + search = + let + foreground = normal.black; + background = normal.cyan; + in + { + matches = { + inherit foreground background; + }; + + focused_match = { + inherit foreground background; + }; + }; + + selection = { + text = "CellForeground"; + background = "0x303340"; + }; + + vi_mode_cursor = { + text = "CellBackground"; + cursor = "CellForeground"; }; }; - selection = { - text = "CellForeground"; - background = "0x303340"; - }; - - vi_mode_cursor = { - text = "CellBackground"; - cursor = "CellForeground"; - }; - - normal = { - black = "0x1b1e28"; - red = "0xd0679d"; - green = "0x5de4c7"; - yellow = "0xfffac2"; - blue = "#435c89"; - magenta = "0xfcc5e9"; - cyan = "0xadd7ff"; - white = "0xffffff"; - }; - - bright = { - black = "0xa6accd"; - red = "0xd0679d"; - green = "0x5de4c7"; - yellow = "0xfffac2"; - blue = "0xadd7ff"; - magenta = "0xfae4fc"; - cyan = "0x89ddff"; - white = "0xffffff"; - }; - }; - cursor = { style = "Underline"; vi_mode_style = "Underline";