Compare commits

..

4 Commits

Author SHA1 Message Date
9a63e0423e nur 2024-11-06 22:11:54 +01:00
91d567d5a5 patching migration 2024-11-06 21:51:22 +01:00
46dcd0753e last migration from old nix config 2024-11-06 21:10:20 +01:00
942fdc8944 zsh and zerotier 2024-11-06 19:45:33 +01:00
18 changed files with 2090 additions and 27 deletions

16
flake.lock generated
View File

@@ -974,6 +974,21 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nur": {
"locked": {
"lastModified": 1730923063,
"narHash": "sha256-QSy8CAkCkDImoLEyICxXtPW9N4rSC9QXcPE83OLXc1c=",
"owner": "nix-community",
"repo": "NUR",
"rev": "51420b39807738ce2e8c43f034c35cd6bc920076",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@@ -1009,6 +1024,7 @@
"hyprsysteminfo": "hyprsysteminfo", "hyprsysteminfo": "hyprsysteminfo",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"nur": "nur",
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
"split-monitor-workspaces": "split-monitor-workspaces", "split-monitor-workspaces": "split-monitor-workspaces",
"stylix": "stylix" "stylix": "stylix"

View File

@@ -4,6 +4,7 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
nur.url = "github:nix-community/NUR";
hyprsunset.url = "github:hyprwm/hyprsunset"; hyprsunset.url = "github:hyprwm/hyprsunset";
hyprsysteminfo.url = "github:/hyprwm/hyprsysteminfo"; hyprsysteminfo.url = "github:/hyprwm/hyprsysteminfo";

54
home/configs/aliases.nix Normal file
View File

@@ -0,0 +1,54 @@
{
myAliases = {
".." = "cd ..";
"cd.." = "cd ..";
ls = "command eza";
grep = "grep --color=auto";
fgrep = "fgrep --color=auto";
egrep = "egrep --color=auto";
l = "eza -G --icons";
ll = "eza -l --icons";
lg = "eza -lG";
lall = "eza -lahF --icons --git";
lalg = "eza -laGhF --icons --git";
latree = "eza -laGghHT --git --icons";
la = "eza --git --icons -la";
lsd = "eza -laD";
cls = "clear";
userlist = "cut -d: -f1 /etc/passwd";
free = "free -mt";
du = "du -ach | sort -h";
ps = "ps auxf";
sudo = "sudo ";
reload = "exec $SHELL -l";
hibernate = "systemctl hibernate";
mkdir = "mkdir -pv";
psmem = "ps -e -orss=,args= | sort -b -k1 -nr";
psmem10 = "ps -e -orss=,args= | sort -b -k1 -nr | head -10";
pscpu = "ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr";
pscpu10 = "ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr | head -10";
xclip = "xclip -selection c";
gua = "git remote | xargs -L1 git push --all";
fetch = "fastfetch";
rebuild = "nh os switch";
update = "nh os switch --update";
garbage = "nh clean all && sudo bootctl cleanup ";
hxd = "hx ~/.files/";
hxc = "hx ~/code/";
lr = "eza -R";
tree = "eza -T";
startupctl = "systemctl list-unit-files --type=service | grep enabled";
};
}

1712
home/configs/p10k.zsh Normal file

File diff suppressed because it is too large Load Diff

135
home/configs/rose-pine.rasi Normal file
View File

@@ -0,0 +1,135 @@
@import "default"
* {
bg: #191724;
cur: #1f1d2e;
fgd: #e0def4;
cmt: #6e6a86;
cya: #9ccfd8;
grn: #31748f;
ora: #ebbcba;
pur: #c4a7e7;
red: #eb6f92;
yel: #f6c177;
font: "Cartograph CF 12";
foreground: @fgd;
background: @bg;
active-background: @grn;
urgent-background: @red;
selected-background: @active-background;
selected-urgent-background: @urgent-background;
selected-active-background: @active-background;
separatorcolor: @active-background;
bordercolor: @ora;
}
#window {
background-color: @background;
border: 3;
border-radius: 6;
border-color: @bordercolor;
padding: 5;
}
#mainbox {
border: 0;
padding: 5;
}
#message {
border: 1px dash 0px 0px ;
border-color: @separatorcolor;
padding: 1px ;
}
#textbox {
text-color: @foreground;
}
#listview {
fixed-height: 0;
border: 2px dash 0px 0px ;
border-color: @bordercolor;
spacing: 2px ;
scrollbar: false;
padding: 2px 0px 0px ;
}
#element {
border: 0;
padding: 1px ;
}
#element.normal.normal {
background-color: @background;
text-color: @foreground;
}
#element.normal.urgent {
background-color: @urgent-background;
text-color: @urgent-foreground;
}
#element.normal.active {
background-color: @active-background;
text-color: @background;
}
#element.selected.normal {
background-color: @selected-background;
text-color: @foreground;
}
#element.selected.urgent {
background-color: @selected-urgent-background;
text-color: @foreground;
}
#element.selected.active {
background-color: @selected-active-background;
text-color: @background;
}
#element.alternate.normal {
background-color: @background;
text-color: @foreground;
}
#element.alternate.urgent {
background-color: @urgent-background;
text-color: @foreground;
}
#element.alternate.active {
background-color: @active-background;
text-color: @foreground;
}
#scrollbar {
width: 2px ;
border: 0;
handle-width: 8px ;
padding: 0;
}
#sidebar {
border: 2px dash 0px 0px ;
border-color: @separatorcolor;
}
#button.selected {
background-color: @selected-background;
text-color: @foreground;
}
#inputbar {
spacing: 0;
text-color: @foreground;
padding: 1px ;
}
#case-indicator {
spacing: 0;
text-color: @foreground;
}
#entry {
spacing: 0;
text-color: @cya;
}
#prompt {
spacing: 0;
text-color: @grn;
}
#inputbar {
children: [ prompt,textbox-prompt-colon,entry,case-indicator ];
}
#textbox-prompt-colon {
expand: false;
str: ":";
margin: 0px 0.3em 0em 0em;
text-color: @grn;
}

