swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 09:07:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: update flake

Browse source
This commit is contained in:
Leon Schwarzäugl 2025-10-07 19:37:47 +02:00
parent d8e99cf6a7
commit 54bb321158
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
10 changed files with 2848 additions and 771 deletions
Download patch file Download diff file Expand all files Collapse all files

78
SwarselSystems.org
View file

@ -1979,7 +1979,8 @@ My work machine. Built for more security, this is the gold standard of my config
# ''; # '';
boot = { boot = {
kernelPackages = lib.mkDefault pkgs.kernel.linuxPackages; # kernelPackages = lib.mkDefault pkgs.kernel.linuxPackages;
kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
binfmt.emulatedSystems = [ "aarch64-linux" ]; binfmt.emulatedSystems = [ "aarch64-linux" ];
initrd = { initrd = {
availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "cryptd" "usbhid" "sd_mod" "r8152" ]; availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "cryptd" "usbhid" "sd_mod" "r8152" ];
@ -4694,7 +4695,6 @@ Mostly used to install some compilers and lsp's that I want to have available wh
nixd nixd
zig zig
zls zls
ansible-language-server
elk-to-svg elk-to-svg
@ -10439,11 +10439,8 @@ This smashes Atmosphere 1.3.2 on the switch, which is what I am currenty using.
This holds configuration that is specific to framework laptops. This holds configuration that is specific to framework laptops.
#+begin_src nix-ts :tangle modules/nixos/optional/framework.nix #+begin_src nix-ts :tangle modules/nixos/optional/framework.nix
{ lib, config, inputs, ... }: { lib, config, ... }:
{ {
# imports = [
# inputs.fw-fanctrl.nixosModules.default
# ];
options.swarselmodules.optional.framework = lib.mkEnableOption "optional framework machine settings"; options.swarselmodules.optional.framework = lib.mkEnableOption "optional framework machine settings";
config = lib.mkIf config.swarselmodules.optional.framework { config = lib.mkIf config.swarselmodules.optional.framework {
services = { services = {
@ -10502,10 +10499,11 @@ This holds configuration that is specific to framework laptops.
hardware = { hardware = {
amdgpu = { amdgpu = {
opencl.enable = true; opencl.enable = true;
amdvlk = { initrd.enable = true;
enable = true; # amdvlk = {
support32Bit.enable = true; # enable = true;
}; # support32Bit.enable = true;
# };
}; };
}; };
}; };
@ -10732,7 +10730,8 @@ Options that I need specifically at work. There are more options at [[#h:f0b2ea9
govc govc
terraform terraform
opentofu opentofu
dev.terragrunt # dev.terragrunt
terragrunt
graphviz graphviz
azure-cli azure-cli
@ -11546,46 +11545,47 @@ TODO: Non-NixOS machines (=sp3) should not use these by default, but instead the
}; };
xdg.mimeApps = { xdg.mimeApps = {
enable = true; enable = true;
defaultApplications = { defaultApplications = {
"x-scheme-handler/http" = [ "firefox.desktop" ]; "application/epub+zip" = [ "calibre-ebook-viewer.desktop" ];
"x-scheme-handler/https" = [ "firefox.desktop" ]; "application/metalink+xml" = [ "emacsclient.desktop" ];
"x-scheme-handler/chrome" = [ "firefox.desktop" ]; "application/msword" = [ "writer.desktop" ];
"text/plain" = [ "emacsclient.desktop" ]; "application/pdf" = [ "org.gnome.Evince.desktop" ];
"text/csv" = [ "emacsclient.desktop" ]; "application/sql" = [ "emacsclient.desktop" ];
"text/html" = [ "firefox.desktop" ]; "application/vnd.ms-excel" = [ "calc.desktop" ];
"application/vnd.ms-powerpoint" = [ "impress.desktop" ];
"application/x-extension-htm" = [ "firefox.desktop" ]; "application/x-extension-htm" = [ "firefox.desktop" ];
"application/x-extension-html" = [ "firefox.desktop" ]; "application/x-extension-html" = [ "firefox.desktop" ];
"application/x-extension-shtml" = [ "firefox.desktop" ]; "application/x-extension-shtml" = [ "firefox.desktop" ];
"application/xhtml+xml" = [ "firefox.desktop" ];
"application/x-extension-xhtml" = [ "firefox.desktop" ];
"application/x-extension-xht" = [ "firefox.desktop" ]; "application/x-extension-xht" = [ "firefox.desktop" ];
"image/png" = [ "imv.desktop" ]; "application/x-extension-xhtml" = [ "firefox.desktop" ];
"image/jpeg" = [ "imv.desktop" ]; "application/xhtml+xml" = [ "firefox.desktop" ];
"image/gif" = [ "imv.desktop" ];
"image/svg" = [ "imv.desktop" ];
"image/webp" = [ "firefox.desktop" ];
"image/vnd.adobe.photoshop" = [ "gimp.desktop" ];
"image/vnd.dxf" = [ "org.inkscape.Inkscape.desktop" ];
"audio/flac" = [ "mpv.desktop" ]; "audio/flac" = [ "mpv.desktop" ];
"audio/mp3" = [ "mpv.desktop" ]; "audio/mp3" = [ "mpv.desktop" ];
"audio/ogg" = [ "mpv.desktop" ]; "audio/ogg" = [ "mpv.desktop" ];
"audio/wav" = [ "mpv.desktop" ]; "audio/wav" = [ "mpv.desktop" ];
"video/mp4" = [ "umpv.desktop" ]; "image/gif" = [ "imv.desktop" ];
"video/mkv" = [ "umpv.desktop" ]; "image/jpeg" = [ "imv.desktop" ];
"video/flv" = [ "umpv.desktop" ]; "image/png" = [ "imv.desktop" ];
"image/svg" = [ "imv.desktop" ];
"image/vnd.adobe.photoshop" = [ "gimp.desktop" ];
"image/vnd.dxf" = [ "org.inkscape.Inkscape.desktop" ];
"image/webp" = [ "firefox.desktop" ];
"text/csv" = [ "emacsclient.desktop" ];
"text/html" = [ "firefox.desktop" ];
"text/plain" = [ "emacsclient.desktop" ];
"video/3gp" = [ "umpv.desktop" ]; "video/3gp" = [ "umpv.desktop" ];
"application/pdf" = [ "org.gnome.Evince.desktop" ]; "video/flv" = [ "umpv.desktop" ];
"application/metalink+xml" = [ "emacsclient.desktop" ]; "video/mkv" = [ "umpv.desktop" ];
"application/sql" = [ "emacsclient.desktop" ]; "video/mp4" = [ "umpv.desktop" ];
"application/vnd.ms-powerpoint" = [ "impress.desktop" ]; "x-scheme-handler/chrome" = [ "firefox.desktop" ];
"application/msword" = [ "writer.desktop" ]; "x-scheme-handler/http" = [ "firefox.desktop" ];
"application/vnd.ms-excel" = [ "calc.desktop" ]; "x-scheme-handler/https" = [ "firefox.desktop" ];
}; };
associations = { associations = {
added = { added = {
"application/x-zerosize" = [ "emacsclient.desktop" ]; "application/x-zerosize" = [ "emacsclient.desktop" ];
"application/epub+zip" = [ "calibre-ebook-viewer.desktop" ];
}; };
}; };
}; };
@ -11714,7 +11714,11 @@ This section is for programs that require no further configuration. zsh Integrat
jq.enable = true; jq.enable = true;
ripgrep.enable = true; ripgrep.enable = true;
pandoc.enable = true; pandoc.enable = true;
# fzf.enable = true; fzf = {
enable = true;
enableBashIntegration = false;
enableZshIntegration = false;
};
zoxide = { zoxide = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;

3450
flake.lock generated
View file

File diff suppressed because it is too large Load diff

11
flake.nix
View file

@ -59,11 +59,12 @@
zjstatus = { zjstatus = {
url = "github:dj95/zjstatus"; url = "github:dj95/zjstatus";
}; };
fw-fanctrl = { # has been upstreamed
# url = "github:TamtamHero/fw-fanctrl/packaging/nix"; # fw-fanctrl = {
url = "github:Swarsel/fw-fanctrl/packaging/nix"; # # url = "github:TamtamHero/fw-fanctrl/packaging/nix";
inputs.nixpkgs.follows = "nixpkgs"; # url = "github:Swarsel/fw-fanctrl/packaging/nix";
}; # inputs.nixpkgs.follows = "nixpkgs";
# };
nix-darwin = { nix-darwin = {
url = "github:lnl7/nix-darwin"; url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

3
hosts/nixos/pyramid/hardware-configuration.nix
View file

@ -22,7 +22,8 @@
# ''; # '';
boot = { boot = {
kernelPackages = lib.mkDefault pkgs.kernel.linuxPackages; # kernelPackages = lib.mkDefault pkgs.kernel.linuxPackages;
kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
binfmt.emulatedSystems = [ "aarch64-linux" ]; binfmt.emulatedSystems = [ "aarch64-linux" ];
initrd = { initrd = {
availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "cryptd" "usbhid" "sd_mod" "r8152" ]; availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "cryptd" "usbhid" "sd_mod" "r8152" ];

51
modules/home/common/desktop.nix
View file

@ -56,46 +56,47 @@
}; };
xdg.mimeApps = { xdg.mimeApps = {
enable = true; enable = true;
defaultApplications = { defaultApplications = {
"x-scheme-handler/http" = [ "firefox.desktop" ]; "application/epub+zip" = [ "calibre-ebook-viewer.desktop" ];
"x-scheme-handler/https" = [ "firefox.desktop" ]; "application/metalink+xml" = [ "emacsclient.desktop" ];
"x-scheme-handler/chrome" = [ "firefox.desktop" ]; "application/msword" = [ "writer.desktop" ];
"text/plain" = [ "emacsclient.desktop" ]; "application/pdf" = [ "org.gnome.Evince.desktop" ];
"text/csv" = [ "emacsclient.desktop" ]; "application/sql" = [ "emacsclient.desktop" ];
"text/html" = [ "firefox.desktop" ]; "application/vnd.ms-excel" = [ "calc.desktop" ];
"application/vnd.ms-powerpoint" = [ "impress.desktop" ];
"application/x-extension-htm" = [ "firefox.desktop" ]; "application/x-extension-htm" = [ "firefox.desktop" ];
"application/x-extension-html" = [ "firefox.desktop" ]; "application/x-extension-html" = [ "firefox.desktop" ];
"application/x-extension-shtml" = [ "firefox.desktop" ]; "application/x-extension-shtml" = [ "firefox.desktop" ];
"application/xhtml+xml" = [ "firefox.desktop" ];
"application/x-extension-xhtml" = [ "firefox.desktop" ];
"application/x-extension-xht" = [ "firefox.desktop" ]; "application/x-extension-xht" = [ "firefox.desktop" ];
"image/png" = [ "imv.desktop" ]; "application/x-extension-xhtml" = [ "firefox.desktop" ];
"image/jpeg" = [ "imv.desktop" ]; "application/xhtml+xml" = [ "firefox.desktop" ];
"image/gif" = [ "imv.desktop" ];
"image/svg" = [ "imv.desktop" ];
"image/webp" = [ "firefox.desktop" ];
"image/vnd.adobe.photoshop" = [ "gimp.desktop" ];
"image/vnd.dxf" = [ "org.inkscape.Inkscape.desktop" ];
"audio/flac" = [ "mpv.desktop" ]; "audio/flac" = [ "mpv.desktop" ];
"audio/mp3" = [ "mpv.desktop" ]; "audio/mp3" = [ "mpv.desktop" ];
"audio/ogg" = [ "mpv.desktop" ]; "audio/ogg" = [ "mpv.desktop" ];
"audio/wav" = [ "mpv.desktop" ]; "audio/wav" = [ "mpv.desktop" ];
"video/mp4" = [ "umpv.desktop" ]; "image/gif" = [ "imv.desktop" ];
"video/mkv" = [ "umpv.desktop" ]; "image/jpeg" = [ "imv.desktop" ];
"video/flv" = [ "umpv.desktop" ]; "image/png" = [ "imv.desktop" ];
"image/svg" = [ "imv.desktop" ];
"image/vnd.adobe.photoshop" = [ "gimp.desktop" ];
"image/vnd.dxf" = [ "org.inkscape.Inkscape.desktop" ];
"image/webp" = [ "firefox.desktop" ];
"text/csv" = [ "emacsclient.desktop" ];
"text/html" = [ "firefox.desktop" ];
"text/plain" = [ "emacsclient.desktop" ];
"video/3gp" = [ "umpv.desktop" ]; "video/3gp" = [ "umpv.desktop" ];
"application/pdf" = [ "org.gnome.Evince.desktop" ]; "video/flv" = [ "umpv.desktop" ];
"application/metalink+xml" = [ "emacsclient.desktop" ]; "video/mkv" = [ "umpv.desktop" ];
"application/sql" = [ "emacsclient.desktop" ]; "video/mp4" = [ "umpv.desktop" ];
"application/vnd.ms-powerpoint" = [ "impress.desktop" ]; "x-scheme-handler/chrome" = [ "firefox.desktop" ];
"application/msword" = [ "writer.desktop" ]; "x-scheme-handler/http" = [ "firefox.desktop" ];
"application/vnd.ms-excel" = [ "calc.desktop" ]; "x-scheme-handler/https" = [ "firefox.desktop" ];
}; };
associations = { associations = {
added = { added = {
"application/x-zerosize" = [ "emacsclient.desktop" ]; "application/x-zerosize" = [ "emacsclient.desktop" ];
"application/epub+zip" = [ "calibre-ebook-viewer.desktop" ];
}; };
}; };
}; };

6
modules/home/common/programs.nix
View file

@ -18,7 +18,11 @@
jq.enable = true; jq.enable = true;
ripgrep.enable = true; ripgrep.enable = true;
pandoc.enable = true; pandoc.enable = true;
# fzf.enable = true; fzf = {
enable = true;
enableBashIntegration = false;
enableZshIntegration = false;
};
zoxide = { zoxide = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;

1
modules/nixos/client/packages.nix
View file

@ -68,7 +68,6 @@
nixd nixd
zig zig
zls zls
ansible-language-server
elk-to-svg elk-to-svg

9
modules/nixos/optional/amdgpu.nix
View file

@ -5,10 +5,11 @@
hardware = { hardware = {
amdgpu = { amdgpu = {
opencl.enable = true; opencl.enable = true;
amdvlk = { initrd.enable = true;
enable = true; # amdvlk = {
support32Bit.enable = true; # enable = true;
}; # support32Bit.enable = true;
# };
}; };
}; };
}; };

7
modules/nixos/optional/framework.nix
View file

@ -1,8 +1,5 @@
{ lib, config, inputs, ... }: { lib, config, ... }:
{ {
imports = [
inputs.fw-fanctrl.nixosModules.default
];
options.swarselmodules.optional.framework = lib.mkEnableOption "optional framework machine settings"; options.swarselmodules.optional.framework = lib.mkEnableOption "optional framework machine settings";
config = lib.mkIf config.swarselmodules.optional.framework { config = lib.mkIf config.swarselmodules.optional.framework {
services = { services = {
@ -20,7 +17,7 @@
ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled" ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled"
''; '';
}; };
programs.fw-fanctrl = { hardware.fw-fanctrl = {
enable = true; enable = true;
config = { config = {
defaultStrategy = "lazy"; defaultStrategy = "lazy";

3
modules/nixos/optional/work.nix
View file

@ -161,7 +161,8 @@ in
govc govc
terraform terraform
opentofu opentofu
dev.terragrunt # dev.terragrunt
terragrunt
graphviz graphviz
azure-cli azure-cli