Compare commits

..

1 commit

Author SHA1 Message Date
6ff34fc3d5 flake.lock: Update
Some checks failed
/ test (push) Has been cancelled
Flake lock file updates:

• Updated input 'catppuccin':
    'github:catppuccin/nix/191fbf2d81a63fad8f62f1233c0051f09b75d0ad' (2024-11-01)
  → 'github:catppuccin/nix/32359bf226fe874d3b7a0a5753d291a4da9616fe' (2024-11-10)
• Updated input 'disko':
    'github:nix-community/disko/856a2902156ba304efebd4c1096dbf7465569454' (2024-11-04)
  → 'github:nix-community/disko/5fd852c4155a689098095406500d0ae3d04654a8' (2024-11-14)
• Updated input 'dream2nix':
    'github:nix-community/dream2nix/51943fca6b95cb9649236bacf5d7c8d9af4c3bec' (2024-11-04)
  → 'github:nix-community/dream2nix/44d41411686bc798876bd6d9f36a4c1143138d85' (2024-11-12)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/1febd5c1ad7e798543c886756c598e0fb8d473fd' (2024-11-05)
  → 'github:nix-community/emacs-overlay/d7618a5f8b29ca9c573df4532631b621b2a763fa' (2024-11-15)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/7ffd9ae656aec493492b44d0ddfb28e79a1ea25d' (2024-11-02)
  → 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/d063c1dd113c91ab27959ba540c0d9753409edf3' (2024-11-04)
  → 'github:NixOS/nixpkgs/689fed12a013f56d4c4d3f612489634267d86529' (2024-11-12)
• Updated input 'git-hooks-nix':
    'github:cachix/git-hooks.nix/d70155fdc00df4628446352fc58adc640cd705c2' (2024-11-05)
  → 'github:cachix/git-hooks.nix/cd1af27aa85026ac759d5d3fccf650abe7e1bbf0' (2024-11-11)
• Updated input 'homeManager':
    'github:nix-community/home-manager/8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661' (2024-11-03)
  → 'github:nix-community/home-manager/1d0862ee2d7c6f6cd720d6f32213fa425004be10' (2024-11-14)
• Updated input 'impermanence':
    'github:nix-community/impermanence/0d09341beeaa2367bac5d718df1404bf2ce45e6f' (2024-10-31)
  → 'github:nix-community/impermanence/3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a' (2024-11-10)
• Updated input 'lix-eval-jobs':
    'git+https://git.lix.systems/lix-project/nix-eval-jobs?ref=refs/heads/main&rev=42a160bce2fd9ffebc3809746bc80cc7208f9b08' (2024-08-13)
  → 'git+https://git.lix.systems/lix-project/nix-eval-jobs?ref=refs/heads/main&rev=57ddb99e781d19704f8a84036f9890e6ca554c41' (2024-11-09)
• Updated input 'lix-eval-jobs/flake-parts':
    'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90' (2024-11-01)
  → 'github:hercules-ci/flake-parts/3d04084d54bedc3d6b8b736c70ef449225c361b1' (2024-10-01)
• Updated input 'lix-eval-jobs/treefmt-nix':
    'github:numtide/treefmt-nix/746901bb8dba96d154b66492a29f5db0693dbfcc' (2024-10-30)
  → 'github:numtide/treefmt-nix/aac86347fb5063960eccb19493e0cadcdb4205ca' (2024-10-22)
• Updated input 'lix-module':
    'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d' (2024-10-01)
  → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34' (2024-11-09)
• Updated input 'mobile-nixos':
    'github:NixOS/mobile-nixos/0516be85630befa2c1e8042ac873342ce186b2f6' (2024-10-30)
  → 'github:NixOS/mobile-nixos/2268e358ed407d9c0a4499ae767d105eeaeec586' (2024-11-06)
• Updated input 'nixDarwin':
    'github:LnL7/nix-darwin/0e3f3f017c14467085f15d42343a3aaaacd89bcb' (2024-11-05)
  → 'github:LnL7/nix-darwin/f86f158efd4bab8dce3e207e4621f1df3a760b7a' (2024-11-15)
• Updated input 'nixThePlanet':
    'github:MatthewCroughan/NixThePlanet/2f622af217807da78e44a5a15f620743dac57f46' (2024-09-23)
  → 'github:MatthewCroughan/NixThePlanet/ef5fad336a55fcbb0680ad21aa58812b2f826435' (2024-11-09)
• Updated input 'nixosHardware':
    'github:NixOS/nixos-hardware/2e78b1af8025108ecd6edaa3ab09695b8a4d3d55' (2024-11-05)
  → 'github:NixOS/nixos-hardware/f6581f1c3b137086e42a08a906bdada63045f991' (2024-11-12)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/7ffd9ae656aec493492b44d0ddfb28e79a1ea25d' (2024-11-02)
  → 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11)
2024-11-15 11:11:11 +00:00
14 changed files with 271 additions and 75 deletions

View file

@ -7,9 +7,5 @@ jobs:
steps:
- uses: actions/checkout@v4
name: Checkout repository
- name: Attic login
run: attic login sisko http://10.100.0.1:8081 ${{secrets.ATTIC_SISKO_TOKEN}}
- name: Start attic watch store
run: attic watch-store sisko &
- name: Build with nix
run: nix-fast-build --no-nom --systems "x86_64-linux aarch64-linux" # --attic-cache "sisko"
run: nix-fast-build --no-nom --systems "x86_64-linux aarch64-linux"

View file

