[NixOS] Use yshui/pijulius picom

[NixOS] Picom is only needed for xmonad
[NixOS] Host docs.railbird.ai
2024-09-05 17:41:53 -06:00 · 2024-08-20 00:43:37 -06:00 · 2024-08-19 14:32:48 -06:00 · 2024-08-18 15:32:36 -06:00 · 2024-08-18 15:32:10 -06:00 · 2024-08-15 01:52:05 -06:00
13 changed files with 125 additions and 117 deletions
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -2322,6 +2322,13 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab
 	(unbind-key "C-j" python-mode-map)
 	(add-hook 'python-mode-hook #'imalison:python-mode)))
 #+END_SRC
+*** ruby
+#+begin_src emacs-lisp
+(use-package ruby-mode
+  :config
+  (setf (alist-get 'ruby-ts-mode apheleia-mode-alist)
+        '(rubocop)))
+#+end_src
 *** go
 #+BEGIN_SRC emacs-lisp
 (use-package go-mode
--- a/nixos/desktop.nix
+++ b/nixos/desktop.nix
@@ -34,7 +34,7 @@ makeEnable config "modules.desktop" true {

  environment.systemPackages = with pkgs; [
    # Appearance
-    gnome.adwaita-icon-theme
+    adwaita-icon-theme
    hicolor-icon-theme
    libsForQt5.breeze-gtk
    # materia-theme
@@ -60,8 +60,8 @@ makeEnable config "modules.desktop" true {

    feh
    firefox
-    gnome.cheese
-    gnome.gpaste
+    cheese
+    gpaste
    kleopatra
    libnotify
    libreoffice
@@ -70,7 +70,6 @@ makeEnable config "modules.desktop" true {
    networkmanagerapplet
    notify-osd-customizable
    okular
-    picom
    pinentry
    psensor
    quassel
--- a/nixos/environment.nix
+++ b/nixos/environment.nix
@@ -34,6 +34,10 @@ with lib;
        eval "$(register-python-argcomplete prod-prb)"
        eval "$(register-python-argcomplete railbird)"
        [ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/zsh"
+
+        # Enable bracketed paste
+        autoload -Uz bracketed-paste-magic
+        zle -N bracketed-paste bracketed-paste-magic
      '';
    };

--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -8,11 +8,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1718371084,
-        "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=",
+        "lastModified": 1723293904,
+        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "3a56735779db467538fb2e577eda28a9daacaca6",
+        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
        "type": "github"
      },
      "original": {
@@ -93,11 +93,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
@@ -162,11 +162,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1712014858,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+        "lastModified": 1719994518,
+        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
        "type": "github"
      },
      "original": {
@@ -238,21 +238,6 @@
      }
    },
    "flake-utils_2": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
      "inputs": {
        "systems": "systems_2"
      },
@@ -270,7 +255,7 @@
        "type": "github"
      }
    },
-    "flake-utils_4": {
+    "flake-utils_3": {
      "inputs": {
        "systems": "systems_3"
      },
@@ -288,7 +273,7 @@
        "type": "github"
      }
    },
-    "flake-utils_5": {
+    "flake-utils_4": {
      "inputs": {
        "systems": "systems_5"
      },
@@ -306,7 +291,7 @@
        "type": "github"
      }
    },
-    "flake-utils_6": {
+    "flake-utils_5": {
      "inputs": {
        "systems": "systems_7"
      },
@@ -324,7 +309,7 @@
        "type": "github"
      }
    },
-    "flake-utils_7": {
+    "flake-utils_6": {
      "inputs": {
        "systems": "systems_8"
      },
@@ -390,6 +375,37 @@
        "url": "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz"
      }
    },
+    "git-hooks-nix": {
+      "inputs": {
+        "flake-compat": [
+          "nix"
+        ],
+        "gitignore": [
+          "nix"
+        ],
+        "nixpkgs": [
+          "nix",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1721042469,
+        "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
    "git-ignore-nix": {
      "inputs": {
        "nixpkgs": [
@@ -566,7 +582,7 @@
    "haskell-language-server": {
      "inputs": {
        "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
        "fourmolu-011": "fourmolu-011",
        "fourmolu-012": "fourmolu-012",
        "gitignore": "gitignore",
@@ -601,7 +617,7 @@
    "haskell-language-server_2": {
      "inputs": {
        "flake-compat": "flake-compat_4",
-        "flake-utils": "flake-utils_6",
+        "flake-utils": "flake-utils_5",
        "fourmolu-011": "fourmolu-011_2",
        "fourmolu-012": "fourmolu-012_2",
        "gitignore": "gitignore_2",
@@ -765,11 +781,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719827439,
-        "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
+        "lastModified": 1723399884,
+        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
+        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
        "type": "github"
      },
      "original": {
@@ -846,15 +862,16 @@
    "libgit2": {
      "flake": false,
      "locked": {
-        "lastModified": 1697646580,
-        "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
+        "lastModified": 1715853528,
+        "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=",
        "owner": "libgit2",
        "repo": "libgit2",
-        "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
+        "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96",
        "type": "github"
      },
      "original": {
        "owner": "libgit2",
+        "ref": "v1.8.1",
        "repo": "libgit2",
        "type": "github"
      }
@@ -935,18 +952,18 @@
      "inputs": {
        "flake-compat": "flake-compat",
        "flake-parts": "flake-parts",
+        "git-hooks-nix": "git-hooks-nix",
        "libgit2": "libgit2",
        "nixpkgs": "nixpkgs_2",
        "nixpkgs-23-11": "nixpkgs-23-11",
-        "nixpkgs-regression": "nixpkgs-regression",
-        "pre-commit-hooks": "pre-commit-hooks"
+        "nixpkgs-regression": "nixpkgs-regression"
      },
      "locked": {
-        "lastModified": 1719926583,
-        "narHash": "sha256-FYclPzNXqbNxUgC6m7wBGMQ0rXzGWpKx5O2fFkEZ04Y=",
+        "lastModified": 1723343056,
+        "narHash": "sha256-ixvBNplVIqUqvshVi5azgPiGIFXlXDmahDcoP/guuTE=",
        "owner": "NixOS",
        "repo": "nix",
-        "rev": "f809edba4feb0293768815bce362c5b8993d6335",
+        "rev": "18485d2d53622c6ec7beab80c77efbd49ed682e2",
        "type": "github"
      },
      "original": {
@@ -995,15 +1012,15 @@
    "nixos-wsl": {
      "inputs": {
        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1719220171,
-        "narHash": "sha256-xywM6JoGT8AwfoOFJBTv8GRlvNu8LYqqqMS/OQ6uCgE=",
+        "lastModified": 1723124175,
+        "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "269411cfed6aab694e46f719277c972de96177bb",
+        "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690",
        "type": "github"
      },
      "original": {
@@ -1062,11 +1079,11 @@
    },
    "nixpkgs-regression_2": {
      "locked": {
-        "lastModified": 1719988509,
-        "narHash": "sha256-Sp+jeqY7EyQznfhs08i56nZz0To11WTCcN5wyGVymBY=",
+        "lastModified": 1723405223,
+        "narHash": "sha256-VSHY8GQ64AseobyeoVkJl+ZDaWPGzKs+CG6RfDM159o=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d23d7c02738377f52fcbdfb3fa16456b78c4f204",
+        "rev": "938253e0f8d5c98c4515a10cc388239cc1431db8",
        "type": "github"
      },
      "original": {
@@ -1077,16 +1094,16 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1717432640,
-        "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
+        "lastModified": 1721548954,
+        "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
+        "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "release-24.05",
+        "ref": "nixos-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -1109,11 +1126,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1718835956,
-        "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
+        "lastModified": 1722087241,
+        "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
+        "rev": "8c50662509100d53229d4be607f1a3a31157fa12",
        "type": "github"
      },
      "original": {
@@ -1125,11 +1142,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1719848872,
-        "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
+        "lastModified": 1723175592,
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
        "type": "github"
      },
      "original": {
@@ -1276,50 +1293,18 @@
        "url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz"
      }
    },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "nix"
-        ],
-        "flake-utils": "flake-utils_2",
-        "gitignore": [
-          "nix"
-        ],
-        "nixpkgs": [
-          "nix",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1712897695,
-        "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
    "railbird-secrets": {
      "inputs": {
        "agenix": "agenix_2",
-        "flake-utils": "flake-utils_5",
+        "flake-utils": "flake-utils_4",
        "nixpkgs": "nixpkgs_7"
      },
      "locked": {
-        "lastModified": 1719620668,
-        "narHash": "sha256-7BhVreuYkLyyY8hWG/UYgFPK7jaBRRVhrcizdukRhRY=",
+        "lastModified": 1722639965,
+        "narHash": "sha256-ZRe5Z5s/UNaXI2piyncQ3YrFl5q3GryZAfFTyeJ/vhM=",
        "ref": "refs/heads/master",
-        "rev": "5d13e6694634b99f299e1e932a2d270a00135d91",
-        "revCount": 69,
+        "rev": "9a92b83c3ad376620db3556c33e51a4300c5badd",
+        "revCount": 73,
        "type": "git",
        "url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git"
      },
@@ -1608,11 +1593,11 @@
    },
    "unstable": {
      "locked": {
-        "lastModified": 1719848872,
-        "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
+        "lastModified": 1723175592,
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
        "type": "github"
      },
      "original": {
@@ -1624,7 +1609,7 @@
    },
    "vscode-server": {
      "inputs": {
-        "flake-utils": "flake-utils_7",
+        "flake-utils": "flake-utils_6",
        "nixpkgs": "nixpkgs_9"
      },
      "locked": {
@@ -1655,11 +1640,11 @@
        "unstable": "unstable"
      },
      "locked": {
-        "lastModified": 1716327650,
-        "narHash": "sha256-IgPfwMto0hiiAYNToV7zti1PmHFjNRk79HlZpo+ThtI=",
+        "lastModified": 1722277235,
+        "narHash": "sha256-fuEgR51OPzwff+ygFhBqJm51oA17rR0KtPfuDLv0Fp0=",
        "owner": "xmonad",
        "repo": "xmonad",
-        "rev": "cfbf1ad51d308161c7adf3e2cb41fde3376ac0de",
+        "rev": "a58ccac7ba46414915de6c7f2b4da08b37784016",
        "type": "github"
      },
      "original": {
--- a/nixos/home-manager.nix
+++ b/nixos/home-manager.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, specialArgs, ... }:
+{ pkgs, ... }:
 {
  xsession = {
    enable = true;
--- a/nixos/machines/biskcomp.nix
+++ b/nixos/machines/biskcomp.nix
@@ -85,6 +85,16 @@ in
          '';
        };
      };
+      "docs.railbird.ai" = {
+        enableACME = true;
+        forceSSL = true;
+        root = "/var/lib/syncthing/railbird/docs";
+        locations."/" = {
+          extraConfig = ''
+            autoindex on;
+          '';
+        };
+      };
    };
  };

--- a/nixos/machines/ryzen-shine.nix
+++ b/nixos/machines/ryzen-shine.nix
@@ -45,15 +45,15 @@
  boot.initrd.kernelModules = [ "dm-snapshot" ];

  # install nvidia drivers in addition to intel one
-  hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
-  hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
+  hardware.graphics.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
+  hardware.graphics.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
  services.xserver = {
    videoDrivers = [ "nvidia" ];
  };

  hardware.nvidia.modesetting.enable = true;

-  hardware.opengl.driSupport32Bit = true;
+  hardware.graphics.enable32Bit = true;

  boot.kernelModules = [ "kvm-amd" ];
  boot.extraModulePackages = [ ];
--- a/nixos/overlay.nix
+++ b/nixos/overlay.nix
@@ -17,14 +17,14 @@ final: prev: {
    };
  });

-  picom = prev.picom.overrideAttrs (old: {
+  picom-pijulius = prev.picom-pijulius.overrideAttrs (old: {
    src = prev.fetchFromGitHub {
      repo = "picom";
-      owner = "colonelpanic8";
-      rev = "ad18423bb809822c35ab22049db3269b3275c3b9";
-      sha256 = "sha256-7BkuBR27prlNyh3QW3Z/vy6O08mBQ0g88zqekJyhqSc=";
+      owner = "pijulius";
+      rev = "cb93ce9aeed7362c10f2537cd51f4ba45e7d88b5";
+      sha256 = "sha256-VAYC4ksQHnO3PctkmPlO/5/lL/7vLcHYRptwb03Hcwc=";
    };
-    nativeBuildInputs = old.nativeBuildInputs ++ [final.pcre final.asciidoctor];
+    nativeBuildInputs = old.nativeBuildInputs ++ [final.asciidoctor];
  });

  expressvpn = prev.expressvpn.overrideAttrs (_: {
--- a/nixos/secrets/gitea-runner-token.mac-demarco-mini.age
+++ b/nixos/secrets/gitea-runner-token.mac-demarco-mini.age
--- a/nixos/secrets/ryzen-shine-kubernetes-token.age
+++ b/nixos/secrets/ryzen-shine-kubernetes-token.age
--- a/nixos/secrets/secrets.nix
+++ b/nixos/secrets/secrets.nix
@@ -10,5 +10,7 @@ in
  "gitea-runner-token.jimi-hendnix.age".publicKeys = keys.agenixKeys;
  "gitea-runner-token.adele.age".publicKeys = keys.agenixKeys;
  "gitea-runner-token.railbird-sf.age".publicKeys = keys.agenixKeys ++ keys.railbird-sf;
+  "gitea-runner-token.mac-demarco-mini.age".publicKeys = keys.agenixKeys ++ keys.railbird-sf;
  "nextcloud-admin.age".publicKeys = keys.agenixKeys;
+  "ryzen-shine-kubernetes-token.age".publicKeys = keys.agenixKeys;
 }
--- a/nixos/xmonad.nix
+++ b/nixos/xmonad.nix
@@ -82,7 +82,8 @@ makeEnable config "modules.xmonad" true  {
      enable = true;
      vSync = config.modules.xmonad.picom.vSync.enable;
      backend = "glx";
-      extraArgs = ["--experimental-backends"];
+      # extraArgs = ["--experimental-backends"];
+      package = pkgs.picom-pijulius;

      settings = {
        animations = true;
Author	SHA1	Message	Date
Ivan Malison	f7ac2caaee	[NixOS] Use yshui/pijulius picom	2024-09-05 17:41:53 -06:00
Ivan Malison	10b8f61d27	[NixOS] Picom is only needed for xmonad	2024-08-20 00:43:37 -06:00
Ivan Malison	58432fe908	[NixOS] Host docs.railbird.ai	2024-08-19 14:32:48 -06:00
Ivan Malison	79908fae93	[NixOS] Add ryzen-shine kubernetes token	2024-08-18 15:32:36 -06:00
Ivan Malison	b597b6e239	[Emacs] Use rubocop in ruby-mode	2024-08-18 15:32:10 -06:00
Ivan Malison	9e8cd58d7f	[nix-darwin] Add gitea-runner token for mac-demarco-mini	2024-08-15 01:52:05 -06:00
Ivan Malison	6643428fca	Revert "[NixOS] Use yshui's picom version from git" This reverts commit `6cb9597df7`.	2024-08-14 01:33:19 -06:00
Ivan Malison	10a732ad75	[taffybar] Bump version	2024-08-11 17:54:49 -06:00
Ivan Malison	e6a75734fb	[NixOS] [zsh] Enable bracketed-paste-magic	2024-08-11 17:54:03 -06:00
Ivan Malison	eb22968ab4	[NixOS] Package renames	2024-08-11 17:52:53 -06:00
Ivan Malison	b12f84c007	[NixOS] Bump nixpkgs version	2024-08-11 17:52:37 -06:00
Ivan Malison	54645ba497	[NixOS] Fix deprecated option use in ryzen-shine	2024-08-11 17:52:17 -06:00