mirror of
https://github.com/EdenQwQ/nixos.git
synced 2025-12-26 10:14:58 +08:00
update shell flakes; update pkgs.system
This commit is contained in:
parent
57f38b5c02
commit
393023b5f7
14 changed files with 44 additions and 40 deletions
42
flake.lock
generated
42
flake.lock
generated
|
|
@ -95,11 +95,11 @@
|
|||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762307984,
|
||||
"narHash": "sha256-IQe2ysGBZhg6TtBliazFGZo9xYJMNTVCDGdiY2BDTjk=",
|
||||
"lastModified": 1763172111,
|
||||
"narHash": "sha256-QseFQKZgMq/kbHlrhfaNlwEyQ1H3J+UhnbgpAIEGpvA=",
|
||||
"owner": "caelestia-dots",
|
||||
"repo": "cli",
|
||||
"rev": "c05f6ef57a4cc7943e38256ce50a63d75927dc1c",
|
||||
"rev": "d89c438284311e99148ece61054cd6f9bc8e8cb7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -119,11 +119,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761962468,
|
||||
"narHash": "sha256-M+RNHviu4H7/iVzubX5NvBGP7mKIbvzQTaKIfv+10QM=",
|
||||
"lastModified": 1762480719,
|
||||
"narHash": "sha256-TjTMNmndJJIxP/N6owC/CoAPiRuM99fNaQbZqHDtwLw=",
|
||||
"owner": "caelestia-dots",
|
||||
"repo": "cli",
|
||||
"rev": "1cea6fb42a533d29d42c2219e405e0b058b5bedc",
|
||||
"rev": "9323fbf1b497204e17dff103cf412daf04a5c723",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -144,11 +144,11 @@
|
|||
"quickshell": "quickshell"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762259112,
|
||||
"narHash": "sha256-Z4Go+PLBy/fViiO0vEpnpA27lCHpldJbFY6LW9XNqkQ=",
|
||||
"lastModified": 1762651107,
|
||||
"narHash": "sha256-V++8JREoP1TC6ROYByMAKx/cSyxza0tp1tUNOpq5Z4k=",
|
||||
"owner": "caelestia-dots",
|
||||
"repo": "shell",
|
||||
"rev": "d81a7929c9d1ac71cb6ab36c3d5ab55c67a1ce99",
|
||||
"rev": "c0ea060ffecd3f38233652556d3085d094082400",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -166,11 +166,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762259112,
|
||||
"narHash": "sha256-Z4Go+PLBy/fViiO0vEpnpA27lCHpldJbFY6LW9XNqkQ=",
|
||||
"lastModified": 1762651107,
|
||||
"narHash": "sha256-V++8JREoP1TC6ROYByMAKx/cSyxza0tp1tUNOpq5Z4k=",
|
||||
"owner": "caelestia-dots",
|
||||
"repo": "shell",
|
||||
"rev": "d81a7929c9d1ac71cb6ab36c3d5ab55c67a1ce99",
|
||||
"rev": "c0ea060ffecd3f38233652556d3085d094082400",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1166,11 +1166,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1762111121,
|
||||
"narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
|
||||
"lastModified": 1762977756,
|
||||
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
|
||||
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1182,11 +1182,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1761907660,
|
||||
"narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
|
||||
"lastModified": 1762363567,
|
||||
"narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
|
||||
"rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1316,11 +1316,11 @@
|
|||
"systems": "systems_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762311813,
|
||||
"narHash": "sha256-wiBOzvHWxKKovbfBpzWfjhXGpO4n/2owlsEHBlL/1k0=",
|
||||
"lastModified": 1763175090,
|
||||
"narHash": "sha256-Cpvt+JmfcVo9HIDyGUsVv4GUzEBmxgPKl3dbAvBrmvU=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "c78e3b5653295fae5a7e9c795eaefbdf5efcd6c6",
|
||||
"rev": "6da74a800f9a900b698c91d869b926a39ac21372",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${pkgs.system};
|
||||
pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||
colors = config.lib.stylix.colors.withHashtag;
|
||||
rPkgs =
|
||||
with pkgs-stable.rPackages;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
lua_ls.enable = true;
|
||||
nixd = {
|
||||
enable = true;
|
||||
package = inputs.nixd.packages.${pkgs.system}.nixd;
|
||||
package = inputs.nixd.packages.${pkgs.stdenv.hostPlatform.system}.nixd;
|
||||
settings = {
|
||||
formatting.command = [ "nixfmt" ];
|
||||
nixd.nixpkgs.expr = "import <nixpkgs> { }";
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
};
|
||||
nil_ls = {
|
||||
enable = true;
|
||||
package = inputs.nil.packages.${pkgs.system}.nil;
|
||||
package = inputs.nil.packages.${pkgs.stdenv.hostPlatform.system}.nil;
|
||||
settings = {
|
||||
# formatting.command = ["nixfmt"];
|
||||
nix.flake = {
|
||||
|
|
|
|||
|
|
@ -19,6 +19,9 @@
|
|||
};
|
||||
};
|
||||
settings = {
|
||||
general.idle = {
|
||||
timeouts = [ ];
|
||||
};
|
||||
appearance.font.family = {
|
||||
mono = config.stylix.fonts.monospace.name;
|
||||
sans = "Hug Me Tight";
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
wayneko
|
||||
xwayland-satellite
|
||||
wmname
|
||||
inputs.hexecute.packages.${pkgs.system}.default
|
||||
inputs.quickshell.packages.${pkgs.system}.default
|
||||
inputs.hexecute.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
];
|
||||
home.file."scripts" = {
|
||||
source = ./scripts;
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ in
|
|||
# programs.quickshell.configs.dms =
|
||||
# let
|
||||
# dankMaterialShell =
|
||||
# inputs.dankMaterialShell.packages.${pkgs.system}.dankMaterialShell.overrideAttrs
|
||||
# inputs.dankMaterialShell.packages.${pkgs.stdenv.hostPlatform.system}.dankMaterialShell.overrideAttrs
|
||||
# {
|
||||
# installPhase = ''
|
||||
# mkdir -p $out/etc/xdg/quickshell/DankMaterialShell
|
||||
|
|
@ -70,7 +70,7 @@ in
|
|||
# in
|
||||
# "${dankMaterialShell}/etc/xdg/quickshell/DankMaterialShell" |> lib.mkForce;
|
||||
programs.dankMaterialShell.quickshell.package =
|
||||
inputs.quickshell.packages.${pkgs.system}.quickshell;
|
||||
inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.quickshell;
|
||||
xdg.configFile."DankMaterialShell/stylix-colors.json".text = builtins.toJSON colorTheme;
|
||||
xdg.configFile."DankMaterialShell/settings.json".text = # json
|
||||
''
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@
|
|||
bar = {
|
||||
backgroundOpacity = 0.6;
|
||||
density = "comfortable";
|
||||
floating = true;
|
||||
floating = false;
|
||||
showCapsule = true;
|
||||
outerCorners = false;
|
||||
outerCorners = true;
|
||||
widgets = {
|
||||
center = [
|
||||
{
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
systemd.user.services = lib.mkIf (config.desktopShell == "noctalia-shell") {
|
||||
noctalia-shell =
|
||||
let
|
||||
noctaliaPackage = inputs.noctalia-shell.packages.${pkgs.system}.default;
|
||||
noctaliaPackage = inputs.noctalia-shell.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||
noctaliaConfig = "/home/${user}/.config/noctalia/gui-settings.json";
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
./zathura.nix
|
||||
];
|
||||
home.packages = with pkgs; [
|
||||
inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.libreoffice
|
||||
inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.onlyoffice-desktopeditors
|
||||
inputs.nixpkgs-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.libreoffice
|
||||
inputs.nixpkgs-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.onlyoffice-desktopeditors
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
nixGL.packages = inputs.nixGL.packages;
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
package = config.lib.nixGL.wrap inputs.ghostty.packages.${pkgs.system}.ghostty;
|
||||
package = config.lib.nixGL.wrap inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.ghostty;
|
||||
settings = {
|
||||
font-family = [
|
||||
"Symbols Nerd Font"
|
||||
|
|
|
|||
|
|
@ -7,5 +7,5 @@
|
|||
./wallpaper.nix
|
||||
./colorscheme.nix
|
||||
];
|
||||
desktopShell = "caelestia";
|
||||
desktopShell = "noctalia-shell";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
};
|
||||
programs.noctalia-shell.enable = config.desktopShell == "noctalia-shell";
|
||||
home.packages = lib.mkIf (config.desktopShell == "noctalia-shell") [
|
||||
inputs.noctalia-shell.packages.${pkgs.system}.default
|
||||
inputs.noctalia-shell.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
{
|
||||
programs.nh = {
|
||||
enable = true;
|
||||
package = inputs.nh.packages.${pkgs.system}.nh;
|
||||
package = inputs.nh.packages.${pkgs.stdenv.hostPlatform.system}.nh;
|
||||
clean = {
|
||||
enable = true;
|
||||
dates = "3 days";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ inputs, pkgs, ... }:
|
||||
{
|
||||
boot = {
|
||||
kernelPackages = inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.linuxPackages_zen;
|
||||
kernelPackages =
|
||||
inputs.nixpkgs-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.linuxPackages_zen;
|
||||
kernelParams = [
|
||||
"loglevel=3"
|
||||
"quiet"
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@
|
|||
src = inputs.scroll;
|
||||
patches = [ ];
|
||||
})).override
|
||||
{ inherit (inputs.nixpkgs-wayland.packages.${final.system}) wlroots; };
|
||||
{ inherit (inputs.nixpkgs-wayland.packages.${final.stdenv.hostPlatform.system}) wlroots; };
|
||||
sway = prev.sway.overrideAttrs (oldAttrs: {
|
||||
passthru.providedSessions = [ "scroll" ];
|
||||
});
|
||||
inherit (inputs.nixpkgs-wayland.packages.${final.system}) swww;
|
||||
inherit (inputs.nixpkgs-wayland.packages.${final.stdenv.hostPlatform.system}) swww;
|
||||
};
|
||||
|
||||
inherit (inputs.niri.overlays) niri;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue