Upgrade flake
This commit is contained in:
1 parent
517d5df1b6
commit
1d30dc5149
11 files changed
+138
-117
No files matched your search
@@ -1,3 +0,0 @@
|
||||
[submodule "config/doom/bkri"]
|
||||
path = config/doom/bkri
|
||||
url = https://git.samfelag.xyz/marc/bkri.git
|
||||
@@ -164,30 +164,3 @@
|
||||
;; (pretty-hook org-mode
|
||||
;; ("[ ]" "☐")
|
||||
;; ("[X]" "☑"))
|
||||
|
||||
|
||||
;; -----------------------------------------------------------------------------
|
||||
;; BK理 (BeKaRi)
|
||||
;; -----------------------------------------------------------------------------
|
||||
(add-load-path! "bkri")
|
||||
(require 'bkri)
|
||||
|
||||
(map! :leader
|
||||
(:prefix-map ("a" . "AI")
|
||||
(:prefix ("b". "BKri")
|
||||
;; Edit queries
|
||||
:desc "Insert" "i" #'bkri-insert-quick
|
||||
:desc "Insert (big prompt)" "I" #'bkri-insert
|
||||
:desc "Replace" "r" #'bkri-replace-region-quick
|
||||
:desc "Replace (big prompt)" "R" #'bkri-replace-region
|
||||
:desc "Edit file" "f" #'bkri-edit-file-quick
|
||||
:desc "Edit file (big prompt)" "F" #'bkri-edit-file
|
||||
;; Search queries
|
||||
:desc "Search" "s" #'bkri-search
|
||||
:desc "Open last search" "S" #'bkri-search-reopen
|
||||
;; Plan queries
|
||||
:desc "Plan" "p" #'bkri-plan-quick
|
||||
:desc "Plan (big prompt)" "P" #'bkri-plan
|
||||
;; Query management
|
||||
:desc "Cancel query at point" "k" #'bkri-cancel-query-at-point
|
||||
:desc "Goto query" "q" #'bkri-goto-query)))
|
||||
@@ -0,0 +1,59 @@
|
||||
job "receptari" {
|
||||
region = "global"
|
||||
datacenters = ["samfelag"]
|
||||
type = "service"
|
||||
|
||||
group "receptari" {
|
||||
count = 1
|
||||
|
||||
restart {
|
||||
attempts = 5
|
||||
delay = "15s"
|
||||
}
|
||||
|
||||
network {
|
||||
port "http" {
|
||||
to = 80
|
||||
}
|
||||
}
|
||||
|
||||
# Volumes
|
||||
|
||||
volume "receptari" {
|
||||
type = "host"
|
||||
read_only = false
|
||||
source = "receptari"
|
||||
}
|
||||
|
||||
# RECEPTARI WEB
|
||||
task "receptari" {
|
||||
driver = "docker"
|
||||
|
||||
env {
|
||||
DB_DIR = "/data/receptari"
|
||||
}
|
||||
|
||||
config {
|
||||
image = "marc.sastre.cat/receptari:latest"
|
||||
ports = ["http"]
|
||||
}
|
||||
|
||||
volume_mount {
|
||||
volume = "receptari"
|
||||
destination = "/data/receptari"
|
||||
read_only = false
|
||||
}
|
||||
|
||||
resources {
|
||||
cpu = 100
|
||||
memory = 512
|
||||
}
|
||||
|
||||
service {
|
||||
name = "receptari"
|
||||
port = "http"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Generated
+38
-77
@@ -2,19 +2,16 @@
|
||||
"nodes": {
|
||||
"agenix": {
|
||||
"inputs": {
|
||||
"darwin": [],
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770165109,
|
||||
"narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
|
||||
"lastModified": 1790734419,
|
||||
"narHash": "sha256-n7wew722m1OTBT9DOIMxNX/NF4zfsSUABAO5eW3wikE=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
|
||||
"rev": "3daa710894355fa2fad8243380af373a2b4046ef",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -45,11 +42,11 @@
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778318532,
|
||||
"narHash": "sha256-xspmhLgWF1FVYUsfxqTYHxZE9M6nNsfOB/zJKIlMKV8=",
|
||||
"lastModified": 1791089655,
|
||||
"narHash": "sha256-UujzS0lYEmvenwnNfN0VvfFg4m6WTiF+IjzEEsnwZ6Q=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "0d43c1b2bf83db3b4376eb8944ea666d67df5c1b",
|
||||
"rev": "3bd20fe06096915a18319236709e3ca91cd6f880",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -82,41 +79,20 @@
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"agenix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745494811,
|
||||
"narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
|
||||
"lastModified": 1790996401,
|
||||
"narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
|
||||
"rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777851538,
|
||||
"narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.11",
|
||||
"ref": "release-26.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -147,7 +123,7 @@
|
||||
"hyprcursor-rose-pine",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_2"
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709914708,
|
||||
@@ -184,11 +160,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1777954456,
|
||||
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
|
||||
"lastModified": 1790822859,
|
||||
"narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
|
||||
"rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -215,16 +191,16 @@
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1778003029,
|
||||
"narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
|
||||
"lastModified": 1790920529,
|
||||
"narHash": "sha256-nQyFkMR78WP6PiXKkDW2SjqzLf/spQqjRuxRGSbcV8k=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
|
||||
"rev": "774debe7a0d1b496e35677ad955a1011c6ff74f3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"ref": "nixos-26.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -247,27 +223,27 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1778003029,
|
||||
"narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
|
||||
"lastModified": 1790920529,
|
||||
"narHash": "sha256-nQyFkMR78WP6PiXKkDW2SjqzLf/spQqjRuxRGSbcV8k=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
|
||||
"rev": "774debe7a0d1b496e35677ad955a1011c6ff74f3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.11",
|
||||
"ref": "nixos-26.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1777954456,
|
||||
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
|
||||
"lastModified": 1790822859,
|
||||
"narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
|
||||
"rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -279,11 +255,11 @@
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1777954456,
|
||||
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
|
||||
"lastModified": 1790185690,
|
||||
"narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
|
||||
"rev": "4975466d324710c576dc11ad614684e6bd8cad8e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -299,11 +275,11 @@
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778341698,
|
||||
"narHash": "sha256-q7Br6sEl+LH7+ZwPft/74TNSTlo9pqJIA5qpK9OcMDA=",
|
||||
"lastModified": 1791104861,
|
||||
"narHash": "sha256-dBuVDdieRg/dBX+AC0DnqLK9iomjzrEA1oVtEApBHsM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "a67c2a7ec0fe8400ab87bf93e0e45cbd274a1ef1",
|
||||
"rev": "257f3348618c2b27274919e92e3f8aabeaa1ce9c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -316,7 +292,7 @@
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"emacs-overlay": "emacs-overlay",
|
||||
"home-manager": "home-manager_2",
|
||||
"home-manager": "home-manager",
|
||||
"hyprcursor-rose-pine": "hyprcursor-rose-pine",
|
||||
"nix-colors": "nix-colors",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
@@ -325,21 +301,6 @@
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
@@ -354,7 +315,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
@@ -371,7 +332,7 @@
|
||||
},
|
||||
"utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
@@ -392,11 +353,11 @@
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778303188,
|
||||
"narHash": "sha256-zXFSvK80qpI91B7DU9QSExAtafSrz6vzormh2kUi6kQ=",
|
||||
"lastModified": 1790843023,
|
||||
"narHash": "sha256-vO6WFunNqHCjEaQc3ytshsGhHMqAIeW+5/rEJRLQLxQ=",
|
||||
"owner": "youwen5",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "9346c84657a9cab472bc4ee5a2d65d42a72d5346",
|
||||
"rev": "710bb85c6cb4f186de8a710615be5b93b5f98885",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -4,17 +4,17 @@
|
||||
inputs = {
|
||||
|
||||
# - Nixpkgs ----------------------------------
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
|
||||
|
||||
# - Home Manager -----------------------------
|
||||
home-manager.url = "github:nix-community/home-manager/release-25.11";
|
||||
home-manager.url = "github:nix-community/home-manager/release-26.05";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# - Agenix -----------------------------------
|
||||
agenix.url = "github:ryantm/agenix";
|
||||
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# optionally choose not to download darwin deps (saves some resources on Linux)
|
||||
agenix.inputs.darwin.follows = "";
|
||||
# agenix.inputs.darwin.follows = "";
|
||||
|
||||
# - NUR --------------------------------------
|
||||
nur.url = "github:nix-community/NUR";
|
||||
|
||||
@@ -63,7 +63,7 @@ in
|
||||
system.pass.enable = true;
|
||||
system.sshfs.enable = true;
|
||||
|
||||
server.vatnajokull.enable = true;
|
||||
server.vatnajokull.enable = false;
|
||||
|
||||
# - Keyboards -
|
||||
system.kanata.enable = true;
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
{
|
||||
# - Nix ----------------------------------------
|
||||
|
||||
system.stateVersion = "22.05";
|
||||
system.stateVersion = "26.05";
|
||||
|
||||
nix = {
|
||||
package = pkgs.nixVersions.stable;
|
||||
|
||||
@@ -107,9 +107,21 @@ in {
|
||||
];
|
||||
|
||||
layerrule = [
|
||||
"animation slide top, swaync-control-center"
|
||||
"animation slide top, swaync-notification-window"
|
||||
];
|
||||
{
|
||||
name = "animate-swaync-control-center";
|
||||
match = {
|
||||
namespace = "swaync-control-center";
|
||||
};
|
||||
animation = "slide top";
|
||||
}
|
||||
{
|
||||
name = "animate-swaync-notification-window";
|
||||
match = {
|
||||
namespace = "swaync-notification-window";
|
||||
};
|
||||
animation = "slide top";
|
||||
}
|
||||
];
|
||||
|
||||
bind = [
|
||||
# Notification center
|
||||
|
||||
@@ -35,6 +35,8 @@ in {
|
||||
pkgs.hyprlandPlugins.hy3
|
||||
];
|
||||
|
||||
configType = "hyprlang";
|
||||
|
||||
settings = {
|
||||
|
||||
general = {
|
||||
|
||||
@@ -28,7 +28,15 @@ in
|
||||
};
|
||||
|
||||
hm.wayland.windowManager.hyprland.settings = lib.mkIf hyprCfg.enable {
|
||||
windowrule = "pseudo, class:fcitx";
|
||||
windowrule = [
|
||||
{
|
||||
name = "pseudotile-fcitx";
|
||||
match = {
|
||||
class = "fcitx";
|
||||
};
|
||||
pseudo = true;
|
||||
}
|
||||
];
|
||||
exec-once = [
|
||||
"fcitx -d -r"
|
||||
"fcitx-remote -r"
|
||||
|
||||
@@ -38,7 +38,16 @@ in
|
||||
};
|
||||
|
||||
hm.wayland.windowManager.hyprland.settings = lib.mkIf hyprCfg.enable {
|
||||
windowrule = "pseudo, class:fcitx";
|
||||
windowrule = [
|
||||
{
|
||||
name = "pseudotile-fcitx";
|
||||
match = {
|
||||
class = "fcitx";
|
||||
};
|
||||
pseudo = true;
|
||||
}
|
||||
];
|
||||
|
||||
exec-once = [
|
||||
"fcitx -d -r"
|
||||
"fcitx-remote -r"
|
||||
|
||||
Reference in new issue
Block a user