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

fixed speakers again

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-01-19 16:00:05 -05:00
parent e4f9fdf172
commit 19ab4d5d20
9 changed files with 2369 additions and 2147 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dotfiles/dot_config/ghostty/config
View file

@ -28,4 +28,14 @@ keybind = ctrl+alt+right=next_tab
keybind = ctrl+alt+up=goto_split:left keybind = ctrl+alt+up=goto_split:left
keybind = ctrl+alt+down=goto_split:right keybind = ctrl+alt+down=goto_split:right
keybind = ctrl+backspace=text:\x1b\x7f keybind = ctrl+backspace=text:\x1b\x7f
keybind = ctrl+shift+k=clear_screen # keybind = ctrl+shift+k=clear_screen
# disabled bindings for testing zellij
# keybind = ctrl+t=unbind
# keybind = ctrl+w=unbind
# keybind = ctrl+alt+right=unbind
# keybind = ctrl+alt+left=unbind
# keybind = ctrl+alt+up=unbind
# keybind = ctrl+alt+down=unbind
# keybind = ctrl+enter=unbind
# keybind = ctrl+shift+enter=unbind

238
dotfiles/dot_config/wezterm/wezterm.lua
View file

@ -1,31 +1,79 @@
local wezterm = require 'wezterm' local wezterm = require 'wezterm'
local config = wezterm.config_builder() local config = wezterm.config_builder()
local act = wezterm.action local act = wezterm.action
local io = require 'io'
local os = require 'os'
-- config.default_prog = { 'fish', '-l' } -- config.default_prog = { 'fish', '-l' }
wezterm.on('trigger-emacs-with-scrollback', function(window, pane)
-- Retrieve the text from the pane
local text = pane:get_lines_as_text(pane:get_dimensions().scrollback_rows)
-- Create a temporary file to pass to vim
local name = os.tmpname()
local f = io.open(name, 'w+')
f:write(text)
f:flush()
f:close()
-- Open a new window running vim and tell it to open the file
window:perform_action(
act.SpawnCommandInNewWindow {
args = { 'em', name },
},
pane
)
-- Wait "enough" time for vim to read the file before we remove it.
-- The window creation and process spawn are asynchronous wrt. running
-- this script and are not awaitable, so we just pick a number.
--
-- Note: We don't strictly need to remove this file, but it is nice
-- to avoid cluttering up the temporary directory.
wezterm.sleep_ms(1000)
os.remove(name)
end)
-- plugins
local domains = wezterm.plugin.require("https://github.com/DavidRR-F/quick_domains.wezterm")
local tabline = wezterm.plugin.require("https://github.com/michaelbrusegard/tabline.wez")
local workspace_switcher = wezterm.plugin.require("https://github.com/MLFlexer/smart_workspace_switcher.wezterm")
config.enable_wayland = false; config.enable_wayland = false;
config.front_end = "WebGpu"; config.front_end = "WebGpu";
local bar = wezterm.plugin.require("https://github.com/adriankarlen/bar.wezterm") config.font_size = 11
config.font_size = 12
config.font = wezterm.font { config.font = wezterm.font {
family = 'JetBrains Mono', family = 'JetBrains Mono',
weight = 'Medium' weight = 'Medium'
} }
config.color_scheme = 'Adventure' -- config.enable_scroll_bar = true
config.color_scheme = 'Adventure'
config.colors = { config.colors = {
background = "#111111",
tab_bar = { tab_bar = {
background = "#111111",
inactive_tab = { inactive_tab = {
fg_color = "#444444", fg_color = "#444444",
bg_color = "#000000" bg_color = "#111111"
} }
} }
} }
config.background = {
{
source = {
Color = '#111111'
},
width = "100%",
height = "100%",
opacity = 1
}
}
config.window_decorations = "TITLE|RESIZE" config.window_decorations = "TITLE|RESIZE"
config.window_padding = { config.window_padding = {
@ -61,6 +109,11 @@ config.keys = {
mods = 'CTRL', mods = 'CTRL',
action = wezterm.action.CloseCurrentTab { confirm = true }, action = wezterm.action.CloseCurrentTab { confirm = true },
}, },
{
key = 'w',
mods = 'CTRL|SHIFT',
action = act.DetachDomain 'CurrentPaneDomain',
},
{ {
key = 'k', key = 'k',
mods = 'CTRL|SHIFT', mods = 'CTRL|SHIFT',
@ -75,20 +128,25 @@ config.keys = {
action = wezterm.action.TogglePaneZoomState, action = wezterm.action.TogglePaneZoomState,
}, },
{ {
key = 'w', key = 'E',
mods = 'CTRL', mods = 'CTRL',
action = wezterm.action.CloseCurrentPane { confirm = true }, action = act.EmitEvent 'trigger-emacs-with-scrollback',
},
{
key = 'o',
mods = 'CTRL',
action = wezterm.action.ShowLauncher
}, },
{ key="Backspace", mods="CTRL", action=act.SendKey { key="Backspace", mods="META" } }, { key="Backspace", mods="CTRL", action=act.SendKey { key="Backspace", mods="META" } },
{ key='t', mods='CTRL', action=act { SpawnCommandInNewTab = { cwd = wezterm.home_dir } } }, { key='t', mods='CTRL', action=act { SpawnCommandInNewTab = { cwd = wezterm.home_dir } } },
{key="LeftArrow", mods="CTRL|META", action=act.ActivateTabRelative(-1)}, { key="LeftArrow", mods="CTRL|META", action=act.ActivateTabRelative(-1) },
{key="RightArrow", mods="CTRL|META", action=act.ActivateTabRelative(1)}, { key="RightArrow", mods="CTRL|META", action=act.ActivateTabRelative(1) },
{key="UpArrow", mods="CTRL|META", action=act.ActivatePaneDirection("Prev")}, { key="UpArrow", mods="CTRL|META", action=act.ActivatePaneDirection("Prev") },
{key="DownArrow", mods="CTRL|META", action=act.ActivatePaneDirection("Next")}, { key="DownArrow", mods="CTRL|META", action=act.ActivatePaneDirection("Next") },
{ key='h', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Left"} }, { key='h', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Left"} },
{ key='l', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Right"} }, { key='l', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Right"} },
@ -96,65 +154,111 @@ config.keys = {
{ key='k', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Down"} }, { key='k', mods='CTRL|META', action=wezterm.action{ActivatePaneDirection="Down"} },
} }
local barconfig = { tabline.setup({
position = "bottom", options = {
max_width = 32, theme = 'Adventure',
separator = { theme_overrides = {
space = 2, background = "#111111",
left_icon = wezterm.nerdfonts.fa_long_arrow_right, tab = {
right_icon = wezterm.nerdfonts.fa_long_arrow_left, active = { fg = '#eeeeee', bg = '#111111' },
field_icon = wezterm.nerdfonts.indent_line, inactive = { fg = '#999999', bg = '#111111' },
}, inactive_hover = { fg = '#cccccc', bg = '#111111' },
modules = { },
tabs = { normal_mode = {
active_tab_fg = 4, a = { bg = "#333333", fg = "#eeeeee" },
inactive_tab_fg = 8, -- overridden by tab colour customization near the top b = { bg = "#111111", fg = "#eeeeee" },
c = { bg = "#111111", fg = "#eeeeee" },
x = { bg = "#111111", fg = "#eeeeee" },
y = { bg = "#111111", fg = "#eeeeee" },
z = { bg = "#333333", fg = "#eeeeee" },
},
copy_mode = {
b = { bg = "#222222", fg = "#eeeeee" }
}
},
section_separators = {
left = wezterm.nerdfonts.ple_right_half_circle_thick,
right = wezterm.nerdfonts.ple_left_half_circle_thick,
},
component_separators = {
left = wezterm.nerdfonts.ple_right_half_circle_thin,
right = wezterm.nerdfonts.ple_left_half_circle_thin,
},
tab_separators = {
left = wezterm.nerdfonts.ple_right_half_circle_thick,
right = wezterm.nerdfonts.ple_left_half_circle_thick,
},
icons_enabled = true,
tabs_enabled = true,
}, },
workspace = { sections = {
enabled = true, tabline_a = { 'workspace' },
icon = wezterm.nerdfonts.cod_window, tabline_b = { '' },
color = 8, tabline_c = { '' },
tab_active = {
'index',
{ 'process', icons_only = true, process_to_icon = { ['fish'] = wezterm.nerdfonts.cod_terminal } },
{ 'parent', padding = 0 },
'/',
{ 'cwd', padding = { left = 0, right = 1 } },
{ 'zoomed', padding = 0 },
},
tab_inactive = {
'index',
{ 'process', process_to_icon = { ['fish'] = wezterm.nerdfonts.cod_terminal } },
{ 'parent', padding = 0 },
'/',
{ 'cwd', padding = { left = 0, right = 1 } },
{ 'zoomed', padding = 0 },
},
tabline_x = { '' },
tabline_y = { '' },
tabline_z = { 'domain' },
}, },
leader = { extensions = {
enabled = true, smart_workspace_switcher,
icon = wezterm.nerdfonts.oct_rocket, quick_domains
color = 2,
}, },
pane = { })
enabled = false,
icon = wezterm.nerdfonts.cod_multiple_windows,
color = 7,
},
username = {
enabled = false,
icon = wezterm.nerdfonts.fa_user,
color = 6,
},
hostname = {
enabled = false,
icon = wezterm.nerdfonts.cod_server,
color = 8,
},
clock = {
enabled = false,
icon = wezterm.nerdfonts.md_calendar_clock,
color = 5,
},
cwd = {
enabled = false,
icon = wezterm.nerdfonts.oct_file_directory,
color = 7,
},
spotify = {
enabled = false,
icon = wezterm.nerdfonts.fa_spotify,
color = 3,
max_width = 64,
throttle = 15,
},
},
}
bar.apply_to_config(config, barconfig) tabline.apply_to_config(config)
domains.apply_to_config(
config,
{
keys = {
-- open domain in new tab
attach = {
-- mod keys for fuzzy domain finder
mods = 'CTRL|SHIFT',
-- base key for fuzzy domain finder
key = 'a',
-- key table to insert key map to if any
tbl = '',
},
-- open domain in split pane
-- excludes remote domains
-- add remote domains as exec domain for split binds
vsplit = {
key = 'v',
mods = 'CTRL',
tbl = 'tmux'
},
hsplit = {
key = 'h',
mods = 'CTRL',
tbl = 'tmux'
}
},
auto = {
ssh_ignore = false,
exec_ignore = {
ssh = false
}
}
}
)
workspace_switcher.apply_to_config(config)
return config return config

