My Nix Infra
nix nixos
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

separate gitconfig for each platform, tidy up nix config

ydcjeff ed3f94b3 1833269c

+86 -59
+2
config/fish/abbr.fish
··· 37 37 abbr -a gm "git merge" 38 38 abbr -a gf "git fetch" 39 39 abbr -a gr "git rebase" 40 + abbr -a gsh "git stash" 41 + abbr -a grt "git restore" 40 42 abbr -a gg "git log --graph --pretty=format:\"%C(bold red)%h%Creset -%C(bold yellow)%d%Creset %s %C(bold green)(%cr) %C(bold blue)<%an>%Creset %C(yellow)%ad%Creset\" --abbrev-commit --date=short" 41 43 abbr -a ggr "git log --reverse --pretty=format:\"%C(bold red)%h%Creset -%C(bold yellow)%d%Creset %s %C(bold green)(%cr) %C(bold blue)<%an>%Creset %C(yellow)%ad%Creset\" --abbrev-commit --date=short" 42 44
+3
config/git/codeberg
··· 1 + [user] 2 + name = ydcjeff 3 + email = ydcjeff@noreply.codeberg.org
+44
config/git/config
··· 1 + [color] 2 + ui = true 3 + 4 + [core] 5 + editor = nvim 6 + pager = delta 7 + 8 + [delta] 9 + navigaate = true 10 + dark = true 11 + side-by-side = true 12 + line-numbers = true 13 + 14 + [fetch] 15 + prune = true 16 + pruneTags = true 17 + 18 + [includeIf "hasconfig:remote.*.url:https://gitlab.it.cs.nycu.edu.tw/**"] 19 + path = /home/ydcjeff/.config/git/cc 20 + 21 + [includeIf "hasconfig:remote.*.url:https://github.com/**"] 22 + path = /home/ydcjeff/.config/git/gh 23 + 24 + [includeIf "hasconfig:remote.*.url:https://gitlab.com/**"] 25 + path = /home/ydcjeff/.config/git/gl 26 + 27 + [includeIf "hasconfig:remote.*.url:https://codeberg.org/**"] 28 + path = /home/ydcjeff/.config/git/codeberg 29 + 30 + [init] 31 + defaultBranch = main 32 + 33 + [interactive] 34 + diffFilter = delta --color-only 35 + 36 + [merge] 37 + conflictstyle = zdiff3 38 + 39 + [pull] 40 + rebase = true 41 + 42 + [push] 43 + default = simple 44 + autoSetupRemote = true
+3
config/git/gh
··· 1 + [user] 2 + name = ydcjeff 3 + email = 32727188+ydcjeff@users.noreply.github.com
config/git/gitconfig-cc config/git/cc
+3
config/git/gl
··· 1 + [user] 2 + name = ydcjeff 3 + email = 4737464-ydcjeff@users.noreply.gitlab.com
config/lazygit/config.yml

This is a binary file and will not be displayed.

+1 -1
flake.nix
··· 21 21 in 22 22 { 23 23 nixosConfigurations = { 24 - risu = utils.mkSystem ./hosts/aspire.nix; 24 + risu = utils.mkSystem ./hosts/risu; 25 25 }; 26 26 27 27 formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt-tree);
+1 -1
hosts/aspire.nix hosts/risu/default.nix
··· 1 1 { pkgs, ... }: 2 2 { 3 3 imports = [ 4 - ../modules/nixos.nix 4 + ../../modules/nixos.nix 5 5 ./disk-config.nix 6 6 ./hardware-configuration.nix 7 7 ];
-7
hosts/disk-config.nix hosts/risu/disk-config.nix
··· 44 44 type = "swap"; 45 45 resumeDevice = true; 46 46 discardPolicy = "both"; 47 - # extraArgs = [ "--force" ]; 48 - # subvolumes = { 49 - # swap = { 50 - # mountpoint = "/swap"; 51 - # swap.swapfile.size = "32G"; 52 - # }; 53 - # }; 54 47 }; 55 48 }; 56 49 };
hosts/hardware-configuration.nix hosts/risu/hardware-configuration.nix
+11 -11
modules/desktop.nix
··· 15 15 services.desktopManager.plasma6 = { 16 16 enable = true; 17 17 }; 18 + services.orca.enable = false; 18 19 19 - environment.systemPackages = with pkgs; [ 20 - kdePackages.dolphin 21 - kdePackages.ark 22 - kdePackages.gwenview 23 - kdePackages.kwalletmanager 24 - ]; 25 - 26 - environment.plasma6.excludePackages = with pkgs; [ 27 - kdePackages.elisa 28 - kdePackages.kate 29 - kdePackages.okular 20 + environment.plasma6.excludePackages = with pkgs.kdePackages; [ 21 + elisa 22 + okular 23 + kate 24 + khelpcenter 25 + plasma-browser-integration 26 + baloo-widgets 27 + dolphin-plugins 28 + krdp 29 + discover 30 30 ]; 31 31 }; 32 32 in
+12 -26
modules/nixos.nix
··· 33 33 noto-fonts-cjk-sans 34 34 noto-fonts-color-emoji 35 35 36 - source-sans 37 - source-serif 38 - source-han-sans 39 - source-han-serif 36 + # source-sans 37 + # source-serif 38 + # source-han-sans 39 + # source-han-serif 40 40 41 41 jetbrains-mono 42 42 ]; 43 43 44 44 fontconfig.defaultFonts = { 45 45 serif = [ 46 - "Source Han Serif SC" 47 - "Source Han Serif TC" 46 + "Noto Serif" 47 + # "Source Han Serif SC" 48 + # "Source Han Serif TC" 48 49 "Noto Color Emoji" 49 50 ]; 50 51 sansSerif = [ 51 - "Source Han Sans SC" 52 - "Source Han Sans TC" 52 + "Noto Sans" 53 + # "Source Han Sans SC" 54 + # "Source Han Sans TC" 53 55 "Noto Color Emoji" 54 56 ]; 55 57 monospace = [ ··· 173 175 }; 174 176 }; 175 177 176 - # xdg 177 - xdg.mime = { 178 - enable = true; 179 - defaultApplications = 180 - let 181 - browser = [ "firefox.desktop" ]; 182 - editors = [ 183 - "nvim.desktop" 184 - "code.desktop" 185 - ]; 186 - in 187 - { 188 - "application/json" = browser; 189 - "application/pdf" = browser; 190 - }; 191 - }; 192 - 193 - services.power-profiles-daemon.enable = true; 178 + services.power-profiles-daemon.enable = false; 179 + services.tlp.enable = true; 194 180 195 181 services.displayManager.sddm = { 196 182 enable = true;
+4 -1
modules/pkgs.nix
··· 12 12 fish 13 13 starship 14 14 fzf 15 + ripgrep 15 16 gnumake 16 17 tree 17 18 neovim ··· 38 39 39 40 # vcs 40 41 git 42 + delta 41 43 github-cli 42 44 glab 45 + lazygit 43 46 44 47 # text processing 45 48 jq ··· 50 53 gnutar 51 54 52 55 # encryption and security 53 - # age 56 + age 54 57 gnupg 55 58 56 59 # vpn
-1
modules/utils.nix
··· 12 12 lib.nixosSystem { 13 13 specialArgs = { inherit inputs; }; 14 14 modules = [ 15 - # /etc/nixos/configuration.nix 16 15 inputs.disko.nixosModules.disko 17 16 config 18 17 ];
+1 -11
scripts/cp-config.sh
··· 3 3 set -e 4 4 5 5 mkdir -p "$HOME"/.config 6 + rm -rf "$HOME"/.gitconfig 6 7 cp -r "$HOME"/.dotfiles/config/* "$HOME"/.config 7 8 # LazyVim 8 9 if [[ ! -d "$HOME"/.config/nvim ]]; then 9 10 git clone https://github.com/LazyVim/starter "$HOME"/.config/nvim 10 11 fi 11 - 12 - # git defaults 13 - git config --global color.ui true 14 - git config --global push.default simple 15 - git config --global fetch.prune true 16 - git config --global pull.rebase true 17 - git config --global user.name "ydcjeff" 18 - git config --global user.email "n2ya@duck.com" 19 - git config --global core.editor "nvim" 20 - git config --global init.defaultBranch main 21 - git config --global includeIf.gitdir/i:"$HOME"/cc/.path "$HOME"/.config/git/gitconfig-cc
+1
scripts/init-work.sh
··· 6 6 mkdir -p "$HOME"/w 7 7 mkdir -p "$HOME"/p 8 8 mkdir -p "$HOME"/s 9 + mkdir -p "$HOME"/dbox 9 10 10 11 if podman container exists cc-www-mariadb; then 11 12 echo "cc-www-mariadb exists"