From 09f7f00394c4b19fe2b98bc3f013f6a3a203a263 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 3 Jun 2023 04:38:32 +0200 Subject: [PATCH] 23.05 --- flake.lock | 46 +++++++++++++-------------------------- flake.nix | 4 ++-- profiles/base/default.nix | 18 +-------------- 3 files changed, 18 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index 30079a7..edecdf9 100644 --- a/flake.lock +++ b/flake.lock @@ -39,20 +39,19 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1681092193, - "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", + "lastModified": 1685599623, + "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", + "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -80,27 +79,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684280442, - "narHash": "sha256-nC1/kfh6tpMQSLQalbNTNnireIlxvLLugrjZdasNh+I=", + "lastModified": 1685533922, + "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c591e7adc514090a77209f56c9d0c551ab8530d", + "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1684349153, - "narHash": "sha256-S/QRtvw5t3bQKjBX89eXsQJpEroPd9oUfhTO0eRBQI8=", + "lastModified": 1685619919, + "narHash": "sha256-h+uu1KF6VsLX089XJ4SpY+eO4U2XCShmGvxt2Sbip/s=", "owner": "nix-community", "repo": "NUR", - "rev": "da988644b16939cd2ccaa5ae2a17250066275361", + "rev": "bf64781ceb53b626a1c443200d71a516edf75ba4", "type": "github" }, "original": { @@ -121,11 +120,11 @@ }, "unstable": { "locked": { - "lastModified": 1684242266, - "narHash": "sha256-uaCQ2k1bmojHKjWQngvnnnxQJMY8zi1zq527HdWgQf8=", + "lastModified": 1685561376, + "narHash": "sha256-uIcJdaovXr55FJdmvR6yIN6IWoOL4amBj56e/T2KhgM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7e0743a5aea1dc755d4b761daf75b20aa486fdad", + "rev": "bc3ec5eaa759d58e9fb1bdc9cfe94f74d0331b31", "type": "github" }, "original": { @@ -134,21 +133,6 @@ "repo": "nixpkgs", "type": "github" } - }, - "utils": { - "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" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index fa19b4c..862f553 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,9 @@ nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc="; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; - home-manager.url = "github:nix-community/home-manager/release-22.11"; + home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 7b4b097..cf66f03 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -2,21 +2,6 @@ let cfg = config.profiles.base; - - helixDesktop = pkgs.makeDesktopItem { - name = "Helix"; - type = "Application"; - desktopName = "Helix"; - genericName = "Text Editor"; - comment = "Edit text files"; - tryExec = "hx"; - exec = "kitty hx %F"; - terminal = false; # Until you can globally set a prefered terminal we hardcoding this - mimeTypes = [ "ext/english" "text/plain" "text/x-makefile" "text/x-c++hdr" "text/x-c++src" "text/x-chdr" "text/x-csrc" "text/x-java" "text/x-moc" "text/x-pascal" "text/x-tcl" "text/x-tex" "application/x-shellscript" "text/x-c" "text/x-c++" ]; - categories = [ "Utility" "TextEditor" ]; - keywords = [ "Text" "editor" ]; - startupNotify = false; - }; in { options.machine = { @@ -60,7 +45,6 @@ in unstable.comma rnix-lsp - helixDesktop openvpn @@ -150,9 +134,9 @@ in url = "https://rycee.gitlab.io/home-manager/options.html#opt-%s"; }; }; + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden cookies-txt metamask no-pdf-download sponsorblock ublock-origin ]; }; }; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden cookies-txt metamask no-pdf-download sponsorblock ublock-origin ]; };