cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

testing ghostty and lock update, which results in some build errors. rocmrocmrocm

Browse Source
This commit is contained in:
cnst
2024-12-28 15:06:50 +01:00
parent 3fb3398f59
commit 76e1fb5028
16 changed files with 398 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/default.nix
View File

@@ -67,6 +67,7 @@
./nixos/programs/corectrl
./nixos/programs/gamemode
./nixos/programs/gamescope
./nixos/programs/ghostty
./nixos/programs/gimp
./nixos/programs/gnome
./nixos/programs/hyprland

104
modules/home/programs/discord/default.nix
View File

@@ -4,54 +4,72 @@
lib,
...
}: let
inherit (lib) mkIf mkEnableOption;
inherit (lib) mkIf mkOption mkEnableOption types;
cfg = config.home.programs.discord;
in {
options = {
home.programs.discord.enable = mkEnableOption "Enables discord";
home.programs.discord = {
enable = mkEnableOption "Enables discord";
variant = mkOption {
type = types.enum ["stable" "ptb" "canary" "vesktop"];
default = "stable";
description = "Preferred package version to use";
};
};
};
config = mkIf cfg.enable {
home.packages = with pkgs; [vesktop];
home.packages = let
variant = cfg.variant or "stable";
in
if variant == "stable"
then [pkgs.discord]
else if variant == "ptb"
then [pkgs.discord-ptb]
else if variant == "canary"
then [pkgs.discord-canary]
else if variant == "vesktop"
then [pkgs.vesktop]
else throw "Unknown package variant: ${variant}";
xdg.configFile."vesktop/themes/base16.css".text =
/*
css
*/
''
/**
* @name Material Gruvbox
* @.
* @author Costeer
* @version 1.5.0
* @website https://github.com/Costeer
* @source https://github.com/Costeer/Gruvbox-Material-Themes
*/
@import url(https://mwittrien.github.io/BetterDiscordAddons/Themes/DiscordRecolor/DiscordRecolor.css);
:root {
--accentcolor: 137, 180, 130;
--accentcolor2: 211, 134, 155;
--linkcolor: 125, 174, 163;
--mentioncolor: 211, 134, 155;
--textbrightest: 221, 199, 161;
--textbrighter: 212, 190, 152;
--textbright: 168, 153, 132;
--textdark: 146, 131, 116;
--textdarker: 146, 131, 116;
--textdarkest: 80, 80, 80;
--font: Input Sans Narrow;
--main-font: Input Sans Narrow;
--code-font: Input Mono Compressed;
--backgroundaccent: 80, 73, 69;
--backgroundprimary: 60, 56, 54;
--backgroundsecondary: 50, 48, 47;
--backgroundsecondaryalt: 40, 40, 40;
--backgroundtertiary: 29, 32, 33;
--backgroundfloating: 20, 22, 23;
--settingsicons: 1;
}
'';
xdg.configFile = mkIf (cfg.variant == "vesktop") {
"vesktop/themes/base16.css".text =
/*
css
*/
''
/**
* @name Material Gruvbox
* @.
* @author Costeer
* @version 1.5.0
* @website https://github.com/Costeer
* @source https://github.com/Costeer/Gruvbox-Material-Themes
*/
@import url(https://mwittrien.github.io/BetterDiscordAddons/Themes/DiscordRecolor/DiscordRecolor.css);
:root {
--accentcolor: 137, 180, 130;
--accentcolor2: 211, 134, 155;
--linkcolor: 125, 174, 163;
--mentioncolor: 211, 134, 155;
--textbrightest: 221, 199, 161;
--textbrighter: 212, 190, 152;
--textbright: 168, 153, 132;
--textdark: 146, 131, 116;
--textdarker: 146, 131, 116;
--textdarkest: 80, 80, 80;
--font: Input Sans Narrow;
--main-font: Input Sans Narrow;
--code-font: Input Mono Compressed;
--backgroundaccent: 80, 73, 69;
--backgroundprimary: 60, 56, 54;
--backgroundsecondary: 50, 48, 47;
--backgroundsecondaryalt: 40, 40, 40;
--backgroundtertiary: 29, 32, 33;
--backgroundfloating: 20, 22, 23;
--settingsicons: 1;
}
'';
};
};
}

7
modules/home/programs/hyprland/keybinds.nix
View File

@@ -1,7 +1,6 @@
{
lib,
config,
pkgs,
osConfig,
...
}: let
@@ -25,10 +24,10 @@ in {
# Common Keybind Variables
"$fileManager" = "thunar";
"$yazi" = "foot -e yazi";
"$tuirun" = "uwsm app -- tuirun-toggle.sh";
"$tuirun" = "tuirun-toggle.sh";
bind = [
"$mod, SPACE, exec, $tuirun"
"$mod, SPACE, exec, tuirun"
"$mod, R, exec, $tuirun"
"$mod, L, exec, ${toggle "nwg-bar"}"
"$mod SHIFT, B, exec, pkill -SIGUSR2 waybar"
@@ -96,7 +95,7 @@ in {
(mkIf (host == "cnix") {
wayland.windowManager.hyprland.settings = {
"$terminal" = "alacritty";
"$terminal" = "ghostty";
"$browser" = "zen";
"$browserinc" = "zen --private-window";
"$mod" = "SUPER";

2
modules/home/programs/misc/default.nix
View File

@@ -21,7 +21,7 @@ in {
};
# a monitor of resources
btop = {
enable = true;
enable = false;
package = pkgs.btop.override {rocmSupport = true;};
settings = {
color_theme = "gruvbox_material_dark";

57
modules/home/programs/vesktop/default.nix Normal file
View File

@@ -0,0 +1,57 @@
{
pkgs,
config,
lib,
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.discord;
in {
options = {
home.programs.discord.enable = mkEnableOption "Enables discord";
};
config = mkIf cfg.enable {
home.packages = with pkgs; [vesktop];
xdg.configFile."vesktop/themes/base16.css".text =
/*
css
*/
''
/**
* @name Material Gruvbox
* @.
* @author Costeer
* @version 1.5.0
* @website https://github.com/Costeer
* @source https://github.com/Costeer/Gruvbox-Material-Themes
*/
@import url(https://mwittrien.github.io/BetterDiscordAddons/Themes/DiscordRecolor/DiscordRecolor.css);
:root {
--accentcolor: 137, 180, 130;
--accentcolor2: 211, 134, 155;
--linkcolor: 125, 174, 163;
--mentioncolor: 211, 134, 155;
--textbrightest: 221, 199, 161;
--textbrighter: 212, 190, 152;
--textbright: 168, 153, 132;
--textdark: 146, 131, 116;
--textdarker: 146, 131, 116;
--textdarkest: 80, 80, 80;
--font: Input Sans Narrow;
--main-font: Input Sans Narrow;
--code-font: Input Mono Compressed;
--backgroundaccent: 80, 73, 69;
--backgroundprimary: 60, 56, 54;
--backgroundsecondary: 50, 48, 47;
--backgroundsecondaryalt: 40, 40, 40;
--backgroundtertiary: 29, 32, 33;
--backgroundfloating: 20, 22, 23;
--settingsicons: 1;
}
'';
};
}

10
modules/nixos/boot/kernel/default.nix
View File

@@ -4,31 +4,31 @@
config,
...
}: let
inherit (lib) mkOption mkIf;
inherit (lib) mkOption types;
cfg = config.nixos.boot.kernel;
in {
options = {
nixos.boot.kernel = {
variant = mkOption {
type = lib.types.enum ["stable" "latest" "cachyos"];
type = types.enum ["stable" "latest" "cachyos"];
default = "latest";
description = "Kernel variant to use.";
};
hardware = mkOption {
type = lib.types.enum ["amd" "nvidia"];
type = types.enum ["amd" "nvidia"];
default = "amd";
description = "Hardware type (GPU) configuration.";
};
extraKernelParams = mkOption {
type = lib.types.listOf lib.types.str;
type = types.listOf lib.types.str;
default = [];
description = "Additional kernel parameters.";
};
extraBlacklistedModules = mkOption {
type = lib.types.listOf lib.types.str;
type = types.listOf lib.types.str;
default = [];
description = "Additional kernel nixos.to blacklist.";
};

6
modules/nixos/hardware/graphics/amd/default.nix
View File

@@ -50,7 +50,7 @@ in {
vulkan-tools
wayland
wayland-protocols
rocmPackages.rocm-smi
# rocmPackages.rocm-smi
];
})
@@ -88,13 +88,13 @@ in {
};
environment.systemPackages = with pkgs; [
vulkanPackages_latest.vulkan-tools
vulkanPackages_latest.vulkan-tools-lunarg
# vulkanPackages_latest.vulkan-tools-lunarg
vulkanPackages_latest.gfxreconstruct
vulkanPackages_latest.spirv-cross
wayland-protocols_git
wayland_git
scx.rustscheds
rocmPackages.rocm-smi
# rocmPackages.rocm-smi
libGL
];
})

16
modules/nixos/programs/ghostty/default.nix Normal file
View File

@@ -0,0 +1,16 @@
{
config,
lib,
inputs,
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.nixos.programs.ghostty;
in {
options = {
nixos.programs.ghostty.enable = mkEnableOption "Enables ghostty";
};
config = mkIf cfg.enable {
environment.systemPackages = [inputs.ghostty.packages.x86_64-linux.default];
};
}

1
modules/nixos/programs/lutris/default.nix
View File

@@ -13,7 +13,6 @@ in {
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
lutris
bottles
];
};
}