mirror of
https://github.com/Smaug123/nix-dotfiles
synced 2025-10-08 07:58:40 +00:00
Compare commits
5 Commits
more-earth
...
waybar
Author | SHA1 | Date | |
---|---|---|---|
|
ef0d29ba6f | ||
|
9e79528620 | ||
|
25c2ca91c8 | ||
|
b3661558ba | ||
|
0972b16055 |
78
flake.lock
generated
78
flake.lock
generated
@@ -7,11 +7,11 @@
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731473366,
|
||||
"narHash": "sha256-sE2WfD3YyNrCROfRZKqMDR77g3KV4FXUaJ7NWe+A7ro=",
|
||||
"lastModified": 1725418254,
|
||||
"narHash": "sha256-2zPzPP9Eu5NxgJxTVcuCCX5xh7CWy7rYaLHfaAZS6H8=",
|
||||
"owner": "tpwrules",
|
||||
"repo": "nixos-apple-silicon",
|
||||
"rev": "3eee753e4b074790342fadb1c4e7183d037ddac4",
|
||||
"rev": "c5f944f49a052232015bb3c03524b69e3fdd2aa4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -27,11 +27,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731454423,
|
||||
"narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=",
|
||||
"lastModified": 1729382845,
|
||||
"narHash": "sha256-REiWck1zIOnZIgGmmOWfwvkQw1f4UrBsxxOSKVSAG4w=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "6c71c49e2448e51ad830ed211024e6d0edc50116",
|
||||
"rev": "a001f44cfc47164839eb61c6b1e7f4288813f7e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -43,17 +43,18 @@
|
||||
},
|
||||
"emacs": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731604406,
|
||||
"narHash": "sha256-CUkO4CXaDcGyUqQ+/ArvekL3hlfgass7LjrnG6m2+g8=",
|
||||
"lastModified": 1729390258,
|
||||
"narHash": "sha256-z4Hg8k6iXIV55lA8HUntfJBdBzxOuG8M4ftWoJhrVqU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "f6c94b95f529cfbd29848c12816111a2471a5293",
|
||||
"rev": "89860b1c343648e8d71b6820e9311b98353ff14e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -81,6 +82,24 @@
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1701680307,
|
||||
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
|
||||
@@ -102,11 +121,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731604581,
|
||||
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
|
||||
"lastModified": 1729321331,
|
||||
"narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
|
||||
"rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -129,11 +148,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1731139594,
|
||||
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
|
||||
"lastModified": 1725103162,
|
||||
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
|
||||
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -145,11 +164,11 @@
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1731386116,
|
||||
"narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
|
||||
"lastModified": 1729181673,
|
||||
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "689fed12a013f56d4c4d3f612489634267d86529",
|
||||
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -161,11 +180,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1731531548,
|
||||
"narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
|
||||
"lastModified": 1729265718,
|
||||
"narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "24f0d4acd634792badd6470134c387a3b039dace",
|
||||
"rev": "ccc0c2126893dd20963580b6478d1a10a4512185",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -231,9 +250,24 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"whisper": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"model": "model",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
|
@@ -1,6 +1,8 @@
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
username,
|
||||
dotnet,
|
||||
...
|
||||
}: {
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
@@ -10,26 +12,33 @@
|
||||
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
};
|
||||
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
|
||||
hardware.nvidia = {
|
||||
modesetting.enable = true;
|
||||
powerManagement.enable = false;
|
||||
|
||||
# I don't have a Turing GPU
|
||||
powerManagement.finegrained = false;
|
||||
|
||||
open = false;
|
||||
nvidiaSettings = true;
|
||||
};
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.grub.useOSProber = true;
|
||||
|
||||
boot.kernelParams = [
|
||||
"video=DP-1:2560x1440@144"
|
||||
"video=HDMI-A-1:1920x1080@144"
|
||||
];
|
||||
|
||||
boot.extraModulePackages = [config.boot.kernelPackages.rtl8821au];
|
||||
|
||||
networking = {
|
||||
|
@@ -3,31 +3,7 @@
|
||||
../hardware/earthworm.nix
|
||||
];
|
||||
|
||||
hardware.asahi.peripheralFirmwareDirectory = ./../firmware;
|
||||
hardware.asahi = {
|
||||
useExperimentalGPUDriver = true;
|
||||
experimentalGPUInstallMode = "overlay";
|
||||
setupAsahiSound = true;
|
||||
withRust = true;
|
||||
};
|
||||
hardware.graphics.enable = true;
|
||||
|
||||
programs.light.enable = true;
|
||||
services.actkbd = {
|
||||
enable = true;
|
||||
bindings = [
|
||||
{
|
||||
keys = [225];
|
||||
events = ["key"];
|
||||
command = "${pkgs.light}/bin/light -A 10";
|
||||
}
|
||||
{
|
||||
keys = [224];
|
||||
events = ["key"];
|
||||
command = "${pkgs.light}/bin/light -U 10";
|
||||
}
|
||||
];
|
||||
};
|
||||
hardware.asahi.peripheralFirmwareDirectory = ../firmware;
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = false;
|
||||
@@ -38,10 +14,6 @@
|
||||
networking = {
|
||||
hostName = "earthworm";
|
||||
networkmanager.enable = true;
|
||||
wireless.iwd = {
|
||||
enable = true;
|
||||
settings.General.EnableNetworkConfiguration = true;
|
||||
};
|
||||
};
|
||||
|
||||
time.timeZone = "Europe/London";
|
||||
@@ -59,11 +31,10 @@
|
||||
environment.systemPackages = [
|
||||
pkgs.vim
|
||||
pkgs.wget
|
||||
pkgs.mesa-asahi-edge
|
||||
];
|
||||
|
||||
environment.loginShellInit = ''
|
||||
[[ "$(tty)" == /dev/tty1 ]] && export WLR_RENDER_NO_EXPLICIT_SYNC=1 && sway
|
||||
[[ "$(tty)" == /dev/tty1 ]] && sway
|
||||
'';
|
||||
|
||||
services.openssh.enable = true;
|
||||
|
@@ -278,6 +278,7 @@
|
||||
nixpkgs.netcoredbg
|
||||
nixpkgs.nil
|
||||
nixpkgs.fsautocomplete
|
||||
nixpkgs.keepassxc
|
||||
nixpkgs.wget
|
||||
nixpkgs.yt-dlp
|
||||
nixpkgs.cmake
|
||||
@@ -313,8 +314,6 @@
|
||||
nixpkgs.deno
|
||||
nixpkgs.yazi
|
||||
nixpkgs.font-awesome
|
||||
nixpkgs.gopls
|
||||
nixpkgs.go
|
||||
]
|
||||
++ (
|
||||
if nixpkgs.stdenv.isLinux
|
||||
@@ -322,7 +321,6 @@
|
||||
nixpkgs.protonmail-bridge
|
||||
nixpkgs.pinentry
|
||||
nixpkgs.signal-desktop
|
||||
nixpkgs.keepassxc
|
||||
]
|
||||
else []
|
||||
)
|
||||
@@ -338,88 +336,4 @@
|
||||
|
||||
home.file.".ideavimrc".source = ./ideavimrc;
|
||||
home.file.".config/yt-dlp/config".source = ./youtube-dl.conf;
|
||||
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
package = nixpkgs.firefox-wayland;
|
||||
profiles = {
|
||||
patrick = {
|
||||
isDefault = true;
|
||||
name = "patrick";
|
||||
search = {
|
||||
default = "Google";
|
||||
force = true;
|
||||
};
|
||||
settings = {
|
||||
# see https://github.com/TLATER/dotfiles/blob/b39af91fbd13d338559a05d69f56c5a97f8c905d/home-config/config/graphical-applications/firefox.nix
|
||||
# see https://www.ghacks.net/2015/08/18/a-comprehensive-list-of-firefox-privacy-and-security-settings/
|
||||
"browser.search.isUS" = false;
|
||||
"browser.search.region" = "GB";
|
||||
"gfx.webrender.all" = true; # enable GPU acceleration
|
||||
"media.ffmpeg.vaapi.enabled" = true;
|
||||
"widget.dmabuf.force-enabled" = true;
|
||||
"privacy.webrtc.legacyGlobalIndicator" = false;
|
||||
"app.shield.optoutstudies.enabled" = false;
|
||||
"app.update.enabled" = false;
|
||||
"app.update.auto" = false;
|
||||
"app.update.silent" = false;
|
||||
"app.update.service.enabled" = false;
|
||||
"app.update.staging.enabled" = false;
|
||||
"browser.discovery.enabled" = false;
|
||||
"browser.laterrun.enabled" = false;
|
||||
"browser.shell.checkDefaultBrowser" = false;
|
||||
"browser.rights.3.shown" = true;
|
||||
"browser.search.update" = false;
|
||||
"extensions.update.enabled" = false;
|
||||
"extensions.update.autoUpdateDefault" = false;
|
||||
"extensions.getAddons.cache.enabled" = false;
|
||||
"dom.ipc.plugins.reportCrashURL" = false;
|
||||
"extensions.webservice.discoverURL" = "http://127.0.0.1";
|
||||
"toolkit.telemetry.unified" = false;
|
||||
"toolkit.telemetry.unifiedIsOptIn" = true;
|
||||
"toolkit.telemetry.enabled" = false;
|
||||
"toolkit.telemetry.server" = "";
|
||||
"toolkit.telemetry.archive.enabled" = false;
|
||||
"lightweightThemes.update.enabled" = false;
|
||||
"startup.homepage_welcome_url" = "";
|
||||
"startup.homepage_welcome_url.additional" = "";
|
||||
"startup.homepage_override_url" = "";
|
||||
"datareporting.healthreport.uploadEnabled" = false;
|
||||
"datareporting.healthreport.documentServerURI" = "";
|
||||
"datareporting.healthreport.service.enabled" = false;
|
||||
"datareporting.healthreport.about.reportUrl" = "data:text/plain,";
|
||||
"toolkit.telemetry.cachedClientID" = "";
|
||||
"browser.selfsupport.url" = "";
|
||||
"browser.selfsupport.enabled" = false;
|
||||
"experiments.enabled" = false;
|
||||
"experiments.supported" = false;
|
||||
"experiments.activeExperiment" = false;
|
||||
"experiments.manifest.uri" = "";
|
||||
"network.allow-experiments" = false;
|
||||
"breakpad.reportURL" = "";
|
||||
"browser.tabs.crashReporting.sendReport" = false;
|
||||
"browser.newtab.preload" = false;
|
||||
"browser.newtabpage.directory.ping" = "data:text/plain,";
|
||||
"browser.newtabpage.directory.source" = "data:text/plain,";
|
||||
"browser.newtabpage.enabled" = false;
|
||||
"browser.newtabpage.enhanced" = false;
|
||||
"browser.newtabpage.introShown" = true;
|
||||
"browser.aboutHomeSnippets.updateUrl" = "https://127.0.0.1";
|
||||
"extensions.pocket.enabled" = false;
|
||||
"extensions.pocket.api" = "";
|
||||
"extensions.pocket.site" = "";
|
||||
"extensions.pocket.oAuthConsumerKey" = "";
|
||||
"social.whitelist" = "";
|
||||
"social.toast-notifications.enabled" = false;
|
||||
"social.shareDirectory" = "";
|
||||
"social.remote-install.enabled" = false;
|
||||
"social.directories" = "";
|
||||
"social.share.activationPanelEnabled" = false;
|
||||
"social.enabled" = false;
|
||||
"dom.flyweb.enabled" = false;
|
||||
"services.sync.enabled" = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@@ -1,13 +1,6 @@
|
||||
{
|
||||
nixpkgs,
|
||||
username,
|
||||
dotnet,
|
||||
...
|
||||
}: {
|
||||
home.packages = [nixpkgs.wl-clipboard nixpkgs.jetbrains.rider];
|
||||
nixpkgs.config.firefox = {
|
||||
speechSynthesisSupport = true;
|
||||
};
|
||||
{nixpkgs, ...}: {
|
||||
home.packages = [nixpkgs.firefox-wayland nixpkgs.jetbrains.rider];
|
||||
nixpkgs.config.firefox.speechSynthesisSupport = true;
|
||||
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
@@ -164,7 +157,7 @@
|
||||
"car" = "";
|
||||
"default" = ["" "" ""];
|
||||
};
|
||||
"on-click" = "${nixpkgs.pavucontrol}/bin/pavucontrol";
|
||||
"on-click" = "pavucontrol";
|
||||
};
|
||||
"custom/media" = {
|
||||
"format" = "{icon} {text}";
|
||||
|
@@ -7,7 +7,6 @@
|
||||
family = "FiraCode Nerd Font Mono";
|
||||
};
|
||||
};
|
||||
terminal = {shell = "${pkgs.zsh}/bin/zsh";};
|
||||
};
|
||||
};
|
||||
|
||||
|
@@ -30,7 +30,3 @@ bindkey '^X^E' edit-command-line
|
||||
bindkey -e
|
||||
|
||||
PATH="$PATH:$HOME/.cargo/bin"
|
||||
|
||||
if [[ -z "$TMUX" ]]; then
|
||||
tmux new-session -A -s default
|
||||
fi
|
||||
|
@@ -15,8 +15,6 @@ local schemas = {
|
||||
|
||||
require("lspconfig")["clangd"].setup({})
|
||||
|
||||
require("lspconfig")["gopls"].setup({})
|
||||
|
||||
require("lspconfig")["yamlls"].setup({
|
||||
settings = {
|
||||
yaml = {
|
||||
|
Reference in New Issue
Block a user