mrflos/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore(deps): nixos 24.11 for dragon

Browse source
This commit is contained in:
Florian Schmitt 2024-12-03 12:23:25 +03:00
parent 789b096077
commit 096313cb82
4 changed files with 96 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
dotfiles/tmux/tmux.conf
View file

@ -15,8 +15,8 @@ set -g pane-border-style 'fg=brightblack,bg=default'
set -g mouse on set -g mouse on
#bind-key -r B run-shell "~/.config/tmux/scripts/sessionizer.sh ~/omerxx/omerxx.com" #bind-key -r B run-shell "~/.config/tmux/scripts/sessionizer.sh ~/omerxx/omerxx.com"
set -g @fzf-url-fzf-options '-p 60%,30% --prompt=" " --border-label=" Open URL "' #set -g @fzf-url-fzf-options '-p 60%,30% --prompt=" " --border-label=" Open URL "'
set -g @fzf-url-history-limit '2000' #set -g @fzf-url-history-limit '2000'
# Vim style pane selection # Vim style pane selection
bind h select-pane -L bind h select-pane -L
@ -31,18 +31,18 @@ set-window-option -g pane-base-index 1
set-option -g renumber-windows on set-option -g renumber-windows on
# Use Alt-arrow keys without prefix key to switch panes # Use Alt-arrow keys without prefix key to switch panes
bind -n M-Left select-pane -L #bind -n M-Left select-pane -L
bind -n M-Right select-pane -R #bind -n M-Right select-pane -R
bind -n M-Up select-pane -U #bind -n M-Up select-pane -U
bind -n M-Down select-pane -D #bind -n M-Down select-pane -D
# Shift arrow to switch windows # Shift arrow to switch windows
bind -n S-Left previous-window #bind -n S-Left previous-window
bind -n S-Right next-window #bind -n S-Right next-window
# Shift Alt vim keys to switch windows # Shift Alt vim keys to switch windows
bind -n M-H previous-window #bind -n M-H previous-window
bind -n M-L next-window #bind -n M-L next-window
# set vi-mode # set vi-mode
set-window-option -g mode-keys vi set-window-option -g mode-keys vi
@ -51,45 +51,45 @@ bind-key -T copy-mode-vi v send-keys -X begin-selection
bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle 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 bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
bind '"' split-window -v -c "#{pane_current_path}" #bind '"' split-window -v -c "#{pane_current_path}"
bind % split-window -h -c "#{pane_current_path}" #bind % split-window -h -c "#{pane_current_path}"
set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'tmux-plugins/tmux-sensible'
set -g @plugin 'tmux-plugins/tmux-yank' set -g @plugin 'tmux-plugins/tmux-yank'
set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-resurrect'
set -g @plugin 'tmux-plugins/tmux-continuum' set -g @plugin 'tmux-plugins/tmux-continuum'
set -g @plugin 'fcsonline/tmux-thumbs' #set -g @plugin 'fcsonline/tmux-thumbs'
set -g @plugin 'sainnhe/tmux-fzf' #set -g @plugin 'sainnhe/tmux-fzf'
set -g @plugin 'wfxr/tmux-fzf-url' #set -g @plugin 'wfxr/tmux-fzf-url'
set -g @plugin 'omerxx/catppuccin-tmux' # My fork that holds the meetings script bc I'm lazy af #set -g @plugin 'omerxx/catppuccin-tmux' # My fork that holds the meetings script bc I'm lazy af
set -g @plugin 'omerxx/tmux-sessionx' #set -g @plugin 'omerxx/tmux-sessionx'
set -g @sessionx-bind 'o' #set -g @sessionx-bind 'o'
set -g @sessionx-x-path '~/dotfiles' #set -g @sessionx-x-path '~/dotfiles'
set -g @sessionx-window-height '85%' #set -g @sessionx-window-height '85%'
set -g @sessionx-window-width '75%' #set -g @sessionx-window-width '75%'
set -g @sessionx-zoxide-mode 'on' #set -g @sessionx-zoxide-mode 'on'
set -g @continuum-restore 'on' #set -g @continuum-restore 'on'
set -g @resurrect-strategy-nvim 'session' #set -g @resurrect-strategy-nvim 'session'
set -g @catppuccin_window_left_separator "" #set -g @catppuccin_window_left_separator ""
set -g @catppuccin_window_right_separator " " #set -g @catppuccin_window_right_separator " "
set -g @catppuccin_window_middle_separator " █" #set -g @catppuccin_window_middle_separator " █"
set -g @catppuccin_window_number_position "right" #set -g @catppuccin_window_number_position "right"
set -g @catppuccin_window_default_fill "number" #set -g @catppuccin_window_default_fill "number"
set -g @catppuccin_window_default_text "#W" #set -g @catppuccin_window_default_text "#W"
set -g @catppuccin_window_current_fill "number" #set -g @catppuccin_window_current_fill "number"
set -g @catppuccin_window_current_text "#W#{?window_zoomed_flag,(),}" #set -g @catppuccin_window_current_text "#W#{?window_zoomed_flag,(),}"
set -g @catppuccin_status_modules_right "directory date_time" #set -g @catppuccin_status_modules_right "directory date_time"
set -g @catppuccin_status_modules_left "session" #set -g @catppuccin_status_modules_left "session"
set -g @catppuccin_status_left_separator " " #set -g @catppuccin_status_left_separator " "
set -g @catppuccin_status_right_separator " " #set -g @catppuccin_status_right_separator " "
set -g @catppuccin_status_right_separator_inverse "no" #set -g @catppuccin_status_right_separator_inverse "no"
set -g @catppuccin_status_fill "icon" #set -g @catppuccin_status_fill "icon"
set -g @catppuccin_status_connect_separator "no" #set -g @catppuccin_status_connect_separator "no"
set -g @catppuccin_directory_text "#{b:pane_current_path}" #set -g @catppuccin_directory_text "#{b:pane_current_path}"
#set -g @catppuccin_meetings_text "#($HOME/.config/tmux/scripts/cal.sh)" #set -g @catppuccin_meetings_text "#($HOME/.config/tmux/scripts/cal.sh)"
set -g @catppuccin_meetings_text "" #set -g @catppuccin_meetings_text ""
set -g @catppuccin_date_time_text "%H:%M" #set -g @catppuccin_date_time_text "%H:%M"
run '~/.config/tmux/plugins/tpm/tpm' run '~/.config/tmux/plugins/tpm/tpm'

