mirror of
https://github.com/Smaug123/nix-dotfiles
synced 2025-10-13 02:18:42 +00:00
Compare commits
13 Commits
more-earth
...
28dab00b65
| Author | SHA1 | Date | |
|---|---|---|---|
|
28dab00b65 | ||
|
|
ca85c8de24 | ||
|
|
c45222500f | ||
|
|
04fab0bad0 | ||
|
|
04079d1082 | ||
|
|
6973cbbd99 | ||
|
|
2346cbb7ce | ||
|
|
247c3419a8 | ||
|
|
8a1f2af5bb | ||
|
|
3bfb4e7ec5 | ||
|
|
d857f7ab9f | ||
|
|
cb3c993507 | ||
|
|
14f21cb172 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -3,3 +3,4 @@ result
|
||||
bin/
|
||||
obj/
|
||||
.DS_Store
|
||||
.direnv/
|
||||
|
||||
@@ -7,10 +7,6 @@ in {
|
||||
# $ nix-env -qaP | grep wget
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.alacritty
|
||||
pkgs.rustup
|
||||
pkgs.libiconv
|
||||
pkgs.clang
|
||||
pkgs.python3
|
||||
];
|
||||
|
||||
|
||||
62
flake.lock
generated
62
flake.lock
generated
@@ -7,11 +7,11 @@
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731473366,
|
||||
"narHash": "sha256-sE2WfD3YyNrCROfRZKqMDR77g3KV4FXUaJ7NWe+A7ro=",
|
||||
"lastModified": 1737610453,
|
||||
"narHash": "sha256-OLgl/kgjOmDFrkU04PlqVklXj1m9y8xF7xbD+blAdg8=",
|
||||
"owner": "tpwrules",
|
||||
"repo": "nixos-apple-silicon",
|
||||
"rev": "3eee753e4b074790342fadb1c4e7183d037ddac4",
|
||||
"rev": "1f7bdbb82f6b9ec1d8d206e2c64d36f13bae91a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -27,11 +27,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731454423,
|
||||
"narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=",
|
||||
"lastModified": 1737504076,
|
||||
"narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "6c71c49e2448e51ad830ed211024e6d0edc50116",
|
||||
"rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -49,11 +49,11 @@
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731604406,
|
||||
"narHash": "sha256-CUkO4CXaDcGyUqQ+/ArvekL3hlfgass7LjrnG6m2+g8=",
|
||||
"lastModified": 1737770462,
|
||||
"narHash": "sha256-d+VpkYISLIBRvSFUCyPbpcanPCheC7THbW2cbgTlb/s=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "f6c94b95f529cfbd29848c12816111a2471a5293",
|
||||
"rev": "1daea5ddf4cebd26c500f265edbeb62d679c7ff7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -82,11 +82,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1701680307,
|
||||
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -102,11 +102,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731604581,
|
||||
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
|
||||
"lastModified": 1737762889,
|
||||
"narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
|
||||
"rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -129,11 +129,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1731139594,
|
||||
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
|
||||
"lastModified": 1737469691,
|
||||
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
|
||||
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -145,27 +145,27 @@
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1731386116,
|
||||
"narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
|
||||
"lastModified": 1737672001,
|
||||
"narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "689fed12a013f56d4c4d3f612489634267d86529",
|
||||
"rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.05",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1731531548,
|
||||
"narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
|
||||
"lastModified": 1737717945,
|
||||
"narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "24f0d4acd634792badd6470134c387a3b039dace",
|
||||
"rev": "ecd26a469ac56357fd333946a99086e992452b6a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -177,11 +177,11 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1695033101,
|
||||
"narHash": "sha256-RQ4m+ycjdLdass7Hr4+Lzwnjw7wGhcUkKqWiJS3YxPM=",
|
||||
"lastModified": 1734254970,
|
||||
"narHash": "sha256-yZzYWWWeOqSFvIirHzY1SJiuSBPmXIYJFhyt+1zkv8A=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d941d9491804e0ca01e03468dbf6f8d3a7919a16",
|
||||
"rev": "d388ee0ec8c623389ab3a7caead258a94cec14de",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -238,11 +238,11 @@
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1704121968,
|
||||
"narHash": "sha256-N8FJb+ohJ4Qt/m5RoAbwm3RP4VRjl+hA6PUCfjPhZo8=",
|
||||
"lastModified": 1734268803,
|
||||
"narHash": "sha256-KDfUObdMdMSM7prp2QO4f5DRCv9Z2TSCZEL0kFEBzN4=",
|
||||
"owner": "Smaug123",
|
||||
"repo": "whisper.cpp",
|
||||
"rev": "04f8e0cdc73abe7c593b2c9405f0f590c51de95a",
|
||||
"rev": "8cbc79c799212037e1c7b45548179f9548ea77a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
withRust = true;
|
||||
};
|
||||
hardware.graphics.enable = true;
|
||||
hardware.bluetooth.enable = true;
|
||||
|
||||
programs.light.enable = true;
|
||||
services.actkbd = {
|
||||
@@ -26,6 +27,21 @@
|
||||
events = ["key"];
|
||||
command = "${pkgs.light}/bin/light -U 10";
|
||||
}
|
||||
{
|
||||
keys = [113];
|
||||
events = ["key"];
|
||||
command = "${pkgs.alsa-utils}/bin/amixer -q set Master toggle";
|
||||
}
|
||||
{
|
||||
keys = [114];
|
||||
events = ["key"];
|
||||
command = "${pkgs.alsa-utils}/bin/amixer -q set Master 10- unmute";
|
||||
}
|
||||
{
|
||||
keys = [115];
|
||||
events = ["key"];
|
||||
command = "${pkgs.alsa-utils}/bin/amixer -q set Master 10+ unmute";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -33,8 +33,8 @@
|
||||
./modules/tmux.nix
|
||||
./modules/zsh.nix
|
||||
./modules/ripgrep.nix
|
||||
./modules/alacritty.nix
|
||||
./modules/rust.nix
|
||||
./modules/posix-sh.nix
|
||||
(import ./modules/mail.nix
|
||||
{
|
||||
inherit mbsync secretsPath;
|
||||
@@ -269,39 +269,29 @@
|
||||
nixpkgs.difftastic
|
||||
nixpkgs.syncthing
|
||||
nixpkgs.nodePackages_latest.dockerfile-language-server-nodejs
|
||||
nixpkgs.nodePackages_latest.bash-language-server
|
||||
nixpkgs.nodePackages_latest.vscode-json-languageserver
|
||||
nixpkgs.nodePackages_latest.vscode-langservers-extracted
|
||||
nixpkgs.hadolint
|
||||
nixpkgs.yaml-language-server
|
||||
nixpkgs.csharp-ls
|
||||
nixpkgs.netcoredbg
|
||||
nixpkgs.nil
|
||||
nixpkgs.fsautocomplete
|
||||
nixpkgs.wget
|
||||
nixpkgs.yt-dlp
|
||||
nixpkgs.cmake
|
||||
nixpkgs.gnumake
|
||||
nixpkgs.gcc
|
||||
nixpkgs.lldb
|
||||
nixpkgs.hledger
|
||||
nixpkgs.hledger-web
|
||||
dotnet
|
||||
nixpkgs.elan
|
||||
nixpkgs.coreutils-prefixed
|
||||
nixpkgs.shellcheck
|
||||
nixpkgs.universal-ctags
|
||||
nixpkgs.asciinema
|
||||
nixpkgs.git-lfs
|
||||
nixpkgs.imagemagick
|
||||
nixpkgs.nixpkgs-fmt
|
||||
nixpkgs.lnav
|
||||
nixpkgs.age
|
||||
nixpkgs.nodejs
|
||||
nixpkgs.pyright
|
||||
nixpkgs.woodpecker-agent
|
||||
nixpkgs.lynx
|
||||
nixpkgs.alejandra
|
||||
nixpkgs.ffmpeg
|
||||
nixpkgs.bat
|
||||
nixpkgs.pandoc
|
||||
@@ -315,10 +305,13 @@
|
||||
nixpkgs.font-awesome
|
||||
nixpkgs.gopls
|
||||
nixpkgs.go
|
||||
nixpkgs.libiconv
|
||||
]
|
||||
++ (
|
||||
if nixpkgs.stdenv.isLinux
|
||||
then [
|
||||
nixpkgs.ghostty
|
||||
nixpkgs.xwaylandvideobridge
|
||||
nixpkgs.protonmail-bridge
|
||||
nixpkgs.pinentry
|
||||
nixpkgs.signal-desktop
|
||||
@@ -330,7 +323,7 @@
|
||||
if machinename == "capybara"
|
||||
then [
|
||||
nixpkgs.steam-run
|
||||
nixpkgs.discord
|
||||
nixpkgs.discord-canary
|
||||
nixpkgs.anki-bin
|
||||
]
|
||||
else []
|
||||
@@ -338,88 +331,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;
|
||||
@@ -20,7 +13,7 @@
|
||||
{command = "${nixpkgs.waybar}/bin/waybar";}
|
||||
];
|
||||
};
|
||||
extraConfig = builtins.readFile ./sway.conf;
|
||||
extraConfig = builtins.replaceStrings ["@@WL-COPY@@" "@@GRIM@@" "@@SLURP@@"] ["${nixpkgs.wl-clipboard}/bin/wl-copy" "${nixpkgs.grim}/bin/grim" "${nixpkgs.slurp}/bin/slurp"] (builtins.readFile ./sway.conf);
|
||||
};
|
||||
|
||||
programs.waybar = {
|
||||
@@ -185,7 +178,7 @@
|
||||
"menu" = "on-click";
|
||||
"menu-file" = ./modules/waybar/power_menu.xml;
|
||||
"menu-actions" = {
|
||||
"shutdown" = "shutdown";
|
||||
"shutdown" = "shutdown now";
|
||||
"reboot" = "reboot";
|
||||
"suspend" = "systemctl suspend";
|
||||
"hibernate" = "systemctl hibernate";
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
{pkgs, ...}: {
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
font = {
|
||||
normal = {
|
||||
family = "FiraCode Nerd Font Mono";
|
||||
};
|
||||
};
|
||||
terminal = {shell = "${pkgs.zsh}/bin/zsh";};
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = [
|
||||
pkgs.alacritty
|
||||
(pkgs.nerdfonts.override {fonts = ["FiraCode" "DroidSansMono"];})
|
||||
];
|
||||
}
|
||||
9
home-manager/modules/ghostty.nix
Normal file
9
home-manager/modules/ghostty.nix
Normal file
@@ -0,0 +1,9 @@
|
||||
{pkgs, ...}: {
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
home.packages = [
|
||||
pkgs.ghostty
|
||||
];
|
||||
}
|
||||
6
home-manager/modules/posix-sh.nix
Normal file
6
home-manager/modules/posix-sh.nix
Normal file
@@ -0,0 +1,6 @@
|
||||
{pkgs, ...}: {
|
||||
home.packages = [
|
||||
pkgs.shellcheck
|
||||
pkgs.nodePackages_latest.bash-language-server
|
||||
];
|
||||
}
|
||||
@@ -29,8 +29,8 @@ zle -N edit-command-line
|
||||
bindkey '^X^E' edit-command-line
|
||||
bindkey -e
|
||||
|
||||
PATH="$PATH:$HOME/.cargo/bin"
|
||||
|
||||
if [[ -z "$TMUX" ]]; then
|
||||
tmux new-session -A -s default
|
||||
fi
|
||||
|
||||
ttyctl -f
|
||||
|
||||
@@ -2,3 +2,12 @@ output Unknown-1 scale 2
|
||||
input * {
|
||||
xkb_layout "gb"
|
||||
}
|
||||
|
||||
# capture all screens to clipboard
|
||||
bindsym Shift+Print exec @@GRIM@@ - | @@WL-COPY@@
|
||||
|
||||
# capture the specified screen area to clipboard
|
||||
bindsym Shift+Alt+Print exec @@GRIM@@ -g "$(@@SLURP@@)" - | @@WL-COPY@@
|
||||
|
||||
# capture the focused monitor to clipboard
|
||||
bindsym Shift+Control+Print exec @@GRIM@@ -o $(swaymsg -t get_outputs | jq -r '.[] | select(.focused) | .name') - | @@WL-COPY@@
|
||||
|
||||
Reference in New Issue
Block a user