diff --git a/flake.lock b/flake.lock --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1771170334, - "narHash": "sha256-tCgoCWORfNHaRXTh2QS44LwxlV8q28jVvjN5ioMicv8=", + "lastModified": 1774186997, + "narHash": "sha256-hyNVlhAqmwcBPl7XRkxbGcMt1BfCOdvuEfBDUf0k8Oo=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "821b4f92c2c0981ea5b571b03403df87d2b2e2ae", + "rev": "546e95f7ec74892a31f883a10b1723c35f2c2edd", "type": "github" }, "original": { @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1771469470, - "narHash": "sha256-GnqdqhrguKNN3HtVfl6z+zbV9R9jhHFm3Z8nu7R6ml0=", + "lastModified": 1773889306, + "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", "owner": "nix-community", "repo": "disko", - "rev": "4707eec8d1d2db5182ea06ed48c820a86a42dc13", + "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", "type": "github" }, "original": { @@ -71,11 +71,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1734806114, - "narHash": "sha256-FWkDtoLMTTk2Lz4d4LkFjtV/xYyIlpwZlX5Np1QhXls=", + "lastModified": 1774698239, + "narHash": "sha256-9gL1K1pKJ5P/KVnpcZusGXhF4LuL4yBdjUy2ZAi5GB4=", "owner": "AdisonCavani", "repo": "distro-grub-themes", - "rev": "ebbd17419890059e371a6f2dbf2a7e76190327d4", + "rev": "6e9e018abf38c0b3ed2bff1912ecf30a94e0c917", "type": "github" }, "original": { @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1771531206, - "narHash": "sha256-1R3Wx6KUkMb4x4E5UOhW9p6rqiexzSGGWxZqSHqW5n0=", + "lastModified": 1775683737, + "narHash": "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "91be7cce763fa4022c7cf025a71b0c366d1b6e77", + "rev": "7ba4ee4228ed36123c7cb75d50524b43514ef992", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1771130777, - "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=", + "lastModified": 1775365369, + "narHash": "sha256-DgH5mveLoau20CuTnaU5RXZWgFQWn56onQ4Du2CqYoI=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "efec7aaad8d43f8e5194df46a007456093c40f88", + "rev": "cef5cf82671e749ac87d69aadecbb75967e6f6c3", "type": "github" }, "original": { @@ -391,11 +391,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1771553299, - "narHash": "sha256-5QDTPX+CsW+vOjouBO+oCK1NJyRV2u1g4mgjbaUnhZU=", + "lastModified": 1775615465, + "narHash": "sha256-as/MWP8MXrnfQ0HNHsCZFj9I1SmSm2s5bK4umn7qkfA=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "71505d3a9ba76e68da9db4dfd443f18d8f499146", + "rev": "ee18f7bcd5a19f66bead9099839dec0407fda6ff", "type": "github" }, "original": { @@ -438,11 +438,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -454,11 +454,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -470,11 +470,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -490,11 +490,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1771603594, - "narHash": "sha256-PXorFKRWA18beQXKgLnD/DVLa2qmT+DCShPnooC1mx0=", + "lastModified": 1775689752, + "narHash": "sha256-NXgAYzaBjmSviGC/1GDpOuTYlb3d4tKmKbXKOhJDj9Y=", "owner": "nix-community", "repo": "NUR", - "rev": "ac7e1d2193a0edf5f294d09e0d3c51006a731785", + "rev": "ae5816b2855c3c3354e62278950962a24a73228f", "type": "github" }, "original": { @@ -543,11 +543,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1771451240, - "narHash": "sha256-qA8rm0zxrFBVbleYEOJziggyJtZEu1DFeAo3OAkbmB4=", + "lastModified": 1775353404, + "narHash": "sha256-9Plcxx+EjvOo+rS2hySI7J2Gue3VXyZn5M+c2oIhaRU=", "owner": "pwndbg", "repo": "pwndbg", - "rev": "5eb91f443cefb75fae9567aa23931670dc2277a9", + "rev": "80b8096eee1aacbb7ae5bb8edf0c348df0558cf5", "type": "github" }, "original": { @@ -670,11 +670,11 @@ ] }, "locked": { - "lastModified": 1771556776, - "narHash": "sha256-zKprqMQDl3xVfhSSYvgru1IGXjFdxryWk+KqK0I20Xk=", + "lastModified": 1775617983, + "narHash": "sha256-2NWGA/I4j/qlx6qbg86QvJiK1/GyH9gnf0hFiARWVwE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8b3f46b8a6d17ab46e533a5e3d5b1cc2ff228860", + "rev": "d98b91b1feae7ef07fa2ccb3aa3f83f11abfae54", "type": "github" }, "original": { @@ -736,11 +736,11 @@ ] }, "locked": { - "lastModified": 1770228511, - "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", + "lastModified": 1775125835, + "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", + "rev": "75925962939880974e3ab417879daffcba36c4a3", "type": "github" }, "original": { diff --git a/common/home/home.nix b/common/home/home.nix --- a/common/home/home.nix +++ b/common/home/home.nix @@ -1,10 +1,18 @@ # This file has general setting configs to make sure that our experiences are consistent. -{ config, pkgs, pkgs-stable, home-manager, nix-index-database, ...}: { +{ + config, + pkgs, + pkgs-stable, + home-manager, + nix-index-database, + ... +}: +{ programs = { home-manager.enable = true; direnv.enable = true; - nix-index.enable = true; + nix-index.enable = true; zsh = { enable = true; @@ -14,16 +22,16 @@ autocd = true; envExtra = builtins.readFile ./dotfiles/.zshrc; - # TODO: Translate oh-my-zsh plugins. + # TODO: Translate oh-my-zsh plugins. }; git = { settings = { - user = { - name = "Reboot-Codes"; - email = "git@reboot-codes.com"; - }; - }; + user = { + name = "Reboot-Codes"; + email = "git@reboot-codes.com"; + }; + }; signing = { key = "F4DB81CBA107C76D0F7A75B18A0D03A6C3DCBA53"; @@ -33,17 +41,19 @@ neovim = { enable = true; + withPython3 = true; + withRuby = true; defaultEditor = true; vimAlias = true; viAlias = true; initLua = builtins.readFile ./dotfiles/init.lua; - plugins = with pkgs.vimPlugins; [ + plugins = with pkgs.vimPlugins; [ catppuccin-nvim { plugin = lightline-vim; - # TODO: Configure lightline. + # TODO: Configure lightline. config = '' let g:lightline = {'colorscheme': 'catppuccin'} ''; @@ -51,12 +61,12 @@ ]; }; - zed-editor = { - enable = false; - installRemoteServer = true; + zed-editor = { + enable = false; + installRemoteServer = true; - userKeymaps = [ - { + userKeymaps = [ + { context = "Workspace"; bindings = { @@ -64,10 +74,10 @@ ctrl-shift-tab = "pane::ActivatePrevItem"; }; } - ]; + ]; - userSettings = { - tab_size = 2; + userSettings = { + tab_size = 2; buffer_font_family = "JetBrainsMono Nerd Font"; ui_font_family = "Roboto"; soft_wrap = "editor_width"; @@ -79,13 +89,13 @@ telemetry = { diagnostics = false; - metrics = false; + metrics = false; }; theme = { mode = "dark"; light = "One Light"; - dark = "Carbonfox"; + dark = "Carbonfox"; }; node = { @@ -100,7 +110,7 @@ }; initialization_options = { - rustfmt = { + rustfmt = { extraArgs = [ "+nightly" ]; }; }; @@ -113,7 +123,7 @@ }; }; }; - }; + }; starship = { enable = true; @@ -163,27 +173,30 @@ shortcut = "a"; historyLimit = 500000; - plugins = with pkgs.tmuxPlugins; [ - tmux-fzf - mode-indicator - ] ++ [ - (pkgs.tmuxPlugins.mkTmuxPlugin { - pluginName = "tmux-suspend"; - rtpFilePath = "suspend.tmux"; - version = "1a2f806666e0bfed37535372279fa00d27d50d14"; + plugins = + with pkgs.tmuxPlugins; + [ + tmux-fzf + mode-indicator + ] + ++ [ + (pkgs.tmuxPlugins.mkTmuxPlugin { + pluginName = "tmux-suspend"; + rtpFilePath = "suspend.tmux"; + version = "1a2f806666e0bfed37535372279fa00d27d50d14"; - postInstall = '' - patchShebangs suspend.tmux - ''; + postInstall = '' + patchShebangs suspend.tmux + ''; - src = pkgs.fetchFromGitHub { - owner = "MunifTanjim"; - repo = "tmux-suspend"; - rev = "1a2f806666e0bfed37535372279fa00d27d50d14"; - hash = "sha256-+1fKkwDmr5iqro0XeL8gkjOGGB/YHBD25NG+w3iW+0g="; - }; - }) - ]; + src = pkgs.fetchFromGitHub { + owner = "MunifTanjim"; + repo = "tmux-suspend"; + rev = "1a2f806666e0bfed37535372279fa00d27d50d14"; + hash = "sha256-+1fKkwDmr5iqro0XeL8gkjOGGB/YHBD25NG+w3iW+0g="; + }; + }) + ]; extraConfig = builtins.readFile ./dotfiles/tmux.conf; }; @@ -204,19 +217,23 @@ hide_cursor = true; }; - background = [{ - path = "screenshot"; - blur_passes = 4; - blur_size = 8; - }]; + background = [ + { + path = "screenshot"; + blur_passes = 4; + blur_size = 8; + } + ]; - input-field = [{ - size = "500, 50"; - font_color = "rgb(124, 207, 158)"; - inner_color = "rgb(0, 0, 0)"; - outline_color = "rgb(124, 207, 158)"; - dots_center = true; - }]; + input-field = [ + { + size = "500, 50"; + font_color = "rgb(124, 207, 158)"; + inner_color = "rgb(0, 0, 0)"; + outline_color = "rgb(124, 207, 158)"; + dots_center = true; + } + ]; }; }; @@ -227,12 +244,15 @@ settings = { main = { layer = "top"; - position = "top"; + position = "top"; height = 32; modules-left = [ "hyprland/workspaces" ]; - modules-center = []; - modules-right = [ "battery" "clock" ]; + modules-center = [ ]; + modules-right = [ + "battery" + "clock" + ]; }; }; }; @@ -252,64 +272,66 @@ }; home = { - file = { - # Configure the `rustfmt` formatter! - "rustfmt.toml" = { - target = ".config/rustfmt/rustfmt.toml"; - enable = true; - text = builtins.readFile ./dotfiles/rustfmt.toml; - }; + file = { + # Configure the `rustfmt` formatter! + "rustfmt.toml" = { + target = ".config/rustfmt/rustfmt.toml"; + enable = true; + text = builtins.readFile ./dotfiles/rustfmt.toml; + }; - "ignore-dev-edition-profile" = { - target = ".mozilla/firefox/ignore-dev-edition-profile"; - enable = true; - text = ""; - }; + "ignore-dev-edition-profile" = { + target = ".mozilla/firefox/ignore-dev-edition-profile"; + enable = true; + text = ""; + }; - "qemu.conf" = { - target = ".config/libvirt/qemu.conf"; - enable = true; - text = '' - nvram = [ "/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd", "/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd" ] - ''; - }; + "qemu.conf" = { + target = ".config/libvirt/qemu.conf"; + enable = true; + text = '' + nvram = [ "/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd", "/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd" ] + ''; + }; - # TODO: add remind script to this! - }; + # TODO: add remind script to this! + }; - sessionVariables = { - GTK_THEME = "Breeze-Dark"; - NIXOS_OZONE_WL = "1"; - }; - }; + sessionVariables = { + GTK_THEME = "Breeze-Dark"; + NIXOS_OZONE_WL = "1"; + }; + }; # TODO: Translate alt DE configs (hyprland, hyprpapr, dunst, waybar) wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; - settings = let - toggle = program: "pkill ${program} || ${program}"; - runOnce = program: "pgrep ${program} || ${program}"; - in { - "exec-once" = [ - "waybar" - "dunst" - ]; + settings = + let + toggle = program: "pkill ${program} || ${program}"; + runOnce = program: "pgrep ${program} || ${program}"; + in + { + "exec-once" = [ + "waybar" + "dunst" + ]; - "$mod" = "SUPER"; + "$mod" = "SUPER"; - bind = [ - "ALT, space, exec, ${toggle "wofi --show drun"}" - "$mod, Return, exec, alacritty" - "$mod, M, exit," - "$mod, BackSpace, killactive," - "SUPER, left, workspace, -1" - "SUPER, right, workspace, +1" - "SHIFT + SUPER, left, movetoworkspace, -1" - "SHIFT + SUPER, right, movetoworkspace, +1" - "$mod, L, exec, ${runOnce "hyprlock"}" - ]; - }; + bind = [ + "ALT, space, exec, ${toggle "wofi --show drun"}" + "$mod, Return, exec, alacritty" + "$mod, M, exit," + "$mod, BackSpace, killactive," + "SUPER, left, workspace, -1" + "SUPER, right, workspace, +1" + "SHIFT + SUPER, left, movetoworkspace, -1" + "SHIFT + SUPER, right, movetoworkspace, +1" + "$mod, L, exec, ${runOnce "hyprlock"}" + ]; + }; }; } diff --git a/common/nixos/default-config.nix b/common/nixos/default-config.nix --- a/common/nixos/default-config.nix +++ b/common/nixos/default-config.nix @@ -337,7 +337,7 @@ "${pkgs.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2"; "/share/soundfonts/arachno.sf2".source = "${pkgs.soundfont-arachno}/share/soundfonts/arachno.sf2"; "/share/soundfonts/GeneralUser-GS.sf2".source = - "${pkgs.soundfont-generaluser}/share/soundfonts/GeneralUser-GS.sf2"; + "${pkgs.soundfont-generaluser-gs}/share/soundfonts/GeneralUser-GS.sf2"; "/share/soundfonts/YDP-GrandPiano.sf2".source = "${pkgs.soundfont-ydp-grand}/share/soundfonts/YDP-GrandPiano.sf2"; }; diff --git a/nixos/custom-odin-nixos/configuration.nix b/nixos/custom-odin-nixos/configuration.nix --- a/nixos/custom-odin-nixos/configuration.nix +++ b/nixos/custom-odin-nixos/configuration.nix @@ -354,6 +354,8 @@ sleepy-launcher.enable = true; neovim = { + withPython3 = true; + withRuby = true; viAlias = true; vimAlias = true; defaultEditor = true; @@ -657,7 +659,7 @@ soundfont-fluid soundfont-arachno soundfont-ydp-grand - soundfont-generaluser + soundfont-generaluser-gs x42-gmsynth direnv diff --git a/nixos/custom-odin-nixos/hardware-configuration.nix b/nixos/custom-odin-nixos/hardware-configuration.nix --- a/nixos/custom-odin-nixos/hardware-configuration.nix +++ b/nixos/custom-odin-nixos/hardware-configuration.nix @@ -1,12 +1,28 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, modulesPath, ... }: +{ + config, + lib, + modulesPath, + ... +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" "vmd" "nvme" "uas" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ + "ahci" + "xhci_pci" + "thunderbolt" + "usb_storage" + "usbhid" + "sd_mod" + "vmd" + "nvme" + "uas" + "rtsx_pci_sdmmc" + ]; boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.extraModulePackages = [ ]; @@ -18,47 +34,60 @@ fallbackToPassword = true; }; - fileSystems."/" = - { device = "/dev/disk/by-uuid/82862926-048f-4b62-a7e1-df224cae1d73"; - fsType = "btrfs"; - options = [ "subvol=root" "compress=zstd" ]; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/82862926-048f-4b62-a7e1-df224cae1d73"; + fsType = "btrfs"; + options = [ + "subvol=root" + "compress=zstd" + ]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/04BA-15B1"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/04BA-15B1"; + fsType = "vfat"; + options = [ + "fmask=0022" + "dmask=0022" + ]; + }; - fileSystems."/home" = - { device = "/dev/disk/by-uuid/82862926-048f-4b62-a7e1-df224cae1d73"; - fsType = "btrfs"; - options = [ "subvol=home" "compress=zstd" ]; - }; + fileSystems."/home" = { + device = "/dev/disk/by-uuid/82862926-048f-4b62-a7e1-df224cae1d73"; + fsType = "btrfs"; + options = [ + "subvol=home" + "compress=zstd" + ]; + }; - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/82862926-048f-4b62-a7e1-df224cae1d73"; - fsType = "btrfs"; - options = [ "subvol=nix" "compress=zstd" "noatime" ]; - }; + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/82862926-048f-4b62-a7e1-df224cae1d73"; + fsType = "btrfs"; + options = [ + "subvol=nix" + "compress=zstd" + "noatime" + ]; + }; - fileSystems."/swap" = - { device = "/dev/disk/by-uuid/82862926-048f-4b62-a7e1-df224cae1d73"; - fsType = "btrfs"; - options = [ "subvol=swap,noatime" ]; - }; - - #fileSystems."/dev/pts" = { - # fsType = "devpts"; - # device = "devpts"; - # options = [ "gid=5,mode=620" ]; - #}; + fileSystems."/swap" = { + device = "/dev/disk/by-uuid/82862926-048f-4b62-a7e1-df224cae1d73"; + fsType = "btrfs"; + options = [ "subvol=swap,noatime" ]; + }; - fileSystems."/srv/win11/pipewire-0" = { - device = "/run/user/1000/pipewire-0"; - fsType = "none"; - options = [ "bind,rw,user,noauto" ]; - }; + #fileSystems."/dev/pts" = { + # fsType = "devpts"; + # device = "devpts"; + # options = [ "gid=5,mode=620" ]; + #}; + + fileSystems."/srv/win11/pipewire-0" = { + device = "/run/user/1000/pipewire-0"; + fsType = "none"; + options = [ "bind,rw,user,noauto" ]; + }; swapDevices = [ { device = "/swap/swapfile"; } diff --git a/nixos/latitude7390-loki-nixos/configuration.nix b/nixos/latitude7390-loki-nixos/configuration.nix --- a/nixos/latitude7390-loki-nixos/configuration.nix +++ b/nixos/latitude7390-loki-nixos/configuration.nix @@ -182,6 +182,8 @@ sleepy-launcher.enable = true; neovim = { + withPython3 = true; + withRuby = true; viAlias = true; vimAlias = true; defaultEditor = true; @@ -424,7 +426,7 @@ soundfont-fluid soundfont-arachno soundfont-ydp-grand - soundfont-generaluser + soundfont-generaluser-gs x42-gmsynth direnv diff --git a/nixos/latitude7390-loki-nixos/hardware-configuration.nix b/nixos/latitude7390-loki-nixos/hardware-configuration.nix --- a/nixos/latitude7390-loki-nixos/hardware-configuration.nix +++ b/nixos/latitude7390-loki-nixos/hardware-configuration.nix @@ -1,12 +1,26 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "vmd" "nvme" "usb_storage" "uas" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "vmd" + "nvme" + "usb_storage" + "uas" + "sd_mod" + "rtsx_pci_sdmmc" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -19,28 +33,31 @@ fallbackToPassword = true; }; - fileSystems."/" = { + fileSystems."/" = { device = "/dev/disk/by-uuid/7eb5ee9c-8a8a-470d-8005-99c7c5919b68"; fsType = "btrfs"; options = [ "subvol=root,compress=zstd" ]; }; - fileSystems."/nix" = { + fileSystems."/nix" = { device = "/dev/disk/by-uuid/7eb5ee9c-8a8a-470d-8005-99c7c5919b68"; fsType = "btrfs"; options = [ "subvol=nix,compress=zstd,noatime" ]; }; - fileSystems."/swap" = { + fileSystems."/swap" = { device = "/dev/disk/by-uuid/7eb5ee9c-8a8a-470d-8005-99c7c5919b68"; fsType = "btrfs"; options = [ "subvol=swap,noatime" ]; }; - fileSystems."/boot" = { + fileSystems."/boot" = { device = "/dev/disk/by-uuid/48E3-3EAB"; fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; + options = [ + "fmask=0022" + "dmask=0022" + ]; }; swapDevices = [ diff --git a/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix b/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix --- a/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix +++ b/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix @@ -270,6 +270,8 @@ programs = { neovim = { + withPython3 = true; + withRuby = true; viAlias = true; vimAlias = true; defaultEditor = true; @@ -512,7 +514,7 @@ soundfont-fluid soundfont-arachno soundfont-ydp-grand - soundfont-generaluser + soundfont-generaluser-gs x42-gmsynth direnv diff --git a/nixos/temp-installer-nixos/configuration.nix b/nixos/temp-installer-nixos/configuration.nix --- a/nixos/temp-installer-nixos/configuration.nix +++ b/nixos/temp-installer-nixos/configuration.nix @@ -52,6 +52,8 @@ programs = { neovim = { + withPython3 = true; + withRuby = true; viAlias = true; vimAlias = true; defaultEditor = true; diff --git a/common/home/packages/avi.nix b/common/home/packages/avi.nix --- a/common/home/packages/avi.nix +++ b/common/home/packages/avi.nix @@ -29,7 +29,6 @@ blockbench # fooyin furnace - helvum musescore muse-sounds-manager blanket @@ -44,7 +43,7 @@ # sooperlooper fretboard livecaptions - pulseeffects-legacy + # pulseeffects-legacy polyphone # mandelbulber ]; diff --git a/common/home/packages/games.nix b/common/home/packages/games.nix --- a/common/home/packages/games.nix +++ b/common/home/packages/games.nix @@ -43,7 +43,7 @@ kdePackages.kapman kdePackages.kolf kdePackages.kreversi - superTuxKart + supertuxkart # gargoyle # colobot azahar diff --git a/common/home/packages/object-creation.nix b/common/home/packages/object-creation.nix --- a/common/home/packages/object-creation.nix +++ b/common/home/packages/object-creation.nix @@ -1,5 +1,6 @@ { pkgs, pkgs-stable, ... }: let unstable = with pkgs; [ + (lib.hiPrio freecad) fritzing qmk mission-planner @@ -20,7 +21,6 @@ # Object creation kicad openscad - (lib.hiPrio freecad) # brlcad ]; in { diff --git a/common/home/packages/office.nix b/common/home/packages/office.nix --- a/common/home/packages/office.nix +++ b/common/home/packages/office.nix @@ -1,4 +1,5 @@ -{ pkgs, pkgs-stable, ... }: let +{ pkgs, pkgs-stable, ... }: +let unstable = with pkgs; [ # Office (see stable) keepassxc @@ -11,7 +12,7 @@ zotero obsidian emacs-gtk - comaps + # comaps asciidoc-full-with-plugins diamond kdePackages.kclock @@ -34,8 +35,8 @@ gnome-obfuscate curtail xournalpp - logseq - lmstudio + logseq + lmstudio # Translation # whisper-ctranslate2 @@ -46,11 +47,11 @@ stable = with pkgs-stable; [ # Office pdfslicer - kiwix + kiwix kiwix-tools zim zim-tools - translatelocally + translatelocally translatelocally-models.uk-en-tiny translatelocally-models.tr-en-tiny translatelocally-models.sq-en-tiny @@ -83,6 +84,7 @@ translatelocally-models.bg-en-tiny translatelocally-models.hbs-eng-tiny ]; -in { +in +{ packages = unstable ++ stable; } diff --git a/common/home/packages/toys.nix b/common/home/packages/toys.nix --- a/common/home/packages/toys.nix +++ b/common/home/packages/toys.nix @@ -1,4 +1,5 @@ -{ pkgs, pkgs-stable, ... }: let +{ pkgs, pkgs-stable, ... }: +let unstable = with pkgs; [ # Cool shit cmatrix @@ -10,20 +11,21 @@ oneko emote glib - protonvpn-gui + proton-vpn ktailctl kdePackages.wallpaper-engine-plugin - # input-leap - python3Packages.pip - python3Packages.srt - python3Packages.torch - python3Packages.openai-whisper - kdePackages.kdeconnect-kde - python313Packages.meshtastic - rymdport - magic-wormhole - peco + # input-leap + python3Packages.pip + python3Packages.srt + python3Packages.torch + python3Packages.openai-whisper + kdePackages.kdeconnect-kde + python313Packages.meshtastic + rymdport + magic-wormhole + peco ]; -in { +in +{ packages = unstable; }