Compare commits

...

3 Commits

Author SHA1 Message Date
3be3fd6f2e removed collisions 2025-01-01 12:15:12 +01:00
8485be713b bootloader module removed 2025-01-01 12:14:49 +01:00
cab60bff45 cleanup + added special options for packages
- gitkraken only on linux and nvtop only on linux
2025-01-01 12:12:40 +01:00
8 changed files with 44 additions and 157 deletions

View File

@ -1,121 +0,0 @@
// Config //
configuration {
modi: "drun";
show-icons: false;
}
* {
main-bg : #11111be6;
main-fg : #cdd6f4ff;
main-br : #cba6f7ff;
main-ex : #f5e0dcff;
select-bg : #b4befeff;
select-fg : #11111bff;
separatorcolor : transparent;
border-color : transparent;
}
// Main //
window {
width: 23em;
height: 30em;
transparency: "real";
fullscreen: false;
enabled: true;
cursor: "default";
spacing: 0em;
padding: 0em;
border-color: @main-br;
background-color: @main-bg;
}
mainbox {
enabled: true;
spacing: 0em;
padding: 0.5em;
orientation: vertical;
children: [ "wallbox" , "listbox" ];
background-color: transparent;
}
wallbox {
spacing: 0em;
padding: 0em;
expand: false;
orientation: horizontal;
background-color: transparent;
background-image: url("~/.dotfiles/config/backgrounds/aurora_borealis.png", width);
children: [ "wallframe" , "inputbar" ];
}
wallframe {
width: 5em;
spacing: 0em;
padding: 0em;
expand: false;
background-color: @main-bg;
background-image: url("~/.dotfiles/config/backgrounds/aurora_borealis.png", height);
}
// Inputs //
inputbar {
enabled: true;
padding: 0em;
children: [ "entry" ];
background-color: @main-bg;
expand: true;
}
entry {
enabled: true;
padding: 1.8em;
text-color: @main-fg;
background-color: transparent;
}
// Lists //
listbox {
spacing: 0em;
padding: 0em;
orientation: vertical;
children: [ "dummy" , "listview" , "dummy" ];
background-color: transparent;
}
listview {
enabled: true;
padding: 0.5em;
columns: 1;
lines: 11;
cycle: true;
fixed-height: true;
fixed-columns: false;
expand: false;
cursor: "default";
background-color: transparent;
text-color: @main-fg;
}
dummy {
spacing: 0em;
padding: 0em;
background-color: transparent;
}
// Elements //
element {
enabled: true;
padding: 0.5em;
cursor: pointer;
background-color: transparent;
text-color: @main-fg;
}
element selected.normal {
background-color: @select-bg;
text-color: @select-fg;
}
element-text {
vertical-align: 0.0;
horizontal-align: 0.0;
cursor: inherit;
background-color: transparent;
text-color: inherit;
}

View File

@ -23,7 +23,7 @@
}; };
}; };
# System level configuration boot.loader.systemd-boot.enable = true;
sys = { sys = {
audio.enable = true; audio.enable = true;
bootloader.systemd-boot.enable = true; bootloader.systemd-boot.enable = true;

View File

@ -29,10 +29,10 @@
]; ];
}; };
# System level configuration boot.loader.systemd-boot.enable = true;
sys = { sys = {
audio.enable = true; audio.enable = true;
bootloader.systemd-boot.enable = true; #bootloader.systemd-boot.enable = true;
desktop = { desktop = {
steamdeck.enable = true; steamdeck.enable = true;
}; };

View File

@ -10,21 +10,28 @@
}; };
config = lib.mkIf config.app_list.terminal_tools.enable { config = lib.mkIf config.app_list.terminal_tools.enable {
home.packages = with pkgs; [ home.packages = with pkgs;
[
btop btop
cmatrix cmatrix
entr entr
figlet figlet
jp2a jp2a
yt-dlp yt-dlp
#nvtopPackages.full
wget wget
curl curl
fzf fzf
tldr tldr
ranger ranger
unzip unzip
]; ]
++ (
if pkgs.system == "x86_64-linux"
then [
nvtopPackages.full
]
else []
);
nixpkgs.config.allowUnfreePredicate = pkg: nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [ builtins.elem (lib.getName pkg) [

View File

@ -16,11 +16,16 @@
userEmail = "kohout.fi.2023@skola.ssps.cz"; userEmail = "kohout.fi.2023@skola.ssps.cz";
}; };
home.packages = with pkgs; [ home.packages = with pkgs;
[
git git
github-cli github-cli
#gitkraken ]
]; ++ (
if pkgs.system == "x86_64-linux"
then [gitkraken]
else []
);
nixpkgs.config.allowUnfreePredicate = pkg: nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [ builtins.elem (lib.getName pkg) [

View File

@ -3,10 +3,10 @@
config, config,
}: { }: {
options = { options = {
sys.bootloader.systemd.enable = lib.mkEnableOption "Enable systemd-boot as the bootloader"; sys.bootloader.systemd-boot.enable = lib.mkEnableOption "Enable systemd-boot as the bootloader";
}; };
config = lib.mkIf config.sys.bootloader.systemd.enable { config = lib.mkIf config.sys.bootloader.systemd-boot.enable {
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
}; };
} }

View File

@ -15,14 +15,14 @@
./settings/loginManager.nix ./settings/loginManager.nix
./settings/style.nix ./settings/style.nix
./settings/default-applications.nix ./settings/default-applications.nix
./settings/bootloader.nix #./settings/bootloader.nix
./settings/user.nix ./settings/user.nix
]; ];
sys = { sys = {
audio.enable = lib.mkDefault true; audio.enable = lib.mkDefault true;
bootloader.systemd-boot.enable = lib.mkDefault true; #bootloader.systemd-boot.enable = lib.mkDefault true;
desktop = { desktop = {
plasma.enable = plasma.enable =
if userSettings.plasma == true if userSettings.plasma == true

View File

@ -18,11 +18,7 @@
# Simply install just the packages # Simply install just the packages
environment.packages = with pkgs; [ environment.packages = with pkgs; [
# User-facing stuff that you really really want to have nano
neovim
git
neofetch
# Some common stuff that people expect to have # Some common stuff that people expect to have
#procps #procps
#killall #killall