From 62cd093202a1e42ec0b2939c24d49186d5d3af74 Mon Sep 17 00:00:00 2001 From: chem Date: Mon, 25 Aug 2025 21:25:43 -0600 Subject: [PATCH] updates post explanation fatberoo --- README.md | 13 +++----- flake.nix | 13 -------- home/modules/accounts.nix | 22 -------------- home/modules/baseline.nix | 2 +- home/modules/deepState.nix | 17 ----------- home/modules/defaultDesktopPack.nix | 3 -- home/modules/gaming.nix | 8 ++--- home/modules/gui/sway.nix | 2 +- home/modules/gui/waybar.nix | 2 +- home/modules/syncthing.nix | 20 ------------- home/modules/terminal/kitty.conf.nix | 2 +- home/modules/yubikey.nix | 20 ------------- home/modules/zsh/zshrc.nix | 4 +-- home/platforms/chem@yuki/default.nix | 16 +++------- sys/modules/graphics.nix | 5 ---- sys/modules/yubikey.nix | 44 ---------------------------- sys/platforms/yuki/default.nix | 2 -- 17 files changed, 17 insertions(+), 178 deletions(-) delete mode 100644 home/modules/accounts.nix delete mode 100644 home/modules/deepState.nix delete mode 100644 home/modules/syncthing.nix delete mode 100644 home/modules/yubikey.nix delete mode 100644 sys/modules/yubikey.nix diff --git a/README.md b/README.md index f5da218..7059e84 100644 --- a/README.md +++ b/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` diff --git a/flake.nix b/flake.nix index 4401d6d..f36bda0 100644 --- a/flake.nix +++ b/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: diff --git a/home/modules/accounts.nix b/home/modules/accounts.nix deleted file mode 100644 index 316db96..0000000 --- a/home/modules/accounts.nix +++ /dev/null @@ -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"; - }; - }; - }; -} diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix index b4bdc1f..faa45f2 100644 --- a/home/modules/baseline.nix +++ b/home/modules/baseline.nix @@ -33,7 +33,7 @@ in { vim zip ]; - keyboard = { + keyboard = { #TODO switch to normal people variant layout = "us"; variant = "altgr-intl"; }; diff --git a/home/modules/deepState.nix b/home/modules/deepState.nix deleted file mode 100644 index 95b2084..0000000 --- a/home/modules/deepState.nix +++ /dev/null @@ -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"; - }; - }; -} diff --git a/home/modules/defaultDesktopPack.nix b/home/modules/defaultDesktopPack.nix index de1a79e..fff8bdd 100644 --- a/home/modules/defaultDesktopPack.nix +++ b/home/modules/defaultDesktopPack.nix @@ -22,13 +22,10 @@ in { pavucontrol pdfarranger qpdfview - runelite spotify tdesktop usbutils - vpsfree-client vscodium-fhs - zola ]; }; } diff --git a/home/modules/gaming.nix b/home/modules/gaming.nix index 5048854..24158aa 100644 --- a/home/modules/gaming.nix +++ b/home/modules/gaming.nix @@ -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 ]; }; } diff --git a/home/modules/gui/sway.nix b/home/modules/gui/sway.nix index a418987..7f92cf2 100644 --- a/home/modules/gui/sway.nix +++ b/home/modules/gui/sway.nix @@ -57,7 +57,7 @@ in { input = { "*" = { xkb_layout = "us"; - xkb_variant = "altgr-intl"; + xkb_variant = "altgr-intl"; #TODO change to normal ppl keeb too }; }; diff --git a/home/modules/gui/waybar.nix b/home/modules/gui/waybar.nix index 0b1d2c6..9aa66a1 100644 --- a/home/modules/gui/waybar.nix +++ b/home/modules/gui/waybar.nix @@ -65,7 +65,7 @@ in { icon-size = 12; }; }; - }; + }; #TODO font negro n shit style = '' * { font-family: "JetBrains Mono", monospace; diff --git a/home/modules/syncthing.nix b/home/modules/syncthing.nix deleted file mode 100644 index 4857e63..0000000 --- a/home/modules/syncthing.nix +++ /dev/null @@ -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; - }; - }; -} diff --git a/home/modules/terminal/kitty.conf.nix b/home/modules/terminal/kitty.conf.nix index 82904a9..21f5a60 100644 --- a/home/modules/terminal/kitty.conf.nix +++ b/home/modules/terminal/kitty.conf.nix @@ -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 diff --git a/home/modules/yubikey.nix b/home/modules/yubikey.nix deleted file mode 100644 index b0b3595..0000000 --- a/home/modules/yubikey.nix +++ /dev/null @@ -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 - ]; - }; -} diff --git a/home/modules/zsh/zshrc.nix b/home/modules/zsh/zshrc.nix index a7bc271..ed874bb 100644 --- a/home/modules/zsh/zshrc.nix +++ b/home/modules/zsh/zshrc.nix @@ -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 ''" - alias vps="ssh -A vps" + alias vim=nvim bindkey -e bindkey "^[[1;5D" backward-word bindkey "^[[1;5C" forward-word diff --git a/home/platforms/chem@yuki/default.nix b/home/platforms/chem@yuki/default.nix index 6e715bc..a9d47b6 100644 --- a/home/platforms/chem@yuki/default.nix +++ b/home/platforms/chem@yuki/default.nix @@ -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 diff --git a/sys/modules/graphics.nix b/sys/modules/graphics.nix index 162e21b..706c2d3 100644 --- a/sys/modules/graphics.nix +++ b/sys/modules/graphics.nix @@ -12,11 +12,6 @@ in { }; config = mkIf cfg.enable { services = { - xserver = { - enable = true; - xkb.layout = "us"; - displayManager.startx.enable = true; - }; libinput.enable = true; }; diff --git a/sys/modules/yubikey.nix b/sys/modules/yubikey.nix deleted file mode 100644 index c5e3008..0000000 --- a/sys/modules/yubikey.nix +++ /dev/null @@ -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; - }; - }; - }; - }; -} diff --git a/sys/platforms/yuki/default.nix b/sys/platforms/yuki/default.nix index c30d3f2..b1c5afc 100644 --- a/sys/platforms/yuki/default.nix +++ b/sys/platforms/yuki/default.nix @@ -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; }; }; };