Compare commits

17 Commits

Author SHA1 Message Date
aner d4dee59413 Package lint inclusion 2026-05-24 17:22:54 +03:00
aner cf57b3eb4a Bugfix for dashboard 2026-05-19 22:44:11 +03:00
aner e5bf9c0a41 Updated 2026-05-17 11:48:46 +03:00
aner 00f62d61eb Fix 2026-05-17 11:23:27 +03:00
aner c4066da976 New azos-core 2026-05-12 23:33:55 +03:00
aner 6751554982 Better exfat support 2026-05-12 10:28:18 +03:00
aner 83c279ded4 Moved autmounting to core 2026-05-12 09:01:11 +03:00
aner f89e04d898 Fix even more things 2026-05-11 15:02:51 +03:00
aner a89f5ca015 Added hl-line externally plus automount 2026-05-11 14:50:45 +03:00
aner 9780d69f25 Updated azos core for safety. 2026-05-08 23:20:11 +03:00
aner 4cd4114f7c Send us back a little bit - I just exernalized evil hl line. 2026-05-08 23:15:15 +03:00
aner ea550d2e8c Updated azos-core, nextcloud client, better zoom for qutebrowser 2026-05-04 14:52:08 +03:00
aner 29a351845b Updated azos-core, cladav sync, arch64 emulation 2026-04-29 20:21:48 +03:00
aner 2d72c3e7df Fixed flake lock submodule things 2026-04-26 00:13:20 +03:00
aner 315e73c63c Fixed git config. 2026-04-25 21:59:10 +03:00
aner 8a8e63b095 Fixed shell handling 2026-04-25 21:40:20 +03:00
aner b68932f516 Fixed submodule handling 2026-04-25 21:39:54 +03:00
13 changed files with 134 additions and 83 deletions
+2 -2
View File
@@ -23,8 +23,8 @@ nix build .#formatter.x86_64-linux
```bash ```bash
# Rebuild the azos environment for lauretta (this machine) — use this when asked to "rebuild" # Rebuild the azos environment for lauretta (this machine) — use this when asked to "rebuild"
sudo nixos-rebuild switch --flake '.?submodules=1#lauretta' sudo nixos-rebuild switch --flake '.?submodules=1#lauretta'
nix flake update # Update all inputs nix flake update --flake '.?submodules=1' # Update all inputs
nix flake lock --update-input X # Update specific input nix flake lock --flake '.?submodules=1' --update-input X # Update specific input
``` ```
> **Note**: When the user asks to "rebuild", they mean rebuilding the lauretta environment with the command above — NOT building the VM. > **Note**: When the user asks to "rebuild", they mean rebuilding the lauretta environment with the command above — NOT building the VM.
Generated
+58 -72
View File
@@ -3,7 +3,7 @@
"azos-core": { "azos-core": {
"inputs": { "inputs": {
"cabata": "cabata", "cabata": "cabata",
"nix-search-cli": "nix-search-cli", "evil-hl-line": "evil-hl-line",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
@@ -36,19 +36,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": { "evil-hl-line": {
"flake": false, "inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2"
},
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1778617640,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "narHash": "sha256-bG1hjyLIOiRB+M1rXm8ch0ftHPvV43lRtzQ8qWcus5s=",
"owner": "edolstra", "owner": "anerisgreat",
"repo": "flake-compat", "repo": "evil-hl-line",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "rev": "7cf5a11bdca2abd9516f0ce572e1e03bb541507f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "edolstra", "owner": "anerisgreat",
"repo": "flake-compat", "repo": "evil-hl-line",
"type": "github" "type": "github"
} }
}, },
@@ -75,12 +78,15 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1676283394, "lastModified": 1731533236,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -96,11 +102,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774647770, "lastModified": 1778954430,
"narHash": "sha256-UNNi14XiqRWWjO8ykbFwA5wRwx7EscsC+GItOVpuGjc=", "narHash": "sha256-oaNyOr05lblaQdtbkbN1wO0b2KLIL2O1LkmwDgdQp4I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "02371c05a04a2876cf92e2d67a259e8f87399068", "rev": "26aaab785b0bab4af60a2c42b22760fa906ef22a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -115,11 +121,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1773185476, "lastModified": 1777848538,
"narHash": "sha256-COuJkFg669oalmEN3T61gD3gM9SfUsiGvDS9pCOphZY=", "narHash": "sha256-Dj51C0NWsglqRrCpdmMr2nFiYacFOid1Tor4H9yG2HY=",
"owner": "musnix", "owner": "musnix",
"repo": "musnix", "repo": "musnix",
"rev": "739e2a1f94c87d5f4c8b880a12480185cf0d7620", "rev": "8548782f0d1d0928daa3fffde8a008f72219a3f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -128,49 +134,13 @@
"type": "github" "type": "github"
} }
}, },
"nix-filter": {
"locked": {
"lastModified": 1710156097,
"narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "3342559a24e85fc164b295c3444e8a139924675b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-search-cli": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_2",
"nix-filter": "nix-filter",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1762187737,
"narHash": "sha256-NGL9jj4y16+d0Es7aK1oxqAimZn7sdJDAxVkcY3CTcg=",
"owner": "peterldowns",
"repo": "nix-search-cli",
"rev": "ab0d5156c1e3b383c250ff273639cd3dea6de2d9",
"type": "github"
},
"original": {
"owner": "peterldowns",
"repo": "nix-search-cli",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1774567711, "lastModified": 1778945272,
"narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=", "narHash": "sha256-Aipz0UiBhE2a1FYJrNc2y+5vKWo5QVkhmaIJk3/ls+g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3f6f874dfc34d386d10e434c48ad966c4832243e", "rev": "379c1f274f0fa354d012f0600806de54e79f29b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -196,11 +166,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1774386573, "lastModified": 1778869304,
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -212,15 +182,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1761752004, "lastModified": 1778443072,
"narHash": "sha256-z83uhYagfW6ZnH5Svvaxx6O0a305sBLGCCJZBJnMD9w=", "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ddf56acbeb53825b79b82c13a657806774bfd137", "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -241,11 +212,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1772198003, "lastModified": 1777268161,
"narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -257,11 +228,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1774273680, "lastModified": 1778869304,
"narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=", "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed", "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -295,6 +266,21 @@
"repo": "x86_64-linux", "repo": "x86_64-linux",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",
+1 -2
View File
@@ -2,7 +2,7 @@
description = "Aner's NIX config for his systems!"; description = "Aner's NIX config for his systems!";
inputs = { inputs = {
self.submodules = true; # self.submodules = true;
# Nixpkgs # Nixpkgs
#Temporarily #Temporarily
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
@@ -70,7 +70,6 @@
}; };
}; };
#TODO this is probably unsupported
#TODO the devshells do not know of the new packages. #TODO the devshells do not know of the new packages.
devShells = forAllSystems (system: ((import ./shells) {pkgs = nixpkgs.legacyPackages.${system};})); devShells = forAllSystems (system: ((import ./shells) {pkgs = nixpkgs.legacyPackages.${system};}));
}; };
+1
View File
@@ -18,5 +18,6 @@
./reaper.nix ./reaper.nix
./snx-rs.nix ./snx-rs.nix
./ytdl.nix ./ytdl.nix
./nextcloud-client.nix
]; ];
} }
+1
View File
@@ -31,6 +31,7 @@ in {
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
enableSshSupport = true; enableSshSupport = true;
grabKeyboardAndMouse = false;
pinentry.package = pkgs.pinentry-gtk2; pinentry.package = pkgs.pinentry-gtk2;
}; };
+1 -3
View File
@@ -25,9 +25,7 @@ in {
}; };
settings = { settings = {
extraConfig = { credential.helper = "!pass-git-helper $@";
credential.helper = "!pass-git-helper $@";
};
user = { user = {
name = "Aner Zakobar"; name = "Aner Zakobar";
email = "aner@zakobar.com"; email = "aner@zakobar.com";
+25
View File
@@ -0,0 +1,25 @@
{
lib,
config,
pkgs,
...
}: let
isEnabled =
config.azos.nextcloud-client.enable;
in {
options.azos.nextcloud-client.enable = lib.mkOption {
default = true;
example = true;
type = lib.types.bool;
};
config = lib.mkIf isEnabled {
home.packages = with pkgs; [
nextcloud-client
];
services.nextcloud-client = {
enable = true;
startInBackground = false;
};
};
}
@@ -54,3 +54,7 @@ c.fonts.messages.warning = monospace
c.fonts.prompts = monospace c.fonts.prompts = monospace
c.fonts.statusbar = monospace c.fonts.statusbar = monospace
c.fonts.hints = "bold 13px 'LiberationMono'" c.fonts.hints = "bold 13px 'LiberationMono'"
#Set highdpi
c.qt.highdpi = True
c.zoom.default = 70
+7
View File
@@ -18,6 +18,7 @@
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.binfmt.emulatedSystems = ["aarch64-linux"];
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
@@ -85,6 +86,8 @@
auto-optimise-store = true; auto-optimise-store = true;
}; };
azos.suites.exwm.enable = true;
home-manager = { home-manager = {
extraSpecialArgs = {inherit inputs outputs pkgs;}; extraSpecialArgs = {inherit inputs outputs pkgs;};
users = { users = {
@@ -107,12 +110,16 @@
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
boot.supportedFilesystems = ["exfat"];
boot.kernelModules = ["exfat"];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vim vim
git git
tmux tmux
killall killall
brightnessctl brightnessctl
exfatprogs
]; ];
fonts.enableDefaultPackages = true; fonts.enableDefaultPackages = true;
+1
View File
@@ -15,5 +15,6 @@ orgTrivialBuild {
pkgs.azos-emacs-station pkgs.azos-emacs-station
agent-shell agent-shell
org-caldav
]; ];
} }
+29
View File
@@ -128,6 +128,35 @@
(kbd "n") 'azos/nixpkgs-search) (kbd "n") 'azos/nixpkgs-search)
#+end_src #+end_src
** CalDAV / Org Sync
#+begin_src emacs-lisp
(require 'org-caldav)
(defvar azos/lauretta/nextcloud-user "aner"
"Nextcloud username for CalDAV sync.")
(setq org-caldav-url "https://nextcloud.zakobar.com/remote.php/dav/calendars/1ddd03a6-4c2d-103c-9f7b-27b20313341d"
org-caldav-calendar-id "personal"
org-caldav-inbox "~/org/caldav-inbox.org"
org-caldav-files '("~/org/todo.org")
org-icalendar-timezone "Asia/Jerusalem")
(defun azos/caldav-sync ()
"Sync org-caldav with Nextcloud calendar, reading password from pass."
(interactive)
(let* ((password (string-trim
(shell-command-to-string
(format "pass zakobar.com/users/%s" azos/lauretta/nextcloud-user))))
(url-http-real-basic-auth-storage
(list (list "nextcloud.zakobar.com:443"
(cons azos/lauretta/nextcloud-user password)))))
(org-caldav-sync)))
(define-key azos/global-minor-mode/open-keymap
(kbd "C") 'azos/caldav-sync)
#+end_src
* Provide * Provide
#+begin_src emacs-lisp #+begin_src emacs-lisp
+3 -3
View File
@@ -4,12 +4,12 @@ pkgs.mkShell {
alejandra alejandra
(pkgs.writeShellScriptBin (pkgs.writeShellScriptBin
"azos-lauretta-update" "azos-lauretta-update"
"sudo nixos-rebuild switch --flake .#lauretta") "sudo nixos-rebuild switch --flake '.?submodules=1#lauretta'")
(pkgs.writeShellScriptBin (pkgs.writeShellScriptBin
"azos-update-azos-core" "azos-update-azos-core"
"nix flake update azos-core") "nix flake update --flake '.?submodules=1' azos-core")
(pkgs.writeShellScriptBin (pkgs.writeShellScriptBin
"azos-update" "azos-update"
"nix flake update") "nix flake update --flake '.?submodules=1'")
]; ];
} }