mass tidy up

This commit is contained in:
serenity-F 2024-11-13 01:25:25 +10:00
parent 3fa9018400
commit a75cf18608
No known key found for this signature in database
5 changed files with 118 additions and 157 deletions

View file

@ -42,10 +42,10 @@
}; };
## To run "normal" linux applications seamlessly ## To run "normal" linux applications seamlessly
appimage = { #appimage = {
enable = true; #enable = true;
binfmt = true; #binfmt = true;
}; #};
}; };
@ -57,7 +57,8 @@
## All common gaming packages declared here ## All common gaming packages declared here
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
steam steam # games storefront/launcher
piper # mouse configuration
]; ];
} }

View file

@ -3,48 +3,25 @@
{ {
imports = [ imports = [
## Import desktop configs
../desktop/common/
## Import service configs
./systemd-services ./systemd-services
## Import program configs
#./nixvim #./nixvim
./kitty.nix ./kitty.nix
./fish.nix ./fish.nix
./git.nix ./git.nix
./btop.nix ./btop.nix
../sway
../hypr
]; ];
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
## Desktop Environment
opentabletdriver # Driver for art tablets
#gnome-calculator # Quick maths
syncthing-tray # File synchronisation
#gnome-calendar # GTK Calendar
gnome-secrets # GTK password vault manager
gnome-keyring # GTK login keyring
appimage-run # Runs appimages
#thunderbird # Email client - commented out due to network issues trying to build it ?
#qt5-wayland # Unsure
#qt6-wayland # Unsure
#pavucontrol # Pulse audio volume contrl
#image-roll # Image viewer
obsidian # Note-taking
nautilus # GTK file manager
#peaclock # Clock but terminal
ydotool # Click/Keypress emulator
cmatrix # For r/unixporn
hyfetch # Fetch, but queer
zathura # PDF viewer
swayimg # Image viewer
kitty # Terminal emulator
#micro # Text editor
piper # mouse configuration
fish # Apparently I broke it lol ?
#btop # System resources
#eog # Image viewer
## Games ## Games
osu-lazer-bin # Rhythm is just a click away! osu-lazer-bin # Rhythm is just a click away!
cockatrice # Magical the gathering but free cockatrice # Magical the gathering but free
@ -61,14 +38,17 @@
spotify # Corpo music streaming spotify # Corpo music streaming
#pragha # Music player #pragha # Music player
#tauon # Music player #tauon # Music player
transmission_4-gtk # Torrent client transmission_4-gtk # Torrent client
nicotine-plus # P2P Media sharing nicotine-plus # P2P Media sharing
#jellyfin # Self-Hosted media streaming #jellyfin # Self-Hosted media streaming
#syncplay # Synchronise local playback with friends #syncplay # Synchronise local playback with friends
vlc # Multimedia player vlc # Multimedia player
## Media Creation ## Productivity
#thunderbird # Email client - commented out due to network issues trying to build it ?
obsidian # Note-taking
## Audio playback and production
#neural-amp-modeler-lv2 # Guitar amp emulator #neural-amp-modeler-lv2 # Guitar amp emulator
bespokesynth # Modular synthesiser and sequencer bespokesynth # Modular synthesiser and sequencer
easyeffects # EQ and audio effects easyeffects # EQ and audio effects
@ -79,22 +59,18 @@
helvum # GTK patchbay helvum # GTK patchbay
ardour # Digital Audio Workstation ardour # Digital Audio Workstation
## Image and Video playback and production
obs-studio # Screen sharing obs-studio # Screen sharing
#inkscape # Vector image editing #inkscape # Vector image editing
#shotcut # Video editing #shotcut # Video editing
#blender # 3D modelling #blender # 3D modelling
gimp # Digital image editing gimp # Digital image editing
## Misc.
]; ];
stateVersion = "23.11"; stateVersion = "23.11";
}; };
programs = { programs = {
home-manager.enable = true; # Declarative dots home-manager.enable = true; # Declarative dots
firefox.enable = true; # Browser of choice firefox.enable = true; # Browser of choice
@ -104,14 +80,6 @@
defaultEditor = true; # Default but keeping micro around defaultEditor = true; # Default but keeping micro around
}; };
#btop = {
#enable = true;
#settings = {
#color_theme = "kyli0x";
#theme_background = false;
#};
#};
}; };
services = { services = {
@ -128,6 +96,15 @@
}; };
home.pointerCursor = {
gtk.enable = true;
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 12;
};
home.sessionVariables.GTK_THEME = "Adwaita-dark";
qt = { qt = {
enable = true; enable = true;
platformTheme.name = "Adwaita-dark"; platformTheme.name = "Adwaita-dark";
@ -175,15 +152,6 @@
}; };
}; };
home.sessionVariables.GTK_THEME = "Adwaita-dark";
home.pointerCursor = {
gtk.enable = true;
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 12;
};
xdg.portal = { xdg.portal = {
enable = true; enable = true;
extraPortals = with pkgs; [ extraPortals = with pkgs; [

View file

@ -0,0 +1,83 @@
{ self, inputs, outputs, lib, config, pkgs, ... }:
{
imports = [
## Import themes and scripts
../common/themes
../common/scripts
## Import common desktop configs
./hyprcursor.nix
./hyprpaper.nix
./hyprlock.nix
./hypridle.nix
./wlogout.nix
./waybar.nix
./dunst.nix
./wofi.nix
## Import individual desktop configs
./sway
./hypr
];
programs = {
## To run "normal" linux applications seamlessly
appimage = {
enable = true;
binfmt = true;
};
};
home.packages = with pkgs; [
## desktop environment
swww
#fish # maybe broken?
kitty # Terminal emulator
waybar
ydotool # Click/Keypress emulator
zathura # PDF viewer
swayimg # Image viewer
cmatrix # For r/unixporn
hyfetch # Fetch, but queer
#peaclock # Clock but terminal
wlroots
wlsunset
wlr-randr
wl-clipboard
appimage-run # Runs appimages
brightnessctl
syncthing-tray # File synchronisation
networkmanagerapplet
hyprpolkitagent
hyprpicker
hyprcursor
hypridle
hyprlock
hyprshot
## gnome stuff
dconf
seahorse
nautilus # GTK file manager
gnome-keyring # GTK login keyring
gnome-secrets # GTK password vault manager
gnome-calendar # GTK Calendar
gnome-calculator # Quick maths
gnome-themes-extra
## lib and compat
xwayland
wayland-utils
wayland-protocols
meson
libva
libnotify
libsForQt5.qt5ct
];
}

View file

@ -1,63 +1,13 @@
{ self, inputs, outputs, lib, config, pkgs, ... }:
{ {
self,
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [ imports = [
./hyprland.nix
../common/themes
../common/scripts
./hyprland.nix
./hyprpaper.nix
./hyprcursor.nix
./wlogout.nix
./hypridle.nix
./hyprlock.nix
./waybar.nix
./dunst.nix
./wofi.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
## desktop environment
swww
waybar
wlroots
wlsunset
wlr-randr
wl-clipboard
hypridle
hyprlock
hyprshot
#hyprpaper
hyprpicker
hyprcursor
hyprpolkitagent
brightnessctl
## gnome stuff
#sushi
dconf
seahorse
networkmanagerapplet
gnome-themes-extra
## lib and compat
xwayland
wayland-utils
wayland-protocols
meson
libva
libnotify
libsForQt5.qt5ct
]; ];
} }

View file

@ -1,57 +1,16 @@
{ self, inputs, outputs, lib, config, pkgs, ... }:
{ {
self,
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [ imports = [
../common/themes
../common/scripts
./sway.nix ./sway.nix
#./hyprcursor.nix
#./wlogout.nix
#./hyprlock.nix
#./waybar.nix
#./dunst.nix
#./wofi.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
## desktop environment
waybar
swww
wlroots
wlsunset
wlr-randr
wl-clipboard
hyprlock
hyprshot
hyprpicker
hyprcursor
brightnessctl
## gnome stuff
## lib and compat
meson
#qt5ct
libva
libnotify
dconf
xwayland
wayland-utils
wayland-protocols
xdg-desktop-portal-gtk
xdg-desktop-portal-gnome
]; ];
} }