mass tidy up
This commit is contained in:
parent
3fa9018400
commit
a75cf18608
5 changed files with 118 additions and 157 deletions
|
|
@ -42,10 +42,10 @@
|
|||
};
|
||||
|
||||
## To run "normal" linux applications seamlessly
|
||||
appimage = {
|
||||
enable = true;
|
||||
binfmt = true;
|
||||
};
|
||||
#appimage = {
|
||||
#enable = true;
|
||||
#binfmt = true;
|
||||
#};
|
||||
|
||||
};
|
||||
|
||||
|
|
@ -57,7 +57,8 @@
|
|||
|
||||
## All common gaming packages declared here
|
||||
environment.systemPackages = with pkgs; [
|
||||
steam
|
||||
steam # games storefront/launcher
|
||||
piper # mouse configuration
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,48 +3,25 @@
|
|||
{
|
||||
|
||||
imports = [
|
||||
|
||||
## Import desktop configs
|
||||
../desktop/common/
|
||||
|
||||
## Import service configs
|
||||
./systemd-services
|
||||
|
||||
## Import program configs
|
||||
#./nixvim
|
||||
./kitty.nix
|
||||
./fish.nix
|
||||
./git.nix
|
||||
./btop.nix
|
||||
../sway
|
||||
../hypr
|
||||
|
||||
];
|
||||
|
||||
home = {
|
||||
|
||||
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
|
||||
osu-lazer-bin # Rhythm is just a click away!
|
||||
cockatrice # Magical the gathering but free
|
||||
|
|
@ -61,14 +38,17 @@
|
|||
spotify # Corpo music streaming
|
||||
#pragha # Music player
|
||||
#tauon # Music player
|
||||
|
||||
transmission_4-gtk # Torrent client
|
||||
nicotine-plus # P2P Media sharing
|
||||
#jellyfin # Self-Hosted media streaming
|
||||
#syncplay # Synchronise local playback with friends
|
||||
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
|
||||
bespokesynth # Modular synthesiser and sequencer
|
||||
easyeffects # EQ and audio effects
|
||||
|
|
@ -79,22 +59,18 @@
|
|||
helvum # GTK patchbay
|
||||
ardour # Digital Audio Workstation
|
||||
|
||||
## Image and Video playback and production
|
||||
obs-studio # Screen sharing
|
||||
#inkscape # Vector image editing
|
||||
#shotcut # Video editing
|
||||
#blender # 3D modelling
|
||||
gimp # Digital image editing
|
||||
|
||||
## Misc.
|
||||
|
||||
];
|
||||
|
||||
stateVersion = "23.11";
|
||||
|
||||
};
|
||||
|
||||
programs = {
|
||||
|
||||
home-manager.enable = true; # Declarative dots
|
||||
|
||||
firefox.enable = true; # Browser of choice
|
||||
|
|
@ -104,14 +80,6 @@
|
|||
defaultEditor = true; # Default but keeping micro around
|
||||
};
|
||||
|
||||
#btop = {
|
||||
#enable = true;
|
||||
#settings = {
|
||||
#color_theme = "kyli0x";
|
||||
#theme_background = false;
|
||||
#};
|
||||
#};
|
||||
|
||||
};
|
||||
|
||||
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 = {
|
||||
enable = true;
|
||||
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 = {
|
||||
enable = true;
|
||||
extraPortals = with pkgs; [
|
||||
|
|
|
|||
83
home/desktop/common/default.nix
Normal file
83
home/desktop/common/default.nix
Normal 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
|
||||
];
|
||||
|
||||
}
|
||||
|
|
@ -1,63 +1,13 @@
|
|||
{ self, inputs, outputs, lib, config, pkgs, ... }:
|
||||
|
||||
{
|
||||
self,
|
||||
inputs,
|
||||
outputs,
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
|
||||
imports = [
|
||||
|
||||
../common/themes
|
||||
../common/scripts
|
||||
|
||||
./hyprland.nix
|
||||
./hyprpaper.nix
|
||||
./hyprcursor.nix
|
||||
./wlogout.nix
|
||||
./hypridle.nix
|
||||
./hyprlock.nix
|
||||
./waybar.nix
|
||||
./dunst.nix
|
||||
./wofi.nix
|
||||
|
||||
./hyprland.nix
|
||||
];
|
||||
|
||||
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
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,57 +1,16 @@
|
|||
{ self, inputs, outputs, lib, config, pkgs, ... }:
|
||||
|
||||
{
|
||||
self,
|
||||
inputs,
|
||||
outputs,
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
|
||||
imports = [
|
||||
|
||||
../common/themes
|
||||
../common/scripts
|
||||
|
||||
./sway.nix
|
||||
|
||||
#./hyprcursor.nix
|
||||
#./wlogout.nix
|
||||
#./hyprlock.nix
|
||||
#./waybar.nix
|
||||
#./dunst.nix
|
||||
#./wofi.nix
|
||||
|
||||
];
|
||||
|
||||
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
|
||||
|
||||
];
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue