Compare commits

..

No commits in common. "c02604bebebdf4cc3368a5f5b0d7cc5aa6b9775d" and "7e6a77501c20c2b7ba46eb1adeff68c7c8ab58fa" have entirely different histories.

6 changed files with 73 additions and 210 deletions

165
flake.lock generated
View file

@ -40,11 +40,11 @@
"cachyos-kernel": { "cachyos-kernel": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1775145950, "lastModified": 1774160598,
"narHash": "sha256-AfVja9nvYHm0BHbuTvn+K8rKfLmPl5QjoiNecp9HOJU=", "narHash": "sha256-ArPoVPHpXauFDGsz7nGBiXljj7keGcp/O4Pf4ZU4/30=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "linux-cachyos", "repo": "linux-cachyos",
"rev": "b91624f68ceaf5394ef1571f60290dca6ba22b45", "rev": "1caa0b77871d4537f0d629a2ce30edb2f6178d19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,11 +56,11 @@
"cachyos-kernel-patches": { "cachyos-kernel-patches": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1775157685, "lastModified": 1774023710,
"narHash": "sha256-g8HgH7gADoEnrBN30BK3pz7+M2pT/p3xtfRFEuEov5w=", "narHash": "sha256-Oc+4K6edCv0fdvfe6UW+OpJiXYWkXRrOH9TDMNwi+J8=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "kernel-patches", "repo": "kernel-patches",
"rev": "c1ba300617a12d257b5721572b9bbe28efae182f", "rev": "a4e26fa95257ac09bd42930334399b0eabd5b5b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -105,11 +105,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1775087534, "lastModified": 1772408722,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,24 +160,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1769996383,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -201,11 +183,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775556024, "lastModified": 1774539458,
"narHash": "sha256-j1u/859OVS54rGlsvFqJdwKPEnFYCI+4pyfTiSfv1Xc=", "narHash": "sha256-H9GIOqdMfQZ6lFetsQhO9TCq53hYzpTHDWOt3PRh9V0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4bdfeff1d9b7473e6e58f73f5809576e8a69e406", "rev": "e2e5f512b33ed19a7a3271d0b73ed5eefcc0be5f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -247,11 +229,11 @@
"niri-blur": { "niri-blur": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1775412875, "lastModified": 1774190104,
"narHash": "sha256-nvTnu0tEgvI6wg0jSORls/272RPtxxmVZ7iq7izA2KA=", "narHash": "sha256-L/Ldq9G41Mj8WjWTuC+rePvWIx1A/tHdFpLbQmtrMSA=",
"owner": "niri-wm", "owner": "niri-wm",
"repo": "niri", "repo": "niri",
"rev": "e0db6df3e1eecb6dd1d034a435dab79cb71d10e3", "rev": "d06dd4b9e60fa07120c217aa095f3ed8caac99f2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,11 +269,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1775239578, "lastModified": 1774290535,
"narHash": "sha256-MKJmDHlaxwBcnfCUEA89AwKOOONjOjbjHNNWdSdg5RA=", "narHash": "sha256-dnFbucSiAjjWmPENgyIiK/ocCuYSp4sM6Sq4WCVjG+8=",
"owner": "xddxdd", "owner": "xddxdd",
"repo": "nix-cachyos-kernel", "repo": "nix-cachyos-kernel",
"rev": "beaf7a533ae106c2681de2624da94707f9857f1f", "rev": "c0fcdf5cab21b7e3157e84046b57407a60934415",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -319,26 +301,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1774748309, "lastModified": 1772328832,
"narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "333c4e0545a6da976206c74db8773a1645b5870a", "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1769909678,
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "72716169fe93074c333e8d0173151350670b824c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -349,11 +316,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1775305101, "lastModified": 1774388614,
"narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=", "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "36a601196c4ebf49e035270e10b2d103fe39076b", "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -365,11 +332,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1775423009, "lastModified": 1774386573,
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,11 +348,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1775231746, "lastModified": 1774235121,
"narHash": "sha256-EFaDQ0rnuSjKfC/DUKHS4toV4rEBuWhSgyX2Yy0kp00=", "narHash": "sha256-CzpSER+YKq4yD+RPom6Su9c/4FutF+sD4rEnls+4MyM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0eac666efaa8a9afea2821f9efc7921b4ef39b4e", "rev": "1116aed2cee959f7d054a462458513ad323b710a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -395,22 +362,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1770115704,
"narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e6eae2ee2110f3d31110d5c222cd395303343b08",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
@ -420,11 +371,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1775307257, "lastModified": 1774309640,
"narHash": "sha256-y9hEecHH4ennFwIcw1n480YCGh73DkEmizmQnyXuvgg=", "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "2e008bb941f72379d5b935d5bfe70ed8b7c793ff", "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -441,11 +392,11 @@
"noctalia-qs": "noctalia-qs" "noctalia-qs": "noctalia-qs"
}, },
"locked": { "locked": {
"lastModified": 1775569376, "lastModified": 1774536980,
"narHash": "sha256-Gge4uDqbcl5kl3fNaRRc6PuOv7YMOqWbX6tRcYwayok=", "narHash": "sha256-j7I4XVEaUsiR0EOUJGnY7DZ0V/GYtcGJ97K3abzU9QY=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-shell", "repo": "noctalia-shell",
"rev": "91d0bb83aefa2d238df31e2a96098a2ef75aa238", "rev": "396fba755b515913f4ac7596c30b827b0f67d53a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -464,11 +415,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1775491791, "lastModified": 1774351986,
"narHash": "sha256-elzmRpudiwtYQNCKk9TAEhlYQV0+yUM81poo01Z7FfQ=", "narHash": "sha256-N131zILQ06ZNEvtgtjjFZ0N5qEI70rKKhCZsBcZoDH8=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-qs", "repo": "noctalia-qs",
"rev": "9e2736531ef7a1a336abf7ec72255d0b192273b6", "rev": "066835ebd5daeabc86df1e62fb5fe82a51407cc0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -485,11 +436,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775570358, "lastModified": 1774540439,
"narHash": "sha256-di7IFQ4ISsQbcqNvL/krG2LXwRLrZ85UzcOrNAv9bEY=", "narHash": "sha256-zVYoM58GjEh07Oa56zRygHaqp+Fm83PK8C77p84l5uA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "72e3cf978afcc0ca1c36624f847a71481d1fc46b", "rev": "95ed6efd2ba5aefb62f522c71ef3276b18a8b5a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -532,30 +483,10 @@
"noctalia": "noctalia", "noctalia": "noctalia",
"nur": "nur", "nur": "nur",
"openmw": "openmw", "openmw": "openmw",
"seamless-asahi-plymouth": "seamless-asahi-plymouth",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"tt-schemes": "tt-schemes" "tt-schemes": "tt-schemes"
} }
}, },
"seamless-asahi-plymouth": {
"inputs": {
"flake-parts": "flake-parts_4",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1770365598,
"narHash": "sha256-tjmDL8eaK2NIwWDho81GhygkBZoauiiiUqwV1VP1FwQ=",
"owner": "luca-schlecker",
"repo": "seamless-asahi-plymouth",
"rev": "e3f5517643f9c2021bee2870b55d8bd363763cd1",
"type": "github"
},
"original": {
"owner": "luca-schlecker",
"repo": "seamless-asahi-plymouth",
"type": "github"
}
},
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -563,11 +494,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775365543, "lastModified": 1774910634,
"narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=", "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "a4ee2de76efb759fe8d4868c33dec9937897916f", "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -615,11 +546,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775125835, "lastModified": 1772660329,
"narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "75925962939880974e3ab417879daffcba36c4a3", "rev": "3710e0e1218041bbad640352a0440114b1e10428",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -10,7 +10,6 @@
nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
apple-silicon.url = "github:nix-community/nixos-apple-silicon"; apple-silicon.url = "github:nix-community/nixos-apple-silicon";
seamless-asahi-plymouth.url = "github:luca-schlecker/seamless-asahi-plymouth";
base16.url = "github:SenchoPens/base16.nix"; base16.url = "github:SenchoPens/base16.nix";
tt-schemes = { tt-schemes = {
@ -67,7 +66,6 @@
nixpkgs-unstable, nixpkgs-unstable,
nix-cachyos-kernel, nix-cachyos-kernel,
apple-silicon, apple-silicon,
seamless-asahi-plymouth,
base16, base16,
tt-schemes, tt-schemes,
sops-nix, sops-nix,
@ -252,7 +250,6 @@
peach = mkNixosSystem { peach = mkNixosSystem {
hostname = "peach"; hostname = "peach";
system = "aarch64-linux"; system = "aarch64-linux";
extraSpecialArgs = { inherit seamless-asahi-plymouth; };
extraModules = [ extraModules = [
apple-silicon.nixosModules.default apple-silicon.nixosModules.default
{ nixpkgs.overlays = [ apple-silicon.overlays.apple-silicon-overlay ]; } { nixpkgs.overlays = [ apple-silicon.overlays.apple-silicon-overlay ]; }

View file

@ -48,13 +48,13 @@
programs.swaylock = with config.scheme; { programs.swaylock = with config.scheme; {
enable = true; enable = true;
# package = pkgs.swaylock-effects; package = pkgs.swaylock-effects;
settings = { settings = {
# this would sometimes load the previous day's wallpaper # this would sometimes load the previous day's wallpaper
# when it is run before the bing retrieval script finishes # when it is run before the bing retrieval script finishes
# image = "~/.local/share/wallpaper/daily-colored.jpg"; image = "~/.local/share/wallpaper/daily-colored.jpg";
# effect-blur = "7x5"; effect-blur = "7x5";
color = "000000"; # black # color = "000000"; # black
font-size = 24; font-size = 24;
indicator-idle-visible = true; indicator-idle-visible = true;
indicator-radius = 100; indicator-radius = 100;

View file

@ -21,21 +21,23 @@
plymouth.enable = true; plymouth.enable = true;
plymouth.logo = "${pkgs.nixos-icons}/share/icons/hicolor/64x64/apps/nix-snowflake-white.png"; plymouth.logo = "${pkgs.nixos-icons}/share/icons/hicolor/64x64/apps/nix-snowflake-white.png";
loader = { loader = {
timeout = 0; timeout = 3;
systemd-boot.enable = true; limine = {
# limine = { enable = true;
# enable = true; maxGenerations = 10;
# maxGenerations = 10; extraConfig = ''
# style = { timeout: 3
# wallpapers = [ ]; '';
# wallpaperStyle = "stretched"; style = {
# backdrop = "#1e1e2e"; wallpapers = [ ];
# interface = { wallpaperStyle = "stretched";
# branding = "kova's nixos!"; backdrop = "#1e1e2e";
# brandingColor = 5; interface = {
# }; branding = "kova's nixos!";
# }; brandingColor = 5;
# }; };
};
};
}; };
kernelParams = [ kernelParams = [
"quiet" "quiet"
@ -123,12 +125,6 @@
upower.enable = true; upower.enable = true;
power-profiles-daemon.enable = true; power-profiles-daemon.enable = true;
openssh.enable = true; openssh.enable = true;
glances.enable = true;
glances.package = pkgs.glances.overrideAttrs (oldAttrs: {
disabledTests = (oldAttrs.disabledTests or [ ]) ++ [
"test_phys_core_returns_int"
];
});
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -156,35 +152,8 @@
sudo.wheelNeedsPassword = false; sudo.wheelNeedsPassword = false;
polkit.enable = true; polkit.enable = true;
}; };
networking.firewall.enable = false;
networking = { networking.networkmanager.enable = true;
firewall.enable = false;
networkmanager.enable = true;
hosts = {
"192.168.1.64" = [
"kube1"
"kube1.local"
"kube1.attlocal.net"
];
"192.168.1.65" = [
"kube2"
"kube2.local"
"kube2.attlocal.net"
];
"192.168.1.66" = [
"kube3"
"kube3.local"
"kube3.attlocal.net"
"kube3.taila30609.ts.net"
];
"192.168.1.67" = [
"kube4"
"kube4.local"
"kube4.attlocal.net"
];
};
};
documentation.man.enable = true; documentation.man.enable = true;
hardware.graphics.enable = true; hardware.graphics.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

View file

@ -2,7 +2,6 @@
config, config,
pkgs, pkgs,
lib, lib,
seamless-asahi-plymouth,
... ...
}: }:
let let
@ -14,43 +13,10 @@ let
}; };
in in
{ {
nixpkgs.overlays = [
(final: prev: {
uboot-asahi = prev.uboot-asahi.overrideAttrs (old: {
postConfigure = (old.postConfigure or "") + ''
cat >> .config <<'EOF'
# CONFIG_VIDEO_LOGO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=n
CONFIG_BOOTDELAY=0
CONFIG_SILENT_CONSOLE=y
CONFIG_PREBOOT="setenv silent 1"
EOF
# Regenerate the configuration with new flags
make olddefconfig
'';
});
})
];
boot = { boot = {
kernelParams = [ "appledrm.show_notch=1" ]; kernelParams = [ "appledrm.show_notch=1" ];
# thank you to u/douv: m1n1CustomLogo = "${asahi-artwork}/logos/png_256/AsahiLinux_logomark.png";
# https://www.reddit.com/r/AsahiLinux/comments/1sb8cby/retro_boot_logo/ plymouth.logo = lib.mkForce "${asahi-artwork}/logos/png_64/AsahiLinux_logomark.png";
m1n1CustomLogo = ./apple-rainbow.png;
plymouth = {
enable = true;
theme = "seamless-asahi";
themePackages = [
(seamless-asahi-plymouth.packages.${pkgs.system}.default.override {
logo = ./apple-rainbow.png;
})
];
extraConfig = ''
DeviceScale=1
'';
};
}; };
programs.dconf.profiles.gdm.databases = [ programs.dconf.profiles.gdm.databases = [