2024-08-20

8 files changed, 95 insertions, 63 deletions

diff --git a/configurations/eonwe/default.nix b/configurations/eonwe/default.nix
index f569a0a..a51b5ea 100644
--- a/configurations/eonwe/default.nix
+++ b/configurations/eonwe/default.nix
@@ -23,7 +23,8 @@ with lib;
     android.enable = true;
     beets.enable = true;
     bluetooth.enable = true;
-    incus.enable = false;
+    incus.enable = true;
+    ipfs.enable = true;
     libvirtd.enable = true;
     mpd.enable = true;
     qutebrowser.enable = true;
diff --git a/flake.lock b/flake.lock
index 0aff90f..323ea7d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -278,11 +278,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723426710,
-        "narHash": "sha256-yrS9al6l3fYfFfvovnyBWnyELDQOdfKyai4K/jKgoBw=",
+        "lastModified": 1724031427,
+        "narHash": "sha256-o1HdAf+7IGv9M13R3c+zc/sJ0QgeEnhsvHBcodI4UpM=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "0d510fe40b56ed74907a021d7e1ffd0042592914",
+        "rev": "4e719b38fa7c85f4f65d0308ca7084c91e7bdd6d",
         "type": "github"
       },
       "original": {
@@ -395,11 +395,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723202784,
-        "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
+        "lastModified": 1723803910,
+        "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "c7012d0c18567c889b948781bc74a501e92275d1",
+        "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba",
         "type": "github"
       },
       "original": {
@@ -453,11 +453,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723399884,
-        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
+        "lastModified": 1723986931,
+        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
+        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
         "type": "github"
       },
       "original": {
@@ -484,11 +484,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1719091691,
-        "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
+        "lastModified": 1724146542,
+        "narHash": "sha256-MLxtqDtu+y/4UDhXX5pFypX9/qbH54TDP6Z90oFzd/A=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
+        "rev": "03fe473c731cda2900bae9894b8dfc68e3492db5",
         "type": "github"
       },
       "original": {
@@ -535,11 +535,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723426731,
-        "narHash": "sha256-5QiBksjdJyiy+4QbpbDoo9o4BMoi7VsvEkAOKOeQMzo=",
+        "lastModified": 1724117732,
+        "narHash": "sha256-YukZGv8DyHYWeKMX3e/f12ShvB1fuBjIYgRP91huP28=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "e739f434eb5055359340907758a910962f07ee4c",
+        "rev": "a8e3133e397a53a3674837a0e8a1efa3b7378da7",
         "type": "github"
       },
       "original": {
@@ -555,11 +555,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723352546,
-        "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
+        "lastModified": 1723950649,
+        "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
+        "rev": "392828aafbed62a6ea6ccab13728df2e67481805",
         "type": "github"
       },
       "original": {
@@ -597,11 +597,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1723310128,
-        "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
+        "lastModified": 1724067415,
+        "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
+        "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2",
         "type": "github"
       },
       "original": {
@@ -612,11 +612,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723221148,
-        "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
+        "lastModified": 1724047581,
+        "narHash": "sha256-BypLrnMS2QvvdVhwWixppTOM3fLPC8eyJse0BNSbbfI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
+        "rev": "e9b5094b8f6e06a46f9f53bb97a9573b7cedf2a2",
         "type": "github"
       },
       "original": {
@@ -643,11 +643,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1723493549,
-        "narHash": "sha256-+U64c7IEcdthD4yPN+ACv6z85iB/1Axt3KqnCiffGGo=",
+        "lastModified": 1724146343,
+        "narHash": "sha256-SLB5mmhHGLhb7npka7lPrIwymuOAHrsLblkWImLh2HE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "58277c36e4bb1af5813bf277fcad870d0741bce5",
+        "rev": "a04eac9c5aa7f82e02d6e9e0b203b6eb5704c141",
         "type": "github"
       },
       "original": {
@@ -659,11 +659,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1723491389,
-        "narHash": "sha256-200CvSdKirifBy+TkjkVOUCXWvKzioufUcMvBU1mu8M=",
+        "lastModified": 1724139824,
+        "narHash": "sha256-ya2P68yRLzutFGcl0CuB6siqP0McLFM92A78NTmNtK0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a97dc6f7ff04801d8d83215d7ebaa41ef9b5a909",
+        "rev": "f07d0e47777d09e719f6f6ebe550f53b240c4d10",
         "type": "github"
       },
       "original": {
@@ -741,11 +741,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723423676,
-        "narHash": "sha256-E+DdXV2cFj77vU35cVNoEEE5YueE075HXiJLXwAxJ0k=",
+        "lastModified": 1724028469,
+        "narHash": "sha256-vUNNPBErgkbthrGq952uNkP/25J12j0uSAB7jjdrNBo=",
         "owner": "nix-community",
         "repo": "srvos",
-        "rev": "a7cc81cd76c4c07bb7db01b731199ecd4be17305",
+        "rev": "5a7a27e18839e3392ac12fcb888d5eb6009ab31b",
         "type": "github"
       },
       "original": {
@@ -775,11 +775,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722946882,
-        "narHash": "sha256-mxtnMye8gs82tdQbVC+g6v3aPOZlH150f9WyntHIkTg=",
+        "lastModified": 1724091143,
+        "narHash": "sha256-55CrA0BNqmnS4qB812D7JY9hNBB0r36sJlErepkfeTo=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "5853f1a8bd072f2ebabfc3de3973084353cf6f1e",
+        "rev": "94d70292d0c687ebacb65d00bd516cbefa18d3ca",
         "type": "github"
       },
       "original": {
@@ -846,11 +846,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723426320,
-        "narHash": "sha256-phnfLdQur8SvDD2/3DZkdKPlHxUuwKRf3YF8Wv2CBnk=",
+        "lastModified": 1724117347,
+        "narHash": "sha256-/nfm6P0owPtCRjT8ktq/8OChtg2HpkrvNaDJGm9N1Lk=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "7270c841614adb30d02e97cdb1a81e3757cef092",
+        "rev": "2ef60116ef361d988317cbe52a09acfeda7d3416",
         "type": "github"
       },
       "original": {
diff --git a/modules/common/ark.nix b/modules/common/ark.nix
index 84ff6db..1e43ef8 100644
--- a/modules/common/ark.nix
+++ b/modules/common/ark.nix
@@ -45,6 +45,7 @@ in
     environment.persistence.${cfg.path} = {
       hideMounts = true;
       enableDebugging = false;
+      enableWarnings = false;
       inherit (cfg) directories files;
     };
 
diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
index 1e575ed..eccf179 100644
--- a/modules/emacs/default.nix
+++ b/modules/emacs/default.nix
@@ -121,7 +121,7 @@ in
                       languagetool # :checkers grammar
                       libxml2 # :lang data :editor format
                       markdownlint-cli # :lang markdown
-                      nil # :lang (nix +lsp)
+                      nixd # :lang (nix +lsp)
                       nixfmt # :lang nix :editor format
                       nls # :lang (nickel +lsp)
                       nodePackages.bash-language-server # :lang (sh +lsp)
diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el
index 51d1c47..206e5cd 100644
--- a/modules/emacs/doom/config.el
+++ b/modules/emacs/doom/config.el
@@ -49,13 +49,26 @@
       lsp-modeline-code-actions-enable nil)
 
 ;;
