format all files
This commit is contained in:
parent
f940a235f0
commit
a47826b7c2
101 changed files with 1073 additions and 1034 deletions
|
|
@ -1,5 +1,4 @@
|
|||
{ libs, ... }:
|
||||
{
|
||||
{libs, ...}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
(libs.root "/host/server/default.nix")
|
||||
|
|
|
|||
|
|
@ -4,13 +4,10 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
}: {
|
||||
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
|
|
@ -19,9 +16,9 @@
|
|||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
|
|
@ -35,7 +32,7 @@
|
|||
};
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/cfa7f30f-f08a-4400-babe-41357586a6a0"; }
|
||||
{device = "/dev/disk/by-uuid/cfa7f30f-f08a-4400-babe-41357586a6a0";}
|
||||
];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
{
|
||||
lib,
|
||||
libs,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
./mount.nix
|
||||
|
|
@ -18,8 +16,8 @@
|
|||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
boot.kernelParams = [ "amd_pstate=active" ];
|
||||
boot.kernelModules = [ "ideapad_laptop" ];
|
||||
boot.kernelParams = ["amd_pstate=active"];
|
||||
boot.kernelModules = ["ideapad_laptop"];
|
||||
services.power-profiles-daemon.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
lm_sensors
|
||||
|
|
@ -38,6 +36,6 @@
|
|||
};
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.extraModulePackages = [ pkgs.linuxPackages_latest.zenpower ];
|
||||
boot.extraModulePackages = [pkgs.linuxPackages_latest.zenpower];
|
||||
system.stateVersion = "25.11";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +1,35 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/85ab0f38-b6e7-4046-a33b-ce7b9812b959";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/85ab0f38-b6e7-4046-a33b-ce7b9812b959";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/2221-C55B";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/2221-C55B";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0022" "dmask=0022"];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/20e229eb-f32e-4369-be96-25275ebc8ae3"; }
|
||||
];
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/20e229eb-f32e-4369-be96-25275ebc8ae3";}
|
||||
];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
{ ... }: {
|
||||
fileSystems = {
|
||||
"/mnt/windows" = {
|
||||
device = "/dev/disk/by-uuid/0000294D000006E6";
|
||||
fsType = "ntfs-3g";
|
||||
options = [
|
||||
"rw"
|
||||
"uid=1000"
|
||||
"gid=100"
|
||||
"umask=022"
|
||||
];
|
||||
};
|
||||
"/mnt/waydroid" = {
|
||||
device = "/home/asakiyuki/.local/share/waydroid/data/media/0";
|
||||
fsType = "fuse.bindfs";
|
||||
options = [
|
||||
"mirror=1000"
|
||||
"xattr-none"
|
||||
"chmod-ignore"
|
||||
];
|
||||
};
|
||||
{...}: {
|
||||
fileSystems = {
|
||||
"/mnt/windows" = {
|
||||
device = "/dev/disk/by-uuid/0000294D000006E6";
|
||||
fsType = "ntfs-3g";
|
||||
options = [
|
||||
"rw"
|
||||
"uid=1000"
|
||||
"gid=100"
|
||||
"umask=022"
|
||||
];
|
||||
};
|
||||
"/mnt/waydroid" = {
|
||||
device = "/home/asakiyuki/.local/share/waydroid/data/media/0";
|
||||
fsType = "fuse.bindfs";
|
||||
options = [
|
||||
"mirror=1000"
|
||||
"xattr-none"
|
||||
"chmod-ignore"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
85
flake.nix
85
flake.nix
|
|
@ -29,53 +29,50 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{
|
||||
self,
|
||||
nixpkgs,
|
||||
unstablepkgs,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
libs = import ./libs/default.nix inputs;
|
||||
custom = import ./packages/default.nix inputs;
|
||||
unstable = import unstablepkgs {
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
unstablepkgs,
|
||||
...
|
||||
} @ inputs: let
|
||||
libs = import ./libs/default.nix inputs;
|
||||
custom = import ./packages/default.nix inputs;
|
||||
unstable = import unstablepkgs {
|
||||
system = "x86_64-linux";
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
|
||||
specialArgs = {
|
||||
inherit
|
||||
self
|
||||
custom
|
||||
libs
|
||||
unstable
|
||||
inputs
|
||||
;
|
||||
};
|
||||
in {
|
||||
nixosConfigurations = {
|
||||
ideapad-slim-5 = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
config.allowUnfree = true;
|
||||
specialArgs = specialArgs;
|
||||
modules = [
|
||||
inputs.nixos-hardware.nixosModules.lenovo-ideapad-slim-5
|
||||
inputs.nix-index-database.nixosModules.default
|
||||
inputs.home-manager.nixosModules.default
|
||||
(libs.root "/devices/ideapad-slim-5/configuration.nix")
|
||||
];
|
||||
};
|
||||
|
||||
specialArgs = {
|
||||
inherit
|
||||
self
|
||||
custom
|
||||
libs
|
||||
unstable
|
||||
inputs
|
||||
;
|
||||
};
|
||||
in
|
||||
{
|
||||
nixosConfigurations = {
|
||||
ideapad-slim-5 = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = specialArgs;
|
||||
modules = [
|
||||
inputs.nixos-hardware.nixosModules.lenovo-ideapad-slim-5
|
||||
inputs.nix-index-database.nixosModules.default
|
||||
inputs.home-manager.nixosModules.default
|
||||
(libs.root "/devices/ideapad-slim-5/configuration.nix")
|
||||
];
|
||||
};
|
||||
|
||||
home-server = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = specialArgs;
|
||||
modules = [
|
||||
inputs.nix-index-database.nixosModules.default
|
||||
inputs.home-manager.nixosModules.default
|
||||
(libs.root "/devices/home-server/configuration.nix")
|
||||
];
|
||||
};
|
||||
home-server = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = specialArgs;
|
||||
modules = [
|
||||
inputs.nix-index-database.nixosModules.default
|
||||
inputs.home-manager.nixosModules.default
|
||||
(libs.root "/devices/home-server/configuration.nix")
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,14 +5,12 @@
|
|||
custom,
|
||||
unstable,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
osconfig = config;
|
||||
in
|
||||
{
|
||||
in {
|
||||
users.users.asakiyuki = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
extraGroups = ["wheel"];
|
||||
};
|
||||
|
||||
home-manager.users.asakiyuki = {
|
||||
|
|
@ -25,6 +23,7 @@ in
|
|||
libs
|
||||
;
|
||||
};
|
||||
|
||||
imports = [
|
||||
./programs.nix
|
||||
./files.nix
|
||||
|
|
|
|||
|
|
@ -4,25 +4,26 @@
|
|||
osconfig,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
home.file = lib.mkMerge [
|
||||
(builtins.mapAttrs (_: path: {
|
||||
source = path;
|
||||
}) osconfig.device.files.source)
|
||||
source = path;
|
||||
})
|
||||
osconfig.device.files.source)
|
||||
|
||||
(builtins.mapAttrs (_: path: {
|
||||
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/${path}";
|
||||
}) osconfig.device.files.symlink)
|
||||
source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/${path}";
|
||||
})
|
||||
osconfig.device.files.symlink)
|
||||
|
||||
(lib.mkMerge (
|
||||
builtins.map (name: lib.setAttrByPath [ name "force" ] true) (
|
||||
builtins.map (name: lib.setAttrByPath [name "force"] true) (
|
||||
builtins.attrNames osconfig.device.files.force
|
||||
)
|
||||
))
|
||||
|
||||
(lib.mkMerge (
|
||||
builtins.map (name: lib.setAttrByPath [ name "force" ] (lib.mkForce true)) (
|
||||
builtins.map (name: lib.setAttrByPath [name "force"] (lib.mkForce true)) (
|
||||
builtins.attrNames osconfig.device.files.mkForce
|
||||
)
|
||||
))
|
||||
|
|
@ -30,26 +31,26 @@
|
|||
|
||||
xdg.configFile.kdeglobals =
|
||||
lib.mkIf (osconfig.device.wm.hyprland.enable || osconfig.device.wm.niri.enable)
|
||||
{
|
||||
text = (
|
||||
builtins.readFile (
|
||||
(pkgs.catppuccin-kde.override {
|
||||
flavour = [ "mocha" ];
|
||||
accents = [ "sapphire" ];
|
||||
})
|
||||
+ "/share/color-schemes/CatppuccinMochaSapphire.colors"
|
||||
)
|
||||
+ ''
|
||||
{
|
||||
text = (
|
||||
builtins.readFile (
|
||||
(pkgs.catppuccin-kde.override {
|
||||
flavour = ["mocha"];
|
||||
accents = ["sapphire"];
|
||||
})
|
||||
+ "/share/color-schemes/CatppuccinMochaSapphire.colors"
|
||||
)
|
||||
+ ''
|
||||
|
||||
[UiSettings]
|
||||
ColorScheme=qt6ct
|
||||
[UiSettings]
|
||||
ColorScheme=qt6ct
|
||||
|
||||
[General]
|
||||
TerminalApplication=${osconfig.device.programs.terminal.name}
|
||||
[General]
|
||||
TerminalApplication=${osconfig.device.programs.terminal.name}
|
||||
|
||||
[Icons]
|
||||
Theme=Papirus
|
||||
''
|
||||
);
|
||||
};
|
||||
[Icons]
|
||||
Theme=Papirus
|
||||
''
|
||||
);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
imports = [
|
||||
../../modules/features/home/ghostty.nix
|
||||
../../modules/features/home/kitty.nix
|
||||
|
|
|
|||
|
|
@ -5,11 +5,9 @@
|
|||
custom,
|
||||
unstable,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
osconfig = config;
|
||||
in
|
||||
{
|
||||
in {
|
||||
users.users.junko = {
|
||||
isNormalUser = true;
|
||||
};
|
||||
|
|
@ -25,7 +23,7 @@ in
|
|||
;
|
||||
};
|
||||
|
||||
imports = [ ];
|
||||
imports = [];
|
||||
|
||||
home = {
|
||||
username = "junko";
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
custom,
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
./programs.nix
|
||||
./device.nix
|
||||
|
|
@ -44,13 +44,14 @@
|
|||
|
||||
home-manager.users.asakiyuki = {
|
||||
home.pointerCursor =
|
||||
(custom.cursors {
|
||||
name = config.device.cursors;
|
||||
size = 48;
|
||||
})
|
||||
{ pkgs = pkgs; };
|
||||
(custom.cursors {
|
||||
name = config.device.cursors;
|
||||
size = 48;
|
||||
})
|
||||
{pkgs = pkgs;};
|
||||
};
|
||||
|
||||
nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
|
||||
xdg.menus.enable = true;
|
||||
services.dbus.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,11 +3,9 @@
|
|||
libs,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
ENABLE_HDR = false;
|
||||
in
|
||||
{
|
||||
in {
|
||||
device = {
|
||||
flake-name = "ideapad-slim-5";
|
||||
cursors = "aemeath";
|
||||
|
|
@ -62,10 +60,8 @@ in
|
|||
};
|
||||
|
||||
source = {
|
||||
".config/qt5ct/colors/Catppuccin-Mocha.conf" =
|
||||
"${pkgs.catppuccin-qt5ct}/share/qt5ct/colors/catppuccin-mocha-sapphire.conf";
|
||||
".config/qt6ct/colors/Catppuccin-Mocha.conf" =
|
||||
"${pkgs.catppuccin-qt5ct}/share/qt6ct/colors/catppuccin-mocha-sapphire.conf";
|
||||
".config/qt5ct/colors/Catppuccin-Mocha.conf" = "${pkgs.catppuccin-qt5ct}/share/qt5ct/colors/catppuccin-mocha-sapphire.conf";
|
||||
".config/qt6ct/colors/Catppuccin-Mocha.conf" = "${pkgs.catppuccin-qt5ct}/share/qt6ct/colors/catppuccin-mocha-sapphire.conf";
|
||||
|
||||
".config/dolphinrc" = libs.root "/configs/dolphinrc";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
{
|
||||
...
|
||||
}:
|
||||
{
|
||||
{...}: {
|
||||
programs = {
|
||||
ffmpeg.enable = true;
|
||||
nodejs.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ libs, ... }:
|
||||
{
|
||||
{libs, ...}: {
|
||||
imports = [
|
||||
./device.nix
|
||||
./programs.nix
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
device = {
|
||||
flake-name = "home-server";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
networking = {
|
||||
firewall = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
programs = {
|
||||
ffmpeg.enable = true;
|
||||
nodejs.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ libs, ... }:
|
||||
{
|
||||
{libs, ...}: {
|
||||
imports = [
|
||||
(libs.root "/modules/services/adguardhome.nix")
|
||||
(libs.root "/modules/services/cloudflare-dyndns.nix")
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{ ... }: {
|
||||
root = path: ../. + path;
|
||||
{...}: {
|
||||
root = path: ../. + path;
|
||||
}
|
||||
|
|
@ -1,68 +1,73 @@
|
|||
{ lib, osconfig, ... }: {
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
shellAliases = lib.attrsets.mergeAttrsList [
|
||||
{
|
||||
cls = "clear";
|
||||
cleanup = "sudo nix-collect-garbage -d";
|
||||
cls-log = "sudo journalctl --vacuum-time=1s";
|
||||
{
|
||||
lib,
|
||||
osconfig,
|
||||
...
|
||||
}: {
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
shellAliases = lib.attrsets.mergeAttrsList [
|
||||
{
|
||||
cls = "clear";
|
||||
cleanup = "sudo nix-collect-garbage -d";
|
||||
cls-log = "sudo journalctl --vacuum-time=1s";
|
||||
|
||||
logout = "pkill -KILL -u $USER";
|
||||
logout = "pkill -KILL -u $USER";
|
||||
|
||||
nrs = "sudo nixos-rebuild switch --flake /etc/nixos#${osconfig.device.flake-name}";
|
||||
flake-upgrade = "nix flake update";
|
||||
}
|
||||
{
|
||||
spf = "superfile";
|
||||
}
|
||||
(lib.optionalAttrs osconfig.virtualisation.waydroid.enable {
|
||||
wss = "waydroid session stop; exit;";
|
||||
})
|
||||
];
|
||||
nrs = "sudo nixos-rebuild switch --flake /etc/nixos#${osconfig.device.flake-name}";
|
||||
flake-upgrade = "nix flake update";
|
||||
}
|
||||
{
|
||||
spf = "superfile";
|
||||
}
|
||||
(lib.optionalAttrs osconfig.virtualisation.waydroid.enable {
|
||||
wss = "waydroid session stop; exit;";
|
||||
})
|
||||
];
|
||||
|
||||
shellOptions = [
|
||||
"histappend"
|
||||
"checkwinsize"
|
||||
"extglob"
|
||||
"globstar"
|
||||
"checkjobs"
|
||||
"autocd"
|
||||
];
|
||||
shellOptions = [
|
||||
"histappend"
|
||||
"checkwinsize"
|
||||
"extglob"
|
||||
"globstar"
|
||||
"checkjobs"
|
||||
"autocd"
|
||||
];
|
||||
|
||||
initExtra = ''
|
||||
function git-commit() {
|
||||
git add .
|
||||
git commit -m "$1"
|
||||
}
|
||||
initExtra =
|
||||
''
|
||||
function git-commit() {
|
||||
git add .
|
||||
git commit -m "$1"
|
||||
}
|
||||
|
||||
function git-push() {
|
||||
git-commit "$1"
|
||||
git push origin HEAD
|
||||
}
|
||||
function git-push() {
|
||||
git-commit "$1"
|
||||
git push origin HEAD
|
||||
}
|
||||
|
||||
function git-pull() {
|
||||
git fetch origin HEAD
|
||||
git pull origin HEAD
|
||||
}
|
||||
function git-pull() {
|
||||
git fetch origin HEAD
|
||||
git pull origin HEAD
|
||||
}
|
||||
|
||||
function get-hash() {
|
||||
nix hash to-sri --type sha256 $(nix-prefetch-url --unpack "$1")
|
||||
}
|
||||
'' +
|
||||
lib.optionalString osconfig.device.programs.tmux.enable ''
|
||||
allowed_terms=("xterm-kitty" "xterm-ghostty")
|
||||
function get-hash() {
|
||||
nix hash to-sri --type sha256 $(nix-prefetch-url --unpack "$1")
|
||||
}
|
||||
''
|
||||
+ lib.optionalString osconfig.device.programs.tmux.enable ''
|
||||
allowed_terms=("xterm-kitty" "xterm-ghostty")
|
||||
|
||||
should_run_tmux=false
|
||||
for term in "${"$" + "{allowed_terms[@]" + "}"}"; do
|
||||
if [[ "$TERM" == "$term" ]]; then
|
||||
should_run_tmux=true
|
||||
break
|
||||
fi
|
||||
done
|
||||
should_run_tmux=false
|
||||
for term in "${"$" + "{allowed_terms[@]" + "}"}"; do
|
||||
if [[ "$TERM" == "$term" ]]; then
|
||||
should_run_tmux=true
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -z "$TMUX" ] && [ "$should_run_tmux" = true ]; then
|
||||
exec tmux
|
||||
fi
|
||||
'';
|
||||
};
|
||||
if [ -z "$TMUX" ] && [ "$should_run_tmux" = true ]; then
|
||||
exec tmux
|
||||
fi
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,8 @@
|
|||
{ pkgs, libs, ... }:
|
||||
{
|
||||
pkgs,
|
||||
libs,
|
||||
...
|
||||
}: {
|
||||
programs = {
|
||||
firefox.profiles.default = {
|
||||
settings = {
|
||||
|
|
@ -138,7 +141,7 @@
|
|||
|
||||
mynixos = {
|
||||
name = "My NixOS";
|
||||
definedAliases = [ "@mynixos" ];
|
||||
definedAliases = ["@mynixos"];
|
||||
icon = "https://mynixos.com/favicon.ico";
|
||||
urls = [
|
||||
{
|
||||
|
|
@ -164,6 +167,6 @@
|
|||
userContent = builtins.readFile (libs.root "/assets/firefox/userContent.css");
|
||||
};
|
||||
|
||||
chromium = { };
|
||||
chromium = {};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
{ lib, osconfig, ... }:
|
||||
{
|
||||
lib,
|
||||
osconfig,
|
||||
...
|
||||
}: {
|
||||
programs.fastfetch = lib.mkIf osconfig.device.programs.fastfetch.enable {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
@ -173,4 +176,3 @@
|
|||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,54 +1,57 @@
|
|||
{ lib, osconfig, ... }:
|
||||
{
|
||||
lib,
|
||||
osconfig,
|
||||
...
|
||||
}: {
|
||||
programs.ghostty =
|
||||
lib.mkIf
|
||||
(osconfig.device.programs.terminal.enable && osconfig.device.programs.terminal.name == "ghostty")
|
||||
{
|
||||
enable = true;
|
||||
settings = {
|
||||
theme = "catppuccin-mocha";
|
||||
(osconfig.device.programs.terminal.enable && osconfig.device.programs.terminal.name == "ghostty")
|
||||
{
|
||||
enable = true;
|
||||
settings = {
|
||||
theme = "catppuccin-mocha";
|
||||
|
||||
font-size = 10;
|
||||
font-family = "SauceCodePro NFP Bold";
|
||||
font-size = 10;
|
||||
font-family = "SauceCodePro NFP Bold";
|
||||
|
||||
window-width = 230;
|
||||
window-height = 68;
|
||||
window-width = 230;
|
||||
window-height = 68;
|
||||
|
||||
window-padding-x = 5;
|
||||
window-padding-y = 0;
|
||||
window-padding-x = 5;
|
||||
window-padding-y = 0;
|
||||
|
||||
keybind = [
|
||||
"ctrl+shift+n=unbind"
|
||||
"ctrl+shift+i=unbind"
|
||||
keybind = [
|
||||
"ctrl+shift+n=unbind"
|
||||
"ctrl+shift+i=unbind"
|
||||
];
|
||||
};
|
||||
|
||||
themes = {
|
||||
catppuccin-mocha = {
|
||||
background = "1e1e2e";
|
||||
cursor-color = "f5e0dc";
|
||||
foreground = "cdd6f4";
|
||||
palette = [
|
||||
"0=#45475a"
|
||||
"1=#f38ba8"
|
||||
"2=#a6e3a1"
|
||||
"3=#f9e2af"
|
||||
"4=#89b4fa"
|
||||
"5=#f5c2e7"
|
||||
"6=#94e2d5"
|
||||
"7=#bac2de"
|
||||
"8=#585b70"
|
||||
"9=#f38ba8"
|
||||
"10=#a6e3a1"
|
||||
"11=#f9e2af"
|
||||
"12=#89b4fa"
|
||||
"13=#f5c2e7"
|
||||
"14=#94e2d5"
|
||||
"15=#a6adc8"
|
||||
];
|
||||
};
|
||||
|
||||
themes = {
|
||||
catppuccin-mocha = {
|
||||
background = "1e1e2e";
|
||||
cursor-color = "f5e0dc";
|
||||
foreground = "cdd6f4";
|
||||
palette = [
|
||||
"0=#45475a"
|
||||
"1=#f38ba8"
|
||||
"2=#a6e3a1"
|
||||
"3=#f9e2af"
|
||||
"4=#89b4fa"
|
||||
"5=#f5c2e7"
|
||||
"6=#94e2d5"
|
||||
"7=#bac2de"
|
||||
"8=#585b70"
|
||||
"9=#f38ba8"
|
||||
"10=#a6e3a1"
|
||||
"11=#f9e2af"
|
||||
"12=#89b4fa"
|
||||
"13=#f5c2e7"
|
||||
"14=#94e2d5"
|
||||
"15=#a6adc8"
|
||||
];
|
||||
selection-background = "353749";
|
||||
selection-foreground = "cdd6f4";
|
||||
};
|
||||
selection-background = "353749";
|
||||
selection-foreground = "cdd6f4";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{ ... }: {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings = {
|
||||
user = {
|
||||
name = "Asaki Yuki";
|
||||
email = "vantrong2007vn@gmail.com";
|
||||
};
|
||||
{...}: {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings = {
|
||||
user = {
|
||||
name = "Asaki Yuki";
|
||||
email = "vantrong2007vn@gmail.com";
|
||||
};
|
||||
|
||||
init = {
|
||||
defaultBranch = "main";
|
||||
};
|
||||
init = {
|
||||
defaultBranch = "main";
|
||||
};
|
||||
|
||||
# pull = {
|
||||
# rebase = "";
|
||||
# };
|
||||
};
|
||||
# pull = {
|
||||
# rebase = "";
|
||||
# };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,79 +1,82 @@
|
|||
{ lib, osconfig, ... }:
|
||||
{
|
||||
lib,
|
||||
osconfig,
|
||||
...
|
||||
}: {
|
||||
programs.kitty =
|
||||
lib.mkIf
|
||||
(osconfig.device.programs.terminal.enable && osconfig.device.programs.terminal.name == "kitty")
|
||||
{
|
||||
enable = true;
|
||||
(osconfig.device.programs.terminal.enable && osconfig.device.programs.terminal.name == "kitty")
|
||||
{
|
||||
enable = true;
|
||||
|
||||
keybindings = {
|
||||
"ctrl+c" = "copy_to_clipboard";
|
||||
"ctrl+v" = "paste_from_clipboard";
|
||||
};
|
||||
|
||||
settings = {
|
||||
window_padding_width = 2;
|
||||
window_padding_height = 2;
|
||||
|
||||
cursor_shape = "beam";
|
||||
# background_opacity = 0.5;
|
||||
|
||||
font_family = "Tahoma";
|
||||
font_size = 9;
|
||||
|
||||
foreground = "#cdd6f4";
|
||||
background = "#1e1e2e";
|
||||
selection_foreground = "#1e1e2e";
|
||||
selection_background = "#f5e0dc";
|
||||
|
||||
cursor = "#f5e0dc";
|
||||
cursor_text_color = "#1e1e2e";
|
||||
|
||||
url_color = "#f5e0dc";
|
||||
|
||||
active_border_color = "#b4befe";
|
||||
inactive_border_color = "#6c7086";
|
||||
bell_border_color = "#f9e2af";
|
||||
|
||||
wayland_titlebar_color = "system";
|
||||
macos_titlebar_color = "system";
|
||||
|
||||
active_tab_foreground = "#11111b";
|
||||
active_tab_background = "#cba6f7";
|
||||
inactive_tab_foreground = "#cdd6f4";
|
||||
inactive_tab_background = "#181825";
|
||||
tab_bar_background = "#11111b";
|
||||
|
||||
mark1_foreground = "#1e1e2e";
|
||||
mark1_background = "#b4befe";
|
||||
mark2_foreground = "#1e1e2e";
|
||||
mark2_background = "#cba6f7";
|
||||
mark3_foreground = "#1e1e2e";
|
||||
mark3_background = "#74c7ec";
|
||||
|
||||
color0 = "#45475a";
|
||||
color8 = "#585b70";
|
||||
|
||||
color1 = "#f38ba8";
|
||||
color9 = "#f38ba8";
|
||||
|
||||
color2 = "#a6e3a1";
|
||||
color10 = "#a6e3a1";
|
||||
|
||||
color3 = "#f9e2af";
|
||||
color11 = "#f9e2af";
|
||||
|
||||
color4 = "#89b4fa";
|
||||
color12 = "#89b4fa";
|
||||
|
||||
color5 = "#f5c2e7";
|
||||
color13 = "#f5c2e7";
|
||||
|
||||
color6 = "#94e2d5";
|
||||
color14 = "#94e2d5";
|
||||
|
||||
color7 = "#bac2de";
|
||||
color15 = "#a6adc8";
|
||||
};
|
||||
keybindings = {
|
||||
"ctrl+c" = "copy_to_clipboard";
|
||||
"ctrl+v" = "paste_from_clipboard";
|
||||
};
|
||||
|
||||
settings = {
|
||||
window_padding_width = 2;
|
||||
window_padding_height = 2;
|
||||
|
||||
cursor_shape = "beam";
|
||||
# background_opacity = 0.5;
|
||||
|
||||
font_family = "Tahoma";
|
||||
font_size = 9;
|
||||
|
||||
foreground = "#cdd6f4";
|
||||
background = "#1e1e2e";
|
||||
selection_foreground = "#1e1e2e";
|
||||
selection_background = "#f5e0dc";
|
||||
|
||||
cursor = "#f5e0dc";
|
||||
cursor_text_color = "#1e1e2e";
|
||||
|
||||
url_color = "#f5e0dc";
|
||||
|
||||
active_border_color = "#b4befe";
|
||||
inactive_border_color = "#6c7086";
|
||||
bell_border_color = "#f9e2af";
|
||||
|
||||
wayland_titlebar_color = "system";
|
||||
macos_titlebar_color = "system";
|
||||
|
||||
active_tab_foreground = "#11111b";
|
||||
active_tab_background = "#cba6f7";
|
||||
inactive_tab_foreground = "#cdd6f4";
|
||||
inactive_tab_background = "#181825";
|
||||
tab_bar_background = "#11111b";
|
||||
|
||||
mark1_foreground = "#1e1e2e";
|
||||
mark1_background = "#b4befe";
|
||||
mark2_foreground = "#1e1e2e";
|
||||
mark2_background = "#cba6f7";
|
||||
mark3_foreground = "#1e1e2e";
|
||||
mark3_background = "#74c7ec";
|
||||
|
||||
color0 = "#45475a";
|
||||
color8 = "#585b70";
|
||||
|
||||
color1 = "#f38ba8";
|
||||
color9 = "#f38ba8";
|
||||
|
||||
color2 = "#a6e3a1";
|
||||
color10 = "#a6e3a1";
|
||||
|
||||
color3 = "#f9e2af";
|
||||
color11 = "#f9e2af";
|
||||
|
||||
color4 = "#89b4fa";
|
||||
color12 = "#89b4fa";
|
||||
|
||||
color5 = "#f5c2e7";
|
||||
color13 = "#f5c2e7";
|
||||
|
||||
color6 = "#94e2d5";
|
||||
color14 = "#94e2d5";
|
||||
|
||||
color7 = "#bac2de";
|
||||
color15 = "#a6adc8";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ ... }: {
|
||||
programs.neovide = {
|
||||
enable = true;
|
||||
settings = {
|
||||
neovim-bin = "/etc/profiles/per-user/asakiyuki/bin/nvim";
|
||||
};
|
||||
{...}: {
|
||||
programs.neovide = {
|
||||
enable = true;
|
||||
settings = {
|
||||
neovim-bin = "/etc/profiles/per-user/asakiyuki/bin/nvim";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +1,15 @@
|
|||
{ osconfig, lib, ... }: {
|
||||
programs.niri = lib.mkIf osconfig.device.wm.niri.enable {
|
||||
enable = true;
|
||||
settings = {
|
||||
binds = {
|
||||
# "Ctrl+Alt+T" = "ghostty";
|
||||
# "Mod+D" = "fuzzel";
|
||||
};
|
||||
};
|
||||
{
|
||||
osconfig,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
programs.niri = lib.mkIf osconfig.device.wm.niri.enable {
|
||||
enable = true;
|
||||
settings = {
|
||||
binds = {
|
||||
# "Ctrl+Alt+T" = "ghostty";
|
||||
# "Mod+D" = "fuzzel";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,11 @@
|
|||
{ pkgs, custom, lib, osconfig, ... }:
|
||||
{
|
||||
pkgs,
|
||||
custom,
|
||||
lib,
|
||||
osconfig,
|
||||
...
|
||||
}:
|
||||
lib.mkIf osconfig.device.programs.obs-studio.enable {
|
||||
programs.obs-studio.enable = true;
|
||||
home.file.".config/obs-studio/themes".source = pkgs.callPackage custom.catppuccin-obs { };
|
||||
programs.obs-studio.enable = true;
|
||||
home.file.".config/obs-studio/themes".source = pkgs.callPackage custom.catppuccin-obs {};
|
||||
}
|
||||
|
|
@ -1,33 +1,32 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
osconfig,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
home.packages = [
|
||||
(lib.mkIf config.programs.catppuccin.enable config.programs.catppuccin.package)
|
||||
}: {
|
||||
home.packages =
|
||||
[
|
||||
(lib.mkIf config.programs.catppuccin.enable config.programs.catppuccin.package)
|
||||
|
||||
(lib.mkIf config.programs.antigravity.enable config.programs.antigravity.package)
|
||||
(lib.mkIf config.programs.prismlauncher.enable config.programs.prismlauncher.package)
|
||||
(lib.mkIf config.programs.vlc.enable config.programs.vlc.package)
|
||||
(lib.mkIf config.programs.gimp.enable config.programs.gimp.package)
|
||||
(lib.mkIf config.programs.libreoffice.enable config.programs.libreoffice.package)
|
||||
(lib.mkIf config.programs.osu.enable config.programs.osu.package)
|
||||
(lib.mkIf config.programs.lmstudio.enable config.programs.lmstudio.package)
|
||||
(lib.mkIf config.programs.blender.enable config.programs.blender.package)
|
||||
(lib.mkIf config.programs.xprop.enable config.programs.xprop.package)
|
||||
(lib.mkIf config.programs.antigravity.enable config.programs.antigravity.package)
|
||||
(lib.mkIf config.programs.prismlauncher.enable config.programs.prismlauncher.package)
|
||||
(lib.mkIf config.programs.vlc.enable config.programs.vlc.package)
|
||||
(lib.mkIf config.programs.gimp.enable config.programs.gimp.package)
|
||||
(lib.mkIf config.programs.libreoffice.enable config.programs.libreoffice.package)
|
||||
(lib.mkIf config.programs.osu.enable config.programs.osu.package)
|
||||
(lib.mkIf config.programs.lmstudio.enable config.programs.lmstudio.package)
|
||||
(lib.mkIf config.programs.blender.enable config.programs.blender.package)
|
||||
(lib.mkIf config.programs.xprop.enable config.programs.xprop.package)
|
||||
|
||||
(lib.mkIf config.programs.pavucontrol.enable config.programs.pavucontrol.package)
|
||||
(lib.mkIf config.programs.nwg-look.enable config.programs.nwg-look.package)
|
||||
(lib.mkIf config.programs.pavucontrol.enable config.programs.pavucontrol.package)
|
||||
(lib.mkIf config.programs.nwg-look.enable config.programs.nwg-look.package)
|
||||
|
||||
(lib.mkIf config.programs.hytale.enable config.programs.hytale.package)
|
||||
(lib.mkIf (
|
||||
config.programs.cider.enable && osconfig.device.programs.cider-2.enable
|
||||
) config.programs.cider.package)
|
||||
]
|
||||
++ (lib.optionals config.programs.proton-ge.enable config.programs.proton-ge.packages)
|
||||
++ (lib.optionals config.programs.proton-apps.enable config.programs.proton-apps.packages);
|
||||
(lib.mkIf config.programs.hytale.enable config.programs.hytale.package)
|
||||
(lib.mkIf (
|
||||
config.programs.cider.enable && osconfig.device.programs.cider-2.enable
|
||||
)
|
||||
config.programs.cider.package)
|
||||
]
|
||||
++ (lib.optionals config.programs.proton-ge.enable config.programs.proton-ge.packages)
|
||||
++ (lib.optionals config.programs.proton-apps.enable config.programs.proton-apps.packages);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, osconfig, ... }: {
|
||||
{
|
||||
lib,
|
||||
osconfig,
|
||||
...
|
||||
}: {
|
||||
programs.starship = lib.mkIf osconfig.device.programs.starship.enable {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -1,41 +1,43 @@
|
|||
{ pkgs, lib, ... }:
|
||||
let
|
||||
catppuccin-gtk = pkgs.catppuccin-gtk.override {
|
||||
variant = "mocha";
|
||||
accents = [ "sapphire" ];
|
||||
size = "compact";
|
||||
};
|
||||
in
|
||||
{
|
||||
home.activation.copyGtkTheme = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
mkdir -p "$HOME/.themes/"
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
catppuccin-gtk = pkgs.catppuccin-gtk.override {
|
||||
variant = "mocha";
|
||||
accents = ["sapphire"];
|
||||
size = "compact";
|
||||
};
|
||||
in {
|
||||
home.activation.copyGtkTheme = lib.hm.dag.entryAfter ["writeBoundary"] ''
|
||||
mkdir -p "$HOME/.themes/"
|
||||
|
||||
if [ ! -d "$HOME/.themes/catppuccin-mocha-sapphire-compact" ]; then
|
||||
cp -r "${catppuccin-gtk}/share/themes/catppuccin-mocha-sapphire-compact" "$HOME/.themes/"
|
||||
fi
|
||||
if [ ! -d "$HOME/.themes/catppuccin-mocha-sapphire-compact" ]; then
|
||||
cp -r "${catppuccin-gtk}/share/themes/catppuccin-mocha-sapphire-compact" "$HOME/.themes/"
|
||||
fi
|
||||
|
||||
if [ ! -d "$HOME/.themes/catppuccin-mocha-sapphire-compact-hdpi" ]; then
|
||||
cp -r "${catppuccin-gtk}/share/themes/catppuccin-mocha-sapphire-compact-hdpi" "$HOME/.themes/"
|
||||
fi
|
||||
if [ ! -d "$HOME/.themes/catppuccin-mocha-sapphire-compact-hdpi" ]; then
|
||||
cp -r "${catppuccin-gtk}/share/themes/catppuccin-mocha-sapphire-compact-hdpi" "$HOME/.themes/"
|
||||
fi
|
||||
|
||||
if [ ! -d "$HOME/.themes/catppuccin-mocha-sapphire-compact-xhdpi" ]; then
|
||||
cp -r "${catppuccin-gtk}/share/themes/catppuccin-mocha-sapphire-compact-xhdpi" "$HOME/.themes/"
|
||||
fi
|
||||
'';
|
||||
if [ ! -d "$HOME/.themes/catppuccin-mocha-sapphire-compact-xhdpi" ]; then
|
||||
cp -r "${catppuccin-gtk}/share/themes/catppuccin-mocha-sapphire-compact-xhdpi" "$HOME/.themes/"
|
||||
fi
|
||||
'';
|
||||
|
||||
# QT
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme.name = "qtct";
|
||||
style = {
|
||||
package = with pkgs; [
|
||||
catppuccin-qt5ct
|
||||
catppuccin-kde
|
||||
kdePackages.breeze
|
||||
];
|
||||
};
|
||||
# QT
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme.name = "qtct";
|
||||
style = {
|
||||
package = with pkgs; [
|
||||
catppuccin-qt5ct
|
||||
catppuccin-kde
|
||||
kdePackages.breeze
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
# GTK
|
||||
gtk.theme.name = "catppuccin-mocha-sapphire-compact";
|
||||
# GTK
|
||||
gtk.theme.name = "catppuccin-mocha-sapphire-compact";
|
||||
}
|
||||
|
|
@ -1,5 +1,9 @@
|
|||
{ lib, osconfig, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
lib,
|
||||
osconfig,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
TOP_PANEL = ''
|
||||
set -g pane-border-status top
|
||||
set -g pane-border-lines single
|
||||
|
|
@ -53,8 +57,7 @@ let
|
|||
bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
|
||||
bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
|
||||
'';
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.tmux = lib.mkIf osconfig.device.programs.tmux.enable {
|
||||
enable = true;
|
||||
keyMode = "vi";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ unstable, ... }:
|
||||
{
|
||||
{unstable, ...}: {
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = unstable.vscode;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,19 @@
|
|||
{ pkgs, lib, osconfig, ... }: {
|
||||
xdg.portal = lib.mkIf osconfig.device.wm.hyprland.enable {
|
||||
enable = true;
|
||||
xdgOpenUsePortal = true;
|
||||
config = {
|
||||
common.default = ["gtk"];
|
||||
hyprland.default = ["gtk" "hyprland"];
|
||||
};
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
pkgs.xdg-desktop-portal-hyprland
|
||||
];
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
osconfig,
|
||||
...
|
||||
}: {
|
||||
xdg.portal = lib.mkIf osconfig.device.wm.hyprland.enable {
|
||||
enable = true;
|
||||
xdgOpenUsePortal = true;
|
||||
config = {
|
||||
common.default = ["gtk"];
|
||||
hyprland.default = ["gtk" "hyprland"];
|
||||
};
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
pkgs.xdg-desktop-portal-hyprland
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,24 +1,29 @@
|
|||
{ inputs, pkgs, libs, ... }: let
|
||||
background = libs.root "/assets/grub/background.png";
|
||||
baseTheme = inputs.honkai-railway-grub-theme.packages.${pkgs.stdenv.hostPlatform.system}.cyrene-grub-theme;
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
libs,
|
||||
...
|
||||
}: let
|
||||
background = libs.root "/assets/grub/background.png";
|
||||
baseTheme = inputs.honkai-railway-grub-theme.packages.${pkgs.stdenv.hostPlatform.system}.cyrene-grub-theme;
|
||||
in {
|
||||
boot = {
|
||||
loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
boot = {
|
||||
loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
|
||||
grub = rec {
|
||||
enable = true;
|
||||
device = "nodev";
|
||||
efiSupport = true;
|
||||
useOSProber = true;
|
||||
splashImage = background;
|
||||
theme = pkgs.runCommand "my-grub-theme" { } ''
|
||||
mkdir -p $out
|
||||
cp -r ${baseTheme}/* $out/
|
||||
chmod -R u+w $out
|
||||
cp ${background} $out/background.png
|
||||
'';
|
||||
};
|
||||
};
|
||||
grub = {
|
||||
enable = true;
|
||||
device = "nodev";
|
||||
efiSupport = true;
|
||||
useOSProber = true;
|
||||
splashImage = background;
|
||||
theme = pkgs.runCommand "my-grub-theme" {} ''
|
||||
mkdir -p $out
|
||||
cp -r ${baseTheme}/* $out/
|
||||
chmod -R u+w $out
|
||||
cp ${background} $out/background.png
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ ... }: {
|
||||
services = {
|
||||
cloudflare-warp.enable = true;
|
||||
};
|
||||
{...}: {
|
||||
services = {
|
||||
cloudflare-warp.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,11 @@
|
|||
{ lib, config, pkgs, ... }: {
|
||||
programs.dconf.enable = true;
|
||||
environment.systemPackages = lib.optionals config.programs.dconf.enable [
|
||||
pkgs.glib
|
||||
];
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.dconf.enable = true;
|
||||
environment.systemPackages = lib.optionals config.programs.dconf.enable [
|
||||
pkgs.glib
|
||||
];
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ lib, config, ... }: {
|
||||
services.flatpak = lib.mkIf config.device.flatpak.enable {
|
||||
enable = true;
|
||||
};
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
services.flatpak = lib.mkIf config.device.flatpak.enable {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, config, ... }: {
|
||||
services = lib.mkIf config.device.dm.gdm.enable {
|
||||
displayManager.gdm.enable = true;
|
||||
};
|
||||
{ lib, config, ... }:
|
||||
{
|
||||
services = lib.mkIf config.device.dm.gdm.enable {
|
||||
displayManager.gdm.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,9 @@
|
|||
{ lib, config, ... }: {
|
||||
services = lib.mkIf config.device.de.gnome.enable {
|
||||
desktopManager.gnome.enable = true;
|
||||
};
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
services = lib.mkIf config.device.de.gnome.enable {
|
||||
desktopManager.gnome.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,9 @@
|
|||
{ lib, config, ... }: {
|
||||
programs.hyprland = lib.mkIf config.device.wm.hyprland.enable {
|
||||
enable = true;
|
||||
};
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
programs.hyprland = lib.mkIf config.device.wm.hyprland.enable {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
{ pkgs, ... }: {
|
||||
i18n.inputMethod = {
|
||||
enable = true;
|
||||
type = "fcitx5";
|
||||
fcitx5.addons = with pkgs; [
|
||||
# fcitx5-bamboo
|
||||
kdePackages.fcitx5-unikey
|
||||
];
|
||||
};
|
||||
{pkgs, ...}: {
|
||||
i18n.inputMethod = {
|
||||
enable = true;
|
||||
type = "fcitx5";
|
||||
fcitx5.addons = with pkgs; [
|
||||
# fcitx5-bamboo
|
||||
kdePackages.fcitx5-unikey
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,10 @@
|
|||
{ lib, config, ... }: {
|
||||
services = lib.mkIf config.device.de.kdePlasma.enable {
|
||||
desktopManager.plasma6.enable = true;
|
||||
xserver.enable = true;
|
||||
};
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
services = lib.mkIf config.device.de.kdePlasma.enable {
|
||||
desktopManager.plasma6.enable = true;
|
||||
xserver.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, config, ... }: {
|
||||
programs.niri.enable = lib.mkIf config.device.wm.niri.enable true;
|
||||
services.xserver.enable = lib.mkIf config.device.wm.niri.enable true;
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
programs.niri.enable = lib.mkIf config.device.wm.niri.enable true;
|
||||
services.xserver.enable = lib.mkIf config.device.wm.niri.enable true;
|
||||
}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
{ pkgs, ... }: {
|
||||
programs.nix-ld = {
|
||||
enable = true;
|
||||
libraries = with pkgs; [
|
||||
stdenv.cc.cc
|
||||
zlib
|
||||
brotli
|
||||
unixODBC
|
||||
zstd
|
||||
glib
|
||||
stdenv.cc.cc.lib
|
||||
];
|
||||
};
|
||||
{pkgs, ...}: {
|
||||
programs.nix-ld = {
|
||||
enable = true;
|
||||
libraries = with pkgs; [
|
||||
stdenv.cc.cc
|
||||
zlib
|
||||
brotli
|
||||
unixODBC
|
||||
zstd
|
||||
glib
|
||||
stdenv.cc.cc.lib
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,10 +3,8 @@
|
|||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
}: {
|
||||
environment.systemPackages = with pkgs;
|
||||
[
|
||||
git
|
||||
vim
|
||||
|
|
@ -15,7 +13,7 @@
|
|||
tree
|
||||
|
||||
nixd
|
||||
nixfmt
|
||||
alejandra
|
||||
|
||||
zip
|
||||
unzip
|
||||
|
|
@ -35,8 +33,9 @@
|
|||
++ (lib.optionals config.programs.gcc.enable config.programs.gcc.packages)
|
||||
++ (lib.optionals config.programs.winepackages.enable config.programs.winepackages.packages)
|
||||
++ (lib.optionals config.programs.kde-packages.enable config.programs.kde-packages.packages)
|
||||
++ (lib.optionals config.programs.r-tensorflow.enable [ config.programs.r-tensorflow.package ])
|
||||
++ (lib.optionals config.programs.r-tensorflow.enable [config.programs.r-tensorflow.package])
|
||||
++ (lib.optionals (
|
||||
config.programs.hyprland-portals.enable && config.device.wm.hyprland.enable
|
||||
) config.programs.hyprland-portals.packages);
|
||||
config.programs.hyprland-portals.enable && config.device.wm.hyprland.enable
|
||||
)
|
||||
config.programs.hyprland-portals.packages);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,29 @@
|
|||
{ pkgs, lib, config, ... }: let
|
||||
custom-sddm-astronaut = pkgs.sddm-astronaut.override {
|
||||
embeddedTheme = config.device.dm.sddm.theme;
|
||||
};
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
custom-sddm-astronaut = pkgs.sddm-astronaut.override {
|
||||
embeddedTheme = config.device.dm.sddm.theme;
|
||||
};
|
||||
in {
|
||||
services.displayManager.sddm = lib.mkIf config.device.dm.sddm.enable {
|
||||
enable = true;
|
||||
wayland.enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
custom-sddm-astronaut
|
||||
];
|
||||
theme = "sddm-astronaut-theme";
|
||||
settings = {
|
||||
Theme = {
|
||||
Current = "sddm-astronaut-theme";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
custom-sddm-astronaut
|
||||
kdePackages.qtmultimedia
|
||||
services.displayManager.sddm = lib.mkIf config.device.dm.sddm.enable {
|
||||
enable = true;
|
||||
wayland.enable = true;
|
||||
extraPackages = [
|
||||
custom-sddm-astronaut
|
||||
];
|
||||
theme = "sddm-astronaut-theme";
|
||||
settings = {
|
||||
Theme = {
|
||||
Current = "sddm-astronaut-theme";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
custom-sddm-astronaut
|
||||
kdePackages.qtmultimedia
|
||||
];
|
||||
}
|
||||
|
|
@ -1,5 +1,9 @@
|
|||
{ lib, config, ... }: {
|
||||
programs.steam = lib.mkIf config.device.programs.steam.enable {
|
||||
enable = true;
|
||||
};
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
programs.steam = lib.mkIf config.device.programs.steam.enable {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ ... }: {
|
||||
services.udisks2 = {
|
||||
enable = true;
|
||||
};
|
||||
{...}: {
|
||||
services.udisks2 = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ ... }: {
|
||||
services.upower = {
|
||||
enable = true;
|
||||
};
|
||||
{...}: {
|
||||
services.upower = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,10 +1,15 @@
|
|||
{ pkgs, lib, config, ... }: {
|
||||
virtualisation.waydroid = {
|
||||
enable = true;
|
||||
package = pkgs.waydroid-nftables;
|
||||
};
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
virtualisation.waydroid = {
|
||||
enable = true;
|
||||
package = pkgs.waydroid-nftables;
|
||||
};
|
||||
|
||||
environment.systemPackages = lib.optionals config.virtualisation.waydroid.enable [
|
||||
pkgs.waydroid-helper
|
||||
];
|
||||
environment.systemPackages = lib.optionals config.virtualisation.waydroid.enable [
|
||||
pkgs.waydroid-helper
|
||||
];
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
{pkgs, ...}: let
|
||||
fetch-fonts = {
|
||||
segoe-ui = {
|
||||
light = pkgs.fetchurl {
|
||||
|
|
@ -62,8 +61,7 @@ let
|
|||
'';
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
fonts.enableDefaultPackages = true;
|
||||
fonts.packages = with pkgs; [
|
||||
custom.tahoma
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{ config, ... }: {
|
||||
hardware.bluetooth.enable = config.device.bluetooth.enable;
|
||||
{config, ...}: {
|
||||
hardware.bluetooth.enable = config.device.bluetooth.enable;
|
||||
}
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./bluetooth.nix
|
||||
];
|
||||
{...}: {
|
||||
imports = [
|
||||
./bluetooth.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ ... }: {
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
backupFileExtension = "bak";
|
||||
};
|
||||
{...}: {
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
backupFileExtension = "bak";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,8 @@
|
|||
{ lib, osconfig, ... }:
|
||||
{
|
||||
lib,
|
||||
osconfig,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./settings/default.nix
|
||||
];
|
||||
|
|
@ -9,4 +12,3 @@
|
|||
xwayland.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ osconfig, ... }:
|
||||
{
|
||||
{osconfig, ...}: {
|
||||
imports = [
|
||||
./key-bind.nix
|
||||
./theme.nix
|
||||
|
|
@ -12,4 +11,3 @@
|
|||
monitorv2 = osconfig.device.wm.hyprland.monitors;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
wayland.windowManager.hyprland.settings.exec-once = [
|
||||
"quickshell"
|
||||
"fcitx5"
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
"$LAPTOP_TOUCHPAD_ENABLE" = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,68 +1,73 @@
|
|||
{ osconfig, config, ... }:
|
||||
{
|
||||
osconfig,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
bind = [
|
||||
"CTRL ALT, T, exec, ${osconfig.device.programs.terminal.name}"
|
||||
bind =
|
||||
[
|
||||
"CTRL ALT, T, exec, ${osconfig.device.programs.terminal.name}"
|
||||
|
||||
"SUPER SHIFT, L, exit,"
|
||||
"SUPER SHIFT, TAB, togglefloating,"
|
||||
"SUPER SHIFT, S, exec, hyprshot -m region -o '${config.home.homeDirectory}/Pictures/Screenshots/' -z"
|
||||
"SUPER, J, togglesplit,"
|
||||
"SUPER, E, exec, dolphin"
|
||||
"SUPER SHIFT, L, exit,"
|
||||
"SUPER SHIFT, TAB, togglefloating,"
|
||||
"SUPER SHIFT, S, exec, hyprshot -m region -o '${config.home.homeDirectory}/Pictures/Screenshots/' -z"
|
||||
"SUPER, J, togglesplit,"
|
||||
"SUPER, E, exec, dolphin"
|
||||
|
||||
"SUPER, C, killactive"
|
||||
"SUPER, C, killactive"
|
||||
|
||||
"SUPER SHIFT, LEFT, resizeactive, -25 0"
|
||||
"SUPER SHIFT, RIGHT, resizeactive, 25 0"
|
||||
"SUPER SHIFT, UP, resizeactive, 0 -25"
|
||||
"SUPER SHIFT, DOWN, resizeactive, 0 25"
|
||||
"SUPER SHIFT, LEFT, resizeactive, -25 0"
|
||||
"SUPER SHIFT, RIGHT, resizeactive, 25 0"
|
||||
"SUPER SHIFT, UP, resizeactive, 0 -25"
|
||||
"SUPER SHIFT, DOWN, resizeactive, 0 25"
|
||||
|
||||
"SUPER, LEFT, movefocus, l"
|
||||
"SUPER, RIGHT, movefocus, r"
|
||||
"SUPER, UP, movefocus, u"
|
||||
"SUPER, DOWN, movefocus, d"
|
||||
"SUPER, LEFT, movefocus, l"
|
||||
"SUPER, RIGHT, movefocus, r"
|
||||
"SUPER, UP, movefocus, u"
|
||||
"SUPER, DOWN, movefocus, d"
|
||||
|
||||
"SUPER CTRL, LEFT, movewindow, l"
|
||||
"SUPER CTRL, RIGHT, movewindow, r"
|
||||
"SUPER CTRL, UP, movewindow, u"
|
||||
"SUPER CTRL, DOWN, movewindow, d"
|
||||
"SUPER CTRL, LEFT, movewindow, l"
|
||||
"SUPER CTRL, RIGHT, movewindow, r"
|
||||
"SUPER CTRL, UP, movewindow, u"
|
||||
"SUPER CTRL, DOWN, movewindow, d"
|
||||
|
||||
"SUPER SHIFT, h, resizeactive, -25 0"
|
||||
"SUPER SHIFT, l, resizeactive, 25 0"
|
||||
"SUPER SHIFT, k, resizeactive, 0 -25"
|
||||
"SUPER SHIFT, j, resizeactive, 0 25"
|
||||
"SUPER SHIFT, h, resizeactive, -25 0"
|
||||
"SUPER SHIFT, l, resizeactive, 25 0"
|
||||
"SUPER SHIFT, k, resizeactive, 0 -25"
|
||||
"SUPER SHIFT, j, resizeactive, 0 25"
|
||||
|
||||
"SUPER, h, movefocus, l"
|
||||
"SUPER, l, movefocus, r"
|
||||
"SUPER, k, movefocus, u"
|
||||
"SUPER, j, movefocus, d"
|
||||
"SUPER, h, movefocus, l"
|
||||
"SUPER, l, movefocus, r"
|
||||
"SUPER, k, movefocus, u"
|
||||
"SUPER, j, movefocus, d"
|
||||
|
||||
"SUPER CTRL, h, movewindow, l"
|
||||
"SUPER CTRL, l, movewindow, r"
|
||||
"SUPER CTRL, k, movewindow, u"
|
||||
"SUPER CTRL, j, movewindow, d"
|
||||
"SUPER CTRL, h, movewindow, l"
|
||||
"SUPER CTRL, l, movewindow, r"
|
||||
"SUPER CTRL, k, movewindow, u"
|
||||
"SUPER CTRL, j, movewindow, d"
|
||||
|
||||
"SUPER, TAB, workspace, e+1"
|
||||
"SUPER ALT, TAB, workspace, e-1"
|
||||
"SUPER, MOUSE_DOWN, workspace, e-1"
|
||||
"SUPER, MOUSE_UP, workspace, e+1"
|
||||
"SUPER, TAB, workspace, e+1"
|
||||
"SUPER ALT, TAB, workspace, e-1"
|
||||
"SUPER, MOUSE_DOWN, workspace, e-1"
|
||||
"SUPER, MOUSE_UP, workspace, e+1"
|
||||
|
||||
", XF86TouchpadToggle, global, asakiyuki:touchpadtoggle"
|
||||
"ALT, SPACE, global, asakiyuki:launcher"
|
||||
", XF86TouchpadToggle, global, asakiyuki:touchpadtoggle"
|
||||
"ALT, SPACE, global, asakiyuki:launcher"
|
||||
|
||||
",XF86MonBrightnessDown, exec, brightnessctl s 5%-"
|
||||
",XF86MonBrightnessUp, exec, brightnessctl s +5%"
|
||||
]
|
||||
++ builtins.concatLists (
|
||||
builtins.genList (i: [
|
||||
"SUPER, ${toString (i + 1)}, workspace,${toString (i + 1)}"
|
||||
"SUPER SHIFT, ${toString (i + 1)}, movetoworkspace,${toString (i + 1)}"
|
||||
]) 9
|
||||
)
|
||||
++ [
|
||||
"SUPER, 0, workspace, 10"
|
||||
"SUPER SHIFT, 0, movetoworkspace, 10"
|
||||
];
|
||||
",XF86MonBrightnessDown, exec, brightnessctl s 5%-"
|
||||
",XF86MonBrightnessUp, exec, brightnessctl s +5%"
|
||||
]
|
||||
++ builtins.concatLists (
|
||||
builtins.genList (i: [
|
||||
"SUPER, ${toString (i + 1)}, workspace,${toString (i + 1)}"
|
||||
"SUPER SHIFT, ${toString (i + 1)}, movetoworkspace,${toString (i + 1)}"
|
||||
])
|
||||
9
|
||||
)
|
||||
++ [
|
||||
"SUPER, 0, workspace, 10"
|
||||
"SUPER SHIFT, 0, movetoworkspace, 10"
|
||||
];
|
||||
|
||||
bindi = [
|
||||
", Caps_Lock, global, asakiyuki:capslock"
|
||||
|
|
|
|||
|
|
@ -1,58 +1,58 @@
|
|||
{ ... }: {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
general = {
|
||||
gaps_in = 5;
|
||||
gaps_out = 10;
|
||||
border_size = 1;
|
||||
"col.active_border" = "rgb(cdd6f4)";
|
||||
"col.inactive_border" = "rgb(7f849c)";
|
||||
allow_tearing = true;
|
||||
resize_on_border = true;
|
||||
};
|
||||
|
||||
decoration = {
|
||||
rounding = 5;
|
||||
rounding_power = 5;
|
||||
active_opacity = 1;
|
||||
inactive_opacity = 1;
|
||||
|
||||
blur = {
|
||||
enabled = true;
|
||||
size = 2;
|
||||
passes = 5;
|
||||
vibrancy = 3;
|
||||
};
|
||||
};
|
||||
|
||||
animations = {
|
||||
enabled = "yes";
|
||||
|
||||
bezier = [
|
||||
"overshot, 0.05, 0.9, 0.1, 1.1"
|
||||
"md3_decel, 0.05, 0.7, 0.1, 1"
|
||||
];
|
||||
|
||||
animation = [
|
||||
"windows, 1, 3, overshot, popin 60%"
|
||||
"border, 1, 10, default"
|
||||
"fade, 1, 2, default"
|
||||
"workspaces, 1, 3.5, overshot, slidefade 15%"
|
||||
"specialWorkspace, 1, 3, md3_decel, slidevert"
|
||||
];
|
||||
};
|
||||
|
||||
dwindle = {
|
||||
pseudotile = true;
|
||||
preserve_split = true;
|
||||
};
|
||||
|
||||
master = {
|
||||
new_status = "master";
|
||||
};
|
||||
|
||||
misc = {
|
||||
force_default_wallpaper = 1;
|
||||
disable_hyprland_logo = true;
|
||||
};
|
||||
{...}: {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
general = {
|
||||
gaps_in = 5;
|
||||
gaps_out = 10;
|
||||
border_size = 1;
|
||||
"col.active_border" = "rgb(cdd6f4)";
|
||||
"col.inactive_border" = "rgb(7f849c)";
|
||||
allow_tearing = true;
|
||||
resize_on_border = true;
|
||||
};
|
||||
|
||||
decoration = {
|
||||
rounding = 5;
|
||||
rounding_power = 5;
|
||||
active_opacity = 1;
|
||||
inactive_opacity = 1;
|
||||
|
||||
blur = {
|
||||
enabled = true;
|
||||
size = 2;
|
||||
passes = 5;
|
||||
vibrancy = 3;
|
||||
};
|
||||
};
|
||||
|
||||
animations = {
|
||||
enabled = "yes";
|
||||
|
||||
bezier = [
|
||||
"overshot, 0.05, 0.9, 0.1, 1.1"
|
||||
"md3_decel, 0.05, 0.7, 0.1, 1"
|
||||
];
|
||||
|
||||
animation = [
|
||||
"windows, 1, 3, overshot, popin 60%"
|
||||
"border, 1, 10, default"
|
||||
"fade, 1, 2, default"
|
||||
"workspaces, 1, 3.5, overshot, slidefade 15%"
|
||||
"specialWorkspace, 1, 3, md3_decel, slidevert"
|
||||
];
|
||||
};
|
||||
|
||||
dwindle = {
|
||||
pseudotile = true;
|
||||
preserve_split = true;
|
||||
};
|
||||
|
||||
master = {
|
||||
new_status = "master";
|
||||
};
|
||||
|
||||
misc = {
|
||||
force_default_wallpaper = 1;
|
||||
disable_hyprland_logo = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +1,11 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
wayland.windowManager.hyprland.settings.windowrule = [
|
||||
"float, class:(clipse)"
|
||||
"size 622 652, class:(clipse)"
|
||||
"stayfocused, class:(clipse)"
|
||||
"float, class:(clipse)"
|
||||
"size 622 652, class:(clipse)"
|
||||
"stayfocused, class:(clipse)"
|
||||
|
||||
"suppressevent maximize, class:.*"
|
||||
"nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0"
|
||||
"suppressevent maximize, class:.*"
|
||||
"nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0"
|
||||
|
||||
"opacity 0.0 override, class:^(xwaylandvideobridge)$"
|
||||
"noanim, class:^(xwaylandvideobridge)$"
|
||||
|
|
@ -19,4 +18,3 @@
|
|||
"tile, class:^(Chromium)$"
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ lib, libs, osconfig, ... }:
|
||||
{
|
||||
lib,
|
||||
libs,
|
||||
osconfig,
|
||||
...
|
||||
}: {
|
||||
programs.nixcord = lib.mkIf osconfig.device.programs.nixcord.enable {
|
||||
enable = true;
|
||||
discord = {
|
||||
|
|
@ -12,7 +16,7 @@
|
|||
config = {
|
||||
useQuickCss = true;
|
||||
enableReactDevtools = true;
|
||||
themeLinks = [ "https://catppuccin.github.io/discord/dist/catppuccin-mocha-blue.theme.css" ];
|
||||
themeLinks = ["https://catppuccin.github.io/discord/dist/catppuccin-mocha-blue.theme.css"];
|
||||
|
||||
plugins = {
|
||||
BlurNSFW.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ pkgs, config, ... }:
|
||||
{
|
||||
{...}: {
|
||||
programs.nixvim.imports = [
|
||||
./default.nix
|
||||
./extra-packages.nix
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
enable = true;
|
||||
vimdiffAlias = true;
|
||||
colorschemes.catppuccin.enable = true;
|
||||
|
|
@ -17,4 +16,3 @@
|
|||
clipboard = "unnamedplus";
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
extraPackages = with pkgs; [
|
||||
nodePackages.prettier
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
globals.mapleader = " ";
|
||||
keymaps =
|
||||
[ ]
|
||||
[]
|
||||
++ (import ./_default.nix)
|
||||
++ (import ./barbar.nix)
|
||||
++ (import ./toggleterm.nix)
|
||||
++ (import ./nvim-tree-toggle.nix);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@
|
|||
}
|
||||
]
|
||||
++ (builtins.genList (i: {
|
||||
mode = "n";
|
||||
key = "<A-${toString (i + 1)}>";
|
||||
action = "<cmd>BufferGoto ${toString (i + 1)}<CR>";
|
||||
options.silent = true;
|
||||
}) 9)
|
||||
|
||||
mode = "n";
|
||||
key = "<A-${toString (i + 1)}>";
|
||||
action = "<cmd>BufferGoto ${toString (i + 1)}<CR>";
|
||||
options.silent = true;
|
||||
})
|
||||
9)
|
||||
|
|
|
|||
|
|
@ -59,5 +59,6 @@
|
|||
options.silent = true;
|
||||
options.noremap = true;
|
||||
}
|
||||
]) 9
|
||||
])
|
||||
9
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,2 @@
|
|||
{ ... }:
|
||||
{
|
||||
|
||||
{...}: {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,13 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
EXTRA_PLUGINS = [
|
||||
./extras/neocord.nix
|
||||
./extras/mini-icons.nix
|
||||
];
|
||||
{pkgs, ...}: let
|
||||
EXTRA_PLUGINS = [
|
||||
./extras/neocord.nix
|
||||
./extras/mini-icons.nix
|
||||
];
|
||||
|
||||
LUA = [
|
||||
./lua/neocord.lua
|
||||
];
|
||||
in
|
||||
{
|
||||
extraPlugins = map (path: import path { plugins = pkgs.vimPlugins; }) EXTRA_PLUGINS;
|
||||
extraConfigLua = builtins.concatStringsSep "\n" (map builtins.readFile LUA);
|
||||
LUA = [
|
||||
./lua/neocord.lua
|
||||
];
|
||||
in {
|
||||
extraPlugins = map (path: import path {plugins = pkgs.vimPlugins;}) EXTRA_PLUGINS;
|
||||
extraConfigLua = builtins.concatStringsSep "\n" (map builtins.readFile LUA);
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }@inputs:
|
||||
{
|
||||
{...} @ inputs: {
|
||||
plugins = {
|
||||
nvim-tree = import ./nvimtree.nix inputs;
|
||||
lsp = import ./lsp.nix inputs;
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
{ ... }: {
|
||||
enable = true;
|
||||
autoEnableSources = true;
|
||||
{...}: {
|
||||
enable = true;
|
||||
autoEnableSources = true;
|
||||
|
||||
settings = {
|
||||
sources = [
|
||||
{ name = "nvim_lsp"; }
|
||||
{ name = "path"; }
|
||||
{ name = "luasnip"; }
|
||||
{ name = "buffer"; }
|
||||
];
|
||||
settings = {
|
||||
sources = [
|
||||
{name = "nvim_lsp";}
|
||||
{name = "path";}
|
||||
{name = "luasnip";}
|
||||
{name = "buffer";}
|
||||
];
|
||||
|
||||
mapping = {
|
||||
"<C-Space>" = "cmp.mapping.complete()";
|
||||
"<C-d>" = "cmp.mapping.scroll_docs(-4)";
|
||||
"<C-f>" = "cmp.mapping.scroll_docs(4)";
|
||||
"<C-e>" = "cmp.mapping.abort()";
|
||||
"<CR>" = "cmp.mapping.confirm({ select = true })";
|
||||
"<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
|
||||
"<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
|
||||
};
|
||||
|
||||
formatting.fields = [ "kind" "abbr" "menu" ];
|
||||
mapping = {
|
||||
"<C-Space>" = "cmp.mapping.complete()";
|
||||
"<C-d>" = "cmp.mapping.scroll_docs(-4)";
|
||||
"<C-f>" = "cmp.mapping.scroll_docs(4)";
|
||||
"<C-e>" = "cmp.mapping.abort()";
|
||||
"<CR>" = "cmp.mapping.confirm({ select = true })";
|
||||
"<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
|
||||
"<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
|
||||
};
|
||||
|
||||
formatting.fields = ["kind" "abbr" "menu"];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,15 +1,14 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
enable = true;
|
||||
settings = {
|
||||
formatters_by_ft = {
|
||||
javascript = [ "prettier" ];
|
||||
typescript = [ "prettier" ];
|
||||
json = [ "prettier" ];
|
||||
css = [ "prettier" ];
|
||||
html = [ "prettier" ];
|
||||
nix = [ "nixfmt" ];
|
||||
php = [ "php_cs_fixer" ];
|
||||
javascript = ["prettier"];
|
||||
typescript = ["prettier"];
|
||||
json = ["prettier"];
|
||||
css = ["prettier"];
|
||||
html = ["prettier"];
|
||||
nix = ["nixfmt"];
|
||||
php = ["php_cs_fixer"];
|
||||
};
|
||||
|
||||
format_on_save = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
{ plugins, ... }:
|
||||
{
|
||||
plugin = plugins.mini-icons;
|
||||
{plugins, ...}: {
|
||||
plugin = plugins.mini-icons;
|
||||
}
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
{ plugins, ... }:
|
||||
{
|
||||
plugin = plugins.neocord;
|
||||
{plugins, ...}: {
|
||||
plugin = plugins.neocord;
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
enable = true;
|
||||
lintersByFt = {
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
enable = true;
|
||||
servers = {
|
||||
phpactor.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
enable = true;
|
||||
cmp.enable = true;
|
||||
{...}: {
|
||||
enable = true;
|
||||
cmp.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ ... }: {
|
||||
enable = true;
|
||||
openOnSetupFile = true;
|
||||
settings.auto_reload_on_write = true;
|
||||
{...}: {
|
||||
enable = true;
|
||||
openOnSetupFile = true;
|
||||
settings.auto_reload_on_write = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
enable = true;
|
||||
settings = {
|
||||
preset = "modern";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
services.adguardhome = {
|
||||
enable = true;
|
||||
port = 34778;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
services.cloudflare-dyndns = {
|
||||
enable = true;
|
||||
apiTokenFile = "/home/asakiyuki/.secret/CLOUDFLARE_TOKEN_KEY";
|
||||
|
|
@ -8,6 +7,6 @@
|
|||
ipv6 = false;
|
||||
ipv4 = true;
|
||||
deleteMissing = false;
|
||||
domains = [ "ddns.asakiyuki.com" ];
|
||||
domains = ["ddns.asakiyuki.com"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
services.fail2ban = {
|
||||
enable = true;
|
||||
ignoreIP = [
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
ports = [ 15523 ];
|
||||
ports = [15523];
|
||||
authorizedKeysInHomedir = true;
|
||||
authorizedKeysFiles = [ "/home/asakiyuki/.ssh/authorized_keys" ];
|
||||
authorizedKeysFiles = ["/home/asakiyuki/.ssh/authorized_keys"];
|
||||
settings = {
|
||||
AllowUsers = [
|
||||
"asakiyuki"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
imports = [ ./programs.nix ];
|
||||
options = { };
|
||||
{...}: {
|
||||
imports = [./programs.nix];
|
||||
options = {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
options.programs = {
|
||||
catppuccin = {
|
||||
enable = lib.mkEnableOption "catppuccin";
|
||||
|
|
@ -13,7 +11,7 @@
|
|||
type = lib.types.package;
|
||||
default = pkgs.catppuccin-gtk.override {
|
||||
variant = "mocha";
|
||||
accents = [ "sapphire" ];
|
||||
accents = ["sapphire"];
|
||||
size = "compact";
|
||||
};
|
||||
description = "Catppuccin GTK package";
|
||||
|
|
@ -21,19 +19,19 @@
|
|||
kde = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = pkgs.catppuccin-kde.override {
|
||||
flavour = [ "mocha" ];
|
||||
accents = [ "sapphire" ];
|
||||
flavour = ["mocha"];
|
||||
accents = ["sapphire"];
|
||||
};
|
||||
description = "Catppuccin KDE package";
|
||||
};
|
||||
};
|
||||
antigravity = {
|
||||
enable = lib.mkEnableOption "antigravity";
|
||||
package = lib.mkPackageOption pkgs "antigravity" { };
|
||||
package = lib.mkPackageOption pkgs "antigravity" {};
|
||||
};
|
||||
prismlauncher = {
|
||||
enable = lib.mkEnableOption "prismlauncher";
|
||||
package = lib.mkPackageOption pkgs "prismlauncher" { };
|
||||
package = lib.mkPackageOption pkgs "prismlauncher" {};
|
||||
};
|
||||
proton-ge = {
|
||||
enable = lib.mkEnableOption "proton-ge utils";
|
||||
|
|
@ -47,39 +45,39 @@
|
|||
};
|
||||
vlc = {
|
||||
enable = lib.mkEnableOption "vlc";
|
||||
package = lib.mkPackageOption pkgs "vlc" { };
|
||||
package = lib.mkPackageOption pkgs "vlc" {};
|
||||
};
|
||||
gimp = {
|
||||
enable = lib.mkEnableOption "gimp";
|
||||
package = lib.mkPackageOption pkgs "gimp" { };
|
||||
package = lib.mkPackageOption pkgs "gimp" {};
|
||||
};
|
||||
libreoffice = {
|
||||
enable = lib.mkEnableOption "libreoffice";
|
||||
package = lib.mkPackageOption pkgs "libreoffice-qt-fresh" { };
|
||||
package = lib.mkPackageOption pkgs "libreoffice-qt-fresh" {};
|
||||
};
|
||||
osu = {
|
||||
enable = lib.mkEnableOption "osu-lazer";
|
||||
package = lib.mkPackageOption pkgs "osu-lazer-bin" { };
|
||||
package = lib.mkPackageOption pkgs "osu-lazer-bin" {};
|
||||
};
|
||||
lmstudio = {
|
||||
enable = lib.mkEnableOption "lmstudio";
|
||||
package = lib.mkPackageOption pkgs "lmstudio" { };
|
||||
package = lib.mkPackageOption pkgs "lmstudio" {};
|
||||
};
|
||||
blender = {
|
||||
enable = lib.mkEnableOption "blender";
|
||||
package = lib.mkPackageOption pkgs "blender" { };
|
||||
package = lib.mkPackageOption pkgs "blender" {};
|
||||
};
|
||||
xprop = {
|
||||
enable = lib.mkEnableOption "xprop";
|
||||
package = lib.mkPackageOption pkgs "xprop" { };
|
||||
package = lib.mkPackageOption pkgs "xprop" {};
|
||||
};
|
||||
pavucontrol = {
|
||||
enable = lib.mkEnableOption "pavucontrol-qt";
|
||||
package = lib.mkPackageOption pkgs.lxqt "pavucontrol-qt" { };
|
||||
package = lib.mkPackageOption pkgs.lxqt "pavucontrol-qt" {};
|
||||
};
|
||||
nwg-look = {
|
||||
enable = lib.mkEnableOption "nwg-look";
|
||||
package = lib.mkPackageOption pkgs "nwg-look" { };
|
||||
package = lib.mkPackageOption pkgs "nwg-look" {};
|
||||
};
|
||||
proton-apps = {
|
||||
enable = lib.mkEnableOption "proton-pass and proton-authenticator";
|
||||
|
|
@ -100,7 +98,7 @@
|
|||
};
|
||||
cider = {
|
||||
enable = lib.mkEnableOption "cider-2";
|
||||
package = lib.mkPackageOption pkgs "cider-2" { };
|
||||
package = lib.mkPackageOption pkgs "cider-2" {};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
{lib, ...}: {
|
||||
imports = [
|
||||
./programs.nix
|
||||
./file.nix
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
{lib, ...}: {
|
||||
options.device = {
|
||||
dm = {
|
||||
sddm = {
|
||||
|
|
|
|||
|
|
@ -1,23 +1,22 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
{lib, ...}: {
|
||||
options.device.files = {
|
||||
symlink = lib.mkOption {
|
||||
default = { };
|
||||
default = {};
|
||||
type = lib.types.attrsOf lib.types.str;
|
||||
};
|
||||
|
||||
source = lib.mkOption {
|
||||
default = { };
|
||||
default = {};
|
||||
type = lib.types.attrsOf lib.types.path;
|
||||
};
|
||||
|
||||
force = lib.mkOption {
|
||||
default = { };
|
||||
default = {};
|
||||
type = lib.types.attrsOf lib.types.bool;
|
||||
};
|
||||
|
||||
mkForce = lib.mkOption {
|
||||
default = { };
|
||||
default = {};
|
||||
type = lib.types.attrsOf lib.types.bool;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, ... }: {
|
||||
options.device = {
|
||||
bluetooth.enable = lib.mkEnableOption "bluetooth";
|
||||
};
|
||||
{lib, ...}: {
|
||||
options.device = {
|
||||
bluetooth.enable = lib.mkEnableOption "bluetooth";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,8 @@
|
|||
{ lib, pkgs, ... }:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
options.device.programs = {
|
||||
terminal = {
|
||||
enable = lib.mkEnableOption "terminal";
|
||||
|
|
@ -23,35 +26,35 @@
|
|||
options.programs = {
|
||||
ffmpeg = {
|
||||
enable = lib.mkEnableOption "ffmpeg";
|
||||
package = lib.mkPackageOption pkgs "ffmpeg-full" { };
|
||||
package = lib.mkPackageOption pkgs "ffmpeg-full" {};
|
||||
};
|
||||
nodejs = {
|
||||
enable = lib.mkEnableOption "nodejs";
|
||||
package = lib.mkPackageOption pkgs "nodejs" { };
|
||||
package = lib.mkPackageOption pkgs "nodejs" {};
|
||||
};
|
||||
bun = {
|
||||
enable = lib.mkEnableOption "bun";
|
||||
package = lib.mkPackageOption pkgs "bun" { };
|
||||
package = lib.mkPackageOption pkgs "bun" {};
|
||||
};
|
||||
brightnessctl = {
|
||||
enable = lib.mkEnableOption "brightnessctl";
|
||||
package = lib.mkPackageOption pkgs "brightnessctl" { };
|
||||
package = lib.mkPackageOption pkgs "brightnessctl" {};
|
||||
};
|
||||
php = {
|
||||
enable = lib.mkEnableOption "php";
|
||||
package = lib.mkPackageOption pkgs "php" { };
|
||||
package = lib.mkPackageOption pkgs "php" {};
|
||||
};
|
||||
ntfs3g = {
|
||||
enable = lib.mkEnableOption "ntfs3g";
|
||||
package = lib.mkPackageOption pkgs "ntfs3g" { };
|
||||
package = lib.mkPackageOption pkgs "ntfs3g" {};
|
||||
};
|
||||
python = {
|
||||
enable = lib.mkEnableOption "python";
|
||||
package = lib.mkPackageOption pkgs "python3" { };
|
||||
package = lib.mkPackageOption pkgs "python3" {};
|
||||
};
|
||||
jdk = {
|
||||
enable = lib.mkEnableOption "jdk-25";
|
||||
package = lib.mkPackageOption pkgs "jdk25" { };
|
||||
package = lib.mkPackageOption pkgs "jdk25" {};
|
||||
};
|
||||
winepackages = {
|
||||
enable = lib.mkEnableOption "Wine and Proton utilities";
|
||||
|
|
@ -67,11 +70,11 @@
|
|||
};
|
||||
quickshell = {
|
||||
enable = lib.mkEnableOption "quickshell";
|
||||
package = lib.mkPackageOption pkgs "quickshell" { };
|
||||
package = lib.mkPackageOption pkgs "quickshell" {};
|
||||
};
|
||||
papirus-icons = {
|
||||
enable = lib.mkEnableOption "papirus-icon-theme";
|
||||
package = lib.mkPackageOption pkgs "papirus-icon-theme" { };
|
||||
package = lib.mkPackageOption pkgs "papirus-icon-theme" {};
|
||||
};
|
||||
kde-packages = {
|
||||
enable = lib.mkEnableOption "KDE utility packages";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ inputs, ... }: {
|
||||
nixpkgs.overlays = [
|
||||
inputs.niri.overlays.niri
|
||||
inputs.dolphin-overlay.overlays.default
|
||||
];
|
||||
{inputs, ...}: {
|
||||
nixpkgs.overlays = [
|
||||
inputs.niri.overlays.niri
|
||||
inputs.dolphin-overlay.overlays.default
|
||||
];
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
{pkgs, ...}:
|
||||
pkgs.stdenv.mkDerivation rec {
|
||||
pname = "bun";
|
||||
version = "1.3.10";
|
||||
|
|
|
|||
|
|
@ -1,48 +1,46 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
{pkgs, ...}: let
|
||||
RELEASE_VERSION = "20260208";
|
||||
PACKAGE_VERSION = "0.1.5";
|
||||
in
|
||||
pkgs.stdenv.mkDerivation rec {
|
||||
pname = "cage-xtmapper";
|
||||
version = PACKAGE_VERSION;
|
||||
pkgs.stdenv.mkDerivation {
|
||||
pname = "cage-xtmapper";
|
||||
version = PACKAGE_VERSION;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/Xtr126/cage-xtmapper/releases/download/v${RELEASE_VERSION}/cage-xtmapper-v${PACKAGE_VERSION}.tar";
|
||||
hash = "sha256-ZmdltOQInGbCBpf/e8D2sB9Rjt4wqd8wwuSFvryHfFA=";
|
||||
};
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/Xtr126/cage-xtmapper/releases/download/v${RELEASE_VERSION}/cage-xtmapper-v${PACKAGE_VERSION}.tar";
|
||||
hash = "sha256-ZmdltOQInGbCBpf/e8D2sB9Rjt4wqd8wwuSFvryHfFA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgs.autoPatchelfHook ];
|
||||
nativeBuildInputs = [pkgs.autoPatchelfHook];
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
wayland
|
||||
libxkbcommon
|
||||
pixman
|
||||
libdrm
|
||||
libGL
|
||||
mesa
|
||||
vulkan-loader
|
||||
udev
|
||||
seatd
|
||||
libxcb-render-util
|
||||
];
|
||||
buildInputs = with pkgs; [
|
||||
wayland
|
||||
libxkbcommon
|
||||
pixman
|
||||
libdrm
|
||||
libGL
|
||||
mesa
|
||||
vulkan-loader
|
||||
udev
|
||||
seatd
|
||||
libxcb-render-util
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
tar xvf $src
|
||||
cp usr/local/bin/cage_xtmapper $out/bin/
|
||||
cp usr/local/bin/cage_xtmapper.sh $out/bin/
|
||||
chmod +x $out/bin/cage_xtmapper
|
||||
chmod +x $out/bin/cage_xtmapper.sh
|
||||
'';
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
description = "cage-xtmapper input mapping tool";
|
||||
homepage = "https://github.com/Xtr126/cage-xtmapper";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
tar xvf $src
|
||||
cp usr/local/bin/cage_xtmapper $out/bin/
|
||||
cp usr/local/bin/cage_xtmapper.sh $out/bin/
|
||||
chmod +x $out/bin/cage_xtmapper
|
||||
chmod +x $out/bin/cage_xtmapper.sh
|
||||
'';
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
description = "cage-xtmapper input mapping tool";
|
||||
homepage = "https://github.com/Xtr126/cage-xtmapper";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,48 +1,46 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
{pkgs, ...}: let
|
||||
RELEASE_VERSION = "20260208";
|
||||
PACKAGE_VERSION = "0.2.0";
|
||||
in
|
||||
pkgs.stdenv.mkDerivation rec {
|
||||
pname = "cage-xtmapper";
|
||||
version = PACKAGE_VERSION;
|
||||
pkgs.stdenv.mkDerivation {
|
||||
pname = "cage-xtmapper";
|
||||
version = PACKAGE_VERSION;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/Xtr126/cage-xtmapper/releases/download/v${RELEASE_VERSION}/cage-xtmapper-v${PACKAGE_VERSION}.tar";
|
||||
hash = "sha256-F1C3KnTzTO1vEouixqO1xnsGmufRyAk+BiRlypNq4kQ=";
|
||||
};
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/Xtr126/cage-xtmapper/releases/download/v${RELEASE_VERSION}/cage-xtmapper-v${PACKAGE_VERSION}.tar";
|
||||
hash = "sha256-F1C3KnTzTO1vEouixqO1xnsGmufRyAk+BiRlypNq4kQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgs.autoPatchelfHook ];
|
||||
nativeBuildInputs = [pkgs.autoPatchelfHook];
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
wayland
|
||||
libxkbcommon
|
||||
pixman
|
||||
libdrm
|
||||
libGL
|
||||
mesa
|
||||
vulkan-loader
|
||||
udev
|
||||
seatd
|
||||
libxcb-render-util
|
||||
];
|
||||
buildInputs = with pkgs; [
|
||||
wayland
|
||||
libxkbcommon
|
||||
pixman
|
||||
libdrm
|
||||
libGL
|
||||
mesa
|
||||
vulkan-loader
|
||||
udev
|
||||
seatd
|
||||
libxcb-render-util
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
tar xvf $src
|
||||
cp usr/local/bin/cage_xtmapper $out/bin/
|
||||
cp usr/local/bin/cage_xtmapper.sh $out/bin/
|
||||
chmod +x $out/bin/cage_xtmapper
|
||||
chmod +x $out/bin/cage_xtmapper.sh
|
||||
'';
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
description = "cage-xtmapper input mapping tool";
|
||||
homepage = "https://github.com/Xtr126/cage-xtmapper";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
tar xvf $src
|
||||
cp usr/local/bin/cage_xtmapper $out/bin/
|
||||
cp usr/local/bin/cage_xtmapper.sh $out/bin/
|
||||
chmod +x $out/bin/cage_xtmapper
|
||||
chmod +x $out/bin/cage_xtmapper.sh
|
||||
'';
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
description = "cage-xtmapper input mapping tool";
|
||||
homepage = "https://github.com/Xtr126/cage-xtmapper";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, pkgs, ... }:
|
||||
{pkgs, ...}:
|
||||
pkgs.stdenv.mkDerivation {
|
||||
pname = "catppuccin-obs";
|
||||
version = "main";
|
||||
|
|
@ -13,4 +13,3 @@ pkgs.stdenv.mkDerivation {
|
|||
cp -r $src/themes/* $out/
|
||||
'';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,31 +1,32 @@
|
|||
{
|
||||
cursors ? "aemeath",
|
||||
size ? 48,
|
||||
}:
|
||||
let
|
||||
_b = name: url: hash: { inherit name url hash; };
|
||||
_q = name: hash: { ${name} = _b name "https://static.asakiyuki.com/cursors/linux/${name}.tar.gz" hash; };
|
||||
}: let
|
||||
_b = name: url: hash: {inherit name url hash;};
|
||||
_q = name: hash: {${name} = _b name "https://static.asakiyuki.com/cursors/linux/${name}.tar.gz" hash;};
|
||||
|
||||
cursors-data = (
|
||||
_q "castorice" "sha256-nqAC+Itr+TXLGG8zYDBoBve+MeRckds5BM23DrsCTMM="
|
||||
// _q "aemeath" "sha256-0eEsUks5MwW4g5Xau24SgchX+LD9Ra3azAH0KL9JzQw="
|
||||
// _q "elysia" "sha256-mjDHklWrX5Pp/vejRQiMk0VA6afY04HXGyGD0PcopdI="
|
||||
// _q "cartethyia" "sha256-jYIDoX+rfUjw6LXrqE4y8j5IL0vByrrRkgRuz08Zy6U="
|
||||
).${cursors};
|
||||
cursors-data =
|
||||
(
|
||||
_q "castorice" "sha256-nqAC+Itr+TXLGG8zYDBoBve+MeRckds5BM23DrsCTMM="
|
||||
// _q "aemeath" "sha256-0eEsUks5MwW4g5Xau24SgchX+LD9Ra3azAH0KL9JzQw="
|
||||
// _q "elysia" "sha256-mjDHklWrX5Pp/vejRQiMk0VA6afY04HXGyGD0PcopdI="
|
||||
// _q "cartethyia" "sha256-jYIDoX+rfUjw6LXrqE4y8j5IL0vByrrRkgRuz08Zy6U="
|
||||
).${
|
||||
cursors
|
||||
};
|
||||
in
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
gtk.enable = true;
|
||||
x11.enable = true;
|
||||
name = cursors-data.name;
|
||||
size = size;
|
||||
package = pkgs.runCommand "moveUp" { } ''
|
||||
mkdir -p $out/share/icons
|
||||
ln -s ${
|
||||
pkgs.fetchzip {
|
||||
url = cursors-data.url;
|
||||
hash = cursors-data.hash;
|
||||
}
|
||||
} $out/share/icons/${cursors-data.name}
|
||||
'';
|
||||
}
|
||||
{pkgs, ...}: {
|
||||
gtk.enable = true;
|
||||
x11.enable = true;
|
||||
name = cursors-data.name;
|
||||
size = size;
|
||||
package = pkgs.runCommand "moveUp" {} ''
|
||||
mkdir -p $out/share/icons
|
||||
ln -s ${
|
||||
pkgs.fetchzip {
|
||||
url = cursors-data.url;
|
||||
hash = cursors-data.hash;
|
||||
}
|
||||
} $out/share/icons/${cursors-data.name}
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Reference in a new issue