refector
This commit is contained in:
parent
8409c29a1f
commit
e6b0f38caa
32 changed files with 44 additions and 88 deletions
|
|
@ -9,21 +9,21 @@
|
|||
./hardware-configuration.nix
|
||||
|
||||
"${inputs.self}/modules/nixos/base"
|
||||
"${inputs.self}/modules/nixos/features/boot.nix"
|
||||
"${inputs.self}/modules/nixos/features/system/boot.nix"
|
||||
"${inputs.self}/modules/nixos/features/fonts.nix"
|
||||
"${inputs.self}/modules/nixos/features/plasma.nix"
|
||||
"${inputs.self}/modules/nixos/features/sound.nix"
|
||||
"${inputs.self}/modules/nixos/features/system/sound.nix"
|
||||
"${inputs.self}/modules/nixos/features/packages.nix"
|
||||
"${inputs.self}/modules/nixos/features/catppuccin.nix"
|
||||
"${inputs.self}/modules/nixos/features/figma-agent.nix"
|
||||
"${inputs.self}/modules/nixos/features/sbctl.nix"
|
||||
"${inputs.self}/modules/nixos/features/grub-standalone.nix"
|
||||
"${inputs.self}/modules/nixos/features/virtualisation.nix"
|
||||
"${inputs.self}/modules/nixos/features/cockpit.nix"
|
||||
"${inputs.self}/modules/nixos/features/bluetooth.nix"
|
||||
"${inputs.self}/modules/nixos/features/graphics.nix"
|
||||
"${inputs.self}/modules/nixos/features/system/sbctl.nix"
|
||||
"${inputs.self}/modules/nixos/features/system/grub-standalone.nix"
|
||||
"${inputs.self}/modules/nixos/features/system/virtualisation.nix"
|
||||
"${inputs.self}/modules/nixos/features/management/cockpit.nix"
|
||||
"${inputs.self}/modules/nixos/features/system/bluetooth.nix"
|
||||
"${inputs.self}/modules/nixos/features/system/graphics.nix"
|
||||
"${inputs.self}/modules/nixos/features/steam.nix"
|
||||
"${inputs.self}/modules/nixos/features/ssh.nix"
|
||||
"${inputs.self}/modules/nixos/features/remote/ssh.nix"
|
||||
];
|
||||
|
||||
networking = {
|
||||
|
|
|
|||
|
|
@ -32,14 +32,14 @@
|
|||
};
|
||||
|
||||
imports = [
|
||||
"${inputs.self}/modules/home/git.nix"
|
||||
# "${inputs.self}/modules/home/firefox.nix
|
||||
"${inputs.self}/modules/home/neovim.nix"
|
||||
"${inputs.self}/modules/home/devtool/git.nix"
|
||||
"${inputs.self}/modules/home/devtool/neovim.nix"
|
||||
"${inputs.self}/modules/home/spicetify.nix"
|
||||
"${inputs.self}/modules/home/ghostty.nix"
|
||||
"${inputs.self}/modules/home/zed.nix"
|
||||
"${inputs.self}/modules/home/devtool/ghostty.nix"
|
||||
"${inputs.self}/modules/home/devtool/zed.nix"
|
||||
"${inputs.self}/modules/home/discord/linux.nix"
|
||||
"${inputs.self}/modules/home/vscode.nix"
|
||||
"${inputs.self}/modules/home/devtool/vscode.nix"
|
||||
"${inputs.self}/modules/home/devtool/ciscopackettracer.nix"
|
||||
./config/shell.nix
|
||||
./config/plasma.nix
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,16 +1,4 @@
|
|||
{ pkgs, inputs }:
|
||||
let
|
||||
system = pkgs.stdenv.hostPlatform.system;
|
||||
pkgsPacketTracer8 = import inputs.nixpkgs-2511 {
|
||||
inherit system;
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
"ciscoPacketTracer8-8.2.2"
|
||||
];
|
||||
};
|
||||
};
|
||||
in
|
||||
with pkgs;
|
||||
(import ../../../../modules/home/packages.nix { inherit pkgs inputs; })
|
||||
++ [
|
||||
|
|
@ -21,7 +9,5 @@ with pkgs;
|
|||
# inputs.waterfox.packages.${pkgs.system}.waterfox
|
||||
gnome-network-displays
|
||||
element-desktop
|
||||
cisco-packet-tracer_9
|
||||
pkgsPacketTracer8.ciscoPacketTracer8
|
||||
# hoffice
|
||||
]
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@
|
|||
};
|
||||
|
||||
imports = [
|
||||
"${inputs.self}/modules/home/neovim.nix"
|
||||
"${inputs.self}/modules/home/ghostty.nix"
|
||||
"${inputs.self}/modules/home/zed.nix"
|
||||
"${inputs.self}/modules/home/devtool/neovim.nix"
|
||||
"${inputs.self}/modules/home/devtool/ghostty.nix"
|
||||
"${inputs.self}/modules/home/devtool/zed.nix"
|
||||
./config/git.nix
|
||||
./config/shell.nix
|
||||
];
|
||||
|
|
|
|||
|
|
@ -33,10 +33,9 @@
|
|||
};
|
||||
|
||||
imports = [
|
||||
"${inputs.self}/modules/home/firefox.nix"
|
||||
"${inputs.self}/modules/home/neovim.nix"
|
||||
"${inputs.self}/modules/home/ghostty.nix"
|
||||
"${inputs.self}/modules/home/zed.nix"
|
||||
"${inputs.self}/modules/home/devtool/neovim.nix"
|
||||
"${inputs.self}/modules/home/devtool/ghostty.nix"
|
||||
"${inputs.self}/modules/home/devtool/zed.nix"
|
||||
"${inputs.self}/modules/home/discord/linux.nix"
|
||||
./config/shell.nix
|
||||
./config/plasma.nix
|
||||
|
|
|
|||
|
|
@ -4,4 +4,5 @@ with pkgs;
|
|||
pjsk-cursor.n25.ani
|
||||
codex
|
||||
inputs.codex-app.packages.${stdenv.buildPlatform.system}.codex-desktop
|
||||
microsoft-edge
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,20 +4,20 @@
|
|||
./hardware-configuration.nix
|
||||
|
||||
"${inputs.self}/modules/nixos/base"
|
||||
"${inputs.self}/modules/nixos/features/boot.nix"
|
||||
"${inputs.self}/modules/nixos/features/system/boot.nix"
|
||||
"${inputs.self}/modules/nixos/features/fonts.nix"
|
||||
"${inputs.self}/modules/nixos/features/packages.nix"
|
||||
"${inputs.self}/modules/nixos/features/plasma.nix"
|
||||
"${inputs.self}/modules/nixos/features/sound.nix"
|
||||
"${inputs.self}/modules/nixos/features/system/sound.nix"
|
||||
"${inputs.self}/modules/nixos/features/catppuccin.nix"
|
||||
"${inputs.self}/modules/nixos/features/figma-agent.nix"
|
||||
"${inputs.self}/modules/nixos/features/cockpit.nix"
|
||||
"${inputs.self}/modules/nixos/features/bluetooth.nix"
|
||||
"${inputs.self}/modules/nixos/features/graphics.nix"
|
||||
"${inputs.self}/modules/nixos/features/ssh.nix"
|
||||
"${inputs.self}/modules/nixos/features/virtualisation.nix"
|
||||
"${inputs.self}/modules/nixos/features/management/cockpit.nix"
|
||||
"${inputs.self}/modules/nixos/features/system/bluetooth.nix"
|
||||
"${inputs.self}/modules/nixos/features/system/graphics.nix"
|
||||
"${inputs.self}/modules/nixos/features/remote/ssh.nix"
|
||||
"${inputs.self}/modules/nixos/features/system/virtualisation.nix"
|
||||
"${inputs.self}/modules/nixos/features/steam.nix"
|
||||
"${inputs.self}/modules/nixos/features/sunshine.nix"
|
||||
"${inputs.self}/modules/nixos/features/remote/sunshine.nix"
|
||||
];
|
||||
|
||||
networking = {
|
||||
|
|
|
|||
|
|
@ -45,17 +45,17 @@
|
|||
xdg.configFile."fontconfig/conf.d/10-hm-fonts.conf".force = true;
|
||||
|
||||
imports = [
|
||||
"${inputs.self}/modules/home/git.nix"
|
||||
"${inputs.self}/modules/home/neovim.nix"
|
||||
"${inputs.self}/modules/home/devtool/git.nix"
|
||||
"${inputs.self}/modules/home/devtool/neovim.nix"
|
||||
"${inputs.self}/modules/home/spicetify.nix"
|
||||
"${inputs.self}/modules/home/ghostty.nix"
|
||||
"${inputs.self}/modules/home/zed.nix"
|
||||
"${inputs.self}/modules/home/devtool/ghostty.nix"
|
||||
"${inputs.self}/modules/home/devtool/zed.nix"
|
||||
"${inputs.self}/modules/home/vicinae.nix"
|
||||
./config/shell.nix
|
||||
./config/plasma.nix
|
||||
"${inputs.self}/modules/home/discord/linux.nix"
|
||||
"${inputs.self}/modules/home/obs-studio.nix"
|
||||
"${inputs.self}/modules/home/vscode.nix"
|
||||
"${inputs.self}/modules/home/ciscopackettracer.nix"
|
||||
"${inputs.self}/modules/home/devtool/vscode.nix"
|
||||
"${inputs.self}/modules/home/devtool/ciscopackettracer.nix"
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
};
|
||||
|
||||
imports = [
|
||||
"${inputs.self}/modules/home/neovim.nix"
|
||||
"${inputs.self}/modules/home/devtool/neovim.nix"
|
||||
./config/shell.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
imports = [
|
||||
./hardware-configuration.nix
|
||||
"${inputs.self}/modules/nixos/base"
|
||||
"${inputs.self}/modules/nixos/features/cockpit.nix"
|
||||
"${inputs.self}/modules/nixos/features/boot.nix"
|
||||
"${inputs.self}/modules/nixos/features/ssh.nix"
|
||||
"${inputs.self}/modules/nixos/features/podman.nix"
|
||||
"${inputs.self}/modules/nixos/features/management/cockpit.nix"
|
||||
"${inputs.self}/modules/nixos/features/system/boot.nix"
|
||||
"${inputs.self}/modules/nixos/features/remote/ssh.nix"
|
||||
"${inputs.self}/modules/nixos/features/management/podman.nix"
|
||||
|
||||
./services/rustfs.nix
|
||||
./services/nextcloud.nix
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
"${inputs.self}/modules/nixos/base"
|
||||
"${inputs.self}/modules/nixos/features/boot.nix"
|
||||
"${inputs.self}/modules/nixos/features/ssh.nix"
|
||||
"${inputs.self}/modules/nixos/features/docker.nix"
|
||||
"${inputs.self}/modules/nixos/features/management/docker.nix"
|
||||
];
|
||||
|
||||
# 1. 크론 설정
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
"${inputs.self}/modules/nixos/base"
|
||||
"${inputs.self}/modules/nixos/features/boot.nix"
|
||||
"${inputs.self}/modules/nixos/features/ssh.nix"
|
||||
"${inputs.self}/modules/nixos/features/docker.nix"
|
||||
"${inputs.self}/modules/nixos/features/management/docker.nix"
|
||||
./services/mailserver.nix
|
||||
./services/caddy.nix
|
||||
];
|
||||
|
|
|
|||
|
|
@ -5,10 +5,9 @@
|
|||
"${inputs.self}/modules/nixos/base"
|
||||
"${inputs.self}/modules/nixos/features/boot.nix"
|
||||
"${inputs.self}/modules/nixos/features/ssh.nix"
|
||||
"${inputs.self}/modules/nixos/features/docker.nix"
|
||||
"${inputs.self}/modules/nixos/features/management/docker.nix"
|
||||
];
|
||||
|
||||
# 1. Docker 추가 설정 (IPv6)
|
||||
virtualisation.docker.daemon.settings = {
|
||||
fixed-cidr-v6 = "fd00::/80";
|
||||
ipv6 = true;
|
||||
|
|
|
|||
19
modules/home/devtool/ciscopackettracer.nix
Normal file
19
modules/home/devtool/ciscopackettracer.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ pkgs, inputs, ... }:
|
||||
let
|
||||
system = pkgs.stdenv.hostPlatform.system;
|
||||
pkgsPacketTracer8 = import inputs.nixpkgs-2511 {
|
||||
inherit system;
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
"ciscoPacketTracer8-8.2.2"
|
||||
];
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
home.packages = [
|
||||
pkgs.cisco-packet-tracer_9
|
||||
pkgsPacketTracer8.ciscoPacketTracer8
|
||||
];
|
||||
}
|
||||
49
modules/home/devtool/ghostty.nix
Normal file
49
modules/home/devtool/ghostty.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{pkgs, ...}: {
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
package = if pkgs.stdenv.isDarwin then pkgs.ghostty-bin else pkgs.ghostty;
|
||||
|
||||
enableFishIntegration = true;
|
||||
settings = {
|
||||
background = "#fcf8f9";
|
||||
foreground = "#191017";
|
||||
|
||||
cursor-color = "#301d23";
|
||||
selection-background = "#f4ecee";
|
||||
selection-foreground = "#191017";
|
||||
|
||||
palette = [
|
||||
"0=#5c5f77"
|
||||
"1=#d20f39"
|
||||
"2=#40a02b"
|
||||
"3=#df8e1d"
|
||||
"4=#1e66f5"
|
||||
"5=#ea76cb"
|
||||
"6=#179299"
|
||||
"7=#acb0be"
|
||||
"8=#6c6f85"
|
||||
"9=#d20f39"
|
||||
"10=#40a02b"
|
||||
"11=#df8e1d"
|
||||
"12=#1e66f5"
|
||||
"13=#ea76cb"
|
||||
"14=#179299"
|
||||
"15=#bcc0cc"
|
||||
];
|
||||
|
||||
window-colorspace = "srgb";
|
||||
window-theme = "ghostty";
|
||||
window-subtitle = "working-directory";
|
||||
|
||||
font-family = "JetBrainsMono NFM Regular";
|
||||
font-family-bold = "JetBrainsMono NFM Bold";
|
||||
font-family-italic = "JetBrainsMono NFM Bold Italic";
|
||||
font-family-bold-italic = "JetBrainsMono NFM Italic";
|
||||
|
||||
window-width = 100;
|
||||
window-height = 30;
|
||||
|
||||
auto-update = "off";
|
||||
};
|
||||
};
|
||||
}
|
||||
26
modules/home/devtool/git.nix
Normal file
26
modules/home/devtool/git.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings = {
|
||||
user = {
|
||||
name = "imnyang";
|
||||
email = "imnyang@pm.me";
|
||||
signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOHP3Z+AYrRh9f8TYyqChKfeyNm3lOe0F75AwRHTTaxD";
|
||||
};
|
||||
gpg = {
|
||||
format = "ssh";
|
||||
"ssh".program = "${pkgs._1password-gui}/bin/op-ssh-sign";
|
||||
};
|
||||
commit.gpgsign = true;
|
||||
init.defaultBranch = "main";
|
||||
pull.rebase = false;
|
||||
includeIf."gitdir:~/workspaces/git/adofai.gg/" = {
|
||||
path = builtins.toFile "gitconfig-adofaigg" ''
|
||||
[user]
|
||||
email = imnyang@adofai.gg
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
23
modules/home/devtool/neovim.nix
Normal file
23
modules/home/devtool/neovim.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
withRuby = true;
|
||||
withPython3 = true;
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
};
|
||||
|
||||
home.activation.nvimConfigRepo = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
target="${config.xdg.configHome}/nvim"
|
||||
|
||||
rm -rf "$target"
|
||||
|
||||
${pkgs.git}/bin/git clone https://git.pari.ng/imnyang/nvim-config.git "$target"
|
||||
'';
|
||||
}
|
||||
51
modules/home/devtool/vscode.nix
Normal file
51
modules/home/devtool/vscode.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
styleScript = pkgs.writeText "inject.js" ''
|
||||
;(() => {
|
||||
const el = document.createElement('style')
|
||||
el.innerText = `
|
||||
.part.editor>.content .editor-group-container .editor-group-watermark .letterpress {
|
||||
background-image: url("https://file.mizuki.guru/.tesiotjosaeifjpoeawsjfnpoiawsejfopieawjfopjakweopfjawieof/IN_VISUAL_STUDIO_CODE.webp") !important;
|
||||
opacity: 1.0;
|
||||
overflow: visible;
|
||||
filter: none;
|
||||
aspect-ratio: 16 / 9 !important;
|
||||
max-height: fit-content !important;
|
||||
}
|
||||
`
|
||||
document.head.appendChild(el)
|
||||
})();
|
||||
'';
|
||||
in
|
||||
{
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
mutableExtensionsDir = true;
|
||||
userSettings = {
|
||||
"extensions.autoUpdate" = true;
|
||||
};
|
||||
package = (pkgs.vscode.override { isInsiders = true; }).overrideAttrs (oldAttrs: {
|
||||
version = "latest";
|
||||
|
||||
src = builtins.fetchTarball {
|
||||
url = "https://code.visualstudio.com/sha/download?build=insider&os=linux-x64";
|
||||
sha256 = "1vzf897inlzxfwmnaykkj3gqg18wbh9zhv7lnh3if6agixv0v91b";
|
||||
};
|
||||
|
||||
buildInputs = oldAttrs.buildInputs ++ [
|
||||
pkgs.krb5
|
||||
pkgs.libsoup_3
|
||||
pkgs.webkitgtk_4_1
|
||||
pkgs.libxtst
|
||||
pkgs.libjpeg8
|
||||
pkgs.pipewire
|
||||
pkgs.libei
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
cat ${styleScript} >> $out/lib/vscode/resources/app/out/vs/code/electron-browser/workbench/workbench.js
|
||||
''
|
||||
+ (oldAttrs.postFixup or "");
|
||||
});
|
||||
};
|
||||
}
|
||||
75
modules/home/devtool/zed.nix
Normal file
75
modules/home/devtool/zed.nix
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.zed-editor = {
|
||||
enable = true;
|
||||
package = if pkgs.stdenv.isDarwin then null else pkgs.zed-editor;
|
||||
extensions = [
|
||||
"nix"
|
||||
"toml"
|
||||
"rust"
|
||||
"git-firefly"
|
||||
];
|
||||
userSettings = {
|
||||
"autosave" = "on_focus_change";
|
||||
"ui_font_size" = 16;
|
||||
"buffer_font_size" = 15;
|
||||
|
||||
"theme" = {
|
||||
"mode" = "light";
|
||||
"light" = "One Light";
|
||||
"dark" = "One Dark";
|
||||
};
|
||||
|
||||
"theme_overrides" = {
|
||||
"One Light" = {
|
||||
"background" = "#FDF7F9";
|
||||
"status_bar.background" = "#FDF7F9";
|
||||
"title_bar.background" = "#FDF7F9";
|
||||
"elevated_surface.background" = "#FDF7F9";
|
||||
|
||||
# 핵심: sidebar/project panel 쪽은 투명 제거
|
||||
"surface.background" = "#FDF7F9";
|
||||
"panel.background" = "#FDF7F9";
|
||||
"editor.gutter.background" = "#FDF7F9";
|
||||
"tab_bar.background" = "#FDF7F9";
|
||||
"toolbar.background" = "#FDF7F9";
|
||||
"terminal.background" = "#FDF7F9";
|
||||
|
||||
# editor만 투명 유지하고 싶으면 이건 남겨도 됨
|
||||
"editor.background" = "#00000000";
|
||||
|
||||
"editor.line_number" = "#A38F96";
|
||||
"border" = "#F2E6EA";
|
||||
"hint.background" = "#F7EBEE";
|
||||
"editor.active_line_number" = "#191013";
|
||||
|
||||
"tab.active_background" = "#8165701a";
|
||||
"element.selected" = "#8165701a";
|
||||
"tab.inactive_background" = "#FDF7F9";
|
||||
|
||||
"editor.indent_guide" = "#F2E6EA";
|
||||
"editor.indent_guide_active" = "#E6D5DB";
|
||||
"panel.indent_guide" = "#F2E6EA";
|
||||
"panel.indent_guide_hover" = "#E6D5DB";
|
||||
"panel.indent_guide_active" = "#D9C4CC";
|
||||
|
||||
"panel.focused_border" = "#00000000";
|
||||
"element.active" = "#81657029";
|
||||
"border.variant" = "#00000000";
|
||||
"scrollbar.track.border" = "#00000000";
|
||||
"editor.active_line.background" = "#8165700f";
|
||||
"scrollbar.track.background" = "#00000000";
|
||||
"scrollbar.thumb.background" = "#A38F9680";
|
||||
"ghost_element.background" = "#00000000";
|
||||
"element.hover" = "#8165700f";
|
||||
"ghost_element.hover" = "#8165700f";
|
||||
"ghost_element.active" = "#8165701a";
|
||||
"ghost_element.selected" = "#81657024";
|
||||
"drop_target.background" = "#8165701a";
|
||||
"editor.highlighted_line.background" = "#8165701a";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
{ pkgs, config, ... }:
|
||||
{
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
configPath = ".mozilla/firefox";
|
||||
package = pkgs.firefox-devedition;
|
||||
policies = {
|
||||
Preferences = {
|
||||
"widget.use-xdg-desktop-portal.file-picker" = {
|
||||
Value = 1;
|
||||
Status = "default";
|
||||
};
|
||||
"middlemouse.paste" = {
|
||||
Value = false;
|
||||
Status = "default";
|
||||
};
|
||||
};
|
||||
ExtensionSettings = {
|
||||
"figma-windows-ua-spoofer@imnyang.local" = {
|
||||
installation_mode = "force_installed";
|
||||
install_url = "https://git.mizuki.guru/imnyang/thisiswindowsfigma/releases/download/v1.0.0/d168a70cb6a24fe4a478-1.0.0.xpi";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.file.".waterfox/native-messaging-hosts".source =
|
||||
config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.mozilla/native-messaging-hosts";
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue