summaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
Diffstat (limited to 'nix')
-rw-r--r--nix/programs/bash.nix58
-rw-r--r--nix/programs/foot.nix2
-rw-r--r--nix/programs/kitty.nix9
-rw-r--r--nix/programs/nvim.nix2
-rw-r--r--nix/programs/sway.nix1
-rw-r--r--nix/programs/zsh.nix9
-rw-r--r--nix/system.nix18
-rw-r--r--nix/user.nix5
-rw-r--r--nix/utils.nix4
-rw-r--r--nix/virtualisation.nix10
-rw-r--r--nix/x86.nix3
11 files changed, 89 insertions, 32 deletions
diff --git a/nix/programs/bash.nix b/nix/programs/bash.nix
new file mode 100644
index 0000000..3c29785
--- /dev/null
+++ b/nix/programs/bash.nix
@@ -0,0 +1,58 @@
+{ config, pkgs, ... }: {
+ users.defaultUserShell = pkgs.bashInteractive;
+ environment.sessionVariables = {
+ SHELL = "${pkgs.bashInteractive}/bin/bash";
+ };
+ home-manager.users.andrew = let
+ homeDir = "${config.users.users.andrew.home}";
+ in {
+ programs.bash = {
+ enable = true;
+ shellAliases = {
+ cp = "rsync -avz";
+ top = "htop";
+ bc = "bc -l";
+ pgrep = "pgrep -f";
+ make = "make -j6";
+ diff = "diff -u";
+ gdb = "gdb -q";
+ mail = "neomutt";
+ iroha = "ssh andrew@iroha";
+ moyo = "ssh andrew@moyo";
+ zasshi = "ssh andrew@zasshi";
+ denpa = "ssh moyo -t 'ssh 192.168.122.89'";
+ rod = "ssh -p 1738 rod";
+ bmrg = "ssh boomerang";
+ cmv = "$HOME/c/camu/scripts/cmv.sh";
+ cmv-add = "$HOME/c/camu/scripts/cmv_add.sh";
+ cmv-pause = "cmv-add PAUSE";
+ cmv-next = "cmv-add NEXT";
+ cmv-prev = "cmv-add PREV";
+ cmv-shuffle = "cmv-add SHUFFLE";
+ cmv-sort = "cmv-add SORT";
+ cmv-reverse = "cmv-add REVERSE";
+ cmv-clear = "cmv-add CLEAR";
+ };
+ historyControl = [ "erasedups" ];
+ historySize = 10000;
+ historyFile = "${homeDir}/.bash_history";
+ historyFileSize = 100000;
+ initExtra = ''
+ RESET="\001\017\002"
+ NORMAL="\001\033[0m\002"
+ RED="\001\033[0;31m\002"
+ YELLOW="\001\033[0;33m\002"
+ CYAN="\001\033[0;36m\002"
+ exit_code_guy()
+ {
+ if [[ $? == 0 ]]; then
+ printf "(・_・) >"
+ else
+ printf "(″ロ゛) > $RED$?"
+ fi
+ }
+ export PS1="$RESET$YELLOW\u$RED@\H$CYAN:\w\$(exit_code_guy)$NORMAL "
+ '';
+ };
+ };
+}
diff --git a/nix/programs/foot.nix b/nix/programs/foot.nix
index 52e9fe3..9cc9fa9 100644
--- a/nix/programs/foot.nix
+++ b/nix/programs/foot.nix
@@ -3,7 +3,7 @@ let
s = config.local;
in {
environment.sessionVariables = {
- TERMINAL = "footclient";
+ TERMINAL = "${pkgs.foot}/bin/footclient";
};
home-manager.users.andrew = {
programs.foot = {
diff --git a/nix/programs/kitty.nix b/nix/programs/kitty.nix
index aa6ffdf..5868b7d 100644
--- a/nix/programs/kitty.nix
+++ b/nix/programs/kitty.nix
@@ -1,24 +1,23 @@
{ config, lib, pkgs, ... }:
let
s = config.local;
- inherit (import ../../nix/utils.nix) optimizeWithFlags;
in {
environment.sessionVariables = {
- TERMINAL = "kitty -1";
+ TERMINAL = "${pkgs.kitty}/bin/kitty -1";
};
home-manager.users.andrew = {
programs.kitty = {
enable = true;
- package = (optimizeWithFlags pkgs.kitty "-O2 -march=native -mtune=native -fomit-frame-pointer");
font = {
name = s.font.name;
size = s.font.size;
};
shellIntegration = {
mode = "enabled";
- enableZshIntegration = true;
+ enableBashIntegration = true;
};
extraConfig = ''
+ shell ${pkgs.bashInteractive}/bin/bash --login
update_check_interval 0
confirm_os_window_close 0
sync_to_monitor yes
@@ -35,7 +34,7 @@ in {
cursor_shape block
cursor_blink_interval -1 linear ease-out
cursor_stop_blinking_after 20.0
- cursor_trail 15
+ cursor_trail 16
foreground #${s.scheme.foreground}
background #${s.scheme.background}
color0 #${s.scheme.color0}
diff --git a/nix/programs/nvim.nix b/nix/programs/nvim.nix
index 2e4b3f0..cdc30d9 100644
--- a/nix/programs/nvim.nix
+++ b/nix/programs/nvim.nix
@@ -1,7 +1,6 @@
{ config, pkgs, ... }:
let
s = config.local;
- inherit (import ../../nix/utils.nix) optimizeWithFlags;
local = pkgs.vimUtils.buildVimPlugin {
pname = "local";
version = "0.2";
@@ -98,7 +97,6 @@ in {
home-manager.users.andrew = {
programs.neovim = {
enable = true;
- package = (optimizeWithFlags pkgs.neovim-unwrapped "-O2 -march=native -mtune=native -fomit-frame-pointer");
viAlias = true;
vimAlias = true;
extraConfig = ''
diff --git a/nix/programs/sway.nix b/nix/programs/sway.nix
index 38bc4ac..31bc9d0 100644
--- a/nix/programs/sway.nix
+++ b/nix/programs/sway.nix
@@ -2,6 +2,7 @@
let
s = config.local;
in {
+ services.xserver.videoDrivers = [ "modesetting" ];
programs.sway = {
enable = true;
extraPackages = with pkgs; [
diff --git a/nix/programs/zsh.nix b/nix/programs/zsh.nix
index 1e5dcd6..6071429 100644
--- a/nix/programs/zsh.nix
+++ b/nix/programs/zsh.nix
@@ -1,19 +1,18 @@
-{ config, pkgs, ... }:
-let
- inherit (import ../../nix/utils.nix) optimizeWithFlags;
-in {
+{ config, pkgs, ... }: {
programs.zsh.enable = true;
environment.shells = [ pkgs.zsh ];
environment.pathsToLink = [ "/share/zsh" ];
users.defaultUserShell = pkgs.zsh;
+ environment.sessionVariables = {
+ SHELL = "${pkgs.zsh}/bin/zsh";
+ };
home-manager.users.andrew = let
homeDir = "${config.users.users.andrew.home}";
in {
programs.zsh = {
enable = true;
- package = (optimizeWithFlags pkgs.zsh "-O2 -march=native -mtune=native -fomit-frame-pointer");
shellAliases = {
sudo = "nocorrect sudo ";
xargs = "nocorrect xargs ";
diff --git a/nix/system.nix b/nix/system.nix
index b72a7db..92535f5 100644
--- a/nix/system.nix
+++ b/nix/system.nix
@@ -2,8 +2,8 @@
nix = {
settings = {
experimental-features = [ "nix-command" "flakes" ];
- auto-optimise-store = true;
system-features = [ "big-parallel" "kvm" ];
+ auto-optimise-store = true;
download-buffer-size = 134217728;
};
gc.automatic = false;
@@ -74,31 +74,25 @@
nixpkgs.config.allowUnfree = true;
hardware.enableRedistributableFirmware = true;
- virtualisation.libvirtd.enable = true;
- programs.virt-manager.enable = true;
- virtualisation.spiceUSBRedirection.enable = true;
-
hardware.graphics = {
enable = true;
- enable32Bit = true;
extraPackages = with pkgs; [
libvdpau-va-gl
vaapiVdpau
];
};
- services.xserver.videoDrivers = [ "modesetting" ];
environment.systemPackages = with pkgs; [
git # flakes
+ appimage-run
i2c-tools
- lm_sensors
pciutils
- appimage-run
+ lm_sensors
+ libdrm
+ libva-utils
vulkan-loader
vulkan-validation-layers
vulkan-tools
- libdrm
- libva-utils
mesa-demos
];
@@ -111,6 +105,8 @@
magicOrExtension = ''\x7fELF....AI\x02'';
};
+ services.openssh.enable = true;
+
time.timeZone = "America/New_York";
i18n.defaultLocale = "en_US.UTF-8";
i18n.supportedLocales = [
diff --git a/nix/user.nix b/nix/user.nix
index 9947933..4c9a980 100644
--- a/nix/user.nix
+++ b/nix/user.nix
@@ -4,7 +4,7 @@ in {
users.users.andrew = {
isNormalUser = true;
uid = 1000;
- extraGroups = [ "wheel" "input" "audio" "video" "render" "disk" "cdrom" "libvirtd" ];
+ extraGroups = [ "wheel" "input" "audio" "video" "render" "disk" "cdrom" ];
};
nix.settings.trusted-users = [ "andrew" ];
@@ -92,8 +92,6 @@ in {
pass
zenity
zathura
- virt-manager
- spice-gtk
];
programs.screen = {
@@ -106,7 +104,6 @@ in {
};
programs.mtr.enable = true;
- services.openssh.enable = true;
services.gnome.gnome-keyring.enable = false;
programs.gnupg.agent = {
enable = true;
diff --git a/nix/utils.nix b/nix/utils.nix
index ff609a6..a0350a0 100644
--- a/nix/utils.nix
+++ b/nix/utils.nix
@@ -5,8 +5,4 @@
cdrom_options = [ "ro" "user" "noauto" "unhide" ];
ntfs_options = [ "uid=1000" "gid=100" "rw" "user" "exec" "umask=000" ];
};
- optimizeWithFlags = pkg: flag:
- pkg.overrideAttrs (attrs: {
- NIX_CFLAGS_COMPILE = (attrs.NIX_CFLAGS_COMPILE or "") + " ${flag}";
- });
}
diff --git a/nix/virtualisation.nix b/nix/virtualisation.nix
new file mode 100644
index 0000000..7e253fe
--- /dev/null
+++ b/nix/virtualisation.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }: {
+ users.users.andrew.extraGroups = [ "libvirtd" ];
+ virtualisation.libvirtd.enable = true;
+ programs.virt-manager.enable = true;
+ virtualisation.spiceUSBRedirection.enable = true;
+ environment.systemPackages = with pkgs; [
+ virt-manager
+ spice-gtk
+ ];
+}
diff --git a/nix/x86.nix b/nix/x86.nix
new file mode 100644
index 0000000..a8ebdd1
--- /dev/null
+++ b/nix/x86.nix
@@ -0,0 +1,3 @@
+{ ... }: {
+ hardware.graphics.enable32Bit = true;
+}
generated by cgit v1.2.3-101-g0448 (git 2.54.0) at 2026-07-25 21:16:00 +0000