atagen/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cosmic alpha

Browse source
This commit is contained in:
atagen 2024-04-10 21:18:41 +10:00
parent 1d41373673
commit c5733c0812
8 changed files with 888 additions and 813 deletions
Download patch file Download diff file Expand all files Collapse all files

121
flake.lock generated
View file

@ -69,6 +69,22 @@
"type": "github"
}
},
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1688025799,
"narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
"owner": "nix-community",
"repo": "flake-compat",
"rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
@ -161,11 +177,11 @@
},
"flatpaks": {
"locked": {
"lastModified": 1708781964,
"narHash": "sha256-qbEZgB1mNuMADLmM64EtcRjDHXR3UFL4xVmoanv9wZU=",
"lastModified": 1711997375,
"narHash": "sha256-KvU4gOtuFMS9Il67glRGtdNfguAINT9pCaXtvCL8uI8=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "09d07c73b4d9771f527a168e0b1b6d8a1f39de28",
"rev": "45bf66f7068db79b552da864c0e87452be624d6c",
"type": "github"
},
"original": {
@ -206,11 +222,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1711330176,
"narHash": "sha256-VfblR12t/hvVARVXczTuaxfATYUAjwwXKg89rjB6r+k=",
"lastModified": 1712599322,
"narHash": "sha256-q/XXK9bWmTmh9aRKT9/QyC02L7j4/cR8D/XglFPGd5A=",
"owner": "helix-editor",
"repo": "helix",
"rev": "614a744d24e54225eae2ad0d27719b81c0cf9a4d",
"rev": "ae85f5ff712db6729032f302494eba0ca5655510",
"type": "github"
},
"original": {
@ -226,11 +242,11 @@
]
},
"locked": {
"lastModified": 1711133180,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"lastModified": 1712462372,
"narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9",
"type": "github"
},
"original": {
@ -284,11 +300,11 @@
]
},
"locked": {
"lastModified": 1711249705,
"narHash": "sha256-h/NQECj6mIzF4XR6AQoSpkCnwqAM+ol4+qOdYi2ykmQ=",
"lastModified": 1712459390,
"narHash": "sha256-e12bNDottaGoBgd0AdH/bQvk854xunlWAdZwr/oHO1c=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "34519f3bb678a5abbddf7b200ac5347263ee781b",
"rev": "4676d72d872459e1e3a248d049609f110c570e9a",
"type": "github"
},
"original": {
@ -306,11 +322,11 @@
]
},
"locked": {
"lastModified": 1711333167,
"narHash": "sha256-j0yUDFX7cyoM5r9afQ45tfu8wqUk0dRicOb79+K81JI=",
"lastModified": 1712592417,
"narHash": "sha256-2gUcX5rdZlMOk3eKbEwXx9riLIoCzC20Cdg3oiQnwoU=",
"owner": "nix-community",
"repo": "nix-ld-rs",
"rev": "76999cac5abefc7862b19daeef0ef91d4270fb17",
"rev": "ce9406c15dfde5233101d3deb464b3c2bcc23916",
"type": "github"
},
"original": {
@ -362,11 +378,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1710553072,
"narHash": "sha256-g80GlUrlCdHQVaJq9r8myCIzLmQp59e6jiGfxkodNYo=",
"lastModified": 1712592356,
"narHash": "sha256-t8B7oqt8IwEh0obg2ZaIa2E5I9XUiKJS7JmM6z7AjgU=",
"owner": "nix-community",
"repo": "nixd",
"rev": "a436786fbd8ed5aafea4b0512cb1170a6e0e39df",
"rev": "c217f098f0a41af48d510150d13fd8b97fd8df88",
"type": "github"
},
"original": {
@ -375,6 +391,27 @@
"type": "github"
}
},
"nixos-cosmic": {
"inputs": {
"flake-compat": "flake-compat_4",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1712621687,
"narHash": "sha256-RcU4hRzPxWZcTBqHDJOncwZQ6frT4zZakXoDUDhn+40=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "81bb8d11d1049dd7a5ff54d1889f0cf45d731368",
"type": "github"
},
"original": {
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1681303793,
@ -424,6 +461,22 @@
"type": "github"
}
},
"nixpkgs-polonium": {
"locked": {
"lastModified": 1710680090,
"narHash": "sha256-K6SxA0WMfpbqsKd7xH2jln5AF00VKHH9dg6cHBB1OSc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5a42ed5aef8631bb5cd30eb16b30ea3ddb0dd91f",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5a42ed5aef8631bb5cd30eb16b30ea3ddb0dd91f",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1678872516,
@ -474,11 +527,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"lastModified": 1712439257,
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
"type": "github"
},
"original": {
@ -490,11 +543,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1710951922,
"narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=",
"lastModified": 1711124224,
"narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f091af045dff8347d66d186a62d42aceff159456",
"rev": "56528ee42526794d413d6f244648aaee4a7b56c0",
"type": "github"
},
"original": {
@ -506,11 +559,11 @@
},
"nur": {
"locked": {
"lastModified": 1711329112,
"narHash": "sha256-Q88QjetVa49Wkgl/zx51ZFOkAxdcqO0n0CHjthfGJBg=",
"lastModified": 1712618213,
"narHash": "sha256-72SqUCVrovvN+U0vJEOsSpHer+X5rbjhmOtvyhDkORg=",
"owner": "nix-community",
"repo": "NUR",
"rev": "5571ac769a3de8152a10d70ca9544e8a461c77d2",
"rev": "f76da9a924dc46ae71ea1694b290e6309fe5fb8c",
"type": "github"
},
"original": {
@ -525,11 +578,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1711295162,
"narHash": "sha256-gPTTYKvdnmaLcgOSpqtKHIf8J60J3Z4jAqXTwluxxUk=",
"lastModified": 1712484920,
"narHash": "sha256-wNwv12U/QYYgZanycZ32A41cEDa2zPwYuMKK6AJYNJk=",
"owner": "pjones",
"repo": "plasma-manager",
"rev": "8a032af55ed686ab21e60530080462a1438812b9",
"rev": "4b127a5ede004f5c6d7c41938c2986b599dc0bf3",
"type": "github"
},
"original": {
@ -574,7 +627,9 @@
"nix-rice": "nix-rice",
"nix-std": "nix-std",
"nixd": "nixd",
"nixos-cosmic": "nixos-cosmic",
"nixpkgs": "nixpkgs_3",
"nixpkgs-polonium": "nixpkgs-polonium",
"nixpkgs-stable": "nixpkgs-stable_2",
"nur": "nur",
"plasma-manager": "plasma-manager",
@ -616,11 +671,11 @@
]
},
"locked": {
"lastModified": 1711332768,
"narHash": "sha256-SFnlIwnrwJxEawLcrH7+zGb8spePcYyai5asMZnm0BM=",
"lastModified": 1712542394,
"narHash": "sha256-UZebDBECRSrJqw4K+LxZ6qFdYnScu6q1XCwqtsu1cas=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "8a8e3ea9a9a4b2225cb5e33e07c3a337f820168c",
"rev": "ece8bdb3c3b58def25f204b9a1261dee55d7c9c0",
"type": "github"
},
"original": {

17
flake.nix
View file

@ -4,6 +4,7 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05";
nixpkgs-polonium.url = "github:NixOS/nixpkgs/5a42ed5aef8631bb5cd30eb16b30ea3ddb0dd91f";
nur.url = "github:/nix-community/NUR";
@ -44,12 +45,19 @@
plasma-manager.url = "github:pjones/plasma-manager";
flatpaks.url = "github:gmodena/nix-flatpak";
nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
self,
nixpkgs,
nixpkgs-stable,
nixpkgs-polonium,
nixos-cosmic,
home-manager,
nur,
helix,
@ -74,10 +82,11 @@
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [
./system/quiver.nix
./system/cachix.nix
nixos-cosmic.nixosModules.default
nur.nixosModules.nur
nix-index-database.nixosModules.nix-index
./system/quiver.nix
./system/cachix.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
@ -94,10 +103,10 @@
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [
./system/adrift.nix
./system/cachix.nix
nur.nixosModules.nur
nix-index-database.nixosModules.nix-index
./system/adrift.nix
./system/cachix.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;

5
home/home.nix
View file

@ -70,7 +70,7 @@ in {
mpv
gtk-engine-murrine
plasma5Packages.polonium
polonium-pkgs.pkgs.plasma5Packages.polonium
]
++ pkgs.rice.fonts.pkgs
++ pkgs.rice.icons.pkgs;
@ -92,10 +92,9 @@ in {
services.flatpak = {
enable = true;
uninstallUnmanagedPackages = true;
uninstallUnmanaged = true;
update.auto.enable = true;
packages = [
"com.logseq.Logseq"
"md.obsidian.Obsidian"
"org.onlyoffice.desktopeditors"
];

1439
home/programs/plasma.nix
View file

File diff suppressed because it is too large Load diff

17
system/configuration.nix
View file

@ -31,8 +31,8 @@
trusted-users = ["bolt" "plank"];
experimental-features = "nix-command flakes";
substitute = true;
substituters = [];
trusted-public-keys = [];
substituters = ["https://cosmic.cachix.org/"];
trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="];
};
extraOptions = ''
keep-outputs = true
@ -90,12 +90,15 @@
runUsingSystemd = true;
};
displayManager.sddm = {
wayland.enable = true; # experimental?
enable = true;
};
displayManager.defaultSession = "plasma";
# displayManager.sddm = {
# # wayland.enable = true; # experimental?
# # wayland.compositor = "kwin";
# enable = true;
# };
# displayManager.defaultSession = "plasmawayland";
};
services.desktopManager.cosmic.enable = true;
services.displayManager.cosmic-greeter.enable = true;
services.udisks2.enable = true;

16
system/quiver.nix
View file

@ -14,9 +14,10 @@
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbcore" "sd_mod"];
boot.initrd.kernelModules = [];
boot.initrd.systemd.enable = true;
boot.kernelModules = ["kvm-amd" "i2c-dev"];
boot.kernelParams = [
"nvidia_drm.modeset=1"
"nvidia-drm.fbdev=1"
"mitigations=off"
"acpi_enforce_resources=lax"
"preempt=full"
@ -28,12 +29,18 @@
];
boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
boot.supportedFilesystems = {
ntfs = true;
btrfs = true;
};
boot.loader.systemd-boot.configurationLimit = 5;
boot.loader.efi.canTouchEfiVariables = true;
# boot.plymouth.enable = true;
boot.supportedFilesystems = ["ntfs"];
# boot.plymouth = with pkgs.rice.plymouth; {
# inherit font theme themePackages;
# enable = true;
# };
security.tpm2.enable = true;
@ -41,7 +48,7 @@
hardware.cpu.amd.updateMicrocode = true;
environment.sessionVariables = rec {
environment.sessionVariables = {
NIXOS_OZONE_WL = "1";
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=5";
GBM_BACKEND = "nvidia-drm";
@ -76,7 +83,6 @@
};
services.xserver.videoDrivers = ["nvidia"];
services.xserver.displayManager.autoLogin.user = "bolt";
hardware.nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.stable;
modesetting.enable = true;

4
util/overlay.nix
View file

@ -9,6 +9,10 @@
system = final.system;
config.allowUnfree = true;
};
polonium-pkgs = import inputs.nixpkgs-polonium {
system = final.system;
config.allowUnfree = true;
};
};
rice = import ./rice.nix;

82
util/rice.nix
View file

@ -3,44 +3,38 @@ with prev.lib.nix-rice; let
# theme = kitty-themes.parseTheme ./op.pal;
theme = kitty-themes.parseTheme ./pal.conf;
# theme = kitty-themes.getThemeByName "everforest_dark_hard";
in rec {
rice = {
in {
rice = rec {
palette =
rec {
normal =
palette.defaultPalette
// {
black = theme.color0;
red = theme.color1;
green = theme.color2;
yellow = theme.color3;
blue = theme.color4;
magenta = theme.color5;
cyan = theme.color6;
white = theme.color7;
};
bright =
palette.defaultPalette
// {
black = theme.color8;
red = theme.color9;
green = theme.color10;
yellow = theme.color11;
blue = theme.color12;
magenta = theme.color13;
cyan = theme.color14;
white = theme.color15;
};
util =
palette.defaultPalette
// {
fg = theme.foreground;
bg = theme.background;
fg_sel = theme.selection_foreground;
bg_sel = theme.selection_background;
cursor = theme.cursor;
# url = theme.url_color;
};
{
normal = {
black = theme.color0;
red = theme.color1;
green = theme.color2;
yellow = theme.color3;
blue = theme.color4;
magenta = theme.color5;
cyan = theme.color6;
white = theme.color7;
};
bright = {
black = theme.color8;
red = theme.color9;
green = theme.color10;
yellow = theme.color11;
blue = theme.color12;
magenta = theme.color13;
cyan = theme.color14;
white = theme.color15;
};
util = {
fg = theme.foreground;
bg = theme.background;
fg_sel = theme.selection_foreground;
bg_sel = theme.selection_background;
cursor = theme.cursor;
# url = theme.url_color;
};
}
// theme;
@ -97,11 +91,6 @@ in rec {
};
bg = {
# image = builtins.path rec {
# name = "wallpaper.jpg";
# path = ../${name};
# sha256 = "ec88d7005a97f104784e53ecaef883d33cf53f76cf4a6e89d05980bbc844c772";
# };
image = prev.callPackage ./wallpaper.nix {} {
palette = palette.toRGBShortHex final.rice.palette;
wallpaper = builtins.path rec {
@ -111,5 +100,14 @@ in rec {
};
};
};
plymouth = {
# no easy way to automate filename sadly - could try stripping "real" font name of spaces?
font = "${fonts.sans.package}/share/fonts/truetype/InriaSans-Regular.ttf";
theme = "colorful_loop";
themePackages = [
(prev.pkgs.adi1090x-plymouth-themes.override {selected_themes = ["colorful_loop"];})
];
};
}; # /rice
}