tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

zenix: tidy up

Browse source
This commit is contained in:
tristan 2024-08-03 18:31:13 +01:00
parent 7b943ae1f6
commit 44c0812e94
12 changed files with 78 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.nix
View file

@ -33,13 +33,12 @@
nixos-modules = [
./hardware/zenix.nix
(auto-login "Hyprland")
./nixos/programs/hyprland.nix
./nixos/programs/gamer.nix
./nixos/programs/personal.nix
./nixos/workstation.nix
];
home-modules = [
./home/workstation.nix
./home/desktop/hyprland/.
./home/programs/graphical.nix
./home/programs/gamer.nix
./home/programs/personal/.
@ -51,11 +50,10 @@
nixos-modules = [
./hardware/fcs-tristan-nixbook.nix
(auto-login "Hyprland")
./nixos/hyprland.nix
./nixos/modules/work.nix
./nixos/workstation.nix
];
home-modules = [
./home/workstation.nix
./home/desktop/hyprland/.
./home/programs/work.nix
./home/programs/graphical.nix
@ -129,11 +127,7 @@
nixos-modules = [
./hardware/vm.nix
(auto-login "Hyprland")
./nixos/workstation.nix
];
home-modules = [
./home/desktop/hyprland/.
./home/workstation.nix
./nixos/programs/hyprland.nix
];
};

1
home/default.nix
View file

@ -10,6 +10,7 @@
./programs/git.nix
./programs/lf/.
./programs/zsh.nix
./programs/tmux.nix
];
programs.home-manager.enable = true;

1
home/desktop/hyprland/default.nix
View file

@ -18,6 +18,7 @@ in {
imports = [
(import ../utils/waybar.nix)
(import ../utils/display.nix)
../../workstation.nix
];
xdg.portal = {
enable = true;

3
home/modules/menu.nix
View file

@ -8,8 +8,9 @@
terminal = config.programs.terminal;
termcmd = "${terminal}/bin/${terminal.pname}";
menucmd = config.programs.menu.drunCommand;
inherit (lib) mkPackageOption mkOption;
in {
options.programs = with lib; {
options.programs = {
menu = {
package = mkPackageOption pkgs "wofi" {
example = "pkgs.dmenu-wayland";

1
home/programs/graphical.nix
View file

@ -37,7 +37,6 @@
brave
vieb
bitwarden
logseq
];
xdg.mimeApps.defaultApplications = {

1
home/programs/personal/default.nix
View file

@ -33,7 +33,6 @@
project = "\${workspaceFolder}";
}
];
};
};

43
home/programs/tmux.nix Normal file
View file

@ -0,0 +1,43 @@
{
programs.tmux = {
enable = true;
baseIndex = 1;
escapeTime = 0;
keyMode = "vi";
mouse = true;
terminal = "screen-256color";
historyLimit = 5000;
extraConfig = ''
bind -n M-s split-window -v
bind -n M-v split-window -h
bind -n M-Enter split-window -h
bind -n M-h select-pane -L
bind -n M-j select-pane -D
bind -n M-k select-pane -U
bind -n M-l select-pane -R
bind -n M-q kill-pane
bind -n M-< resize-pane -L 10
bind -n M-> resize-pane -R 10
bind -n M-- resize-pane -D 10
bind -n M-+ resize-pane -U 10
bind -n M-z resize-pane -Z
bind -n M-u copy-mode
bind -n M-p paste-buffer
bind -n M-n next-window
set-option -g renumber-windows on
'';
};
# programs.kitty = {
# enable = true;
# keybindings = {
# "alt+h" = "neighboring_window left";
# "alt+l" = "neighboring_window right";
# "alt+j" = "neighboring_window down";
# "alt+k" = "neighboring_window up";
# "alt+enter" = "new_window";
# };
# shellIntegration.enableZshIntegration = true;
# };
}

4
lib/nixvim.nix
View file

@ -121,10 +121,6 @@
lazygit.enable = true;
which-key.enable = true;
toggleterm = {
enable = true;
settings = {open_mapping = "[[<c-`>]]";};
};
dap = {
enable = true;

39
nixos/default.nix
View file

@ -8,7 +8,6 @@
}: let
user = config.user;
in {
imports = [
./modules/podman.nix
];
@ -99,44 +98,6 @@ in {
sops
];
programs.tmux.enable = true;
programs.tmux.extraConfig = ''
set-option -sa terminal-overrides ",xterm*:Tc"
set escape-time 0
bind -n M-s split-window -v
bind -n M-v split-window -h
bind -n M-Enter split-window -h
bind -n M-h select-pane -L
bind -n M-j select-pane -D
bind -n M-k select-pane -U
bind -n M-l select-pane -R
bind -n M-q kill-pane
bind -n M-< resize-pane -L 10
bind -n M-> resize-pane -R 10
bind -n M-- resize-pane -D 10
bind -n M-+ resize-pane -U 10
bind -n M-z resize-pane -Z
bind -n M-u copy-mode
bind -n M-p paste-buffer
bind -n M-n next-window
set-window-option -g mode-keys vi
bind-key -T copy-mode-vi v send-keys -X begin-selection
bind-key -T copy-mode-vi y send-keys -X copy-selection
set -g mouse on
set -g base-index 1
set -g pane-base-index 1
set-window-option -g pane-base-index 1
set-option -g renumber-windows on
bind -n "M-`" break-pane -d
bind -n "M-`" break-pane -d
'';
boot.kernel.sysctl = {
"net.ipv4.ip_unprivileged_port_start" = 53;
};

13
nixos/programs/hyprland.nix Normal file
View file

@ -0,0 +1,13 @@
{config, ...}: {
programs.hyprland.enable = true;
security.pam.services.hyprlock = {};
imports = [
./pipewire.nix
../workstation.nix
];
home-manager.users.${config.user}.imports = [
../../home/desktop/hyprland/.
];
}

15
nixos/programs/pipewire.nix Normal file
View file

@ -0,0 +1,15 @@
{
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
};
# pipewire raop
networking.firewall.allowedUDPPorts = [6002 6001];
# network streaming
networking.firewall.allowedTCPPorts = [4713];
}

22
nixos/workstation.nix
View file

@ -7,29 +7,7 @@
imports = [
inputs.stylix.nixosModules.stylix
];
nixpkgs.config.permittedInsecurePackages = [
"electron-27.3.11"
];
programs.hyprland.enable = true;
# use pipewire
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
};
# pipewire raop
networking.firewall.allowedUDPPorts = [6002 6001];
# network streaming
networking.firewall.allowedTCPPorts = [4713];
security.pam.services.swaylock = {};
security.pam.services.hyprlock = {};
security.polkit.enable = true;
systemd.user.services.polkit-gnome-authentication-agent-1 = {
description = "polkit-gnome-authentication-agent-1";