This commit is contained in:
joy 2024-10-04 18:30:45 +02:00
parent 478d0de3a9
commit 9819da5c5e
38 changed files with 46 additions and 85 deletions

View file

@ -1,4 +1,4 @@
{...}: { {
networking.hostName = "desktop"; networking.hostName = "desktop";
services.hardware.openrgb.enable = true; services.hardware.openrgb.enable = true;
hardware.amdgpu.opencl.enable = true; hardware.amdgpu.opencl.enable = true;

View file

@ -4,7 +4,6 @@
{ {
config, config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {

View file

@ -1,4 +1,4 @@
{...}: { {
networking.hostName = "laptop"; networking.hostName = "laptop";
# services.xserver.desktopManager.gnome.enable = true; # services.xserver.desktopManager.gnome.enable = true;

View file

@ -1,13 +1,6 @@
{ {pkgs, ...}: {
config,
lib,
pkgs,
...
}: {
# Simply install just the packages
environment.packages = with pkgs; [ environment.packages = with pkgs; [
# User-facing stuff that you really really want to have vim
vim # or some other editor, e.g. nano or neovim
zsh zsh
fish fish
font-awesome font-awesome
@ -16,19 +9,15 @@
ffmpeg ffmpeg
yt-dlp yt-dlp
lazygit lazygit
# toybox
unixtools.ping unixtools.ping
cowsay cowsay
# Some common stuff that people expect to have
procps procps
# killall
openssh_hpn openssh_hpn
git git
diffutils diffutils
findutils findutils
utillinux utillinux
tzdata tzdata
# hostname
man man
gnugrep gnugrep
gnupg gnupg
@ -41,18 +30,14 @@
unzip unzip
]; ];
# Backup etc files instead of failing to activate generation if a file already exists in /etc
environment.etcBackupExtension = ".bak"; environment.etcBackupExtension = ".bak";
# Read the changelog before changing this value
system.stateVersion = "24.05"; system.stateVersion = "24.05";
# Set up nix for flakes
nix.extraOptions = '' nix.extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';
# Set your time zone
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
home-manager.config = { home-manager.config = {
@ -61,8 +46,6 @@
imports = [ imports = [
./home ./home
]; ];
# config = ./home.nix;
}; };
user.shell = "${pkgs.zsh}/bin/zsh"; user.shell = "${pkgs.zsh}/bin/zsh";

View file

@ -1,4 +1,4 @@
{inputs, ...}: { {
imports = [ imports = [
./zsh ./zsh
./git ./git

View file

@ -1,4 +1,4 @@
{...}: { {
programs.git = { programs.git = {
enable = true; enable = true;
userEmail = "mail@joygnu.org"; userEmail = "mail@joygnu.org";

View file

@ -1,4 +1,4 @@
{...}: { {
programs.helix = { programs.helix = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;

View file

@ -1,4 +1,4 @@
{pkgs, ...}: { {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
@ -16,12 +16,5 @@
history.size = 1000000; history.size = 1000000;
history.path = ".config/zsh/history"; history.path = ".config/zsh/history";
oh-my-zsh = {
enable = true;
plugins = [
# "history-substring-search"
];
};
}; };
} }

View file

@ -1,4 +1,4 @@
{...}: { {
home-manager.users.joy.programs.git = { home-manager.users.joy.programs.git = {
enable = true; enable = true;
userEmail = "mail@joygnu.org"; userEmail = "mail@joygnu.org";

View file

@ -1,4 +1,4 @@
{...}: { {
home-manager.users.joy.programs.newsboat = { home-manager.users.joy.programs.newsboat = {
enable = true; enable = true;
browser = "firefox"; browser = "firefox";

View file

@ -1,4 +1,4 @@
{...}: { {
services.openssh = { services.openssh = {
enable = true; enable = true;
settings = { settings = {

View file

@ -1,4 +1,4 @@
{...}: { {
home-manager.users.joy.programs.git = { home-manager.users.joy.programs.git = {
enable = true; enable = true;
userEmail = "mail@joygnu.org"; userEmail = "mail@joygnu.org";

View file

@ -1,4 +1,4 @@
{...}: { {
services.openssh = { services.openssh = {
enable = true; enable = true;
settings = { settings = {

View file

@ -1,4 +1,4 @@
{...}: { {
home-manager.users.joy.programs.firefox = { home-manager.users.joy.programs.firefox = {
enable = true; enable = true;
profiles.joy = { profiles.joy = {

View file

@ -3,7 +3,6 @@
./suyu ./suyu
./steam ./steam
./norisk ./norisk
./mangohud
./mics ./mics
]; ];
} }

View file

@ -1,3 +0,0 @@
{...}: {
home-manager.users.joy.programs.mangohud.enable = true;
}

View file

@ -3,6 +3,7 @@
prismlauncher prismlauncher
zulu17 zulu17
dolphin-emu dolphin-emu
mangohud
lutris-free lutris-free
]; ];
} }

View file

@ -1,4 +1,4 @@
{...}: { {
home-manager.users.joy.programs.mpv = { home-manager.users.joy.programs.mpv = {
enable = true; enable = true;
bindings = { bindings = {

View file

@ -1,4 +1,4 @@
{...}: { {
services.blueman.enable = true; services.blueman.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
} }

View file

@ -1,3 +1,3 @@
{...}: { {
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
} }

View file

@ -1,5 +1,6 @@
{ {
imports = [ imports = [
./powerkey
./bluetooth ./bluetooth
./sound ./sound
./boot ./boot

View file

@ -0,0 +1,3 @@
{
services.logind.powerKey = "suspend";
}

View file

@ -1,4 +1,4 @@
{...}: { {
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {

View file

@ -1,4 +1,4 @@
{...}: { {
virtualisation.docker.rootless.enable = true; virtualisation.docker.rootless.enable = true;
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
users.users.joy.extraGroups = ["docker"]; users.users.joy.extraGroups = ["docker"];

View file

@ -1,4 +1,4 @@
{...}: { {
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;

View file

@ -1,4 +1,4 @@
{...}: { {
services.invidious = { services.invidious = {
enable = true; enable = true;
settings = { settings = {

View file

@ -1,4 +1,4 @@
{...}: { {
services.devmon.enable = true; services.devmon.enable = true;
services.udisks2.enable = true; services.udisks2.enable = true;
services.printing.enable = true; services.printing.enable = true;

View file

@ -1,4 +1,4 @@
{...}: { {
services = { services = {
syncthing = { syncthing = {
enable = true; enable = true;

View file

@ -1,4 +1,4 @@
{...}: { {
services.devmon.enable = true; services.devmon.enable = true;
services.udisks2.enable = true; services.udisks2.enable = true;
services.gvfs.enable = true; services.gvfs.enable = true;

View file

@ -1,4 +1,4 @@
{...}: { {
imports = [ imports = [
./user ./user
./homemanger ./homemanger

View file

@ -1,4 +1,4 @@
{...}: { {
home-manager = { home-manager = {
backupFileExtension = "bkp"; backupFileExtension = "bkp";
users.joy = { users.joy = {

View file

@ -1,6 +1,5 @@
{...}: { {
nix.settings.experimental-features = ["nix-command" "flakes"]; nix.settings.experimental-features = ["nix-command" "flakes"];
time.timeZone = "Europe/Zurich"; time.timeZone = "Europe/Zurich";
system.stateVersion = "23.11"; system.stateVersion = "23.11";
services.logind.powerKey = "suspend";
} }

View file

@ -1,3 +1,3 @@
{...}: { {
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
} }

View file

@ -1,4 +1,4 @@
{...}: { {
users.users.joy = { users.users.joy = {
isNormalUser = true; isNormalUser = true;
description = "joy"; description = "joy";

View file

@ -1,4 +1,4 @@
{...}: { {
home-manager.users.joy.xdg = { home-manager.users.joy.xdg = {
desktopEntries = { desktopEntries = {
hx = { hx = {
@ -20,7 +20,7 @@
}; };
}; };
userDirs = { userDirs = {
enable = false; enable = true;
desktop = "~/media/pic/screen"; desktop = "~/media/pic/screen";
download = "~/dl"; download = "~/dl";
}; };

View file

@ -1,8 +1,8 @@
{ pkgs, ... }: { {pkgs, ...}: {
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
}; };
home-manager.users.joy = { home-manager.users.joy = {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
@ -16,10 +16,6 @@
"HYPRCURSOR_THEME = Bibata-Modern-Ice" "HYPRCURSOR_THEME = Bibata-Modern-Ice"
"HYPRCURSOR_SIZE = 24" "HYPRCURSOR_SIZE = 24"
"NIXOS_OZONE_WL = 1" "NIXOS_OZONE_WL = 1"
"QT_QPA_PLATFORM=wayland;xcb"
"QT_QPA_PLATFORMTHEME = qt5ct"
"QT_AUTO_SCREEN_SCALE_FACTOR = 1"
"QT_WAYLAND_DISABLE_WINDOWDECORATION =1"
]; ];
xwayland = { xwayland = {
force_zero_scaling = true; force_zero_scaling = true;
@ -32,10 +28,8 @@
exec-once = [ exec-once = [
"ags" "ags"
]; ];
windowrule = [
];
windowrulev2 = [ windowrulev2 = [
"float,:title:^(mpv)(.*)$" "float,:title:^(mpv)(.*)$"
"float,title:(Pipewire)" "float,title:(Pipewire)"
"float,title:(Disks)" "float,title:(Disks)"
"float,title:(Calculator)" "float,title:(Calculator)"
@ -85,7 +79,7 @@
"$mod, Z, exec, sh $sciPath/screen.sh" "$mod, Z, exec, sh $sciPath/screen.sh"
"$mod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy" "$mod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy"
"$mod, O, exec, sh $sciPath/mpv.sh" "$mod, O, exec, sh $sciPath/mpv.sh"
"$mod+Shift, TAB,hyprexpo:expo, toggleoverview" "$mod+Shift, TAB,hyprexpo:expo, toggleoverview"
# controls # controls
"$mod, Q, killactive" "$mod, Q, killactive"
"$mod, W, togglefloating" "$mod, W, togglefloating"
@ -96,7 +90,7 @@
"$mod+shift, B, exec, sh $sciPath/ags.sh" "$mod+shift, B, exec, sh $sciPath/ags.sh"
"$mod, up, exec, sh $sciPath/volume.sh -i" "$mod, up, exec, sh $sciPath/volume.sh -i"
"$mod, down, exec, sh $sciPath/volume.sh -d" "$mod, down, exec, sh $sciPath/volume.sh -d"
"$mod, P, exec, hyprctl dispatch togglefloating active; hyprctl dispatch pin active; hyprctl dispatch resizeactive 800 600; hyprctl dispatch movewindowpixel exact 0 100%-600" "$mod, P, exec, hyprctl dispatch togglefloating active; hyprctl dispatch pin active; hyprctl dispatch resizeactive -100000 -10000; hyprctl dispatch movewindowpixel exact 0 100%-600"
# cmus # cmus
"$mod, D, exec, sh $sciPath/cmus.sh" "$mod, D, exec, sh $sciPath/cmus.sh"
@ -159,7 +153,7 @@
}; };
plugins = with pkgs.hyprlandPlugins; [ plugins = with pkgs.hyprlandPlugins; [
hyprexpo hyprexpo
]; ];
}; };
}; };
} }

View file

@ -10,9 +10,4 @@ in {
iconTheme.package = gruvboxPlus; iconTheme.package = gruvboxPlus;
iconTheme.name = "GruvboxPlus"; iconTheme.name = "GruvboxPlus";
}; };
# qt.enable = true;
# qt.style.name = "adwaita-dark";
# qt.style.package = pkgs.adwaita-qt;
# qt.platformTheme.name = "adwaita";
} }

View file

@ -1,10 +1,8 @@
{ pkgs, ... }: {pkgs, ...}: let
let backgroundUrl = "https://wallpapers.joygnu.org/wallpapers/anime/ghibli-japanese-walled-garden.png"; backgroundUrl = "https://wallpapers.joygnu.org/wallpapers/anime/ghibli-japanese-walled-garden.png";
backgroundSha256 = "sha256-10Lv25V0RG0mnw/O90DeVchCNWJbdktUADtuI+enEwM="; backgroundSha256 = "sha256-10Lv25V0RG0mnw/O90DeVchCNWJbdktUADtuI+enEwM=";
in in {
stylix = {
{
stylix = {
enable = true; enable = true;
base16Scheme = { base16Scheme = {
@ -50,5 +48,4 @@ in
}; };
}; };
}; };
} }