+;;; Nix
+;;
+
+(after! nix
+  (after! lsp-mode
+    (add-to-list 'lsp-language-id-configuration '(nix-mode . "nix"))
+    (lsp-register-client (make-lsp-client
+                          :new-connection (lsp-stdio-connection "nixd")
+                          :activation-fn (lsp-activate-on "nix")
+                          :server-id 'nixd
+                          :major-modes 'nix-mode))
+    (add-hook 'nix-mode-hook 'lsp-deferred)))
+
+;;
 ;;; Go
 ;;
 
-(setq lsp-go-analyses
-  '((unsedvariable . t)
-    (unusedparams . t)
-    (unusedwrite . t)))
+(setq lsp-go-analyses '((unsedvariable . t)
+                        (unusedparams . t)
+                        (unusedwrite . t)))
 
 ;;
 ;;; Org
@@ -146,12 +159,12 @@
 (use-package! nickel-mode
   :config
   (after! lsp-mode
-    (add-to-list 'lsp-language-id-configuration '(nickel-mode . "nickel")
-      (lsp-register-client (make-lsp-client
-                             :new-connection (lsp-stdio-connection "nls")
-                             :activation-fn (lsp-activate-on "nickel")
-                             :server-id 'nls
-                             :major-modes 'nickel-mode)))
+    (add-to-list 'lsp-language-id-configuration '(nickel-mode . "nickel"))
+    (lsp-register-client (make-lsp-client
+                          :new-connection (lsp-stdio-connection "nls")
+                          :activation-fn (lsp-activate-on "nickel")
+                          :server-id 'nls
+                          :major-modes 'nickel-mode))
     (add-hook 'nickel-mode-hook 'lsp-deferred)))
 
 ;;
@@ -181,16 +194,19 @@
       elfeed-goodies/entry-pane-position 'bottom)
 
 (add-hook! 'elfeed-new-entry-hook
-           '((elfeed-make-tagger :before "2 weeks ago"
-                                 :remove 'unread)
-             (elfeed-make-tagger :feed-title "SberMarket Tech"
-                                 :entry-title (not ".*(DevOps|Golang).*")
-                                 :add 'junk
-                                 :remove 'unread)
-             (elfeed-make-tagger :feed-title "dotconferences"
-                                 :entry-title (not ".*dotGo.*")
-                                 :add 'junk
-                                 :remove 'unread)))
+           '((elfeed-make-tagger
+              :before "2 weeks ago"
+              :remove 'unread)
+             (elfeed-make-tagger
+              :feed-title "SberMarket Tech"
+              :entry-title (not ".*(DevOps|Golang).*")
+              :add 'junk
+              :remove 'unread)
+             (elfeed-make-tagger
+              :feed-title "dotconferences"
+              :entry-title (not ".*dotGo.*")
+              :add 'junk
+              :remove 'unread)))
 
 ;;
 ;;; mu4e
diff --git a/modules/ipfs.nix b/modules/ipfs.nix
index 1dad6a6..1e1d23f 100644
--- a/modules/ipfs.nix
+++ b/modules/ipfs.nix
@@ -115,7 +115,21 @@ in
 
                 NoAnnounce = filterAddresses;
               };
+
               Swarm.AddrFilters = filterAddresses;
+
+              API.HTTPHeaders = {
+                Access-Control-Allow-Origin = [
+                  "http://127.0.0.1:5001"
+                  "http://webui.ipfs.io.ipns.localhost:6001"
+                ];
+                Access-Control-Allow-Methods = [
+                  "PUT"
+                  "POST"
+                ];
+              };
+
+              Experimental.FilestoreEnabled = true;
             }
           )
         ];
diff --git a/modules/mpv.nix b/modules/mpv.nix
index 467dc94..90d46d9 100644
--- a/modules/mpv.nix
+++ b/modules/mpv.nix
@@ -103,7 +103,7 @@ in
         scripts = with pkgs.mpvScripts; [
           autoload
           mpv-cheatsheet
-          mpv-webm # FIXME https://nixpk.gs/pr-tracker.html?pr=333779
+          mpv-webm
           sponsorblock
           thumbfast
           uosc
diff --git a/modules/profiles/headful.nix b/modules/profiles/headful.nix
index 1b98df0..9f6bff5 100644
--- a/modules/profiles/headful.nix
+++ b/modules/profiles/headful.nix
@@ -50,7 +50,7 @@ in
         '';
 
         packages = with pkgs; [
-          element-desktop
+          # element-desktop
           fd
           imv
           libreoffice-fresh