7
dotfiles/dot_ssh/config Normal file
View file

@ -0,0 +1,7 @@
Host media-server
User media
Hostname media-server
Host emenel.ca
user emenel
Hostname emenel.ca

48
flake.lock generated
View file

@ -134,11 +134,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1736780823, "lastModified": 1737085478,
"narHash": "sha256-0O+w/MYI7xC4h1MmNg8rPVUIGPIIZYv+Vq0ZAY+MnW4=", "narHash": "sha256-EzdUQf1ljtGIWMmscVzoW3rUxxN3UKyNXOXbzUvz3BQ=",
"owner": "ghostty-org", "owner": "ghostty-org",
"repo": "ghostty", "repo": "ghostty",
"rev": "132c4f1f68d75813370cadfc090f96a32be19705", "rev": "72d085525b22d66468c5969a4d507a0fa68d4a04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -212,11 +212,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1736785676, "lastModified": 1737299337,
"narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "narHash": "sha256-0NBrY2A7buujKmeCbieopOMSbLxTu8TFcTLqAbTnQDw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "rev": "f8ef4541bb8a54a8b52f19b52912119e689529b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -288,11 +288,11 @@
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1736334301, "lastModified": 1736952876,
"narHash": "sha256-370z+WLVnD7LrN/SvTCZxPl/XPTshS5NS2dHN4iyK6o=", "narHash": "sha256-dJXuLP2CBkIG333L+Rb3e1D0oXHYbl0MgmKPGuvFuAI=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "5f4ec93d432cd5288f6fe20d8842dceb5a065885", "rev": "b6966d5fa96b0fae99a4da0b5bdfbb0a75f5c058",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -303,11 +303,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1736441705, "lastModified": 1737306472,
"narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "narHash": "sha256-+X9KAryvDsIE7lQ0FdfiD1u33nOVgsgufedqspf77N4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "rev": "cb3173dc5c746fa95bca1f035a7e4d2b588894ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -366,11 +366,11 @@
}, },
"nixpkgs-unstable_2": { "nixpkgs-unstable_2": {
"locked": { "locked": {
"lastModified": 1736701207, "lastModified": 1737062831,
"narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -398,11 +398,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736684107, "lastModified": 1737165118,
"narHash": "sha256-vH5mXxEvZeoGNkqKoCluhTGfoeXCZ1seYhC2pbMN0sg=", "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "635e887b48521e912a516625eee7df6cf0eba9c1", "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -476,11 +476,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736777442, "lastModified": 1737107480,
"narHash": "sha256-eON7amRmBl59QH6K9uypewkKveaNbosY6CtUgRcv7YU=", "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "0f4744b5a95151a85c4f35010dd2d748228f7f53", "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -533,11 +533,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1735931735, "lastModified": 1737065773,
"narHash": "sha256-4wzEN5IPYmqLP8TAdFatoRhCZ7W9y65AWoYN0Qgvbg8=", "narHash": "sha256-YPP/92ViF7zd3TAnQL65pIaYiNeyqjPA4JnO6l/Hn0s=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "8e9cf912e66f704f300fac6107206a75036de1e7", "rev": "6c443bee9a21b6d37e06227085ddcd9633529a69",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -46,6 +46,10 @@
url = "github:mrshmllow/affinity-nix"; url = "github:mrshmllow/affinity-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# zjstatus = {
# url = "github:dj95/zjstatus";
# };
}; };
outputs = {nixpkgs, home-manager, sops-nix, nix-flatpak, kmonad, musnix, self, ... } @ inputs: outputs = {nixpkgs, home-manager, sops-nix, nix-flatpak, kmonad, musnix, self, ... } @ inputs:

78
home/home.nix
View file

@ -24,6 +24,7 @@
inputs.affinity-nix.packages.x86_64-linux.designer inputs.affinity-nix.packages.x86_64-linux.designer
guix guix
uv
thonny thonny
@ -213,6 +214,7 @@
gnomeExtensions.dash-to-dock gnomeExtensions.dash-to-dock
# gnomeExtensions.solaar-extension # gnomeExtensions.solaar-extension
gnomeExtensions.paperwm gnomeExtensions.paperwm
gnomeExtensions.custom-hot-corners-extended
gnomeExtensions.media-controls gnomeExtensions.media-controls
gnomeExtensions.looking-glass-button gnomeExtensions.looking-glass-button
gnomeExtensions.auto-power-profile gnomeExtensions.auto-power-profile
@ -271,7 +273,7 @@
ungoogled-chromium ungoogled-chromium
obsidian obsidian
vlc vlc
polychromatic unstable.polychromatic
discord discord
slack slack
signal-desktop signal-desktop
@ -290,7 +292,9 @@
blender blender
davinci-resolve-studio davinci-resolve-studio
steam steam
zotero_7 zotero
jre
tesseract
handbrake handbrake
renoise renoise
krita krita
@ -400,18 +404,20 @@
defaultSymlinkPath = "/run/user/1000/secrets"; defaultSymlinkPath = "/run/user/1000/secrets";
defaultSecretsMountPoint = "/run/user/1000/secrets.d"; defaultSecretsMountPoint = "/run/user/1000/secrets.d";
secrets.bw_client_id = { secrets = {
path = "${config.sops.defaultSymlinkPath}/bw_client_id"; bw_client_id = {
path = "${config.sops.defaultSymlinkPath}/bw_client_id";
};
bw_api_key = {
path = "${config.sops.defaultSymlinkPath}/bw_api_key";
};
ssh_key = {
path = "${config.sops.defaultSymlinkPath}/ssh_key";
};
borg_url = {
path = "${config.sops.defaultSymlinkPath}/borg_url";
};
}; };
secrets.bw_api_key = {
path = "${config.sops.defaultSymlinkPath}/bw_api_key";
};
secrets.ssh_key = {
path = "${config.sops.defaultSymlinkPath}/ssh_key";
};
}; };
programs = { programs = {
@ -428,6 +434,9 @@
"em" = "emacsclient -n -r"; "em" = "emacsclient -n -r";
"mkdir" = "mkdir -pv"; "mkdir" = "mkdir -pv";
}; };
interactiveShellInit = ''
bind --erase \ct
'';
plugins = [ plugins = [
{ {
name = "upto"; name = "upto";
@ -438,6 +447,15 @@
sha256 = "sha256-Lv2XtP2x9dkIkUUjMBWVpAs/l55Ztu7gIjKYH6ZzK4s="; sha256 = "sha256-Lv2XtP2x9dkIkUUjMBWVpAs/l55Ztu7gIjKYH6ZzK4s=";
}; };
} }
# {
# name = "zellij.fish";
# src = pkgs.fetchFromGitHub {
# owner = "kpbaks";
# repo = "zellij.fish";
# rev = "0b2393b48b55a7f3b200b5a12ac0cf26444b7172";
# sha256 = "sha256-Nxo6usCI5tqLJ/CZ1YXtCFJ+piy1DGlzFIi9/HSgDIk=";
# };
# }
]; ];
}; };
starship = { starship = {
@ -486,6 +504,12 @@
enable = true; enable = true;
package = inputs.wezterm.packages.${pkgs.system}.default; package = inputs.wezterm.packages.${pkgs.system}.default;
}; };
# zellij = {
# enable = true;
# package = pkgs.unstable.zellij;
# enableFishIntegration = true;
# enableBashIntegration = true;
# };
bat = { bat = {
enable = true; enable = true;
}; };
@ -507,7 +531,7 @@
]; ];
repositories = [ repositories = [
{ {
"path" = "${config.sops.defaultSymlinkPath}/borg_url"; "path" = "ssh://oyi3ydnz@oyi3ydnz.repo.borgbase.com/./repo";
"label" = "eddie on borgbase"; "label" = "eddie on borgbase";
} }
]; ];
@ -528,6 +552,7 @@
}; };
fzf = { fzf = {
enable = true; enable = true;
enableFishIntegration = false;
}; };
broot = { broot = {
enable = true; enable = true;
@ -660,13 +685,14 @@
}; };
# moving files! # moving files!
home.file.".npmrc".source = ../dotfiles/dot_npmrc;
xdg.configFile."just/justfile".source = ../dotfiles/dot_config/just/justfile; xdg.configFile."just/justfile".source = ../dotfiles/dot_config/just/justfile;
xdg.configFile."starship.toml".source = ../dotfiles/dot_config/starship.toml; xdg.configFile."starship.toml".source = ../dotfiles/dot_config/starship.toml;
xdg.configFile."ghostty".source = ../dotfiles/dot_config/ghostty; xdg.configFile."ghostty".source = ../dotfiles/dot_config/ghostty;
xdg.configFile."wezterm".source = ../dotfiles/dot_config/wezterm; xdg.configFile."wezterm".source = ../dotfiles/dot_config/wezterm;
xdg.configFile."git".source = ../dotfiles/dot_config/git; xdg.configFile."git".source = ../dotfiles/dot_config/git;
xdg.configFile."rbw".source = ../dotfiles/dot_config/rbw; xdg.configFile."rbw".source = ../dotfiles/dot_config/rbw;
home.file.".ssh/config".source = ../dotfiles/dot_ssh/config;
home.file.".npmrc".source = ../dotfiles/dot_npmrc;
home.file.".vst3/yabridge/yabridge.toml".source = ../dotfiles/dot_vst3/yabridge.toml; home.file.".vst3/yabridge/yabridge.toml".source = ../dotfiles/dot_vst3/yabridge.toml;
home.file.".sbclrc".source = ../dotfiles/dot_sbclrc; home.file.".sbclrc".source = ../dotfiles/dot_sbclrc;
home.file.".signature".source = ../dotfiles/dot_signature; home.file.".signature".source = ../dotfiles/dot_signature;
@ -681,6 +707,28 @@
xdg.configFile."emacs".enable = false; xdg.configFile."emacs".enable = false;
xdg.configFile."zellij/config.kdl".text = ''
theme "molokai-dark"
pane_frames false
default_shell "fish"
copy_on_select false
keybinds {
shared {
bind "Ctrl Alt Left" { GoToPreviousTab; }
bind "Ctrl Alt Right" { GoToNextTab; }
bind "Ctrl Alt Up" { FocusPreviousPane; }
bind "Ctrl Alt Down" { FocusNextPane; }
bind "Ctrl Enter" { NewPane "Down"; }
bind "Ctrl Shift Enter" { NewPane "Right"; }
}
locked {
bind "Ctrl t" { NewTab; }
bind "Ctrl w" { CloseTab; }
}
}
'';
home.file.".msmtprc".source = ../dotfiles/dot_msmtprc; home.file.".msmtprc".source = ../dotfiles/dot_msmtprc;
home.file.".mbsyncrc".source = ../dotfiles/dot_mbsyncrc; home.file.".mbsyncrc".source = ../dotfiles/dot_mbsyncrc;
xdg.configFile."isyncrc".enable = false; xdg.configFile."isyncrc".enable = false;

