faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed merge conflicts

Browse source
This commit is contained in:
Charlie Root 2024-04-13 15:35:13 +02:00
commit 62d0e0591b
49 changed files with 814 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hosts/vali/mars/awesome.nix
View file

@ -1,8 +1,8 @@
{ pkgs, lib, config, ... }:
with lib; let
cfg = config.myOptions.programs.awesome;
cfg = config.modules.programs.awesome;
in {
options.myOptions.programs.awesome.enable = mkEnableOption "awesome";
options.modules.programs.awesome.enable = mkEnableOption "awesome";
config = mkIf cfg.enable {
services.xserver = {

2
hosts/vali/mars/configuration.nix
View file

@ -34,7 +34,7 @@
}
'';
};
myOptions = {
modules = {
other = {
system = {
hostname = "mars";

8
hosts/vali/mars/hypr/land.nix
View file

@ -2,8 +2,8 @@
with lib; let
cfg = config.myOptions.programs.hypr.land;
username = config.myOptions.other.system.username;
cfg = config.modules.programs.hypr.land;
username = config.modules.other.system.username;
hmCfg = config.home-manager.users.${username};
smwPresent = elem inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces cfg.extraPlugins;
@ -13,7 +13,7 @@ with lib; let
inherit (inputs.hyprland.packages.${pkgs.system}) hyprland;
inherit (inputs.hyprlock.packages.${pkgs.system}) hyprlock;
in {
options.myOptions.programs.hypr.land = {
options.modules.programs.hypr.land = {
enable = mkEnableOption "huperland";
startupSound = mkOption {
type = with types; nullOr path;
@ -359,7 +359,7 @@ in {
"[workspace special:rog silent;tile] ${config.services.asusd.package}/bin/rog-control-center")
"[workspace special:keepassxc silent;tile] ${pkgs.keepassxc}/bin/keepassxc"
(if config.myOptions.programs.foot.server then "sleep 0.5 && ${pkgs.systemd}/bin/systemctl --user restart foot.service" else ";")
(if config.modules.programs.foot.server then "sleep 0.5 && ${pkgs.systemd}/bin/systemctl --user restart foot.service" else ";")
"${hyprland}/bin/hyprctl setcursor Bibata-Modern-Classic 24"

6
hosts/vali/mars/hypr/lock.nix
View file

@ -5,12 +5,12 @@
pkgs,
...
}: with lib; let
cfg = config.myOptions.programs.hypr.lock;
username = config.myOptions.other.system.username;
cfg = config.modules.programs.hypr.lock;
username = config.modules.other.system.username;
text_color = "rgba(eae0e4FF)";
in {
options.myOptions.programs.hypr.lock = {
options.modules.programs.hypr.lock = {
enable = mkEnableOption "hiper zamek";
extraSettings = mkOption {
type = types.attrs;

4
hosts/vali/mars/i3/i3.nix
View file

@ -1,9 +1,9 @@
{ pkgs, lib, config, callPackage, ... }:
with lib; let
cfg = config.myOptions.programs.i3;
username = config.myOptions.other.system.username;
cfg = config.modules.programs.i3;
in {
options.myOptions.programs.i3.enable = mkEnableOption "i3";
options.modules.programs.i3.enable = mkEnableOption "i3";
config = mkIf cfg.enable {
home-manager.users.${username}.xdg.configFile."i3/config".source = ./config;

1
hosts/vali/mars/programs.nix
View file

@ -1,6 +1,7 @@
{ config, inputs, pkgs, ... }:
let
fenix = inputs.fenix.packages.${pkgs.system};
username = config.modules.other.system.username;
in {
environment.systemPackages = with pkgs; [
alacritty

78
hosts/vali/mars/temp Normal file
View file

@ -0,0 +1,78 @@
{ config, inputs, pkgs, ... }:
let
username = config.myOptions.other.system.username;
in {
home-manager.users.${username} = {
home.packages = let
fenix = inputs.fenix.packages.${pkgs.system};
in with pkgs; [
alacritty
alsa-utils
asciinema
betterbird
bibata-cursors
dig
easyeffects
element-desktop
eza
fastfetch
(fenix.complete.withComponents [
"cargo"
"clippy"
"rust-src"
"rustc"
"rustfmt"
])
ffmpeg_6-full
flameshot
foot
gcc
gdb
grimblast
git
httpie
imagemagick
keepassxc
krita
lazygit
libreoffice-fresh
neofetch
neovim
networkmanagerapplet
nextcloud-client
pamixer
pavucontrol
pcmanfm
pfetch
playerctl
polkit
python3
qbittorrent
ripgrep
rustdesk
rofi
scc
sherlock
signal-desktop-beta
smartmontools
st
steam
strawberry.strawberry-wrapped
telegram-desktop
texliveFull
thunderbird
tor-browser-bundle-bin
trash-cli
tree
unzip
ventoy-full
vesktop
vlc
xclip
yt-dlp
zathura
zip
];
};
}