add restruct2

This commit is contained in:
cnst
2024-06-27 18:18:19 +02:00
parent 81e269fade
commit 82a4545886
20 changed files with 81 additions and 15 deletions

View File

@@ -1,39 +0,0 @@
{ pkgs, ... }:
{
imports = [
./zellij
./firefox
./git
./hypr
./neovim
./shell/adam.nix
./appearance
];
home.packages = with pkgs; [
# Desktop
alacritty
wl-clipboard
keepassxc
ranger
webcord
xfce.thunar
xfce.thunar-volman
xfce.thunar-archive-plugin
gnome.file-roller
wireguard-tools
wpa_supplicant
ntfs3g
kdePackages.polkit-kde-agent-1
networkmanagerapplet
htop
btop
pamixer
qbittorrent
fastfetch
waybar
nwg-look
thefuck
calcurse
gnome.adwaita-icon-theme
];
}

View File

@@ -1,29 +0,0 @@
{ pkgs, config, ... }:
{
imports = [ ./gtk.nix ];
xdg = {
userDirs = {
enable = true;
createDirectories = true;
desktop = "${config.home.homeDirectory}/desktop";
documents = "${config.home.homeDirectory}/documents";
download = "${config.home.homeDirectory}/downloads";
music = "${config.home.homeDirectory}/media/music";
pictures = "${config.home.homeDirectory}/media/images";
publicShare = "${config.home.homeDirectory}/documents/share";
templates = "${config.home.homeDirectory}/documents/templates";
videos = "${config.home.homeDirectory}/media/videos";
};
portal = {
enable = true;
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
};
};
dconf = {
settings = {
"org/gnome/desktop/interface" = {
color-scheme = "prefer-dark";
};
};
};
}

View File

@@ -1,23 +0,0 @@
{ pkgs, ... }:
{
home.pointerCursor = {
name = "Adwaita";
package = pkgs.gnome.adwaita-icon-theme;
size = 24;
};
gtk = {
enable = true;
theme = {
package = pkgs.orchis-theme;
name = "Orchis-Grey-Dark-Compact";
};
iconTheme = {
package = pkgs.gruvbox-plus-icons;
name = "Gruvbox-Plus-Dark";
};
font = {
name = "FiraCode Nerd Font Light";
size = 11;
};
};
}

View File

@@ -1,40 +0,0 @@
{ pkgs, ... }:
{
imports = [
./zellij
./firefox
./git
./hypr
./neovim
./shell/cnst.nix
./appearance
];
home.packages = with pkgs; [
# Desktop
alacritty
wl-clipboard
keepassxc
ranger
webcord
xfce.thunar
xfce.thunar-volman
xfce.thunar-archive-plugin
gnome.file-roller
wireguard-tools
wpa_supplicant
ntfs3g
kdePackages.polkit-kde-agent-1
networkmanagerapplet
htop
btop
pamixer
virt-manager
qbittorrent
fastfetch
waybar
nwg-look
thefuck
calcurse
gnome.adwaita-icon-theme
];
}

View File

@@ -1,27 +0,0 @@
{
pkgs,
lib,
config,
inputs,
...
}:
let
firefoxFlake = inputs.firefox-nightly.packages.${pkgs.stdenv.hostPlatform.system};
_firefoxNightly = firefoxFlake.firefox-nightly-bin;
_chrome = pkgs.google-chrome.override { commandLineArgs = [ "--force-dark-mode" ]; };
in
{
home.packages = lib.mkMerge [
(lib.mkIf (pkgs.hostPlatform.system == "x86_64-linux") (
with pkgs;
[
# browsers
_firefoxNightly
pkgs.firefox-bin
_chrome
]
))
];
}

View File

@@ -1,12 +0,0 @@
{
programs.firefox = {
enable = true;
};
xdg.mimeApps.defaultApplications = {
"text/html" = [ "firefox.desktop" ];
"text/xml" = [ "firefox.desktop" ];
"x-scheme-handler/http" = [ "firefox.desktop" ];
"x-scheme-handler/https" = [ "firefox.desktop" ];
};
}

View File

@@ -1,7 +0,0 @@
{
programs.git = {
enable = true;
userName = "cnst";
userEmail = "cnst@cana.st";
};
}

View File

@@ -1,54 +0,0 @@
{
lib,
config,
pkgs,
...
}:
{
imports = [ ../mako ];
xdg.portal =
let
hyprland = config.wayland.windowManager.hyprland.package;
xdph = pkgs.xdg-desktop-portal-hyprland.override { inherit hyprland; };
in
{
extraPortals = [ xdph ];
configPackages = [ hyprland ];
};
home.packages = with pkgs; [
grimblast
slurp
hyprpicker
swaybg
tofi
gnome.gnome-calculator
];
home.sessionVariables = {
BROWSER = "firefox";
MOZ_ENABLE_WAYLAND = 1;
NIXOS_OZONE_WL = 1;
SDL_VIDEODRIVER = "wayland";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
LIBSEAT_BACKEND = "logind";
};
wayland.windowManager.hyprland = {
enable = true;
package = pkgs.hyprland;
xwayland.enable = true;
extraConfig = ''
${builtins.readFile ./hyprland.conf}
'';
systemd = {
enable = true;
extraCommands = [
"systemctl --user stop graphical-session.target"
"systemctl --user start hyprland-session.target"
];
};
};
}