View File

@@ -7,16 +7,21 @@
./programs/fastfetch.nix ./programs/fastfetch.nix
# ./programs/foot.nix # ./programs/foot.nix
./programs/git.nix ./programs/git.nix
# ./programs/helix.nix ./programs/gpg.nix
./programs/helix.nix
./programs/kitty.nix ./programs/kitty.nix
./programs/neovide.nix
./programs/neovim.nix
./programs/packages.nix ./programs/packages.nix
./programs/shell.nix ./programs/shell.nix
./programs/tmux.nix
./programs/vscodium.nix ./programs/vscodium.nix
# ./programs/yazi.nix # ./programs/yazi.nix
# ./programs/zathura.nix # ./programs/zathura.nix
./system/dunst.nix ./system/dunst.nix
./system/hyprland.nix ./system/hyprland.nix
./system/rofi.nix
./system/stylix.nix ./system/stylix.nix
./system/waybar.nix ./system/waybar.nix
./system/wlsunset.nix ./system/wlsunset.nix

View File

@@ -2,7 +2,7 @@
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Michał Czyż"; userName = "Michał Czyż";
userEmail = "mike@c2yz.com"; userEmail = "mike@c2yz.com";
extraConfig = { extraConfig = {

7
home/programs/gpg.nix Normal file
View File

@@ -0,0 +1,7 @@
{
services.gpg-agent = {
enable = true;
defaultCacheTtl = 1800;
enableSshSupport = true;
};
}

View File

@@ -1,6 +1,12 @@
{ { lib, ... }: {
programs.kitty = { programs.kitty = {
enable = true; enable = true;
font = {
name = lib.mkForce "FiraCode Nerd Font";
size = 12;
};
themeFile = "rose-pine";
settings = { settings = {
confirm_os_window_close = 0; confirm_os_window_close = 0;

17
home/programs/neovide.nix Normal file
View File

@@ -0,0 +1,17 @@
{pkgs, ...}: {
home.packages = with pkgs; [
neovide
];
home.file = {
".config/neovide/config.toml" = {
text = ''
vsync = true
[font]
normal = ["FiraCode Nerd Font"]
size = 14
'';
};
};
}

15
home/programs/neovim.nix Normal file
View File

@@ -0,0 +1,15 @@
{ inputs
, pkgs
, ...
}: {
programs.neovim = {
enable = true;
# package = pkgs.neovim;
viAlias = true;
vimAlias = true;
vimdiffAlias = true;
defaultEditor = true;
};
}

View File

@@ -42,7 +42,6 @@
obs-studio obs-studio
okular okular
# > desktop < # # > desktop < #
firefox firefox
telegram-desktop telegram-desktop
@@ -66,11 +65,9 @@
platformio platformio
iwgtk iwgtk
imv imv
neovide
feh feh
zed-editor zed-editor
zint zint
tmux
zip zip
unzip unzip
pavucontrol pavucontrol
@@ -78,9 +75,7 @@
qalculate-gtk qalculate-gtk
file-roller file-roller
vim vim
rofi
nixfmt-rfc-style nixfmt-rfc-style
nemo nemo
neovim
]; ];
} }

View File

@@ -1,3 +1,9 @@
{ pkgs
, ...
}:
let
cli = import ../configs/aliases.nix;
in
{ {
programs = { programs = {
zoxide.enable = true; zoxide.enable = true;
@@ -32,27 +38,39 @@
bash = { bash = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
shellAliases = { shellAliases = cli.myAliases;
fetch = "fastfetch";
rebuild = "nh os switch";
update = "nh os switch --update";
garbage = "nh clean all && sudo bootctl cleanup ";
hxd = "hx ~/.files/";
hxc = "hx ~/code/";
ls = "eza";
la = "eza -a";
ll = "eza -l";
lr = "eza -R";
tree = "eza -T";
".." = "cd ..";
grep = "grep --color=auto";
startupctl = "systemctl list-unit-files --type=service | grep enabled";
}; };
zsh = {
enable = true;
enableCompletion = true;
history.size = 10000000;
shellAliases = cli.myAliases;
# plugins = [
# {
# name = "powerlevel10k";
# src = pkgs.zsh-powerlevel10k;
# file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
# }
# ];
autosuggestion = {
enable = true;
};
syntaxHighlighting = {
enable = true;
};
historySubstringSearch = {
enable = true;
};
initExtra = ''
eval "$(zoxide init --cmd cd zsh)"
'';
}; };
}; };
} }

49
home/programs/tmux.nix Normal file
View File

@@ -0,0 +1,49 @@
{ pkgs, ... }: {
programs.tmux = {
enable = true;
mouse = true;
prefix = "C-Space";
keyMode = "vi";
terminal = "screen-256color";
baseIndex = 1;
plugins = with pkgs.tmuxPlugins; [
sensible
vim-tmux-navigator
rose-pine
yank
];
extraConfig = ''
# history limit
set -g history-limit 5000
# increase repeat time
set -g repeat-time 1000
# decrese command delay
set -sg escape-time 1
# faster key repetition
set -s escape-time 0
setw -g aggressive-resize on
# reload tmux while using tmux
bind r source-file ~/.config/tmux/tmux.conf \; display "Reloaded!"
# Shift Alt vim keys to switch windows
bind -n M-H previous-window
bind -n M-L next-window
# Vim like yank
bind-key -T copy-mode-vi v send-keys -X begin-selection
bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
# Open panes in current directory
bind '"' split-window -v -c "#{pane_current_path}"
bind % split-window -h -c "#{pane_current_path}"
'';
};
}

View File

@@ -1,19 +1,25 @@
{ pkgs, ... }: { { pkgs, ... }: {
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium-fhs;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
ms-python.python ms-python.python
ms-python.debugpy ms-python.debugpy
jnoortheen.nix-ide jnoortheen.nix-ide
mvllow.rose-pine mvllow.rose-pine
github.copilot
github.copilot-chat
ms-vsliveshare.vsliveshare
rust-lang.rust-analyzer
]; ];
userSettings = { userSettings = {
"editor.fontSize" = 18; "editor.fontSize" = 16;
"editor.fontFamily" = "FiraCode Nerd Font";
"explorer.confirmDelete" = false; "explorer.confirmDelete" = false;
"disable-hardware-acceleration" = true;
"explorer.confirmDragAndDrop" = true; "explorer.confirmDragAndDrop" = true;
"git.openRepositoryInParentFolders" = "never"; "git.openRepositoryInParentFolders" = "never";
@@ -47,7 +53,7 @@
"editor.formatOnPaste" = true; "editor.formatOnPaste" = true;
"editor.minimap.enabled" = false; "editor.minimap.enabled" = false;
"symbols.hidesExplorerArrows" = false; # "symbols.hidesExplorerArrows" = false;
"workbench.iconTheme" = "rose-pine-icons"; "workbench.iconTheme" = "rose-pine-icons";
"workbench.colorTheme" = "Rosé Pine"; "workbench.colorTheme" = "Rosé Pine";

View File

@@ -296,6 +296,7 @@
exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
# exec-once=zsh $HOME/.config/hypr/autostart.sh # exec-once=zsh $HOME/.config/hypr/autostart.sh
exec-once = waybar exec-once = waybar
exec-once = keepassxc
############################# #############################
### ENVIRONMENT VARIABLES ### ### ENVIRONMENT VARIABLES ###
@@ -352,6 +353,8 @@
# SSH Agents # SSH Agents
env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/ssh-agent.socket env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/ssh-agent.socket
env = NIXOS_OZONE_WL,1
##################### #####################
### LOOK AND FEEL ### ### LOOK AND FEEL ###
##################### #####################
@@ -403,6 +406,7 @@
cursor { cursor {
no_hardware_cursors = true no_hardware_cursors = true
inactive_timeout = 5
} }
# https://wiki.hyprland.org/Configuring/Variables/#animations # https://wiki.hyprland.org/Configuring/Variables/#animations

8
home/system/rofi.nix Normal file
View File

@@ -0,0 +1,8 @@
{ lib, pkgs, ... }: {
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
location = "center";
theme = lib.mkForce ../configs/rose-pine.rasi;
};
}

View File

@@ -9,6 +9,21 @@
brightnessctl brightnessctl
]; ];
services.zerotierone = {
enable = true;
};
services.flatpak.enable = true;
xdg.portal = {
enable = true;
configPackages = with pkgs; [
xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland
];
};
programs.zsh.enable = true; programs.zsh.enable = true;
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [