Compare commits
No commits in common. "a1d0ca2d653abc0bd4b1dca1e082703d5dd2619e" and "776e4cd49c570249b56172f05c0e3be58297bd2c" have entirely different histories.
a1d0ca2d65
...
776e4cd49c
@ -14,6 +14,7 @@ toplevel@{ inputs, withSystem, config, ... }:
|
|||||||
util
|
util
|
||||||
swayland
|
swayland
|
||||||
web
|
web
|
||||||
|
work
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -2,9 +2,21 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
flake.homeManagerModules = {
|
flake.homeManagerModules = {
|
||||||
base = moduleWithSystem (
|
base = moduleWithSystem (
|
||||||
top@{ ... }:
|
top@{ ... }:
|
||||||
perSystem@{ config, ... }: {
|
perSystem@{ pkgs, config, ... }: {
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
home.stateVersion = toplevel.config.flake.stateVersion;
|
home = {
|
||||||
|
stateVersion = toplevel.config.flake.stateVersion;
|
||||||
|
username = "ivand";
|
||||||
|
homeDirectory = "/home/ivand";
|
||||||
|
sessionVariables = {
|
||||||
|
EDITOR = "nvim";
|
||||||
|
PAGER = "bat";
|
||||||
|
TERM = "screen-256color";
|
||||||
|
MAKEFLAGS = "-j 4";
|
||||||
|
};
|
||||||
|
pointerCursor = with pkgs; { name = "catppuccin-mocha-green-cursors"; package = catppuccin-cursors.mochaGreen; size = 24; gtk.enable = true; };
|
||||||
|
packages = with pkgs; [ transmission_4 speedtest-cli nvim ];
|
||||||
|
};
|
||||||
xdg = {
|
xdg = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userDirs = with config; {
|
userDirs = with config; {
|
||||||
@ -35,13 +47,6 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
ivand = moduleWithSystem (
|
ivand = moduleWithSystem (
|
||||||
top@{ ... }:
|
top@{ ... }:
|
||||||
perSystem@{ pkgs, config, ... }: {
|
perSystem@{ pkgs, config, ... }: {
|
||||||
home = {
|
|
||||||
username = "ivand";
|
|
||||||
homeDirectory = "/home/ivand";
|
|
||||||
sessionVariables = { EDITOR = "nvim"; PAGER = "bat"; TERM = "screen-256color"; MAKEFLAGS = "-j 4"; };
|
|
||||||
pointerCursor = with pkgs; { name = "catppuccin-mocha-green-cursors"; package = catppuccin-cursors.mochaGreen; size = 24; gtk.enable = true; };
|
|
||||||
packages = with pkgs; [ transmission_4 speedtest-cli nvim ];
|
|
||||||
};
|
|
||||||
programs = {
|
programs = {
|
||||||
password-store = { enable = true; package = pkgs.pass.withExtensions (e: with e; [ pass-otp pass-file ]); settings = { PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store"; }; };
|
password-store = { enable = true; package = pkgs.pass.withExtensions (e: with e; [ pass-otp pass-file ]); settings = { PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store"; }; };
|
||||||
git = {
|
git = {
|
||||||
@ -55,36 +60,22 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
};
|
};
|
||||||
ssh = {
|
ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
matchBlocks = { vpsfree = { hostname = "37.205.13.29"; user = "ivand"; }; vpsfree-root = { hostname = "37.205.13.29"; user = "root"; }; };
|
matchBlocks = {
|
||||||
|
vpsfree = {
|
||||||
|
hostname = "37.205.13.29";
|
||||||
|
user = "ivand";
|
||||||
|
};
|
||||||
|
vpsfree-root = {
|
||||||
|
hostname = "37.205.13.29";
|
||||||
|
user = "root";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
gpg.enable = true;
|
gpg.enable = true;
|
||||||
};
|
};
|
||||||
services = { gpg-agent = { enable = true; enableBashIntegration = true; enableZshIntegration = true; enableNushellIntegration = true; pinentryPackage = pkgs.pinentry-qt; }; };
|
services = { gpg-agent = { enable = true; enableBashIntegration = true; enableZshIntegration = true; enableNushellIntegration = true; pinentryPackage = pkgs.pinentry-qt; }; };
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
util = moduleWithSystem (
|
|
||||||
top@{ ... }:
|
|
||||||
perSystem@{ ... }: {
|
|
||||||
programs = {
|
|
||||||
tealdeer = {
|
|
||||||
enable = true;
|
|
||||||
settings = { display = { compact = true; }; updates = { auto_update = true; }; };
|
|
||||||
};
|
|
||||||
bottom = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
flags = { rate = "250ms"; };
|
|
||||||
row = [
|
|
||||||
{ ratio = 40; child = [{ type = "cpu"; } { type = "mem"; } { type = "net"; }]; }
|
|
||||||
{ ratio = 35; child = [{ type = "temp"; } { type = "disk"; }]; }
|
|
||||||
{ ratio = 40; child = [{ type = "proc"; default = true; }]; }
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
bat.enable = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
);
|
|
||||||
shell = moduleWithSystem (
|
shell = moduleWithSystem (
|
||||||
top@{ ... }:
|
top@{ ... }:
|
||||||
perSystem@{ pkgs, ... }: {
|
perSystem@{ pkgs, ... }: {
|
||||||
@ -166,6 +157,29 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
util = moduleWithSystem (
|
||||||
|
top@{ ... }:
|
||||||
|
perSystem@{ ... }: {
|
||||||
|
programs = {
|
||||||
|
tealdeer = {
|
||||||
|
enable = true;
|
||||||
|
settings = { display = { compact = true; }; updates = { auto_update = true; }; };
|
||||||
|
};
|
||||||
|
bottom = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
flags = { rate = "250ms"; };
|
||||||
|
row = [
|
||||||
|
{ ratio = 40; child = [{ type = "cpu"; } { type = "mem"; } { type = "net"; }]; }
|
||||||
|
{ ratio = 35; child = [{ type = "temp"; } { type = "disk"; }]; }
|
||||||
|
{ ratio = 40; child = [{ type = "proc"; default = true; }]; }
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
bat.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
swayland = moduleWithSystem (
|
swayland = moduleWithSystem (
|
||||||
top@{ ... }:
|
top@{ ... }:
|
||||||
perSystem@{ pkgs, config, ... }: {
|
perSystem@{ pkgs, config, ... }: {
|
||||||
@ -259,7 +273,8 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemd = { enable = true; target = "sway-session.target"; };
|
systemd = { enable = true; target = "sway-session.target"; };
|
||||||
style = ''
|
style = /* CSS */
|
||||||
|
''
|
||||||
@define-color rosewater #f5e0dc;
|
@define-color rosewater #f5e0dc;
|
||||||
@define-color flamingo #f2cdcd;
|
@define-color flamingo #f2cdcd;
|
||||||
@define-color pink #f5c2e7;
|
@define-color pink #f5c2e7;
|
||||||
@ -416,8 +431,8 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
font = { package = pkgs.fira-code; name = "FiraCodeNFM-Reg"; };
|
font = { package = pkgs.fira-code; name = "FiraCodeNFM-Reg"; };
|
||||||
settings = { background_opacity = "0.90"; cursor_shape = "beam"; term = "screen-256color"; };
|
settings = { background_opacity = "0.90"; cursor_shape = "beam"; term = "screen-256color"; };
|
||||||
};
|
};
|
||||||
imv = { enable = true; settings = { options.fullscreen = true; }; };
|
imv.enable = true;
|
||||||
mpv = { enable = true; scripts = with pkgs.mpvScripts; [ uosc thumbfast ]; };
|
mpv.enable = true;
|
||||||
bash.profileExtra = '' [ "$(tty)" = "/dev/tty1" ] && exec sway '';
|
bash.profileExtra = '' [ "$(tty)" = "/dev/tty1" ] && exec sway '';
|
||||||
zsh.loginExtra = '' [ "$(tty)" = "/dev/tty1" ] && exec sway '';
|
zsh.loginExtra = '' [ "$(tty)" = "/dev/tty1" ] && exec sway '';
|
||||||
nushell.loginFile.text = '' if (tty) == "/dev/tty1" { sway } '';
|
nushell.loginFile.text = '' if (tty) == "/dev/tty1" { sway } '';
|
||||||
@ -492,5 +507,11 @@ toplevel@{ moduleWithSystem, ... }: {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
work = moduleWithSystem (
|
||||||
|
top@{ ... }:
|
||||||
|
perSystem@{ pkgs, ... }: {
|
||||||
|
programs.chromium = { enable = true; package = pkgs.ungoogled-chromium; };
|
||||||
|
}
|
||||||
|
);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user