View File

@@ -1,7 +0,0 @@
# HYPRLAND CONFIGURATION
source=./land/appearance.conf
source=./land/inputs.conf
source=./land/keybinds.conf
source=./land/rules.conf
source=./land/startup.conf

View File

@@ -1,27 +0,0 @@
{ pkgs, ... }:
{
home.packages = [ pkgs.libnotify ];
services.mako = {
enable = true;
iconPath = "$HOME/.nix-profile/share/icons/Gruvbox-Plus-Dark";
font = "FiraCode Nerd Font Medium 12";
padding = "10";
margin = "10";
anchor = "bottom-right";
width = 400;
height = 150;
borderSize = 2;
defaultTimeout = 12000;
backgroundColor = "#3c3836dd";
borderColor = "#689d6add";
textColor = "#d5c4a1dd";
layer = "overlay";
extraConfig = ''
max-history=50
outer-margin=25
icon-location=right
max-icon-size=48
'';
};
}

View File

@@ -1,103 +0,0 @@
{ pkgs, inputs, ... }:
with pkgs;
let
tools = [
fswatch # File watcher utility, replacing libuv.fs_event for neovim 10.0
fzf
git
sqlite
tree-sitter
];
c = [
clang
clang-tools
cmake
gcc
gnumake
];
gamedev = [
# parser, linter and formatter for GDScript
gdtoolkit_3
gdtoolkit_4
];
golang = [
delve # debugger
go
gofumpt
goimports-reviser
golines
gopls
gotools
];
lua = [
lua-language-server
stylua
];
markup = [
cbfmt # format codeblocks
codespell
markdownlint-cli
mdformat
typst-lsp
];
nix = [
alejandra
nixd
nixfmt-rfc-style
nixpkgs-fmt
statix
];
python = [
black
isort
python311Packages.jedi-language-server
ruff
ruff-lsp
];
rust = [
cargo
rustfmt
rust-analyzer
];
shell = [
nodePackages.bash-language-server
shellcheck
shfmt
];
web = [
deno
nodePackages.sql-formatter
nodePackages.typescript-language-server
nodejs
prettierd # multi-language formatters
vscode-langservers-extracted
yarn
];
extraPackages =
tools ++ c ++ gamedev ++ golang ++ lua ++ markup ++ nix ++ python ++ rust ++ shell ++ web;
in
{
# for quick development
home.packages = rust;
programs.neovim = {
enable = true;
defaultEditor = true;
package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
plugins = with pkgs.vimPlugins; [ telescope-cheat-nvim ];
inherit extraPackages;
};
}

View File

@@ -1,35 +0,0 @@
{ config, ... }:
{
programs.zsh = {
enable = true;
enableCompletion = true;
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
shellAliases = {
nixconfig = "cd /home/adam/.nix-config/";
ll = "ls -l";
nixupdate = "sudo nixos-rebuild switch --flake .#adampad";
flakeupdate = "nix flake update";
};
history = {
size = 1000;
path = "${config.xdg.dataHome}/zsh/history";
};
oh-my-zsh = {
enable = true;
plugins = [
"git"
"thefuck"
];
theme = "robbyrussell";
};
initExtra = ''
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=241'
eval $(thefuck --alias)
eval $(thefuck --alias FUCK)
eval "$(zellij setup --generate-auto-start zsh)"
'';
};
}

View File

@@ -1,35 +0,0 @@
{ config, ... }:
{
programs.zsh = {
enable = true;
enableCompletion = true;
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
shellAliases = {
nixconfig = "cd /home/cnst/.nix-config/";
ll = "ls -l";
nixupdate = "sudo nixos-rebuild switch -v --show-trace --flake .#cnix";
flakeupdate = "nix flake update";
};
history = {
size = 1000;
path = "${config.xdg.dataHome}/zsh/history";
};
oh-my-zsh = {
enable = true;
plugins = [
"git"
"thefuck"
];
theme = "robbyrussell";
};
initExtra = ''
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=241'
eval $(thefuck --alias)
eval $(thefuck --alias FUCK)
eval "$(zellij setup --generate-auto-start zsh)"
'';
};
}

View File

@@ -1,86 +0,0 @@
{
home.shellAliases = {
zj = "zellij";
};
programs.zellij = {
enable = true;
enableZshIntegration = true;
settings = {
# Make zellij UI more compact
ui = {
pane_frames = {
hide_session_name = true;
};
};
default_layout = "compact";
copy_command = "wl-copy";
on_force_close = "detach";
default_shell = "zsh";
default_mode = "normal";
theme = "gruvbox-dark";
themes = {
gruvbox-dark = {
fg = [
213
196
161
];
bg = [
40
40
40
];
black = [
60
56
54
];
red = [
204
36
29
];
green = [
152
151
26
];
yellow = [
215
153
33
];
blue = [
69
133
136
];
magenta = [
177
98
134
];
cyan = [
104
157
106
];
white = [
251
241
199
];
orange = [
214
93
14
];
};
};
};
};
}