85
machines/dragon/configuration.nix
View file

@ -12,10 +12,9 @@
networking.hostName = "dragon"; # Define your hostname. networking.hostName = "dragon"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.extraHosts = networking.extraHosts = ''
'' 163.172.173.184 aleks-test-install-bookworm.test
163.172.173.184 aleks-test-install-bookworm.test '';
'';
# Configure network proxy if necessary # Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.default = "http://user:password@proxy:port/";
@ -42,13 +41,10 @@
LC_TIME = "fr_FR.UTF-8"; LC_TIME = "fr_FR.UTF-8";
}; };
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
driSupport = true;
driSupport32Bit = true;
}; };
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.config.nvidia.acceptLicense = true; nixpkgs.config.nvidia.acceptLicense = true;
hardware.nvidia = { hardware.nvidia = {
@ -82,56 +78,57 @@
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.latest; package = config.boot.kernelPackages.nvidiaPackages.latest;
}; };
#hardware.opengl = {
# enable = true;
#};
#hardware.nvidia = {
# modesetting.enable = true;
# powerManagement.enable = false;
# powerManagement.finegrained = true;
# open = true;
# nvidiaSettings = true;
# package = config.boot.kernelPackages.nvidiaPackages.beta;
#};
services.xserver = { services.xserver = {
enable = true; enable = true;
videoDrivers = [ "intel" "nvidia" ]; videoDrivers = [
"intel"
"nvidia"
];
xkb.layout = "us"; xkb.layout = "us";
xkb.variant = ""; xkb.variant = "";
}; };
fileSystems."/mnt/nas/music" = fileSystems."/mnt/nas/music" = {
{ device = "192.168.1.2:/volume1/music";
device = "192.168.1.2:/volume1/music"; options = [
options = [ "nfsvers=4.2" "x-systemd.automount" "noauto" "rw" "relatime" "user" "acl" "defaults" ]; "nfsvers=4.2"
fsType = "nfs"; "x-systemd.automount"
}; "noauto"
"rw"
"relatime"
"user"
"acl"
"defaults"
];
fsType = "nfs";
};
services.rpcbind.enable = true; # needed for NFS services.rpcbind.enable = true; # needed for NFS
systemd.mounts = [{ systemd.mounts = [
type = "nfs"; {
mountConfig = { type = "nfs";
Options = "defaults,acl,user,noauto,relatime,rw"; mountConfig = {
}; Options = "defaults,acl,user,noauto,relatime,rw";
what = "192.168.1.2:/volume1/music"; };
where = "/mnt/nas/music"; what = "192.168.1.2:/volume1/music";
}]; where = "/mnt/nas/music";
}
systemd.automounts = [{ ];
wantedBy = [ "multi-user.target" ];
automountConfig = {
TimeoutIdleSec = "600";
};
where = "/mnt/nas/music";
}];
systemd.automounts = [
{
wantedBy = [ "multi-user.target" ];
automountConfig = {
TimeoutIdleSec = "600";
};
where = "/mnt/nas/music";
}
];
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
# Enable sound with pipewire. # Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {

23
modules/console.nix
View file

@ -1,12 +1,5 @@
# cli programs should be available on servers and desktop # cli programs should be available on servers and desktop
{ config, pkgs, ... }: { config, pkgs, ... }:
let
unstable =
import
(builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/7afa2c97ebb0585d00c64c112344483e89e00545")
# reuse the current configuration
{ config = config.nixpkgs.config; };
in
{ {
programs.zsh.enable = true; programs.zsh.enable = true;
programs.fzf = { programs.fzf = {
@ -14,13 +7,13 @@ in
keybindings = true; keybindings = true;
}; };
# programs.neovim = { # programs.neovim = {
# enable = true; # enable = true;
# defaultEditor = true; # defaultEditor = true;
# package = unstable.neovim; # package = pkgs.neovim;
# viAlias = true; # viAlias = true;
# vimAlias = true; # vimAlias = true;
# }; #};
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
@ -58,7 +51,7 @@ in
mpv mpv
neofetch neofetch
nixd nixd
unstable.neovim neovim
ollama ollama
pandoc pandoc
pass pass

3
modules/desktop.nix
View file

@ -1,7 +1,6 @@
# Window Manager and desktop programs # Window Manager and desktop programs
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
@ -138,7 +137,7 @@
signal-desktop signal-desktop
thunderbird thunderbird
tigervnc tigervnc
transmission-qt transmission_4-qt
unetbootin unetbootin
vlc vlc