more incomprehensible changes :)
This commit is contained in:
parent
c4449191dd
commit
2a0373dc73
14 changed files with 1267 additions and 47 deletions
|
|
@ -36,19 +36,19 @@ in
|
|||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
# TODO: use GRUB2 instead
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
#boot.loader = {
|
||||
# efi = {
|
||||
# canTouchEfiVariables = true;
|
||||
# efiSysMountPoint = "/boot/efi";
|
||||
# };
|
||||
# grub = {
|
||||
# efiSupport = true;
|
||||
# #efiInstallAsRemovable = true; # in case canTouchEfiVariables doesn't work on this system
|
||||
# device = "nodev";
|
||||
# };
|
||||
#};
|
||||
#boot.loader.systemd-boot.enable = true;
|
||||
#boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader = {
|
||||
efi = {
|
||||
canTouchEfiVariables = true;
|
||||
efiSysMountPoint = "/boot/efi";
|
||||
};
|
||||
grub = {
|
||||
efiSupport = true;
|
||||
#efiInstallAsRemovable = true; # in case canTouchEfiVariables doesn't work on this system
|
||||
device = "nodev";
|
||||
};
|
||||
};
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "Australia/Brisbane";
|
||||
|
|
@ -97,6 +97,10 @@ in
|
|||
};
|
||||
|
||||
users = {
|
||||
# using fish as the login shell tends
|
||||
# to go very poorly because it isn't
|
||||
# POSIX compliant, so we'll just use
|
||||
# simple Bash then :)
|
||||
defaultUserShell = pkgs.bash;
|
||||
|
||||
users = {
|
||||
|
|
@ -104,7 +108,7 @@ in
|
|||
me = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
shell = pkgs.fish;
|
||||
shell = pkgs.bash; #pkgs.fish
|
||||
packages = with pkgs; [
|
||||
firefox
|
||||
nitch
|
||||
|
|
@ -117,7 +121,7 @@ in
|
|||
dev = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
shell = pkgs.zsh;
|
||||
shell = pkgs.bash; #pkgs.zsh
|
||||
packages = with pkgs; [
|
||||
];
|
||||
};
|
||||
|
|
@ -126,7 +130,7 @@ in
|
|||
ae = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
shell = pkgs.fish;
|
||||
shell = pkgs.bash; #pkgs.fish
|
||||
packages = with pkgs; [
|
||||
];
|
||||
};
|
||||
|
|
@ -137,29 +141,44 @@ in
|
|||
|
||||
# ---- SYSTEM PACKAGES -----
|
||||
environment.systemPackages = with pkgs; [
|
||||
# Applications
|
||||
#kitty (switched to Rio)
|
||||
vesktop
|
||||
# User Environment
|
||||
inputs.swww.packages.${pkgs.system}.swww
|
||||
#vesktop
|
||||
helvum
|
||||
easyeffects
|
||||
ani-cli
|
||||
|
||||
wl-clipboard # clipboard for wayland
|
||||
|
||||
python310 # I use 3.10 since it's in a pretty stable state now
|
||||
|
||||
# fish plugins
|
||||
grc # colorise command outputs
|
||||
|
||||
# Pretty necessary
|
||||
#vim
|
||||
git
|
||||
|
||||
# Super duper necessary
|
||||
# Unix Commands
|
||||
wget
|
||||
tree
|
||||
];
|
||||
|
||||
|
||||
# Enable the use of certain programs
|
||||
programs = {
|
||||
hyprland.enable = true;
|
||||
fish.enable = true;
|
||||
zsh.enable = true;
|
||||
hyprland = {
|
||||
enable = true;
|
||||
# set the flake package
|
||||
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
# make sure to also set the portal package, so that they are in sync
|
||||
portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||
|
||||
git.enable = true;
|
||||
xwayland.enable = true;
|
||||
#systemd.enable = true;
|
||||
};
|
||||
|
||||
|
||||
zsh.enable = true;
|
||||
fish.enable = true;
|
||||
|
||||
neovim = {
|
||||
enable = true;
|
||||
|
|
@ -172,9 +191,21 @@ in
|
|||
set tabstop=4
|
||||
set shiftwidth=4
|
||||
'';
|
||||
# set cc=80
|
||||
};
|
||||
};
|
||||
|
||||
# I want to use fish as my login shell but it always goes terrible
|
||||
# cause it isn't POSIX compliant, so instead Bash is my login and
|
||||
# will just exec fish (^-^)
|
||||
bash = {
|
||||
interactiveShellInit = ''
|
||||
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
|
||||
then
|
||||
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
|
||||
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
|
||||
fi
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -188,6 +219,7 @@ in
|
|||
"IosevkaTerm" # big nah
|
||||
"CascadiaCode" # potential
|
||||
"FiraCode" # potential
|
||||
"JetBrainsMono" # for my rofi theme
|
||||
"Hasklig"
|
||||
"Hack"]; })
|
||||
|
||||
|
|
@ -206,6 +238,21 @@ in
|
|||
};
|
||||
|
||||
|
||||
# ----- STYLIX -----
|
||||
|
||||
#stylix = {
|
||||
# enable = true;
|
||||
# image = pkgs.fetchurl {
|
||||
# url = "https://www.pixelstalk.net/wp-content/uploads/2016/05/Epic-Anime-Awesome-Wallpapers.jpg";
|
||||
# sha256 = "enQo3wqhgf0FEPHj2coOCvo7DuZv+x5rL/WIo4qPI50=";
|
||||
# };
|
||||
#
|
||||
# # Stylix will automatically theme applications
|
||||
# #autoEnable = true;
|
||||
# #image = ../../wallpapers/wall.png;
|
||||
# #image = "/home/me/nixdots/wallpapers/ghibli-esque-valley.png";
|
||||
#};
|
||||
|
||||
|
||||
|
||||
# Enable the new CLI commands and the flakes as experimental features
|
||||
|
|
@ -225,6 +272,13 @@ in
|
|||
# Enable the OpenSSH daemon.
|
||||
# services.openssh.enable = true;
|
||||
|
||||
|
||||
# Enable OpenGL
|
||||
hardware = {
|
||||
graphics.enable = true;
|
||||
};
|
||||
|
||||
|
||||
|
||||
# DO NOT MODIFY
|
||||
system.stateVersion = "24.05"; # Did you read the comment?
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue