forked from fabian/nix_config
updates post explanation fatberoo
This commit is contained in:
parent
82f58738ad
commit
62cd093202
17 changed files with 17 additions and 178 deletions
13
README.md
13
README.md
|
@ -1,17 +1,12 @@
|
|||
## Screenshots
|
||||
|
||||
[Click here](https://old.reddit.com/r/unixporn/comments/1ml7w96/sway_minimalist_rice_on_nixos/)
|
||||
|
||||
|
||||
## Unified nix configuration
|
||||
|
||||
Switch server: `nixos-rebuild switch --target-host root@posixlycorrect.com --use-substitutes --show-trace --flake .\#vps`
|
||||
Update whole flake: `nix flake update --commit-lock-file`
|
||||
|
||||
Switch current machine: `sudo nixos-rebuild switch --flake . --show-trace`
|
||||
|
||||
Switch current home manager: `home-manager switch --flake . --show-trace`
|
||||
|
||||
Update homepage: `nix flake update --commit-lock-file homepage`
|
||||
|
||||
Update whole flake: `nix flake update --commit-lock-file`
|
||||
## Maintenance shit ()
|
||||
Clean shit de Home: `nix store gc`
|
||||
|
||||
Clean shit de sys: `sudo nix store gc`
|
||||
|
|
13
flake.nix
13
flake.nix
|
@ -13,24 +13,11 @@
|
|||
hm-isolation.url = "github:3442/hm-isolation";
|
||||
nixGL.url = "github:guibou/nixGL";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
vpsadminos.url = "github:vpsfreecz/vpsadminos";
|
||||
|
||||
homepage.url = "git+https://git.posixlycorrect.com/fabian/homepage.git?ref=master";
|
||||
|
||||
trivionomicon = {
|
||||
url = "./trivionomicon";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
authentik-nix = {
|
||||
url = "github:nix-community/authentik-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
mediawikiSkinCitizen = {
|
||||
url = "github:StarCitizenTools/mediawiki-skins-Citizen/v2.27.0";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
||||
outputs = flakes:
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.services.accounts;
|
||||
in {
|
||||
options.local.services.accounts.enable = mkEnableOption "accounts settings";
|
||||
config = mkIf cfg.enable {
|
||||
accounts.email.accounts = {
|
||||
"josescalante9808@gmail.com" = {
|
||||
address = "josescalante9808@gmail..com";
|
||||
userName = "josescalante9808";
|
||||
realName = "josem";
|
||||
primary = true;
|
||||
flavor = "gmail.com";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -33,7 +33,7 @@ in {
|
|||
vim
|
||||
zip
|
||||
];
|
||||
keyboard = {
|
||||
keyboard = { #TODO switch to normal people variant
|
||||
layout = "us";
|
||||
variant = "altgr-intl";
|
||||
};
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.services.deepState;
|
||||
in {
|
||||
options.local.services.deepState.enable = mkEnableOption "trivionomicon settings";
|
||||
config = mkIf cfg.enable {
|
||||
home.sessionVariables = {
|
||||
FSOCIETY_TELEGRAM_BACKUP_N = "0";
|
||||
FSOCIETY_TELEGRAM_BACKUP_LOCATION = "/extern/var/fsociety_backup";
|
||||
};
|
||||
};
|
||||
}
|
|
@ -22,13 +22,10 @@ in {
|
|||
pavucontrol
|
||||
pdfarranger
|
||||
qpdfview
|
||||
runelite
|
||||
spotify
|
||||
tdesktop
|
||||
usbutils
|
||||
vpsfree-client
|
||||
vscodium-fhs
|
||||
zola
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -11,10 +11,10 @@ in {
|
|||
enable = mkEnableOption "gaming apps";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = [
|
||||
pkgs.lutris
|
||||
pkgs.openrct2
|
||||
pkgs.prismlauncher
|
||||
home.packages = with pkgs; [
|
||||
lutris
|
||||
openrct2
|
||||
prismlauncher
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -57,7 +57,7 @@ in {
|
|||
input = {
|
||||
"*" = {
|
||||
xkb_layout = "us";
|
||||
xkb_variant = "altgr-intl";
|
||||
xkb_variant = "altgr-intl"; #TODO change to normal ppl keeb too
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@ in {
|
|||
icon-size = 12;
|
||||
};
|
||||
};
|
||||
};
|
||||
}; #TODO font negro n shit
|
||||
style = ''
|
||||
* {
|
||||
font-family: "JetBrains Mono", monospace;
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.services.syncthing;
|
||||
in {
|
||||
options.local.services.syncthing = {
|
||||
enable = mkEnableOption "syncthing settings";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
tray.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
|
@ -5,7 +5,7 @@
|
|||
italic_font JetBrains Mono Italic
|
||||
bold_italic_font JetBrains Mono Bold Italic
|
||||
|
||||
font_size 15
|
||||
font_size 10
|
||||
disable_ligatures cursor
|
||||
|
||||
initial_window_width 1200
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.apps.yubikey;
|
||||
in {
|
||||
options.local.apps.yubikey = {
|
||||
enable = mkEnableOption "Yubikey home settings";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
yubikey-manager
|
||||
yubico-pam
|
||||
yubikey-personalization
|
||||
];
|
||||
};
|
||||
}
|
|
@ -78,14 +78,12 @@
|
|||
alias ls='ls --color -F'
|
||||
alias l='ls --color -FhAltr'
|
||||
alias x='killall --ignore-case --user=$(whoami) --interactive'
|
||||
alias sc='${lib.getExe pkgs.maim} -s -u | ${lib.getExe pkgs.xclip} -selection clipboard -t image/png -i'
|
||||
alias tree='tree -CF'
|
||||
alias lock="betterlockscreen -l"
|
||||
alias nightmode="${lib.getExe pkgs.redshift} -P -O 1000"
|
||||
alias lightmode="${lib.getExe pkgs.redshift} -x="
|
||||
alias inbox="echo >> $HOME/gtd/inbox"
|
||||
alias nixoide="nix repl '<nixpkgs>'"
|
||||
alias vps="ssh -A vps"
|
||||
alias vim=nvim
|
||||
bindkey -e
|
||||
bindkey "^[[1;5D" backward-word
|
||||
bindkey "^[[1;5C" forward-word
|
||||
|
|
|
@ -28,16 +28,16 @@
|
|||
enable = true;
|
||||
prompt = "%B[%~] \${vcs_info_msg_0_}%b";
|
||||
};
|
||||
accounts.enable = true;
|
||||
deepState.enable = true;
|
||||
syncthing.enable = true;
|
||||
gpg = { #TODO finish setup gpg
|
||||
enable = false;
|
||||
defaultKey = "7AA277E604A4173916BBB4E91FFAC35E1798174F";
|
||||
};
|
||||
};
|
||||
|
||||
apps = {
|
||||
terminal.enable = true;
|
||||
neovim.enable = true;
|
||||
gaming.enable = true;
|
||||
yubikey.enable = true;
|
||||
defaultDesktopPack.enable = true;
|
||||
firefox.enable = true;
|
||||
mapping.enable = true;
|
||||
|
@ -63,14 +63,6 @@
|
|||
|
||||
home = {
|
||||
packages = with pkgs; [
|
||||
darktable
|
||||
(gajim.override {
|
||||
enableSecrets = true;
|
||||
enableUPnP = true;
|
||||
enableAppIndicator = true;
|
||||
enableE2E = true;
|
||||
enableRST = true;
|
||||
})
|
||||
gnucash
|
||||
kdePackages.kdenlive
|
||||
nmap
|
||||
|
|
|
@ -12,11 +12,6 @@ in {
|
|||
};
|
||||
config = mkIf cfg.enable {
|
||||
services = {
|
||||
xserver = {
|
||||
enable = true;
|
||||
xkb.layout = "us";
|
||||
displayManager.startx.enable = true;
|
||||
};
|
||||
libinput.enable = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,44 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.local.sys.yubikey;
|
||||
in {
|
||||
options.local.sys.yubikey = {
|
||||
enable = mkEnableOption "yubikey settings";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
services = {
|
||||
pcscd.enable = true;
|
||||
udev.packages = [pkgs.yubikey-personalization];
|
||||
};
|
||||
|
||||
environment.etc."pkcs11/modules/ykcs11".text = ''
|
||||
module: ${pkgs.yubico-piv-tool}/lib/libykcs11.so
|
||||
'';
|
||||
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
|
||||
security.pam = {
|
||||
services = {
|
||||
login.u2fAuth = true;
|
||||
sudo.u2fAuth = true;
|
||||
};
|
||||
|
||||
u2f = {
|
||||
enable = true;
|
||||
control = "sufficient";
|
||||
settings = {
|
||||
debug = false;
|
||||
cue = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -14,7 +14,6 @@
|
|||
local.sys = {
|
||||
baseline.enable = true;
|
||||
|
||||
yubikey.enable = true;
|
||||
audio.enable = true;
|
||||
graphics.enable = true;
|
||||
virtualisation.enable = true;
|
||||
|
@ -25,7 +24,6 @@
|
|||
users = {
|
||||
chem = {
|
||||
enable = true;
|
||||
unixId = 1002;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue