flake.lock

@@ -28,11 +28,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1708141957,
-        "narHash": "sha256-IWkw+jsVpu7HFNPbOTJaQeMYQ5/eh7ZVScPvtlSo8vc=",
+        "lastModified": 1707817777,
+        "narHash": "sha256-vHyIs1OULQ3/91wD6xOiuayfI71JXALGA5KLnDKAcy0=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "40b567388381137a3c49acdff5f4b6946d645a5f",
+        "rev": "5a30b9e5ac7c6167e61b1f4193d5130bb9f8defa",
         "type": "github"
       },
       "original": {
@@ -381,11 +381,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1708118438,
-        "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
+        "lastModified": 1707956935,
+        "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
+        "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
         "type": "github"
       },
       "original": {

home-manager/modules/machine.nix

@@ -21,7 +21,6 @@ with lib;
     ./../programs/chromium.nix
     ./../programs/mpv.nix
     ./../programs/syncthing.nix
-    ./../programs/hstr.nix
     ./../../nix.nix
     ./packages.nix
   ];

home-manager/modules/packages.nix

@@ -1,9 +1,7 @@
 { config, pkgs, lib, inputs, ... }:
 
 with lib;
-let
-    electronFlags = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
-in {
+{
   config = {
     nixpkgs.overlays = [
       (final: prev: {
@@ -17,6 +15,8 @@ in {
 
     home.packages = with pkgs; [
       up
+      rbenv
+      # cargo-update
       htop
       rustc
       cargo
@@ -34,6 +34,7 @@ in {
       nix-init
       nodePackages.nodemon
       pocketbase
+      # surrealdb
       thefuck
       hub
       httpie
@@ -50,6 +51,9 @@ in {
       (pkgs.writeShellScriptBin "nix-build-default" ''
         nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }'
       '')
+      (callPackage ./../pkgs/docker-craft-cms-dev-env.nix {
+        inherit lib;
+      })
       (callPackage ./../pkgs/toggl-time-grouper/package.nix {
         inherit lib;
       })
@@ -70,11 +74,11 @@ in {
       gh
       nil
       nixd
-      unrar
     ] ++ (if config.machine.isGraphical then [
       (pkgs.nerdfonts.override {
         fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];
       })
+      # anki
       corefonts
       vistafonts
       jetbrains.webstorm
@@ -99,11 +103,12 @@ in {
       bottles
       protontricks
       heroic
-      (vscode.override { commandLineArgs = electronFlags; })
+      (vscode.fhsWithPackages (ps: with ps; [ sqlite ]))
       quickemu
       quickgui
       trilium-desktop
       anki
+      inputs.nix-software-center.packages.x86_64-linux.nix-software-center
       inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
       jetbrains-toolbox
       mumble

home-manager/programs/alacritty.nix

@@ -8,7 +8,7 @@
         decorations = "full";
         dynamic_title = true;
       };
-      window.opacity = 0.9;
+      window.opacity = 1;
       font = {
         normal = {
           family = "JetbrainsMono NFM";
@@ -18,7 +18,7 @@
           family = "JetbrainsMono NFM";
           style = "Bold";
         };
-        size = 12;
+        size = 14;
       };
       cursor.style.shape = "Beam";
       colors = {

home-manager/programs/chromium.nix

@@ -19,9 +19,12 @@ let
     "bmnlcjabgnpnenekpadlanbbkooimhnj" # Honey
     "kbfnbcaeplbcioakkpcpgfkobkghlhen" # Grammarly
   ];
-  isEnabled = if config.machine.isGraphical then true else false;
-  dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
-  commandLineArgs = [
+in
+{
+  programs.vivaldi = {
+    enable = if config.machine.isGraphical then true else false;
+    dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
+    commandLineArgs = [
       "--ignore-gpu-blocklist"
       "--enable-gpu-rasterization"
       "--enable-zero-copy"
@@ -30,22 +33,11 @@ let
       "--use-vulkan"
       "--ozone-platform-hint=auto"
       "--enable-hardware-overlays"
-  ];
-  extensions = map
-    (eid: {
-      id = eid;
-    })
-    chromium_extension;
-in
-{
-  programs.vivaldi = {
-    enable = isEnabled;
-    dictionaries = dictionaries;
-    commandLineArgs = commandLineArgs;
-    extensions = extensions;
-  };
-  programs.google-chrome = {
-    enable = isEnabled;
-    commandLineArgs = commandLineArgs;
+    ];
+    extensions = map
+      (eid: {
+        id = eid;
+      })
+      chromium_extension;
   };
 }

home-manager/programs/hstr.nix

@@ -1,5 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  programs.hstr = { enable = true; };
-}