all pckgs sync

This commit is contained in:
2024-11-05 09:07:52 +01:00
parent 3b6cbf4398
commit ffab3aa91b
28 changed files with 815 additions and 729 deletions

31
flake.lock generated
View File

@@ -455,6 +455,36 @@
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
} }
}, },
"hyprland-plugins": {
"inputs": {
"hyprland": [
"hyprland"
],
"nixpkgs": [
"hyprland-plugins",
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland-plugins",
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1730588120,
"narHash": "sha256-R+COuotzT6Pl0P1wOOzKQZnpq3TPHtBfwDWYWST7awo=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
"rev": "c347d8ad9b80370d573e5a01b2e8bf10e6d0dbe5",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-plugins",
"type": "github"
}
},
"hyprland-protocols": { "hyprland-protocols": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -973,6 +1003,7 @@
"chaotic": "chaotic", "chaotic": "chaotic",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins",
"hyprpolkitagent": "hyprpolkitagent", "hyprpolkitagent": "hyprpolkitagent",
"hyprsunset": "hyprsunset", "hyprsunset": "hyprsunset",
"hyprsysteminfo": "hyprsysteminfo", "hyprsysteminfo": "hyprsysteminfo",

View File

@@ -15,6 +15,11 @@
submodules = true; submodules = true;
}; };
hyprland-plugins = {
url = "github:hyprwm/hyprland-plugins";
inputs.hyprland.follows = "hyprland";
};
split-monitor-workspaces = { split-monitor-workspaces = {
url = "github:Duckonaut/split-monitor-workspaces"; url = "github:Duckonaut/split-monitor-workspaces";
inputs.hyprland.follows = "hyprland"; # <- make sure this line is present for the plugin to work as intended inputs.hyprland.follows = "hyprland"; # <- make sure this line is present for the plugin to work as intended

View File

@@ -3,26 +3,24 @@
imports = imports =
if hostname == "zion" then if hostname == "zion" then
[ [
./programs/git.nix
./programs/btop.nix ./programs/btop.nix
# ./programs/yazi.nix
# ./programs/foot.nix
./programs/shell.nix
# ./programs/helix.nix
# ./programs/zathura.nix
./programs/packages.nix
# ./programs/vscodium.nix
./programs/vscode.nix
./programs/kitty.nix
./programs/fastfetch.nix ./programs/fastfetch.nix
# ./programs/foot.nix
./programs/git.nix
# ./programs/helix.nix
./programs/kitty.nix
./programs/packages.nix
./programs/shell.nix
./programs/vscodium.nix
# ./programs/yazi.nix
# ./programs/zathura.nix
./system/tofi.nix
./system/wofi.nix
./system/dunst.nix ./system/dunst.nix
./system/hyprland.nix
./system/stylix.nix ./system/stylix.nix
./system/waybar.nix ./system/waybar.nix
./system/wlsunset.nix ./system/wlsunset.nix
./system/hyprland.nix ./system/wofi.nix
] ]
else if hostname == "server" then else if hostname == "server" then
[ [

View File

@@ -1,36 +1,85 @@
{ pkgs, inputs, ... }: { pkgs, inputs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
# DEV # > graphics < #
tuxpaint
krita
# > terminal < #
kitty
kitty-themes
# > tools < #
git
wget
eza
yt-dlp
ffmpeg
texlive.combined.scheme-full
fastfetch
zoxide
btop
htop
killall
woeusb
pavucontrol
steam-run
unzip
openvpn
wol
direnv
p7zip
hoppscotch
networkmanagerapplet
protonvpn-cli_2
python3 python3
# MEDIA
mpv
imv
pwvucontrol pwvucontrol
# CONNECTIONS # > media < #
overskride spotify
protonvpn-cli_2 vlc
networkmanagerapplet mpv
obs-studio
okular
# APPS
floorp # > desktop < #
spotube firefox
vesktop telegram-desktop
nautilus google-chrome
evolution
obsidian
foliate
helio-workstation
keepassxc keepassxc
whatsapp-for-linux vesktop
# > gaming < #
prismlauncher
classicube
steam
# > development < #
podman
podman-compose
seahorse
platformio
iwgtk
imv
neovide
feh
zed-editor
zint
tmux
zip
unzip
pavucontrol
libreoffice libreoffice
qalculate-gtk qalculate-gtk
# Utilities
ventoy-full
file-roller file-roller
vim vim
firefox
rofi rofi
nixfmt nixfmt-rfc-style
nemo nemo
neovim neovim
]; ];

View File

@@ -1,58 +0,0 @@
{ pkgs, ... }:
{
programs.vscode = {
enable = true;
extensions = with pkgs.vscode-extensions; [
ms-python.python
ms-python.debugpy
jnoortheen.nix-ide
mvllow.rose-pine
];
userSettings = {
"editor.fontSize" = 18;
"explorer.confirmDelete" = false;
"explorer.confirmDragAndDrop" = true;
"git.openRepositoryInParentFolders" = "never";
"[python]" = {
"editor.defaultFormatter" = "ms-python.black-formatter";
"editor.formatOnSave" = true;
};
"nix.enableLanguageServer" = true;
"nix.serverPath" = "${pkgs.nixd}/bin/nixd";
"nix.serverSettings" = {
"nixd" = {
"formatting" = {
"command" = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ];
};
"nixpkgs" = {
"expr" = "import <nixpkgs> { }";
"options" = {
"nixos" = {
"expr" = "(builtins.getFlake \"/home/mike/.files\").nixosConfigurations.zion.options";
};
};
};
};
};
"editor.formatOnSave" = true;
"editor.fontLigatures" = true;
"editor.formatOnPaste" = true;
"editor.minimap.enabled" = false;
"symbols.hidesExplorerArrows" = false;
"workbench.iconTheme" = "rose-pine-icons";
"workbench.colorTheme" = "Rosé Pine";
"workbench.preferredDarkColorTheme" = "Rosé Pine";
"workbench.preferredHighContrastColorTheme" = "Rosé Pine";
};
};
}

View File

@@ -1,5 +1,4 @@
{ pkgs, ... }: { pkgs, ... }: {
{
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
@@ -8,7 +7,7 @@
ms-python.python ms-python.python
ms-python.debugpy ms-python.debugpy
jnoortheen.nix-ide jnoortheen.nix-ide
catppuccin.catppuccin-vsc mvllow.rose-pine
]; ];
userSettings = { userSettings = {
@@ -34,7 +33,8 @@
"expr" = "import <nixpkgs> { }"; "expr" = "import <nixpkgs> { }";
"options" = { "options" = {
"nixos" = { "nixos" = {
"expr" = "(builtins.getFlake \"/home/nel/Dotfiles\").nixosConfigurations.laptop.options"; "expr" = ''
(builtins.getFlake "/home/mike/.files").nixosConfigurations.zion.options'';
}; };
}; };
}; };
@@ -49,11 +49,10 @@
"symbols.hidesExplorerArrows" = false; "symbols.hidesExplorerArrows" = false;
"catppuccin.accentColor" = "blue"; "workbench.iconTheme" = "rose-pine-icons";
"workbench.iconTheme" = "vs-minimal"; "workbench.colorTheme" = "Rosé Pine";
"workbench.colorTheme" = "Catppuccin Mocha"; "workbench.preferredDarkColorTheme" = "Rosé Pine";
"workbench.preferredDarkColorTheme" = "Catppuccin Mocha"; "workbench.preferredHighContrastColorTheme" = "Rosé Pine";
"workbench.preferredHighContrastColorTheme" = "Catppuccin Mocha";
}; };
}; };

