I really should commit more
This commit is contained in:
parent
3aeda379d5
commit
e1aa67dbb2
7 changed files with 67 additions and 14 deletions
|
@ -70,6 +70,9 @@
|
||||||
(defwidget power []
|
(defwidget power []
|
||||||
(box :class "power" :valign "end" "⏻"))
|
(box :class "power" :valign "end" "⏻"))
|
||||||
|
|
||||||
|
(defwidget tray []
|
||||||
|
(systray :orientation "v" :icon-size 20))
|
||||||
|
|
||||||
(defwidget bar []
|
(defwidget bar []
|
||||||
(centerbox :orientation "vertical"
|
(centerbox :orientation "vertical"
|
||||||
:halign "center"
|
:halign "center"
|
||||||
|
@ -81,6 +84,7 @@
|
||||||
(mic)
|
(mic)
|
||||||
(volume)
|
(volume)
|
||||||
(battery)
|
(battery)
|
||||||
|
(tray)
|
||||||
(power))))
|
(power))))
|
||||||
|
|
||||||
|
|
||||||
|
|
15
config/zshrc
15
config/zshrc
|
@ -7,7 +7,6 @@ unsetopt autocd beep notify
|
||||||
unsetopt PROMPT_SP
|
unsetopt PROMPT_SP
|
||||||
bindkey -v
|
bindkey -v
|
||||||
# End of lines configured by zsh-newuser-install
|
# End of lines configured by zsh-newuser-install
|
||||||
|
|
||||||
export XDG_CONFIG_HOME="$HOME/.config"
|
export XDG_CONFIG_HOME="$HOME/.config"
|
||||||
export XDG_CACHE_HOME="$HOME/.cache"
|
export XDG_CACHE_HOME="$HOME/.cache"
|
||||||
export XDG_DATA_HOME="$HOME/.local/share"
|
export XDG_DATA_HOME="$HOME/.local/share"
|
||||||
|
@ -30,6 +29,7 @@ alias imv="imv -b aa77bb"
|
||||||
alias find="fd"
|
alias find="fd"
|
||||||
alias tree="eza --tree"
|
alias tree="eza --tree"
|
||||||
alias icat="kitty +kitten icat"
|
alias icat="kitty +kitten icat"
|
||||||
|
alias qsus="NIXPKGS_ALLOW_UNFREE=1 nix-shell -p quartus-prime-lite -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/fe7ab74a86d78ba00d144aa7a8da8c71a200c563.tar.gz"
|
||||||
|
|
||||||
# Automatically get new programs for autocompletion
|
# Automatically get new programs for autocompletion
|
||||||
|
|
||||||
|
@ -37,6 +37,19 @@ zshcache_time="$(date +%s%N)"
|
||||||
|
|
||||||
autoload -Uz add-zsh-hook
|
autoload -Uz add-zsh-hook
|
||||||
|
|
||||||
|
function osc7-pwd() {
|
||||||
|
emulate -L zsh # also sets localoptions for us
|
||||||
|
setopt extendedglob
|
||||||
|
local LC_ALL=C
|
||||||
|
printf '\e]2;%s%s\e\' ${PWD//(#m)([^@-Za-z&-;_~])/%${(l:2::0:)$(([##16]#MATCH))}}
|
||||||
|
}
|
||||||
|
|
||||||
|
function chpwd-osc7-pwd() {
|
||||||
|
(( ZSH_SUBSHELL )) || osc7-pwd
|
||||||
|
}
|
||||||
|
add-zsh-hook -Uz chpwd chpwd-osc7-pwd
|
||||||
|
|
||||||
|
|
||||||
rehash_precmd() {
|
rehash_precmd() {
|
||||||
if [[ -a /var/cache/zsh/pacman ]]; then
|
if [[ -a /var/cache/zsh/pacman ]]; then
|
||||||
local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)"
|
local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)"
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
nixpkgs-xr,
|
nixpkgs-xr,
|
||||||
nixos-hardware,
|
nixos-hardware,
|
||||||
|
nixpkgs-quartus,
|
||||||
home-manager,
|
home-manager,
|
||||||
osu-nixos,
|
|
||||||
...
|
...
|
||||||
} : {
|
} : {
|
||||||
|
|
||||||
|
@ -85,6 +85,6 @@
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-xr.url = "github:nix-community/nixpkgs-xr";
|
nixpkgs-xr.url = "github:nix-community/nixpkgs-xr";
|
||||||
nixos-hardware.url = "github:Nixos/nixos-hardware/master";
|
nixos-hardware.url = "github:Nixos/nixos-hardware/master";
|
||||||
osu-nixos.url = "github:Asqiir/osu-nixos";
|
nixpkgs-quartus.url = "github:nixos/nixpkgs/nixos-22.05";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,6 +66,24 @@ in
|
||||||
allowedUDPPorts = [ 22000 ];
|
allowedUDPPorts = [ 22000 ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.udev.packages = [
|
||||||
|
(pkgs.writeTextFile {
|
||||||
|
|
||||||
|
name = "alterra-udev";
|
||||||
|
destination = "/etc/udev/rules.d/92-alterra.rules";
|
||||||
|
text = ''
|
||||||
|
# USB-Blaster
|
||||||
|
SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6001", MODE="0666"
|
||||||
|
SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6002", MODE="0666"
|
||||||
|
|
||||||
|
SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6003", MODE="0666"
|
||||||
|
|
||||||
|
# USB-Blaster II
|
||||||
|
SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6010", MODE="0666"
|
||||||
|
SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6810", MODE="0666"
|
||||||
|
'';
|
||||||
|
})];
|
||||||
|
|
||||||
environment.etc.hosts.mode = "0644";
|
environment.etc.hosts.mode = "0644";
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -35,8 +35,11 @@
|
||||||
"kernel.yama.ptrace_scope=0"
|
"kernel.yama.ptrace_scope=0"
|
||||||
];
|
];
|
||||||
|
|
||||||
virtualisation.docker.enable = true;
|
virtualisation = {
|
||||||
virtualisation.libvirtd.enable = true;
|
docker.enable = true;
|
||||||
|
libvirtd.enable = true;
|
||||||
|
waydroid.enable = true;
|
||||||
|
};
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
hardware.bluetooth.settings.General.Experimental = true;
|
hardware.bluetooth.settings.General.Experimental = true;
|
||||||
hardware.graphics = {
|
hardware.graphics = {
|
||||||
|
|
|
@ -12,6 +12,9 @@
|
||||||
"steam-original"
|
"steam-original"
|
||||||
"steam-run"
|
"steam-run"
|
||||||
];
|
];
|
||||||
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
|
"olm-3.2.16"
|
||||||
|
];
|
||||||
|
|
||||||
hardware = {
|
hardware = {
|
||||||
opentabletdriver.enable = true;
|
opentabletdriver.enable = true;
|
||||||
|
@ -49,18 +52,22 @@
|
||||||
|
|
||||||
users.users.stitchynyan = {
|
users.users.stitchynyan = {
|
||||||
description = "Personal user";
|
description = "Personal user";
|
||||||
extraGroups = [ "audio" "dialout" "docker" "kvm" "libvirtd" "networkmanager" "wheel" ];
|
extraGroups = [ "audio" "dialout" "docker" "kvm" "libvirtd" "networkmanager" "wireshark" "wheel" ];
|
||||||
home = "/home/stitchynyan";
|
home = "/home/stitchynyan";
|
||||||
initialHashedPassword = "$y$j9T$rvySCWHYE4AO4A9J0Vf20.$x5hpBNsOWovQFtNfFUIt17OAH5MJFwFBGjxbaEIagJ3";
|
initialHashedPassword = "$y$j9T$rvySCWHYE4AO4A9J0Vf20.$x5hpBNsOWovQFtNfFUIt17OAH5MJFwFBGjxbaEIagJ3";
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|
||||||
i18n.inputMethod = {
|
i18n = {
|
||||||
enable = true;
|
defaultLocale = "ja_JP.UTF-8";
|
||||||
type = "fcitx5";
|
inputMethod = {
|
||||||
fcitx5.addons = [
|
enable = true;
|
||||||
pkgs.fcitx5-mozc
|
type = "fcitx5";
|
||||||
];
|
fcitx5.addons = with pkgs; [
|
||||||
|
fcitx5-mozc
|
||||||
|
fcitx5-nord
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,10 @@ let
|
||||||
] pkgs;
|
] pkgs;
|
||||||
pcPkgs = lib.attrVals [
|
pcPkgs = lib.attrVals [
|
||||||
"activitywatch"
|
"activitywatch"
|
||||||
|
"awatcher"
|
||||||
|
"anki"
|
||||||
"dunst"
|
"dunst"
|
||||||
|
"foliate"
|
||||||
"foot"
|
"foot"
|
||||||
"grim"
|
"grim"
|
||||||
"imv"
|
"imv"
|
||||||
|
@ -24,21 +27,25 @@ let
|
||||||
"lynx"
|
"lynx"
|
||||||
"mpv"
|
"mpv"
|
||||||
"msmtp"
|
"msmtp"
|
||||||
"mupdf"
|
|
||||||
"neomutt"
|
"neomutt"
|
||||||
"networkmanagerapplet"
|
"networkmanagerapplet"
|
||||||
"nheko"
|
"nheko"
|
||||||
"notmuch"
|
"notmuch"
|
||||||
"okular"
|
"okular"
|
||||||
|
"osu-lazer"
|
||||||
"pavucontrol"
|
"pavucontrol"
|
||||||
"pass"
|
"pass"
|
||||||
"playerctl"
|
"playerctl"
|
||||||
"prismlauncher"
|
"prismlauncher"
|
||||||
|
"pstree"
|
||||||
"qt5ct"
|
"qt5ct"
|
||||||
"qt6ct"
|
"qt6ct"
|
||||||
|
"qbittorrent"
|
||||||
"slurp"
|
"slurp"
|
||||||
"swaylock-effects"
|
"swaylock-effects"
|
||||||
|
"tofi"
|
||||||
"wofi"
|
"wofi"
|
||||||
|
"zathura"
|
||||||
] pkgs ++ [ pkgs.hunspellDicts.en_US ];
|
] pkgs ++ [ pkgs.hunspellDicts.en_US ];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
@ -54,8 +61,9 @@ in
|
||||||
#steamvr?
|
#steamvr?
|
||||||
procps
|
procps
|
||||||
usbutils
|
usbutils
|
||||||
|
yt-dlp
|
||||||
(python311.withPackages (lib.attrVals [ "matplotlib" "python-lsp-server" "sympy"]))
|
(python311.withPackages (lib.attrVals [ "matplotlib" "python-lsp-server" "sympy"]))
|
||||||
(octaveFull.withPackages (lib.attrVals ["symbolic"]))
|
#(octaveFull.withPackages (lib.attrVals ["symbolic"]))
|
||||||
]
|
]
|
||||||
++ (lib.optionals (nixosConfig.stitchyconf.form == "handheld") handheldPkgs)
|
++ (lib.optionals (nixosConfig.stitchyconf.form == "handheld") handheldPkgs)
|
||||||
++ (lib.optionals (nixosConfig.stitchyconf.form == "pc") pcPkgs);
|
++ (lib.optionals (nixosConfig.stitchyconf.form == "pc") pcPkgs);
|
||||||
|
|
Loading…
Reference in a new issue