@ -11,22 +11,19 @@
];
perSystem =
{ config, ... }:
{ ... }:
{
treefmt.config = {
projectRootFile = ".git/config";
flakeFormatter = true;
flakeCheck = true;
programs = {
nixfmt.enable = true;
deadnix.enable = false;
};
};
pre-commit.settings = {
hooks.treefmt = {
enable = true;
package = config.treefmt.build.wrapper;
};
pre-commit.settings.hooks = {
nixfmt-rfc-style.enable = true;
deadnix.enable = false;
};
};

185
flake.lock generated
View file

@ -132,6 +132,22 @@
"type": "github"
}
},
"fan-control": {
"flake": false,
"locked": {
"lastModified": 1669548492,
"narHash": "sha256-qqPmOEF+r10VGz3izAnHZW6aJk1mOXy9BrpR9FvWSt0=",
"owner": "pymumu",
"repo": "fan-control-rock5b",
"rev": "8419990c6c0f47a3ed0b55255d7e3591cc5fdab9",
"type": "github"
},
"original": {
"owner": "pymumu",
"repo": "fan-control-rock5b",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
@ -261,6 +277,24 @@
"type": "indirect"
}
},
"flake-parts_5": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1678379998,
"narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
@ -513,6 +547,23 @@
"type": "github"
}
},
"kernel-src": {
"flake": false,
"locked": {
"lastModified": 1676631659,
"narHash": "sha256-TjAF7BPSDy5iHSk8byp+vsKop0V+rqrmr+TXLqXLB2M=",
"owner": "radxa",
"repo": "kernel",
"rev": "a9583fb47e9b96c552f458a376207141602c0025",
"type": "github"
},
"original": {
"owner": "radxa",
"repo": "kernel",
"rev": "a9583fb47e9b96c552f458a376207141602c0025",
"type": "github"
}
},
"lanzaboote": {
"inputs": {
"crane": "crane",
@ -796,6 +847,22 @@
"type": "github"
}
},
"nixpkgs-kernel": {
"locked": {
"lastModified": 1656239181,
"narHash": "sha256-wW1xRFBn376yGloXZ4QzBE4hjipMawpV18Lshd9QSPw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1730504152,
@ -826,6 +893,24 @@
"type": "github"
}
},
"nixpkgs-lib_3": {
"locked": {
"dir": "lib",
"lastModified": 1678375444,
"narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1731386116,
@ -968,6 +1053,22 @@
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1678470307,
"narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0c4800d579af4ed98ecc47d464a5e7b0870c4b1f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1682134069,
"narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
@ -1035,6 +1136,22 @@
"type": "github"
}
},
"panfork": {
"flake": false,
"locked": {
"lastModified": 1670633863,
"narHash": "sha256-4eZHMiYS+sRDHNBtLZTA8ELZnLns7yT3USU5YQswxQ0=",
"owner": "panfork",
"repo": "mesa",
"rev": "120202c675749c5ef81ae4c8cdc30019b4de08f4",
"type": "gitlab"
},
"original": {
"owner": "panfork",
"repo": "mesa",
"type": "gitlab"
}
},
"pre-commit-hooks-nix": {
"inputs": {
"flake-compat": [
@ -1102,6 +1219,31 @@
"type": "github"
}
},
"rock5b": {
"inputs": {
"fan-control": "fan-control",
"flake-parts": "flake-parts_5",
"kernel-src": "kernel-src",
"nixpkgs": "nixpkgs_8",
"nixpkgs-kernel": "nixpkgs-kernel",
"panfork": "panfork",
"tow-boot": "tow-boot",
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1685695782,
"narHash": "sha256-zBQFjZhFWsxCA31jI4Ui3l8KhrqQaG0dHi/v/vIvZcM=",
"owner": "aciceri",
"repo": "rock5b-nixos",
"rev": "3868939df4a6d5292077e154c8cb36de1fde4d30",
"type": "github"
},
"original": {
"owner": "aciceri",
"repo": "rock5b-nixos",
"type": "github"
}
},
"root": {
"inputs": {
"agenix": "agenix",
@ -1124,7 +1266,8 @@
"nixThePlanet": "nixThePlanet",
"nixosHardware": "nixosHardware",
"nixpkgs": "nixpkgs_7",
"treefmt-nix": "treefmt-nix_2",
"rock5b": "rock5b",
"treefmt-nix": "treefmt-nix_3",
"vscode-server": "vscode-server"
}
},
@ -1232,6 +1375,23 @@
"type": "github"
}
},
"tow-boot": {
"flake": false,
"locked": {
"lastModified": 1677346757,
"narHash": "sha256-3SKlcZhfUaNz1bd/l/1B3D66NUk3sALVIyP8DHv41SU=",
"owner": "aciceri",
"repo": "Tow-Boot",
"rev": "85d099f3473effdeca409bd165175d64dfb37ecc",
"type": "github"
},
"original": {
"owner": "aciceri",
"ref": "rock5b",
"repo": "Tow-Boot",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@ -1254,6 +1414,27 @@
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"rock5b",
"nixpkgs"
]
},
"locked": {
"lastModified": 1678277086,
"narHash": "sha256-fQ1G72KhLWWf2z+ug9+4ErTEayvlcVQMul0qusKKBgk=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "ec39cfa24342fdf0b04ae44592a191c4765f9c74",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_3": {
"inputs": {
"nixpkgs": [
"nixpkgs"
@ -1276,7 +1457,7 @@
"vscode-server": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_8"
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1729422940,

View file

@ -23,6 +23,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
agenix.url = "github:ryantm/agenix";
rock5b.url = "github:aciceri/rock5b-nixos";
treefmt-nix = {
url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs";

View file

@ -44,8 +44,8 @@ in
mediainfo
unzipNLS
nodejs_20
qadwaitadecorations
kdePackages.qtwayland
pkgs.qadwaitadecorations
pkgs.kdePackages.qtwayland
]
++ (with hunspellDicts; [
en_US-large
@ -62,12 +62,12 @@ in
);
in
lib.hm.dag.entryAfter [ "writeBoundary" ] ''
PATH=$PATH:${path}
if [ ! -d "$HOME/.config/emacs" ]; then
mkdir "$HOME/.config/emacs"
$DRY_RUN_CMD ln -s "$HOME/projects/aciceri/nixfleet/hmModules/emacs/init.el" "$HOME/.config/emacs/init.el"
$DRY_RUN_CMD ln -s "$HOME/.config/emacs" "$HOME/emacs"
fi
$DRY_RUN_CMD ln -sfn ${treesitGrammars} "$HOME/.config/emacs/tree-sitter"
PATH=$PATH:${path}
if [ ! -d "$HOME/.config/emacs" ]; then
mkdir "$HOME/.config/emacs"
$DRY_RUN_CMD ln -s "$HOME/projects/aciceri/nixfleet/hmModules/emacs/init.el" "$HOME/.config/emacs/init.el"
$DRY_RUN_CMD ln -s "$HOME/.config/emacs" "$HOME/emacs"
fi
$DRY_RUN_CMD ln -sfn ${treesitGrammars} "$HOME/.config/emacs/tree-sitter"
'';
}

View file

@ -57,7 +57,6 @@
(focus-follows-mouse t)
(mouse-autoselect-window t)
(treesit-font-lock-level 4)
(custom-file "~/.config/emacs/custom.el")
:config
(set-face-background 'vertical-border (face-background 'default))
(set-display-table-slot standard-display-table 'vertical-border (make-glyph-code ?┃))
@ -523,13 +522,10 @@
))
(use-package yaml-mode
:hook (yaml-mode . yaml-ts-mode))
:hook (yaml-mode . tree-sitter-hl-mode))
(use-package sh-mode
:hook (sh-mode . bash-ts-mode))
(use-package gptscript-mode
:mode "\\.gpt\\'")
:hook (sh-mode . tree-sitter-hl-mode))
;; FIXME
;; (use-package mmm-mode
@ -776,7 +772,7 @@ This is meant to be an helper to be called from the window manager."
:target (file+head "%<%Y-%m-%d>.org" "#+TITLE: %<%Y-%m-%d>"))
("b" "Billable entry" entry
"* TODO ${Entry} :billable:${Client}:\n:PROPERTIES:\n:SPENT: ${Spent}\n:END:\n%?"
:target (file+head "%<%Y-%m-%d>.org" "#+TITLE: %<%Y-%m-%d>")
:target (file+head "%<%Y-%m-%d>.org" "#+title %<%Y-%m-%d>")
:create-id t))
)
:config
@ -851,18 +847,19 @@ This is meant to be an helper to be called from the window manager."
("C-c n s" . consult-org-roam-search))
(use-package org-roam-ui
:straight
:after org-roam
:hook (after-init . org-roam-ui-mode) ;; don't care about startup time since I'm using Emacs daemonized
:config
(setq org-roam-ui-sync-theme t
org-roam-ui-follow t
org-roam-ui-update-on-save t
org-roam-ui-open-on-start nil))
org-roam-ui-open-on-start t))
(use-package gptel
:custom
(gptel-api-key (lambda () (require 'f) (f-read-text (getenv "OPENAI_API_KEY_PATH"))))
(gptel-model 'gpt-4o)
(gptel-model "gpt-4o")
:config
(require 'gptel-curl)
@ -951,3 +948,30 @@ This is meant to be an helper to be called from the window manager."
(provide 'init)
;;; init.el ends here
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(custom-safe-themes
'("5bafdfa3e21f921abf9b9fd77e1e0ce032e62e3a6f8f13ec8ce7945727c654e9"
"5f92b9fc442528b6f106eaefa18bb5e7bfa0d737164e18f1214410fef2a6678d"
"b7f70bd00f79099f11d67a25c592d70593377488a263bb3dd73dee99b0549dba"
"7d10494665024176a90895ff7836a8e810d9549a9872c17db8871900add93d5c"
"b5c3c59e2fff6877030996eadaa085a5645cc7597f8876e982eadc923f597aca" default))
'(magit-todos-insert-after '(bottom) nil nil "Changed by setter of obsolete option `magit-todos-insert-at'")
'(org-fold-catch-invisible-edits 'show-and-error nil nil "Customized with use-package org")
'(safe-local-variable-values
'((eval progn (require 'org-re-reveal)
(add-hook 'after-save-hook #'org-re-reveal-export-to-html nil t))
(copilot-mode 0) (copilot-mode -1))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
)
;; Local Variables:
;; byte-compile-warnings: (not free-vars noruntime unresolved)
;; End:

