diff --git a/flake.lock b/flake.lock index 581f5da..9457803 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -287,11 +287,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -485,11 +485,11 @@ ] }, "locked": { - "lastModified": 1733389730, - "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", + "lastModified": 1731535640, + "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", "owner": "nix-community", "repo": "home-manager", - "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", + "rev": "35b055009afd0107b69c286fca34d2ad98940d57", "type": "github" }, "original": { @@ -564,6 +564,7 @@ "locked": { "lastModified": 1728951119, "narHash": "sha256-vUBgL8zJBDyj2serxdEVbNqe6pBN4YgWwhtg3XP8mpQ=", + "ref": "refs/heads/main", "rev": "f6077314fa6aff862758095bb55fe844e9162a1d", "revCount": 16344, "type": "git", @@ -588,11 +589,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1732351635, - "narHash": "sha256-H94CcQ3yamG5+RMxtxXllR02YIlxQ5WD/8PcolO9yEA=", + "lastModified": 1731185443, + "narHash": "sha256-9qkRZFTgbMonlBaLqL+OW6iiHLWXuBJlThISMhwQuGg=", "ref": "refs/heads/main", - "rev": "dfc286ca3dc49118c30d8d6205d6d6af76c62b7a", - "revCount": 617, + "rev": "57ddb99e781d19704f8a84036f9890e6ca554c41", + "revCount": 613, "type": "git", "url": "https://git.lix.systems/lix-project/nix-eval-jobs" }, @@ -613,11 +614,11 @@ ] }, "locked": { - "lastModified": 1732603698, - "narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=", + "lastModified": 1731185731, + "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=", "ref": "refs/heads/main", - "rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730", - "revCount": 123, + "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34", + "revCount": 117, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -698,11 +699,11 @@ ] }, "locked": { - "lastModified": 1731952509, - "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=", + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "7b5f051df789b6b20d259924d349a9ba3319b226", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", "type": "github" }, "original": { @@ -995,11 +996,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -1283,11 +1284,11 @@ ] }, "locked": { - "lastModified": 1732292307, - "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", + "lastModified": 1729613947, + "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "705df92694af7093dfbb27109ce16d828a79155f", + "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", "type": "github" }, "original": { diff --git a/hmModules/cura/default.nix b/hmModules/cura/default.nix index 96a2f2c..7b530f3 100644 --- a/hmModules/cura/default.nix +++ b/hmModules/cura/default.nix @@ -4,7 +4,7 @@ ( let cura5 = pkgs.appimageTools.wrapType2 rec { - pname = "cura5"; + name = "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 11b765b..e1bd97a 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -881,8 +881,6 @@ 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) @@ -921,9 +919,6 @@ 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 @@ -972,26 +967,5 @@ 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 deleted file mode 100644 index b241700..0000000 --- a/hmModules/sdrangel/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ - pkgs.sdrangel - pkgs.kdePackages.qtlocation - ]; -} diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index 1d68741..fb10d92 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -4,7 +4,6 @@ age, hostname, config, - username, ... }: { @@ -60,7 +59,7 @@ settings = { daemon = { enabled = true; - socket_path = "/home/${username}/.local/share/atuin/atuin.sock"; # FIXME using ~ or $HOME doesn't work: https://github.com/atuinsh/atuin/issues/2289 + socket_path = "/home/ccr/.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 aa8d2fb..f86454b 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -119,20 +119,6 @@ }; }; - - 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 1e60076..3b17a67 100644 --- a/hosts/kirk/default.nix +++ b/hosts/kirk/default.nix @@ -40,7 +40,7 @@ ccr = { enable = true; - autologin = false; + autologin = true; modules = [ "git" "git-workspace" @@ -72,8 +72,6 @@ "catppuccin" "libreoffice" "emacs" - "chirp" - "sdrangel" ]; extraGroups = [ ]; backupPaths = [ ]; @@ -101,7 +99,6 @@ 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 c2cf5b9..5842bf7 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -91,9 +91,8 @@ "emacs" "vial" "chirp" - "sdrangel" ]; - extraGroups = [ "plugdev" ]; + extraGroups = [ ]; backupPaths = [ ]; }; diff --git a/hosts/sisko/disko.nix b/hosts/sisko/disko.nix index 55ec848..ba5c708 100644 --- a/hosts/sisko/disko.nix +++ b/hosts/sisko/disko.nix @@ -66,11 +66,8 @@ in size = "100%"; content = { type = "filesystem"; - format = "xfs"; + format = "bcachefs"; mountpoint = "/mnt/hd"; - mountOptions = [ - "nofail" - ]; }; }; }; diff --git a/hosts/spock/default.nix b/hosts/spock/default.nix deleted file mode 100644 index c564f78..0000000 --- a/hosts/spock/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - 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 deleted file mode 100644 index 7793f66..0000000 --- a/hosts/tpol/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - 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 9f885c1..a923f7d 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -12,7 +12,6 @@ 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 3f53722..bd582f7 100644 --- a/modules/binfmt/default.nix +++ b/modules/binfmt/default.nix @@ -3,10 +3,9 @@ "i686-linux" "aarch64-linux" "riscv64-linux" - "armv6l-linux" ]; nix.extraOptions = '' - extra-platforms = aarch64-linux arm-linux i686-linux riscv64-linux armv6l-linux + extra-platforms = aarch64-linux arm-linux i686-linux riscv64-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 31c7859..3ffa60d 100644 --- a/modules/ccr/default.nix +++ b/modules/ccr/default.nix @@ -86,7 +86,6 @@ in "dialout" "systemd-journal" "camera" - "networkmanager" ]; ccr.modules = [ "shell" diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix index 426f375..e89327a 100644 --- a/modules/fonts/default.nix +++ b/modules/fonts/default.nix @@ -1,21 +1,19 @@ { pkgs, ... }: { fonts = { - 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)); + 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 + ]; fontconfig.defaultFonts = { monospace = [ "DejaVu Sans Mono for Powerline" ]; sansSerif = [ "DejaVu Sans" ]; diff --git a/modules/mara/default.nix b/modules/mara/default.nix index df60577..8696519 100644 --- a/modules/mara/default.nix +++ b/modules/mara/default.nix @@ -4,7 +4,6 @@ pkgs, fleetHmModules, fleetFlake, - vpn, ... }: { @@ -47,33 +46,20 @@ default = [ "wheel" "fuse" - "video" - "dialout" - "systemd-journal" - "camera" "networkmanager" + "dialout" ]; }; }; 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.fish; + shell = pkgs.nushell; openssh.authorizedKeys.keys = config.mara.authorizedKeys; }; @@ -82,16 +68,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.mara = { - imports = fleetHmModules config.mara.modules ++ [ - { - _module.args = { - inherit (config.age) secrets; - inherit vpn; - username = "mara"; - hostname = config.networking.hostName; - }; - } - ]; + imports = fleetHmModules config.mara.modules; home.packages = config.mara.packages; home.stateVersion = config.system.stateVersion; }; diff --git a/modules/networkmanager/default.nix b/modules/networkmanager/default.nix index 4e2eb66..7259900 100644 --- a/modules/networkmanager/default.nix +++ b/modules/networkmanager/default.nix @@ -1,5 +1,6 @@ { 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 3eeff72..2294bb4 100644 --- a/modules/xfce/default.nix +++ b/modules/xfce/default.nix @@ -5,11 +5,10 @@ xterm.enable = false; xfce.enable = true; }; - }; - - services.displayManager = { - defaultSession = "xfce"; - autoLogin.user = "mara"; + 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 65249d2..cf81eca 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -118,7 +118,6 @@ 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 a322a52..2cebf84 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -182,8 +182,4 @@ 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 deleted file mode 100644 index f870a1d..0000000 --- a/secrets/tpol-wireguard-private-key.age +++ /dev/null @@ -1,17 +0,0 @@ -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