diff --git a/flake.lock b/flake.lock index 434f82b..8b933cc 100644 --- a/flake.lock +++ b/flake.lock @@ -119,11 +119,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1733361773, - "narHash": "sha256-b+cFO1MDGjkR6VnYfTiZTqWQtXbKKFIw0GzvEEzDEOs=", + "lastModified": 1733473330, + "narHash": "sha256-u+omEO2O4TaUIxOCkCBbgYC9piLN4NEiq/nYwB8hCRY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2e6e7801a515f8dbece2d888244a6a2604e36e86", + "rev": "e3ac055c27f9268a294c911578c7cb04c087c7ab", "type": "github" }, "original": { @@ -485,11 +485,11 @@ ] }, "locked": { - "lastModified": 1733389730, - "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -778,11 +778,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -935,11 +935,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -996,11 +996,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -1325,11 +1325,11 @@ ] }, "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "lastModified": 1733440889, + "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", "type": "github" }, "original": { diff --git a/hmModules/cura/default.nix b/hmModules/cura/default.nix index 7b530f3..96a2f2c 100644 --- a/hmModules/cura/default.nix +++ b/hmModules/cura/default.nix @@ -4,7 +4,7 @@ ( let cura5 = pkgs.appimageTools.wrapType2 rec { - name = "cura5"; + pname = "cura5"; version = "5.8.0"; src = pkgs.fetchurl { url = "https://github.com/Ultimaker/Cura/releases/download/${version}/UltiMaker-Cura-${version}-linux-X64.AppImage"; diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index e1bd97a..11b765b 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -881,6 +881,8 @@ This is meant to be an helper to be called from the window manager." :custom (gptel-api-key (lambda () (require 'f) (f-read-text (getenv "OPENAI_API_KEY_PATH")))) (gptel-model 'gpt-4o) + (gptel-default-mode 'org-mode) + (gptel-org-branching-context 't) :config (require 'gptel-curl) @@ -919,6 +921,9 @@ This is meant to be an helper to be called from the window manager." ) ;; destroy frame on exit ) +(use-package mixed-pitch + :hook (text-mode . mixed-pitch-mode)) + (use-package pass :config (require 'password-store-otp) ;; FIXME use `use-pacakge' idiomatic way @@ -967,5 +972,26 @@ This is meant to be an helper to be called from the window manager." (:name "GitHub" :query "tag:github" :key "g") (:name "Trash" :query "tag:trash" :key "t")))) +;;; Experiments, remove from here + +(defun ccr/test () + "test" + (interactive) + (with-selected-frame + (make-frame '((name . "emacs-run-launcher") + (minibuffer . only) + (fullscreen . 0) ; no fullscreen + (undecorated . t) ; remove title bar + ;;(auto-raise . t) ; focus on this frame + ;;(tool-bar-lines . 0) + ;;(menu-bar-lines . 0) + (internal-border-width . 10) + (width . 80) + (height . 11))) + (unwind-protect + (completing-read "ciao " '("foo" "bar") nil t "") + (delete-frame)))) + + (provide 'init) ;;; init.el ends here diff --git a/hmModules/sdrangel/default.nix b/hmModules/sdrangel/default.nix new file mode 100644 index 0000000..b241700 --- /dev/null +++ b/hmModules/sdrangel/default.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + home.packages = [ + pkgs.sdrangel + pkgs.kdePackages.qtlocation + ]; +} diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index fb10d92..1d68741 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -4,6 +4,7 @@ age, hostname, config, + username, ... }: { @@ -59,7 +60,7 @@ settings = { daemon = { enabled = true; - socket_path = "/home/ccr/.local/share/atuin/atuin.sock"; # FIXME using ~ or $HOME doesn't work: https://github.com/atuinsh/atuin/issues/2289 + socket_path = "/home/${username}/.local/share/atuin/atuin.sock"; # FIXME using ~ or $HOME doesn't work: https://github.com/atuinsh/atuin/issues/2289 }; auto_sync = true; sync_frequency = "5m"; diff --git a/hosts/default.nix b/hosts/default.nix index f86454b..aa8d2fb 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -119,6 +119,20 @@ }; }; + + tpol = { + extraModules = with inputs; [ + lix-module.nixosModules.default + ]; + secrets = { + "tpol-wireguard-private-key" = { }; + }; + vpn = { + ip = "10.100.0.7"; + publicKey = "b/Pi7koTFo5CMAAzcL2ulvQ/0dUjKzbmXpvh4Lb/Bgo="; + }; + extraHmModulesUser = "mara"; + }; }; vpnExtra = { diff --git a/hosts/kirk/default.nix b/hosts/kirk/default.nix index 3b17a67..1e60076 100644 --- a/hosts/kirk/default.nix +++ b/hosts/kirk/default.nix @@ -40,7 +40,7 @@ ccr = { enable = true; - autologin = true; + autologin = false; modules = [ "git" "git-workspace" @@ -72,6 +72,8 @@ "catppuccin" "libreoffice" "emacs" + "chirp" + "sdrangel" ]; extraGroups = [ ]; backupPaths = [ ]; @@ -99,6 +101,7 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "schedutil"; hardware.enableRedistributableFirmware = lib.mkDefault true; + hardware.rtl-sdr.enable = true; hardware.graphics = { enable = true; diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 5842bf7..c2cf5b9 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -91,8 +91,9 @@ "emacs" "vial" "chirp" + "sdrangel" ]; - extraGroups = [ ]; + extraGroups = [ "plugdev" ]; backupPaths = [ ]; }; diff --git a/hosts/sisko/disko.nix b/hosts/sisko/disko.nix index ba5c708..55ec848 100644 --- a/hosts/sisko/disko.nix +++ b/hosts/sisko/disko.nix @@ -66,8 +66,11 @@ in size = "100%"; content = { type = "filesystem"; - format = "bcachefs"; + format = "xfs"; mountpoint = "/mnt/hd"; + mountOptions = [ + "nofail" + ]; }; }; }; diff --git a/hosts/spock/default.nix b/hosts/spock/default.nix new file mode 100644 index 0000000..c564f78 --- /dev/null +++ b/hosts/spock/default.nix @@ -0,0 +1,48 @@ +{ + lib, + modulesPath, + ... +}: +{ + imports = [ + "${modulesPath}/installer/sd-card/sd-image-aarch64.nix" + ]; + + sdImage.compressImage = false; + + nixpkgs = { + # hostPlatform = lib.mkDefault "armv6-linux"; + # config = { + # allowUnfree = true; + # }; + # overlays = [ + # # Workaround: https://github.com/NixOS/nixpkgs/issues/154163 + # # modprobe: FATAL: Module sun4i-drm not found in directory + # (final: super: { + # makeModulesClosure = x: + # super.makeModulesClosure (x // {allowMissing = true;}); + # }) + # ]; + }; + + fileSystems = { + "/" = { + device = "/dev/disk/by-label/NIXOS_SD"; + fsType = "ext4"; + options = [ "noatime" ]; + }; + }; + + networking = { + networkmanager.enable = false; + }; + + # Set your time zone. + time.timeZone = "Europe/Rome"; + + # Allow the user to log in as root without a password. + users.users.root.initialHashedPassword = ""; + + hardware.enableRedistributableFirmware = true; + system.stateVersion = "24.11"; +} diff --git a/hosts/tpol/default.nix b/hosts/tpol/default.nix new file mode 100644 index 0000000..7793f66 --- /dev/null +++ b/hosts/tpol/default.nix @@ -0,0 +1,94 @@ +{ + modulesPath, + fleetModules, + pkgs, + lib, + vpn, + config, + ... +}: +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") ] + ++ fleetModules [ + "common" + "ssh" + "nix" + "networkmanager" + "dbus" + "udisks2" + "xdg" + "printing" + "mara" + "xfce" + "battery" + "printing" + "wireguard-client" + ]; + + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ehci_pci" + "ahci" + "usb_storage" + "sd_mod" + "sr_mod" + "rtsx_pci_sdmmc" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + boot.loader.grub.device = "/dev/sda"; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/1522f8d9-5251-408d-9b6e-ed6da7da916a"; + fsType = "btrfs"; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/e111fbc7-8e5d-4fcb-95c9-249f53ab0adc"; } + ]; + + mara = { + enable = true; + modules = [ + "shell" + "mpv" + "firefox" + "git" + "chrome" + "udiskie" + "helix" + "remmina" + ]; + }; + + # nevertheless this is a laptop the battery is completely gone, so it works only attached to electrictiy + powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; + + networking.firewall.allowedTCPPorts = [ 1234 ]; + + hardware.rtl-sdr.enable = true; + + systemd.services.rtl-tcp = { + description = "rtl_sdr over TCP"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${lib.getExe' pkgs.rtl-sdr "rtl_tcp"} -a ${vpn.${config.networking.hostName}} + ''; + }; + }; + + systemd.services.sdrangelsrv = { + description = "sdrangelsrv"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${lib.getExe' pkgs.sdrangel "sdrangelsrv"} --remote-tcp-hwtype RTLSDR --remote-tcp-port 1234 --remote-tcp-address ${ + vpn.${config.networking.hostName} + } --remote-tcp + ''; + }; + }; +} diff --git a/lib/default.nix b/lib/default.nix index a923f7d..9f885c1 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -12,6 +12,7 @@ pbp = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFF05LScu9m5BXMlFAT1g+g/AkAi7kvq1dY6W3Rzqq3f"; picard = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ1+1z1IsLVJ6aGarMgzw3NbmFKcpYVgdUjl7xDsewxT"; deltaflyer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPETMwELvGTnhKJbpK0oFs4lK8vm/kV9KdgL9wufYDDQ"; + tpol = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIQxHSow2l0TDWTonBPPaGvTgVvMS/xsQOf1nHnvLSwV"; }; }; } diff --git a/modules/binfmt/default.nix b/modules/binfmt/default.nix index bd582f7..3f53722 100644 --- a/modules/binfmt/default.nix +++ b/modules/binfmt/default.nix @@ -3,9 +3,10 @@ "i686-linux" "aarch64-linux" "riscv64-linux" + "armv6l-linux" ]; nix.extraOptions = '' - extra-platforms = aarch64-linux arm-linux i686-linux riscv64-linux + extra-platforms = aarch64-linux arm-linux i686-linux riscv64-linux armv6l-linux ''; # XXX For some reason `docker buildx` isn't aware of this: diff --git a/modules/ccr/default.nix b/modules/ccr/default.nix index 3ffa60d..31c7859 100644 --- a/modules/ccr/default.nix +++ b/modules/ccr/default.nix @@ -86,6 +86,7 @@ in "dialout" "systemd-journal" "camera" + "networkmanager" ]; ccr.modules = [ "shell" diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix index e89327a..426f375 100644 --- a/modules/fonts/default.nix +++ b/modules/fonts/default.nix @@ -1,19 +1,21 @@ { pkgs, ... }: { fonts = { - packages = with pkgs; [ - powerline-fonts - dejavu_fonts - fira-code - fira-code-symbols - iosevka - iosevka-comfy.comfy - emacs-all-the-icons-fonts - nerdfonts - joypixels - etBook - vegur - ]; + packages = + with pkgs; + [ + powerline-fonts + dejavu_fonts + fira-code + fira-code-symbols + iosevka + iosevka-comfy.comfy + emacs-all-the-icons-fonts + joypixels + etBook + vegur + ] + ++ (builtins.filter lib.attrsets.isDerivation (builtins.attrValues nerd-fonts)); fontconfig.defaultFonts = { monospace = [ "DejaVu Sans Mono for Powerline" ]; sansSerif = [ "DejaVu Sans" ]; diff --git a/modules/mara/default.nix b/modules/mara/default.nix index 8696519..df60577 100644 --- a/modules/mara/default.nix +++ b/modules/mara/default.nix @@ -4,6 +4,7 @@ pkgs, fleetHmModules, fleetFlake, + vpn, ... }: { @@ -46,20 +47,33 @@ default = [ "wheel" "fuse" - "networkmanager" + "video" "dialout" + "systemd-journal" + "camera" + "networkmanager" ]; }; }; config = lib.mkIf config.mara.enable { + + programs.fish.enable = true; + + mara.modules = [ + "shell" + "git" + "nix-index" + "btop" + ]; + users.users.mara = { uid = 1001; inherit (config.mara) hashedPassword; description = "Mara Savastano"; isNormalUser = true; inherit (config.mara) extraGroups; - shell = pkgs.nushell; + shell = pkgs.fish; openssh.authorizedKeys.keys = config.mara.authorizedKeys; }; @@ -68,7 +82,16 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.mara = { - imports = fleetHmModules config.mara.modules; + imports = fleetHmModules config.mara.modules ++ [ + { + _module.args = { + inherit (config.age) secrets; + inherit vpn; + username = "mara"; + hostname = config.networking.hostName; + }; + } + ]; home.packages = config.mara.packages; home.stateVersion = config.system.stateVersion; }; diff --git a/modules/networkmanager/default.nix b/modules/networkmanager/default.nix index 7259900..4e2eb66 100644 --- a/modules/networkmanager/default.nix +++ b/modules/networkmanager/default.nix @@ -1,6 +1,5 @@ { lib, ... }: { networking.networkmanager.enable = true; - ccr.extraGroups = [ "networkmanager" ]; networking.useDHCP = lib.mkDefault true; } diff --git a/modules/xfce/default.nix b/modules/xfce/default.nix index 2294bb4..3eeff72 100644 --- a/modules/xfce/default.nix +++ b/modules/xfce/default.nix @@ -5,10 +5,11 @@ xterm.enable = false; xfce.enable = true; }; - displayManager = { - defaultSession = "xfce"; - autoLogin.user = "mara"; - }; + }; + + services.displayManager = { + defaultSession = "xfce"; + autoLogin.user = "mara"; }; home-manager.users.mara.home.file."background-image" = { diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index cf81eca..65249d2 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -118,6 +118,7 @@ let solidity-mode telega aggressive-indent + mixed-pitch # org-re-reveal # FIXME very not nice hash mismatch when building ] ) diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 2cebf84..a322a52 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -182,4 +182,8 @@ with keys.users; deltaflyer ]; + "tpol-wireguard-private-key.age".publicKeys = [ + ccr-ssh + tpol + ]; } diff --git a/secrets/tpol-wireguard-private-key.age b/secrets/tpol-wireguard-private-key.age new file mode 100644 index 0000000..f870a1d --- /dev/null +++ b/secrets/tpol-wireguard-private-key.age @@ -0,0 +1,17 @@ +age-encryption.org/v1 +-> ssh-rsa /AagBw +qUiTcrs0L+daa9FAsa80rdJsZCKCJN76KREz7mU7FF3ZBGp4VvisP4hJSjNKheWW +pfVaefXfuIsw2GvGqUjNZMGHj650gGEqMtO6nLuetMuCIWF7uTdPpnNQMK6BB2ni +Wlfu2g4rul6aV+S6KNiVBqlKJn521TOkEutsXFjaAJpnRVOG50P/8k9fPzjXNZnj +NqmMhGjOE8tDs9TM1nWM4yYDX3KMDULvcBHycV3yQRzswEJc4jq9oLS8SbyE+4Hy +dH6hkWLiRMz06Xg4F0XifGY4lglcMiQqNdNe5xMZtuR33Z1GUiY9HGU5FvXmUbQx +HTWTklzH8q0vdEmb2tFftCM8AMeodI3CLBt+DNlQ3V0+izUmOJwTGz5OGfT6SiWY +epMF5kXmZipWu5KsEoY1hv1INvGR84LyicpOT2vPV7cakx9ahlCgV5vhdmcAZy5F +CRAhnvIsZZMHwGV9lmAMI93wgPyU0ybtwjSpPbHAqv0DQj+CBrEY5ict3+HhSe5J +QrfcLRsQRox3QuR/jQvixBX63qNaezYFmpBuWP7XI7PuPj7KdUgECNfMctcVmCSb +xHKmYkf8I8Si1doFOZbYOXheiI/zNk0xLAONPI+LQ6ZemUODhpcpRSSkhcDKQdtC +srxvyTvYOk4IFjmjuk2JyE1Vp6wg+aiySZlyfFA7WQY +-> ssh-ed25519 X7Q5KQ UoryJKCMOKeAkI1dbz8On5q0wSd+XIUCdWI31gyS6D4 +exrVhh9tGzQyToDKcv5sspbeKhdTp1q0wKuHWo+onKQ +--- QkkySHHmaJFZu2BNT0ZZ9NZipUbFqyzxL32YZx5DRbQ +wc^[v$j7Lmt{`0]l聾3 {C\XZ)Z$4d/.L \ No newline at end of file