File diff suppressed because it is too large Load Diff

View File

@@ -18,33 +18,35 @@
autoEnable = true; autoEnable = true;
targets = { targets = {
foot.enable = false; gnome.enable = true;
gtk.enable = true;
# foot.enable = false;
wofi.enable = false; wofi.enable = false;
tofi.enable = false; # tofi.enable = false;
vscode.enable = false; vscode.enable = false;
waybar.enable = false; waybar.enable = false;
hyprland.enable = false; hyprland.enable = false;
}; };
image = ../wallpapers/nixppuccin.png; image = ../wallpapers/blockwavemoon.png;
override = { override = {
base00 = "1e1e2e"; # base base00 = "191724";
base01 = "181825"; # mantle base01 = "1f1d2e";
base02 = "313244"; # surface0 base02 = "26233a";
base03 = "45475a"; # surface1 base03 = "6e6a86";
base04 = "585b70"; # surface2 base04 = "908caa";
base05 = "cdd6f4"; # text base05 = "e0def4";
base06 = "f5e0dc"; # rosewater base06 = "e0def4";
base07 = "b4befe"; # lavender base07 = "524f67";
base08 = "f38ba8"; # red base08 = "eb6f92";
base09 = "fab387"; # peach base09 = "f6c177";
base0A = "f9e2af"; # yellow base0A = "ebbcba";
base0B = "a6e3a1"; # green base0B = "31748f";
base0C = "94e2d5"; # teal base0C = "9ccfd8";
base0D = "89b4fa"; # blue base0D = "c4a7e7";
base0E = "cba6f7"; # mauve base0E = "f6c177";
base0F = "f2cdcd"; # flamingo base0F = "524f67";
}; };
cursor = { cursor = {

View File

@@ -30,9 +30,9 @@
}; };
style = '' style = ''
/** ********** Fonts ********** **/ /** ********** Fonts ********** **/
* { * {
font-size: 14px; font-size: 14px;
font-weight: 800; font-weight: 800;
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 840 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1024 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 376 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 190 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 MiB

View File

@@ -4,20 +4,28 @@
if hostname == "zion" then [ if hostname == "zion" then [
./zion.nix ./zion.nix
./modules/nh.nix ./modules/adb.nix
./modules/boot.nix ./modules/ananicy.nix
./modules/users.nix
./modules/greetd.nix
./modules/fstrim.nix
./modules/nvidia.nix
./modules/network.nix
./modules/security.nix
./modules/pipewire.nix
./modules/gsettings.nix
# ./modules/bluetooth.nix # ./modules/bluetooth.nix
./modules/packages.nix ./modules/boot.nix
# ./modules/lanzaboot.nix
./modules/configuration.nix ./modules/configuration.nix
./modules/fstrim.nix
./modules/gaming.nix
./modules/greetd.nix
./modules/gsettings.nix
# ./modules/kde.nix
# ./modules/lanzaboot.nix
./modules/network.nix
./modules/nh.nix
./modules/nvidia.nix
./modules/ollama.nix
./modules/packages.nix
./modules/pipewire.nix
./modules/printing.nix
./modules/security.nix
./modules/ssh.nix
./modules/users.nix
./modules/vm.nix
] ]
else if hostname == "thor" then [ else if hostname == "thor" then [
./thor.nix ./thor.nix

View File

@@ -16,7 +16,7 @@
}; };
kernelPackages = kernelPackages =
if hostname == "zion" then pkgs.linuxPackages #linuxPackages_zen #linuxPackages #linuxPackages_latest #linuxPackages_xanmod_latest if hostname == "zion" then pkgs.linuxPackages_cachyos #linuxPackages_zen #linuxPackages #linuxPackages_latest #linuxPackages_xanmod_latest
else if hostname == "thor" then pkgs.linuxPackages else if hostname == "thor" then pkgs.linuxPackages
else if hostname == "server" then pkgs.linuxPackages else if hostname == "server" then pkgs.linuxPackages
else pkgs.linuxPackages_zen; else pkgs.linuxPackages_zen;

View File

@@ -1,8 +1,20 @@
{ hostname, inputs, ... }: { hostname, inputs, pkgs, ... }:
{ {
time.timeZone = "Europe/Warsaw"; time.timeZone = "Europe/Warsaw";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "pl_PL.UTF-8";
LC_IDENTIFICATION = "pl_PL.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "pl_PL.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "pl_PL.UTF-8";
LC_TELEPHONE = "pl_PL.UTF-8";
LC_TIME = "en_US.UTF-8";
};
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;
@@ -16,7 +28,11 @@
}; };
}; };
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment = {
sessionVariables.NIXOS_OZONE_WL = "1";
shells = with pkgs; [ bash zsh ];
};
system = { system = {
stateVersion = "24.05"; stateVersion = "24.05";
@@ -26,15 +42,20 @@
}; };
}; };
nixpkgs = { config = { allowUnfree = true; }; }; nixpkgs = {
config = {
# I'm sorry Richard Stallman
allowUnfree = true;
};
};
documentation = { documentation = {
enable = false; enable = true;
doc.enable = false; doc.enable = false;
man.enable = false; man.enable = true;
dev.enable = false; dev.enable = false;
info.enable = false; info.enable = false;
nixos.enable = false; nixos.enable = true;
}; };
nix = { nix = {

View File

@@ -6,8 +6,11 @@
dosfstools dosfstools
nix-output-monitor nix-output-monitor
nvd nvd
brightnessctl
]; ];
programs.zsh.enable = true;
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
nerdfonts nerdfonts
noto-fonts noto-fonts
@@ -25,6 +28,12 @@
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
settings = {
max-cache-ttl = 60480000;
default-cache-ttl = 60480000;
# default-cache-ttl-ssh = 60480000;
# max-cache-ttl-ssl = 60480000;
};
}; };
} }

