diff options
| -rw-r--r-- | flake.lock | 27 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | nixos/machine/adm-omnia.nix | 7 | ||||
| -rw-r--r-- | nixos/machine/dean.nix | 2 | ||||
| -rw-r--r-- | nixos/machine/spt-mox2.nix | 14 | ||||
| -rw-r--r-- | nixos/modules/desktop.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/develop.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/generic.nix | 2 |
8 files changed, 29 insertions, 28 deletions
@@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660639432, - "narHash": "sha256-2WDiboOCfB0LhvnDVMXOAr8ZLDfm3WdO54CkoDPwN1A=", + "lastModified": 1661120702, + "narHash": "sha256-o2P8sp6FaCwPT8i67Un3w5DN0+nFnY8e9xk7Tj0hpmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c6409e965a6c883677be7b9d87a95fab6c3472e", + "rev": "3ed15c29ce0fd1c3fcfbbeebcf1607057200d83c", "type": "github" }, "original": { @@ -107,8 +107,11 @@ ] }, "locked": { - "lastModified": 1660460791, - "narHash": "sha256-/9OCv3pab2ojDGiL000dnropBpXulUzGeWLjVyWkAgw=", + "lastModified": 1660980319, + "narHash": "sha256-kOmTRZQW7iCLFKX5/XavdE9Y6WdZlNgJ+ZcnpwcSgCk=", + "ref": "refs/heads/master", + "rev": "28175647be4ef4f5539857b7dc102e674700f775", + "revCount": 39, "type": "git", "url": "file:///home/cynerd/projects/nixturris" }, @@ -119,11 +122,11 @@ }, "personal-secret": { "locked": { - "lastModified": 1659901081, - "narHash": "sha256-S81VB06BqQr4Wox8g1uWiGRyhPtNLahs5mSF3HslRWw=", + "lastModified": 1660915143, + "narHash": "sha256-tx1GravYySdBr+jngQf5O4nCr1Wxoxuv7MSnc0/97+k=", "ref": "refs/heads/master", - "rev": "3859c3d6b744726a23ae1c903c6ecd28ff2ffc35", - "revCount": 28, + "rev": "0c198386f5641a793651264d571a076b63dcf5cb", + "revCount": 29, "type": "git", "url": "ssh://git@cynerd.cz/nixos-personal-secret" }, @@ -167,11 +170,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1654787204, - "narHash": "sha256-SFzlL4FxwazJqzMPvLPT0IVWaYqV+NMdHxOEOawZ9Z8=", + "lastModified": 1661025608, + "narHash": "sha256-RJD0js+10s18ovDy0b/edPdQ+H4rc6V0UI0YjGK4rL0=", "owner": "wentasah", "repo": "sterm", - "rev": "aec0022e09119ec4e0cf8ba85515cbde907384b6", + "rev": "e306235a2980675b9bce6e115b68e9bdccc0f684", "type": "github" }, "original": { @@ -52,6 +52,7 @@ { boot.loader.systemd-boot.enable = false; } ];}; raspi3System = genericSystem {system = "aarch64-linux"; extra_modules = [ + nixturris.nixosModules.turris-crossbuild ({pkgs, ...}: { boot.loader.systemd-boot.enable = false; boot.loader.grub.enable = false; diff --git a/nixos/machine/adm-omnia.nix b/nixos/machine/adm-omnia.nix index c7c2063..48af6fa 100644 --- a/nixos/machine/adm-omnia.nix +++ b/nixos/machine/adm-omnia.nix @@ -8,6 +8,7 @@ with lib; cynerd = { #openvpn.oldpersonal = true; }; + boot.kernelPackages = pkgs.linuxPackages; networking = { # TODO we need vlan filtering to filter out guest and adm network @@ -40,12 +41,6 @@ with lib; enable = true; environmentFile = "/run/secrets/hostapd.env"; interfaces = { - "mlan0" = { - countryCode = "CZ"; - ssid = "TurrisRules"; - wpa = true; - wpaPassphrase = "@PASS_TURRIS_RULES@"; - }; "wlp1s0" = { countryCode = "CZ"; hwMode = "a"; diff --git a/nixos/machine/dean.nix b/nixos/machine/dean.nix index b34bb0b..f2d5459 100644 --- a/nixos/machine/dean.nix +++ b/nixos/machine/dean.nix @@ -37,7 +37,7 @@ with lib; }]; environment.systemPackages = with pkgs; [ - openocd + #openocd sterm ]; diff --git a/nixos/machine/spt-mox2.nix b/nixos/machine/spt-mox2.nix index a3de15d..65748fb 100644 --- a/nixos/machine/spt-mox2.nix +++ b/nixos/machine/spt-mox2.nix @@ -24,16 +24,16 @@ with lib; enable = true; environmentFile = "/run/secrets/hostapd.env"; interfaces = { - "mlan0" = { - countryCode = "CZ"; - ssid = "TurrisRules"; - wpa = true; - wpaPassphrase = "@PASS_TURRIS_RULES@"; - }; + #"mlan0" = { + #countryCode = "CZ"; + #ssid = "TurrisRules"; + #wpa = true; + #wpaPassphrase = "@PASS_TURRIS_RULES@"; + #}; "wlp1s0" = { countryCode = "CZ"; hwMode = "a"; - channel = 36; + channel = 40; ieee80211ac = true; ht_capab = ["HT40+" "LDPC" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "DSSS_CCK-40"]; vht_capab = ["RXLDPC" "SHORT-GI-80" "TX-STBC-2BY1" "RX-ANTENNA-PATTERN" "TX-ANTENNA-PATTERN" "RX-STBC-1" "MAX-MPDU-11454" "MAX-A-MPDU-LEN-EXP7"]; diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix index 500e3de..bff2c1e 100644 --- a/nixos/modules/desktop.nix +++ b/nixos/modules/desktop.nix @@ -229,5 +229,7 @@ in { services.xserver.xkbOptions = "grp:alt_shift_toggle,caps:escape"; services.gpm.enable = true; + services.locate.enable = true; + }; } diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix index 310eaa3..51e106a 100644 --- a/nixos/modules/develop.nix +++ b/nixos/modules/develop.nix @@ -77,7 +77,7 @@ in { qemu # U-Boot - ubootTools + #ubootTools tftp-hpa # Network diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix index 29c2155..6469a9d 100644 --- a/nixos/modules/generic.nix +++ b/nixos/modules/generic.nix @@ -34,7 +34,7 @@ in { boot.loader.systemd-boot.enable = mkOverride 1100 true; boot.loader.efi.canTouchEfiVariables = mkDefault true; - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = mkOverride 1100 pkgs.linuxPackages_latest; boot.kernelParams = ["boot.shell_on_fail"]; hardware.enableAllFirmware = true; |