View file

@ -86,7 +86,7 @@ in
};
xdg.configFile."tridactyl/tridactylrc".text = ''
set editorcmd emacsclient -c %f
set editorcmd footclient -e hx %f
colors catppuccin
'';

View file

@ -23,6 +23,8 @@ in
../waybar
../swayidle
../gammastep
# ../wezterm
# ../wayvnc
../swaync
../foot
];
@ -66,6 +68,33 @@ in
enable = true;
};
# services.kanshi = {
# enable = true;
# systemdTarget = "hyprland-session.target";
# profiles = {
# undocked = {
# outputs = [
# {
# status = "enable";
# criteria = "eDP-1";
# }
# ];
# };
# docked = {
# outputs = [
# {
# status = "disable";
# criteria = "eDP-1";
# }
# {
# status = "enable";
# criteria = "DP-1";
# }
# ];
# };
# };
# };
home.file.".icons/catppuccin-mocha-sapphire" = {
source = "${pkgs.catppuccin-cursors.mochaSapphire}/share/icons/catppuccin-mocha-sapphire-cursors";
recursive = true;

View file

@ -99,10 +99,10 @@ general {
decoration {
rounding = 8
# drop_shadow = true
# shadow_range = 4
# shadow_render_power = 3
# col.shadow = rgba(a8cfee11)
drop_shadow = true
shadow_range = 4
shadow_render_power = 3
col.shadow = rgba(a8cfee11)
}
animations {

View file

@ -1,9 +1,7 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
helix
vim
git
environment.systemPackages = [
pkgs.vim
];
nix.settings.experimental-features = "nix-command flakes";
@ -12,5 +10,5 @@
services.nix-daemon.enable = true;
system.stateVersion = 5;
# nixpkgs.localSystem = "x86_64-darwin";
}

View file

@ -1,9 +0,0 @@
{
writeShellApplication,
...
}:
writeShellApplication {
name = "deploy-darwin";
text = builtins.readFile ./deploy-darwin.sh;
runtimeInputs = [ ];
}

View file

@ -1,11 +0,0 @@
CLOSURE_DRV=$(nix eval .#darwinConfigurations.archer.config.system.build.toplevel.drvPath --raw)
echo "$CLOSURE_DRV"
nix copy --to ssh://admin@macos-ventura "$CLOSURE_DRV"
# shellcheck disable=SC2029
ssh admin@macos-ventura "nix build $CLOSURE_DRV^out"
ssh admin@macos-ventura "./result/activate-user"
ssh admin@macos-ventura "echo admin | sudo -S ./result/activate"
# ssh admin@macos-ventura "./result/sw/bin/darwin-rebuild activate"
ssh admin@macos-ventura "nix profile install ./result"

View file

@ -1,4 +1,4 @@
host=${1-picard}
host=${1-mothership}
nixos-rebuild switch \
--flake ".#${host}" \

View file

@ -24,16 +24,6 @@ let
};
deps = [ ];
};
gptscript = buildEmacsPackage {
name = "gptscript";
src = pkgs.fetchFromGitHub {
owner = "emacs-openai";
repo = "gptscript-mode";
rev = "d9c6272de1288d3f42a1cbac136e5fac57e185e2";
hash = "sha256-RM0dptx8qm2b4fvW6oQ0Lq5kshRKcapeIW2piUMAZmw=";
};
deps = [ ];
};
};
# *List* containing emacs packages from (M)ELPA
@ -116,8 +106,8 @@ let
gptel
agenix
solidity-mode
telega
# org-re-reveal # FIXME very not nice hash mismatch when building
# gptel # TODO uncomment when there will be a new release including GPT-4o
]
)
++ (with elpaPackages; [