View File

@@ -0,0 +1,3 @@
{
services.printing.enable = true;
}

View File

@@ -4,4 +4,10 @@
rtkit.enable = true; rtkit.enable = true;
polkit.enable = true; polkit.enable = true;
}; };
services = {
gnome.gnome-keyring.enable = true;
udisks2.enable = true;
gvfs.enable = true;
};
} }

View File

@@ -6,6 +6,7 @@
ports = [ 22 ]; ports = [ 22 ];
settings = { settings = {
PermitRootLogin = "no";
PasswordAuthentication = true; PasswordAuthentication = true;
UseDns = true; UseDns = true;
}; };

View File

@@ -1,11 +1,20 @@
{ inputs, username, hostname, ... }: { inputs, username, hostname, pkgs, ... }:
{ {
imports = [ inputs.home-manager.nixosModules.home-manager ]; imports = [ inputs.home-manager.nixosModules.home-manager ];
users.defaultUserShell = pkgs.zsh;
users.users.${username} = { users.users.${username} = {
isNormalUser = true; isNormalUser = true;
description = "${username}"; description = "${username}";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [
"networkmanager"
"wheel"
"docker"
"games"
"dialout"
"libvirtd"
];
}; };
home-manager = { home-manager = {

View File

@@ -18,6 +18,9 @@
services.spice-vdagentd.enable = true; services.spice-vdagentd.enable = true;
virtualisation = { virtualisation = {
podman = {
enable = true;
};
spiceUSBRedirection.enable = true; spiceUSBRedirection.enable = true;
libvirtd = { libvirtd = {
enable = true; enable = true;