48
overlays/default.nix
View file

@ -16,12 +16,60 @@
]; ];
}); });
# zjstatus = inputs.zjstatus.packages.${prev.system}.default;
wineWowPackages.stagingFull = prev.wineWowPackages.stagingFull.overrideAttrs (old: { wineWowPackages.stagingFull = prev.wineWowPackages.stagingFull.overrideAttrs (old: {
patches = old.patches ++ [ ./wine-6006.patch ]; patches = old.patches ++ [ ./wine-6006.patch ];
waylandSupport = true; waylandSupport = true;
fontconfigSupport = true; fontconfigSupport = true;
vulkanSupport = true; vulkanSupport = true;
}); });
raylib = prev.raylib.overrideDerivation (previous: {
src = prev.fetchFromGitHub {
owner = "raysan5";
repo = "raylib";
hash = "sha256-PHYdAEhittShd1UhASdhmq0nGHEEVZEUGcjCUUJZl9g=";
rev = "c9c830cb971d7aa744fe3c7444b768ccd5176c4c";
};
patches = [""];
});
openrazer-daemon = prev.openrazer-daemon.overrideDerivation (previous: {
name = "openrazer-daemon";
src = prev.fetchFromGitHub {
owner = "openrazer";
repo = "openrazer";
hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM=";
rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5";
};
});
python312 = prev.python312.override {
packageOverrides = pyself: pysuper: {
openrazer = pysuper.openrazer.overrideAttrs (_: {
src = prev.fetchFromGitHub {
owner = "openrazer";
repo = "openrazer";
hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM=";
rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5";
};
});
};
};
python311 = prev.python311.override {
packageOverrides = pyself: pysuper: {
openrazer = pysuper.openrazer.overrideAttrs (_: {
src = prev.fetchFromGitHub {
owner = "openrazer";
repo = "openrazer";
hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM=";
rev = "5e677b178be7da08fb72d7cd0791bf68a129fcc5";
};
});
};
};
}; };
# When applied, the unstable nixpkgs set (declared in the flake inputs) will # When applied, the unstable nixpkgs set (declared in the flake inputs) will

