william/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor refactor

Browse source
This commit is contained in:
rotterdam 2023-04-05 11:46:03 -03:00
parent b9f445c747
commit 37c6e842f1
12 changed files with 48 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hosts/common/packages.nix
View file

@ -9,7 +9,6 @@
btop
comma
git
lazydocker
micro
neofetch
# nix-your-shell # Currently only available in unstable
@ -17,8 +16,6 @@
tmux
tree
wget
# Package overrides
(nnn.override { withNerdIcons = true; })
];
programs = {

5
hosts/desktops/common/hardware.nix
View file

@ -6,7 +6,10 @@
bluetooth.enable = true;
pulseaudio.enable = false; # Use pipewire instead
steam-hardware.enable = true; # Allow steam client to manage controllers
opengl.driSupport32Bit = true; # For OpenGL games
opengl = {
driSupport32Bit = true; # For OpenGL games
mesaPackage = pkgs.mesa_22; # NixOS/nixpkgs/issues/223729
};
};
sound.enable = true;

7
hosts/desktops/common/packages.nix
View file

@ -23,7 +23,6 @@
heroic
inkscape
# itch # Currently using unsafe electron version
jellyfin-media-player
junction
kolourpaint
libfido2
@ -46,9 +45,7 @@
signal-desktop
solvespace
space-cadet-pinball
spotify
steam-run
streamlink-twitch-gui-bin
tdesktop
thunderbird-wayland # Until thunderbird moves to using wayland by default
ungoogled-chromium
@ -59,9 +56,7 @@
wezterm
# Package overrides
(appimage-run.override { extraPkgs = pkgs: [ libthai ]; })
# Packages from 3rd party overlays
agenix
chatterino7
# Packages from 3rd party
koi
];

4
hosts/desktops/rotterdam.nix
View file

@ -10,8 +10,6 @@
./rotterdam
];
hardware.opengl.mesaPackage = pkgs.mesa_22;
networking.hostName = "rotterdam";
services.hardware.openrgb.enable = true;
@ -42,7 +40,7 @@
cemu
retroarchFull
rpcs3
# yuzu-ea
yuzu-ea
# Packages from 3rd party overlays
emulationstation-de
];

8
hosts/servers/alexandria/default.nix
View file

@ -2,12 +2,12 @@
{
imports = [
./hardware-configuration.nix
./containerised.nix
./variables.nix
./services.nix
./security.nix
./hardware-configuration.nix
./matrix.nix
./security.nix
./services.nix
./users.nix
./variables.nix
];
}

5
hosts/servers/alexandria/users.nix
View file

@ -2,10 +2,7 @@
{
users = {
users = {
nginx.extraGroups = [ "acme" ];
user.extraGroups = [ "docker" ];
};
users = { nginx.extraGroups = [ "acme" ]; };
groups = {
hosted = {
gid = 1005;

5
hosts/servers/common/users.nix
View file

@ -1,5 +0,0 @@
{ specialArgs, inputs, config, pkgs, lib, ... }:
{
home-manager.users.user = import ../../../users/servers/user.nix";
}

52
users/common/programs.nix
View file

@ -11,6 +11,35 @@
enable = true;
enableFishIntegration = true;
};
direnv = {
enable = true;
nix-direnv.enable = true;
};
tmux = {
enable = true;
clock24 = true;
extraConfig = "set -g mouse on";
};
starship = {
enable = true;
enableBashIntegration = true;
enableFishIntegration = true;
};
git = {
enable = true;
diff-so-fancy.enable = true;
userName = "William";
userEmail = "baduhai@proton.me";
};
btop = {
enable = true;
settings = {
color_theme = "catppuccin_mocha.theme";
theme_background = false;
proc_sorting = "cpu direct";
update_ms = 500;
};
};
micro = {
enable = true;
settings = {
@ -23,24 +52,10 @@
relativeruler = true;
};
};
starship = {
enable = true;
enableBashIntegration = true;
enableFishIntegration = true;
};
btop = {
enable = true;
settings = {
color_theme = "catppuccin_mocha.theme";
theme_background = false;
proc_sorting = "cpu direct";
update_ms = 500;
};
};
fish = {
enable = true;
# interactiveShellInit = "nix-your-shell fish | source"; # nix-your-shell only in unstable
# loginShellInit = "nix-your-shell fish | source";
interactiveShellInit = "nix-your-shell fish | source";
loginShellInit = "nix-your-shell fish | source";
shellAliases = {
nano = "micro";
wget = ''wget --hsts-file="$XDG_DATA_HOME/wget-hsts"'';
@ -74,10 +89,5 @@
}
];
};
tmux = {
enable = true;
clock24 = true;
extraConfig = "set -g mouse on";
};
};
}

2
users/desktops/common/default.nix
View file

@ -1,5 +1,5 @@
{ ... }:
{
imports = [ ./home.nix ./programs.nix ./services.nix ];
imports = [ ./home.nix ./programs.nix ];
}

1
users/desktops/common/home.nix
View file

@ -2,6 +2,7 @@
{
home = {
packages = with pkgs; [ nix-your-shell ];
pointerCursor = {
size = 24;
gtk.enable = true;

20
users/desktops/common/programs.nix
View file

@ -25,10 +25,6 @@
enable = true;
enableSessionWide = true;
};
direnv = {
enable = true;
nix-direnv.enable = true;
};
obs-studio = {
enable = true;
plugins = [
@ -36,24 +32,16 @@
pkgs.obs-studio-plugins.obs-pipewire-audio-capture
];
};
git = {
enable = true;
diff-so-fancy.enable = true;
userName = "William";
userEmail = "baduhai@proton.me";
};
fish = {
interactiveShellInit = "nix-your-shell fish | source";
loginShellInit = "nix-your-shell fish | source";
functions = {
rebuild =
"rm ~/.gtkrc-2.0; sudo nixos-rebuild switch --flake '/home/user/Projects/personal/nix-config#'";
"sudo nixos-rebuild switch --flake '/home/user/Projects/personal/nix-config#'";
rebuild-boot =
"rm ~/.gtkrc-2.0; sudo nixos-rebuild boot --flake '/home/user/Projects/personal/nix-config#'";
"sudo nixos-rebuild boot --flake '/home/user/Projects/personal/nix-config#'";
upgrade =
"rm ~/.gtkrc-2.0; nix flake lock --update-input nixpkgs --commit-lock-file /home/user/Projects/personal/nix-config; sudo nixos-rebuild switch --upgrade --flake '/home/user/Projects/personal/nix-config#'";
"nix flake update --commit-lock-file /home/user/Projects/personal/nix-config";
upgrade-boot =
"rm ~/.gtkrc-2.0; nix flake lock --update-input nixpkgs --commit-lock-file /home/user/Projects/personal/nix-config; sudo nixos-rebuild boot --upgrade --flake '/home/user/Projects/personal/nix-config#'";
"rm ~/.gtkrc-2.0; nix run '/home/user/Projects/personal/nix-config#homeConfigurations.desktop.activationPackage'";
};
};
};

5
users/desktops/common/services.nix
View file

@ -1,5 +0,0 @@
{ config, pkgs, lib, ... }:
{
services = { kdeconnect.enable = true; };
}