diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml new file mode 100644 index 00000000..f0217a83 --- /dev/null +++ b/.github/workflows/mirror.yml @@ -0,0 +1,23 @@ +name: Mirror repository + +on: + push: + branches: + - main + +jobs: + mirror: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Mirror to SourceHut + run: | + git remote set-url --add --push origin git@git.sr.ht:~canasta/cnix + git remote set-url --push origin --mirror=push + git push --mirror + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} diff --git a/flake.lock b/flake.lock index 99106188..ea4de9f0 100644 --- a/flake.lock +++ b/flake.lock @@ -154,11 +154,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1729924178, - "narHash": "sha256-ZhDqOYZwx0kYg1vPrmZ2fJm/wem739eNSSK+GlzdeqA=", + "lastModified": 1730010749, + "narHash": "sha256-UBckyKItSD0z50+3YQOqfOuyvUI7UjPHiLbOPFUolqo=", "owner": "nix-community", "repo": "fenix", - "rev": "e831b4d256526cc56bd37c7c579842866410bebc", + "rev": "5fa09829e74070c1e83b2aaa50b71bbc6da3f37c", "type": "github" }, "original": { @@ -461,11 +461,11 @@ ] }, "locked": { - "lastModified": 1729894599, - "narHash": "sha256-nL9nzNE5/re/P+zOv7NX6bRm5e+DeS1HIufQUJ01w20=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "93435d27d250fa986bfec6b2ff263161ff8288cb", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -592,11 +592,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1729957831, - "narHash": "sha256-xI4wC3/KqK+GhLVZWDzSXncLqO6vF0DXYvykXdtnCdE=", + "lastModified": 1729989895, + "narHash": "sha256-IFctdjt+v7zRDe24Y8+BdVDaKy0pmn60FWDzpYg4CT0=", "owner": "hyprwm", "repo": "hyprland", - "rev": "c356e425008cba8bd0c87487a2c79b9be4eda2aa", + "rev": "a3d3b4fd64a51a8c1663b450bd2a408f1f0fa9b3", "type": "github" }, "original": { @@ -925,11 +925,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1729733994, - "narHash": "sha256-OFI0EG5ToqHJMPgMKmo6eAJcHqhNVgrgcAMQ8oIHEN8=", + "lastModified": 1729993301, + "narHash": "sha256-1SJ5Ky+HSMXAf+uij34MIB2jii0RZwFmOaJg1/e9Rzg=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "af2e2e01939aa85a6ca588b97297a0856618f341", + "rev": "655bf9e689c9f7b15ba6521b849321120c0af616", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1729939720, - "narHash": "sha256-F7jTiYAxLF0Hcv92Xa5dIufzH1plmS9nbwO50j/9Kxw=", + "lastModified": 1730025694, + "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c93e398e719021a9ad9da56af1589d23029f3cea", + "rev": "23664a7358c599dd4f975f16cea0865bf423e83d", "type": "github" }, "original": { @@ -1146,11 +1146,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -1176,21 +1176,6 @@ "type": "github" } }, - "nur": { - "locked": { - "lastModified": 1729971220, - "narHash": "sha256-m8FayBFkRGljYTZDWygQdDqoD7ScUSm1iPi6iAvfSw0=", - "owner": "nix-community", - "repo": "NUR", - "rev": "e51ca268e4ffb736cc9db0ef2c8bf36ef026ffdc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -1266,7 +1251,6 @@ "nixpak": "nixpak", "nixpkgs": "nixpkgs_8", "nixpkgs-small": "nixpkgs-small", - "nur": "nur", "systems": "systems_5", "tuirun": "tuirun", "zen-browser": "zen-browser" @@ -1275,11 +1259,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1729845655, - "narHash": "sha256-6I3gJLnOLnUIWFUlEnvC0FdzX8Xwu+y3Vo0q4VB6Wbk=", + "lastModified": 1729923686, + "narHash": "sha256-Tc+5E/UmjpXlYGQQ6X2nGDv6J6VQgZ+pVOJLcNCIVQc=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "f4466718b838de706d74e2c13f20a41c034d87a5", + "rev": "26d2fbaef2d68a2fccf55d725915188c2634439a", "type": "github" }, "original": { @@ -1450,11 +1434,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1729899621, - "narHash": "sha256-nyGycAl1Dwa1BO1mCN9+TR26jmdheYHUxEQtBEVuLCc=", + "lastModified": 1729978972, + "narHash": "sha256-Zox0iAi4CRPn4rxrhOetFFZ2jcSipe8tGD8nMTgcjhE=", "ref": "refs/heads/main", - "rev": "785bccedbd0e8e9cf5427a511cd935a74d582d06", - "revCount": 824, + "rev": "72499f349ca81cb2838eced9d7c465b2cf71c4a2", + "revCount": 825, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/" @@ -1514,11 +1498,11 @@ ] }, "locked": { - "lastModified": 1729421324, - "narHash": "sha256-uZGVMe9EgSXmiX6WysVt8ooHP+KW2biEmP/lxLMQ7aY=", + "lastModified": 1730051017, + "narHash": "sha256-7n+4NlrURzLlOhzbYKyXRYjdxBPhVkvuJeAdy8DRuYU=", "owner": "cnsta", "repo": "zen-browser-flake", - "rev": "70f6800e45062c93c99118a9010a42adbb63b1f3", + "rev": "f51f96f708c8709c96c17994298b5249d70e3780", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5001d845..9b2bf293 100644 --- a/flake.nix +++ b/flake.nix @@ -49,8 +49,6 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; - nur.url = "github:nix-community/NUR"; - # Hyprland environment hyprland.url = "github:hyprwm/hyprland"; diff --git a/modules/home/programs/firefox/default.nix b/modules/home/programs/firefox/default.nix index 6009556d..c6f6d279 100644 --- a/modules/home/programs/firefox/default.nix +++ b/modules/home/programs/firefox/default.nix @@ -9,7 +9,7 @@ cfg = config.home.programs.firefox; in { imports = [ - inputs.nur.hmModules.nur + # inputs.nur.hmModules.nur ]; options = { home.programs.firefox.enable = mkEnableOption "Enables firefox"; @@ -27,15 +27,15 @@ in { order = ["DuckDuckGo" "Google"]; }; bookmarks = {}; - extensions = with config.nur.repos.rycee.firefox-addons; [ - ublock-origin - sponsorblock - clearurls - swedish-dictionary - reddit-enhancement-suite - return-youtube-dislikes - enhancer-for-youtube # unfree - ]; + # extensions = with config.nur.repos.rycee.firefox-addons; [ + # ublock-origin + # sponsorblock + # clearurls + # swedish-dictionary + # reddit-enhancement-suite + # return-youtube-dislikes + # enhancer-for-youtube # unfree + # ]; settings = { "apz.overscroll.enabled" = true; "browser.aboutConfig.showWarning" = false; diff --git a/modules/home/programs/neovim/plugins/default.nix b/modules/home/programs/neovim/plugins/default.nix index feaa0b5e..66944bc7 100644 --- a/modules/home/programs/neovim/plugins/default.nix +++ b/modules/home/programs/neovim/plugins/default.nix @@ -10,7 +10,6 @@ ./gitsigns.nix ./treesitter.nix ./conform.nix - ./gx.nix ./bqf.nix ./colorizer.nix ./web-devicons.nix diff --git a/modules/home/programs/neovim/plugins/gx.nix b/modules/home/programs/neovim/plugins/gx.nix deleted file mode 100644 index 8be7285c..00000000 --- a/modules/home/programs/neovim/plugins/gx.nix +++ /dev/null @@ -1,28 +0,0 @@ -{pkgs, ...}: let - gx-nvim = pkgs.vimUtils.buildVimPlugin { - name = "gx-nvim"; - src = pkgs.fetchFromGitHub { - owner = "chrishrb"; - repo = "gx.nvim"; - rev = "f29a87454b02880e0d76264c21be8316224a7395"; - hash = "sha256-QWJ/cPvSyMTJoWLg51BNFf9+/9i7G+nzennpHP/eQ4g="; - }; - }; -in { - programs.neovim.plugins = [ - { - plugin = gx-nvim; - type = "lua"; - config = - /* - lua - */ - '' - require("gx").setup({}) - vim.keymap.set({ "n", "x" }, "gx", ":Browse", { - desc = "Open the file under cursor with system app", - }) - ''; - } - ]; -} diff --git a/nix/default.nix b/nix/default.nix index 6464b10c..efb516eb 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -37,6 +37,7 @@ auto-optimise-store = true; builders-use-substitutes = true; warn-dirty = false; + allow-import-from-derivation = false; experimental-features = ["nix-command" "flakes"]; flake-registry = "/etc/nix/registry.json"; diff --git a/users/cnst/modules.nix b/users/cnst/modules.nix index c83debaf..12ecdc64 100644 --- a/users/cnst/modules.nix +++ b/users/cnst/modules.nix @@ -30,7 +30,7 @@ enable = true; }; chromium = { - enable = false; + enable = true; }; discord = { enable = true;