73
system/eddie/configuration.nix
View file

@ -60,7 +60,7 @@
tailscale tailscale
rsync rsync
gnupg gnupg
openrazer-daemon # openrazer-daemon
clinfo clinfo
alsa-utils alsa-utils
psutils psutils
@ -74,37 +74,32 @@
glfw-wayland glfw-wayland
# libGL.dev # libGL.dev
openssl openssl
adi1090x-plymouth-themes
# solaar # solaar
# logitech-udev-rules # logitech-udev-rules
linuxKernel.packages.linux_6_12.openrazer linuxKernel.packages.linux_6_12.openrazer
]; ];
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.systemd-boot.configurationLimit = 8;
boot.loader.efi.canTouchEfiVariables = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
boot = { boot = {
loader = {
systemd-boot.enable = true;
systemd-boot.configurationLimit = 8;
efi.canTouchEfiVariables = true;
};
# plymouth = {
# enable = true;
# font = "${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Medium.ttf";
# themePackages = [ pkgs.adi1090x-plymouth-themes ];
# theme = "deus_ex";
# };
kernelPackages = pkgs.linuxPackages_latest;
initrd.kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" "snd-virmidi" ]; initrd.kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" "snd-virmidi" ];
kernelParams = [ "nvidia_drm.fbdev=1" "nvidia_drm.modeset=1" ]; kernelParams = [ "nvidia_drm.fbdev=1" "nvidia_drm.modeset=1" ];
}; };
systemd.services.tailscaled.after = ["NetworkManager-wait-online.service"]; systemd.services.tailscaled.after = ["NetworkManager-wait-online.service"];
nixpkgs.config.packageOverrides = pkgs: {
openrazer-daemon = pkgs.openrazer-daemon.overrideDerivation (previous: {
name = "openrazer-daemon-latest";
src = pkgs.fetchFromGitHub {
owner = "openrazer";
repo = "openrazer";
hash = "sha256-GqmFpVNuPRNM95pJsihsk/d3s61t4Lw+qaukKip9BAM=";
rev = "HEAD";
};
# patches = [""];
});
};
documentation = { documentation = {
dev.enable = true; dev.enable = true;
man.generateCaches = false; man.generateCaches = false;
@ -130,6 +125,10 @@
}; };
enableAllFirmware = true; enableAllFirmware = true;
firmware = [
pkgs.sof-firmware
pkgs.alsa-firmware
];
nvidia = { nvidia = {
# Modesetting is required. # Modesetting is required.
@ -225,9 +224,13 @@
programs.nh = { programs.nh = {
enable = true; enable = true;
clean.enable = true; clean = {
clean.extraArgs = "--keep-since 4d --keep 3"; enable = true;
dates = "daily";
extraArgs = "--keep-since 4d --keep 3";
};
flake = "/home/emenel/source/nixos-config"; flake = "/home/emenel/source/nixos-config";
package = pkgs.unstable.nh;
}; };
programs.dconf.enable = true; programs.dconf.enable = true;
@ -380,21 +383,21 @@
programs.virt-manager.enable = true; programs.virt-manager.enable = true;
virtualisation = { # virtualisation = {
libvirtd = { # libvirtd = {
enable = true; # enable = true;
qemu = { # qemu = {
package = pkgs.qemu_kvm; # package = pkgs.qemu_kvm;
swtpm.enable = true; # swtpm.enable = true;
ovmf.enable = true; # ovmf.enable = true;
ovmf.packages = [ pkgs.OVMFFull.fd ]; # ovmf.packages = [ pkgs.OVMFFull.fd ];
}; # };
}; # };
spiceUSBRedirection.enable = true; # spiceUSBRedirection.enable = true;
}; # };
services.qemuGuest.enable = true; # services.qemuGuest.enable = true;
services.spice-vdagentd.enable = true; # services.spice-vdagentd.enable = true;
programs.appimage = { programs.appimage = {
enable = true; enable = true;

4008
system/eddie/razer-speaker-fix.nix
View file

File diff suppressed because it is too large Load diff