Compare commits
15 Commits
96a1f8a395
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 8fee12bcb2 | |||
| 97452af41d | |||
| 11db4dfdab | |||
| 0f3aa402ee | |||
| 693184e68e | |||
| 11004b1daf | |||
| a0de120141 | |||
| 2b2732b5a2 | |||
| fc1253eb9d | |||
| 5cdc51b10f | |||
| d0308a327e | |||
| 31b881972e | |||
| 6758b8f6bc | |||
| 105393e0d0 | |||
| 84153bbf3e |
@@ -58,10 +58,16 @@ Die Konfiguration ist in logische Module unterteilt, um die Wartung und Übertra
|
||||
|
||||
## Installation & Setup
|
||||
|
||||
### 0. Temporäre Shell mit Git
|
||||
|
||||
```bash
|
||||
nix-shell -p git
|
||||
```
|
||||
|
||||
### 1. Repository klonen
|
||||
|
||||
```bash
|
||||
git clone https://github.com/DEIN_USERNAME/nixos-config.git ~/nixos
|
||||
git clone https://gitea.timvandenboom.eth64.de/nils/nixos ~/nixos
|
||||
cd ~/nixos
|
||||
|
||||
```
|
||||
@@ -130,24 +136,7 @@ Wenn du Änderungen vornimmst, folge immer diesem Ablauf:
|
||||
|
||||
---
|
||||
|
||||
### Was wurde ergänzt?
|
||||
|
||||
* **Pfad-Klarheit**: Es wird explizit auf `/home/nils/nixos` hingewiesen.
|
||||
* **Git-Pflicht**: Der Hinweis auf `git init` und die Notwendigkeit von `git add` für Flakes ist jetzt prominenter.
|
||||
* **Boot-Befehl**: Die Unterscheidung zwischen `switch` und `boot` wurde hinzugefügt, da du für das Hibernation-Setup zwingend den `boot`-Parameter benötigst, um die Kernel-Parameter (`resume_offset`) im Bootloader zu registrieren.
|
||||
|
||||
Soll ich noch einen Abschnitt hinzufügen, wie man überprüft, ob der Symlink korrekt gesetzt wurde?
|
||||
|
||||
### 3. Hardware-Konfiguration
|
||||
|
||||
Die `hardware-configuration.nix` ist spezifisch für jedes Gerät. Sie wird automatisch generiert und sollte im Hauptverzeichnis bleiben.
|
||||
|
||||
* Die Datei wird beim ersten Setup automatisch eingebunden.
|
||||
|
||||
|
||||
* **Wichtig:** Falls du das System auf neuer Hardware aufsetzt, generiere sie mit `nixos-generate-config` neu.
|
||||
|
||||
### 4. Konfiguration anwenden
|
||||
### Konfiguration anwenden
|
||||
|
||||
```bash
|
||||
sudo nixos-rebuild switch --flake .#nixos
|
||||
|
||||
@@ -6,16 +6,90 @@
|
||||
settings = {
|
||||
general.import = [ "${config.home.homeDirectory}/.config/alacritty/colors.toml" ];
|
||||
|
||||
env.TERM = "xterm-256color";
|
||||
window = {
|
||||
opacity = 0.9;
|
||||
padding = { x = 10; y = 10; };
|
||||
env = {
|
||||
TERM = "xterm-256color";
|
||||
WINIT_X11_SCALE_FACTOR = "1";
|
||||
};
|
||||
font.size = 12;
|
||||
|
||||
terminal.shell = {
|
||||
program = "${pkgs.zellij}/bin/zellij";
|
||||
window = {
|
||||
dynamic_padding = true;
|
||||
decorations = "full";
|
||||
title = "Alacritty@nixos";
|
||||
opacity = 0.8;
|
||||
decorations_theme_variant = "Dark";
|
||||
dimensions = {
|
||||
columns = 100;
|
||||
lines = 30;
|
||||
};
|
||||
class = {
|
||||
instance = "Alacritty";
|
||||
general = "Alacritty";
|
||||
};
|
||||
};
|
||||
|
||||
scrolling = {
|
||||
history = 10000;
|
||||
multiplier = 3;
|
||||
};
|
||||
|
||||
font = {
|
||||
size = 12;
|
||||
normal = { family = "monospace"; style = "Regular"; };
|
||||
bold = { family = "monospace"; style = "Bold"; };
|
||||
italic = { family = "monospace"; style = "Italic"; };
|
||||
bold_italic = { family = "monospace"; style = "Bold Italic"; };
|
||||
};
|
||||
|
||||
selection = {
|
||||
semantic_escape_chars = ",│`|:\"' ()[]{}<>\t";
|
||||
save_to_clipboard = true;
|
||||
};
|
||||
|
||||
cursor = {
|
||||
style = {
|
||||
shape = "Beam";
|
||||
blinking = "Always";
|
||||
};
|
||||
vi_mode_style = {
|
||||
shape = "Block";
|
||||
};
|
||||
unfocused_hollow = true;
|
||||
thickness = 0.15;
|
||||
};
|
||||
|
||||
mouse = {
|
||||
hide_when_typing = true;
|
||||
bindings = [
|
||||
{ mouse = "Middle"; action = "PasteSelection"; }
|
||||
];
|
||||
};
|
||||
|
||||
keyboard.bindings = [
|
||||
{ key = "Paste"; action = "Paste"; }
|
||||
{ key = "Copy"; action = "Copy"; }
|
||||
{ key = "L"; mods = "Control"; action = "ClearLogNotice"; }
|
||||
{ key = "L"; mods = "Control"; mode = "~Vi"; chars = "\f"; }
|
||||
{ key = "PageUp"; mods = "Shift"; mode = "~Alt"; action = "ScrollPageUp"; }
|
||||
{ key = "PageDown"; mods = "Shift"; mode = "~Alt"; action = "ScrollPageDown"; }
|
||||
{ key = "Home"; mods = "Shift"; mode = "~Alt"; action = "ScrollToTop"; }
|
||||
{ key = "End"; mods = "Shift"; mode = "~Alt"; action = "ScrollToBottom"; }
|
||||
{ key = "V"; mods = "Control|Shift"; action = "Paste"; }
|
||||
{ key = "C"; mods = "Control|Shift"; action = "Copy"; }
|
||||
{ key = "F"; mods = "Control|Shift"; action = "SearchForward"; }
|
||||
{ key = "B"; mods = "Control|Shift"; action = "SearchBackward"; }
|
||||
{ key = "C"; mods = "Control|Shift"; mode = "Vi"; action = "ClearSelection"; }
|
||||
{ key = "Key0"; mods = "Control"; action = "ResetFontSize"; }
|
||||
];
|
||||
|
||||
general = {
|
||||
live_config_reload = true;
|
||||
working_directory = "None";
|
||||
|
||||
# terminal.shell = {
|
||||
# program = "${pkgs.zellij}/bin/zellij";
|
||||
# };
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -22,9 +22,12 @@
|
||||
};
|
||||
themes = {
|
||||
transparent = {
|
||||
inherits = "base16_transparent";
|
||||
inherits = "tokyonight_moon";
|
||||
"ui.background" = { };
|
||||
|
||||
"ui.statusline" = { fg = "fg"; };
|
||||
"ui.statusline.inactive" = { fg = "comment"; };
|
||||
|
||||
"ui.linenr" = { fg = "#666666"; };
|
||||
"ui.linenr.selected" = {
|
||||
fg = "#ffffff";
|
||||
|
||||
@@ -51,10 +51,25 @@
|
||||
};
|
||||
|
||||
decoration = {
|
||||
rounding = 10;
|
||||
# active_opacity = 1.0;
|
||||
# inactive_opacity = 0.8;
|
||||
shadow = {
|
||||
enabled = true;
|
||||
range = 15;
|
||||
render_power = 3;
|
||||
color = "rgba(0,0,0,0.4)";
|
||||
color_inactive = "rgba(0,0,0,0.2)";
|
||||
};
|
||||
# dim_inactive = true;
|
||||
# dim_strength = 0.05;
|
||||
blur = {
|
||||
enabled = true;
|
||||
size = 8;
|
||||
size = 10;
|
||||
passes = 3;
|
||||
noise = 0.12;
|
||||
contrast = 1.1;
|
||||
brightness = 0.8;
|
||||
new_optimizations = true;
|
||||
ignore_opacity = true;
|
||||
};
|
||||
|
||||
@@ -7,107 +7,67 @@
|
||||
extraConfig = {
|
||||
modes = "window,run,ssh,drun";
|
||||
show-icons = true;
|
||||
drun-display-format = "{name}";
|
||||
display-drun = "Apps:";
|
||||
terminal = "alacritty";
|
||||
};
|
||||
theme = "${config.home.homeDirectory}/.config/rofi/main-theme.rasi";
|
||||
};
|
||||
|
||||
xdg.configFile."rofi/main-theme.rasi".text = ''
|
||||
/* Importiert die von Matugen generierten Farben */
|
||||
@import "${config.home.homeDirectory}/.config/rofi/matugen-colors.rasi"
|
||||
|
||||
configuration {
|
||||
wayland-layer: "overlay";
|
||||
//display-drun: "";
|
||||
//display-run: "";
|
||||
//display-window: "";
|
||||
//display-ssh: "";
|
||||
show-icons: true;
|
||||
}
|
||||
|
||||
* {
|
||||
background-color: @bg0;
|
||||
border-color: @fg0;
|
||||
font: "JetBrainsMono Nerd Font 12";
|
||||
background-color: transparent;
|
||||
text-color: @fg0;
|
||||
font: "JetBrainsMono Nerd Font 11";
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
spacing: 0px;
|
||||
}
|
||||
|
||||
window {
|
||||
width: 100% ;
|
||||
padding: 4px ;
|
||||
anchor: north;
|
||||
location: north;
|
||||
y-offset: -30px;
|
||||
children: [ "horibox" ];
|
||||
location: center;
|
||||
width: 680;
|
||||
border-radius: 20px;
|
||||
border: 2px;
|
||||
border-color: @blue; /* Hier wird jetzt die Matugen-Farbe genutzt */
|
||||
background-color: @bg0;
|
||||
}
|
||||
|
||||
horibox {
|
||||
orientation: horizontal;
|
||||
children: [ "container-left", "container-right" ];
|
||||
background-color: transparent;
|
||||
mainbox { padding: 12px; }
|
||||
|
||||
inputbar {
|
||||
background-color: @bg1;
|
||||
border-color: @bg3;
|
||||
border-radius: 12px;
|
||||
border: 2px;
|
||||
padding: 8px 16px;
|
||||
spacing: 8px;
|
||||
children: [ prompt, entry ];
|
||||
}
|
||||
|
||||
container-left {
|
||||
orientation: horizontal;
|
||||
expand: true;
|
||||
children: [ "dummy", "inputbar" ];
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
container-right {
|
||||
orientation: horizontal;
|
||||
expand: true;
|
||||
children: [ "listview", "dummy" ];
|
||||
background-color: transparent;
|
||||
}
|
||||
prompt { text-color: @blue; }
|
||||
entry { placeholder: "Search..."; placeholder-color: @fg2; text-color: @fg0; }
|
||||
|
||||
listview {
|
||||
layout: horizontal;
|
||||
horizontal-align: 0.5;
|
||||
spacing: 15px ;
|
||||
lines: 100;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
entry {
|
||||
enabled: true;
|
||||
width: 5em ;
|
||||
expand: false;
|
||||
background-color: transparent;
|
||||
text-color: @fg0;
|
||||
placeholder: "Suche...";
|
||||
placeholder-color: @fg1;
|
||||
}
|
||||
|
||||
prompt {
|
||||
background-color: transparent;
|
||||
text-color: @blue;
|
||||
margin: 0 10px 0 0;
|
||||
margin: 12px 0 0;
|
||||
lines: 8;
|
||||
columns: 1;
|
||||
fixed-height: false;
|
||||
}
|
||||
|
||||
element {
|
||||
padding: 0px 5px;
|
||||
border-radius: 4px;
|
||||
background-color: transparent;
|
||||
text-color: @fg0;
|
||||
padding: 8px 16px;
|
||||
spacing: 12px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
element selected {
|
||||
element selected normal {
|
||||
background-color: @bg2;
|
||||
text-color: @fg0;
|
||||
text-color: @blue;
|
||||
}
|
||||
|
||||
element-text {
|
||||
background-color: transparent;
|
||||
text-color: inherit;
|
||||
}
|
||||
|
||||
element-icon {
|
||||
background-color: transparent;
|
||||
text-color: inherit;
|
||||
size: 1.0em;
|
||||
}
|
||||
element-icon { size: 1.5em; }
|
||||
element-text { text-color: inherit; vertical-align: 0.5; }
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -7,67 +7,107 @@
|
||||
extraConfig = {
|
||||
modes = "window,run,ssh,drun";
|
||||
show-icons = true;
|
||||
drun-display-format = "{name}";
|
||||
display-drun = "Apps:";
|
||||
terminal = "alacritty";
|
||||
};
|
||||
theme = "${config.home.homeDirectory}/.config/rofi/main-theme.rasi";
|
||||
};
|
||||
|
||||
xdg.configFile."rofi/main-theme.rasi".text = ''
|
||||
/* Importiert die von Matugen generierten Farben */
|
||||
@import "${config.home.homeDirectory}/.config/rofi/matugen-colors.rasi"
|
||||
|
||||
configuration {
|
||||
wayland-layer: "overlay";
|
||||
//display-drun: "";
|
||||
//display-run: "";
|
||||
//display-window: "";
|
||||
//display-ssh: "";
|
||||
show-icons: true;
|
||||
}
|
||||
|
||||
* {
|
||||
font: "JetBrainsMono Nerd Font 12";
|
||||
background-color: transparent;
|
||||
background-color: @bg0;
|
||||
border-color: @fg0;
|
||||
text-color: @fg0;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
spacing: 0px;
|
||||
font: "JetBrainsMono Nerd Font 11";
|
||||
}
|
||||
|
||||
window {
|
||||
location: center;
|
||||
width: 680;
|
||||
border-radius: 20px;
|
||||
border: 2px;
|
||||
border-color: @blue; /* Hier wird jetzt die Matugen-Farbe genutzt */
|
||||
width: 100% ;
|
||||
padding: 4px ;
|
||||
anchor: north;
|
||||
location: north;
|
||||
y-offset: -30px;
|
||||
children: [ "horibox" ];
|
||||
background-color: @bg0;
|
||||
}
|
||||
|
||||
mainbox { padding: 12px; }
|
||||
|
||||
inputbar {
|
||||
background-color: @bg1;
|
||||
border-color: @bg3;
|
||||
border-radius: 12px;
|
||||
border: 2px;
|
||||
padding: 8px 16px;
|
||||
spacing: 8px;
|
||||
children: [ prompt, entry ];
|
||||
horibox {
|
||||
orientation: horizontal;
|
||||
children: [ "container-left", "container-right" ];
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
prompt { text-color: @blue; }
|
||||
entry { placeholder: "Search..."; placeholder-color: @fg2; text-color: @fg0; }
|
||||
container-left {
|
||||
orientation: horizontal;
|
||||
expand: true;
|
||||
children: [ "dummy", "inputbar" ];
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
container-right {
|
||||
orientation: horizontal;
|
||||
expand: true;
|
||||
children: [ "listview", "dummy" ];
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
listview {
|
||||
margin: 12px 0 0;
|
||||
lines: 8;
|
||||
columns: 1;
|
||||
fixed-height: false;
|
||||
layout: horizontal;
|
||||
horizontal-align: 0.5;
|
||||
spacing: 15px ;
|
||||
lines: 100;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
entry {
|
||||
enabled: true;
|
||||
width: 5em ;
|
||||
expand: false;
|
||||
background-color: transparent;
|
||||
text-color: @fg0;
|
||||
placeholder: "Suche...";
|
||||
placeholder-color: @fg1;
|
||||
}
|
||||
|
||||
prompt {
|
||||
background-color: transparent;
|
||||
text-color: @blue;
|
||||
margin: 0 10px 0 0;
|
||||
}
|
||||
|
||||
element {
|
||||
padding: 8px 16px;
|
||||
spacing: 12px;
|
||||
border-radius: 10px;
|
||||
padding: 0px 5px;
|
||||
border-radius: 4px;
|
||||
background-color: transparent;
|
||||
text-color: @fg0;
|
||||
}
|
||||
|
||||
element selected normal {
|
||||
element selected {
|
||||
background-color: @bg2;
|
||||
text-color: @blue;
|
||||
text-color: @fg0;
|
||||
}
|
||||
|
||||
element-icon { size: 1.5em; }
|
||||
element-text { text-color: inherit; vertical-align: 0.5; }
|
||||
element-text {
|
||||
background-color: transparent;
|
||||
text-color: inherit;
|
||||
}
|
||||
|
||||
element-icon {
|
||||
background-color: transparent;
|
||||
text-color: inherit;
|
||||
size: 1.0em;
|
||||
}
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -2,11 +2,10 @@
|
||||
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
shellAbbrs = {
|
||||
# nix develop -c $SHELL
|
||||
nd = "nix develop -c fish";
|
||||
lg = "lazygit";
|
||||
};
|
||||
# shellAbbrs = {
|
||||
# nd = "nix develop -c fish";
|
||||
# lg = "lazygit";
|
||||
# };
|
||||
|
||||
interactiveShellInit = ''
|
||||
set fish_greeting
|
||||
@@ -22,7 +21,7 @@
|
||||
|
||||
settings = {
|
||||
default_shell = "fish";
|
||||
theme = "matugen";
|
||||
# theme = "matugen";
|
||||
default_layout = "compact";
|
||||
show_startup_tips = false;
|
||||
|
||||
@@ -59,6 +58,7 @@
|
||||
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
|
||||
programs.git = {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
enableFishIntegration = true;
|
||||
|
||||
keymap = {
|
||||
manager.prepend_keymap = [
|
||||
mgr.prepend_keymap = [
|
||||
{
|
||||
on = [ "g" "e" ];
|
||||
run = "arrow 100000000";
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
git vim wget curl helix
|
||||
swaybg whitesur-cursors copyq
|
||||
whitesur-cursors copyq
|
||||
kdePackages.kwallet-pam
|
||||
brightnessctl
|
||||
libxkbcommon
|
||||
|
||||
@@ -27,6 +27,10 @@ truncation_symbol = "…/"
|
||||
"Downloads" = " "
|
||||
"Music" = " "
|
||||
"Pictures" = " "
|
||||
"Dokumente" = " "
|
||||
"Musik" = " "
|
||||
"Bilder" = " "
|
||||
"Dev" = " "
|
||||
|
||||
[time]
|
||||
disabled = false
|
||||
|
||||
|
After Width: | Height: | Size: 5.5 MiB |
|
After Width: | Height: | Size: 1.7 MiB |
|
Before Width: | Height: | Size: 3.7 MiB After Width: | Height: | Size: 1.7 MiB |
|
After Width: | Height: | Size: 7.1 MiB |
|
After Width: | Height: | Size: 2.4 MiB |
|
After Width: | Height: | Size: 1.9 MiB |
|
After Width: | Height: | Size: 1.9 MiB |
|
After Width: | Height: | Size: 3.8 MiB |
|
After Width: | Height: | Size: 1.1 MiB |
|
After Width: | Height: | Size: 6.0 MiB |
|
After Width: | Height: | Size: 1.3 MiB |