From d94c80295faafa9848757898bef6c1695c6c4e7b Mon Sep 17 00:00:00 2001 From: Lukas Heiligenbrunner Date: Sun, 5 Nov 2023 19:46:19 +0100 Subject: [PATCH] add somepkgs --- flake.lock | 65 ++++++++++++++++++++++++++++++ flake.nix | 11 +++++- modules/packages.nix | 4 ++ resources/PrusaSlicer.ini | 83 --------------------------------------- resources/homeprinter.ini | 13 ------ 5 files changed, 79 insertions(+), 97 deletions(-) create mode 100644 flake.lock delete mode 100644 resources/PrusaSlicer.ini delete mode 100644 resources/homeprinter.ini diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..46c1e18 --- /dev/null +++ b/flake.lock @@ -0,0 +1,65 @@ +{ + "nodes": { + "gnomeNixpkgs": { + "locked": { + "lastModified": 1698624843, + "narHash": "sha256-pSGoY3A+4hz6291/8phhwhzAKL61G09b+xK/tiUAJ0o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "47fbfd7a7f668692abf8cc649d9a901b18a9a424", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "gnome", + "repo": "nixpkgs", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698860414, + "narHash": "sha256-ejtFTDbo7tT8j8AIQfN9g+4dlQmrUDoC3dEaw77jVcY=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "fc2a8842ea5106640eb89ec522dde9120df82d8a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "gnomeNixpkgs": "gnomeNixpkgs", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 6a641d7..5135690 100644 --- a/flake.nix +++ b/flake.nix @@ -7,9 +7,11 @@ # import homemanager home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + + gnomeNixpkgs.url = "github:NixOS/nixpkgs/gnome"; }; - outputs = { self, nixpkgs, home-manager }: + outputs = { self, nixpkgs, home-manager, gnomeNixpkgs }: let system="x86_64-linux"; pkgs = import nixpkgs { @@ -22,6 +24,13 @@ main = lib.nixosSystem { inherit system; modules = [ + # { + # nixpkgs.overlays = [ + # (self: super: { + # gnome = gnomeNixpkgs.legacyPackages.x86_64-linux.gnome; + # }) + # ]; + # } ./configuration.nix home-manager.nixosModules.home-manager { diff --git a/modules/packages.nix b/modules/packages.nix index 8ae6300..a5457bc 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -28,6 +28,7 @@ # system utilities wget scrcpy + cmake # web firefox @@ -36,10 +37,13 @@ openscad vscode git + flutter prusa-slicer rustup jetbrains.idea-ultimate kicad + rstudio + R # multimedia vlc diff --git a/resources/PrusaSlicer.ini b/resources/PrusaSlicer.ini deleted file mode 100644 index 040ab81..0000000 --- a/resources/PrusaSlicer.ini +++ /dev/null @@ -1,83 +0,0 @@ -# generated by PrusaSlicer 2.6.1 on 2023-11-01 at 14:55:08 UTC -alert_when_supports_needed = 1 -allow_auto_color_change = 1 -allow_ip_resolve = 1 -auto_toolbar_size = 100 -autocenter = 0 -background_processing = 0 -clear_undo_redo_stack_on_new_project = 1 -collapsed_sidebar = 0 -color_mapinulation_panel = 0 -custom_toolbar_size = 100 -default_action_on_close_application = none -default_action_on_new_project = none -default_action_on_select_preset = none -desktop_integration_URL_path = /home/lukas/.local/share/applications/PrusaSlicerURLProtocol.desktop -downloader_url_registered = 1 -drop_project_action = 1 -export_sources_full_pathnames = 0 -no_controller = 1 -no_defaults = 1 -no_templates = 0 -non_manifold_edges = 1 -notify_release = none -order_volumes = 1 -preset_update = 1 -remember_output_path = 1 -remember_output_path_removable = 1 -restore_win_position = 1 -reverse_mouse_wheel_zoom = 0 -seq_top_layer_only = 1 -show_drop_project_dialog = 1 -show_hints = 1 -show_incompatible_presets = 0 -show_splash_screen = 1 -single_instance = 0 -url_downloader_dest = /home/lukas/Downloads -use_custom_toolbar_size = 0 -use_free_camera = 0 -use_inches = 0 -use_perspective_camera = 1 -version = 2.6.1 -version_online = 2.6.1 -view_mode = expert - -[filaments] -Esun ABS = 1 -Esun ABS @Template = 1 -Esun PLA = 1 -Esun PLA @Template = 1 -Generic ABS = 1 -Generic ABS @MK4 = 1 -Generic ABS @Template = 1 -Generic PETG = 1 -Generic PETG @PG = 1 -Generic PETG @Template = 1 -Generic PLA = 1 -Generic PLA @PG = 1 -Generic PLA @Template = 1 -Prusa ABS = 1 -Prusa ABS @Template = 1 -Prusament ASA @MK4 = 1 -Prusament PA11 Carbon Fiber @PG = 1 -Prusament PC Blend @MK4 = 1 -Prusament PC Blend Carbon Fiber @MK4 = 1 -Prusament PETG = 1 -Prusament PETG @PG = 1 -Prusament PETG @Template = 1 -Prusament PLA = 1 -Prusament PLA @PG = 1 -Prusament PLA @Template = 1 -Prusament PVB @PG = 1 - -[presets] -filament = Esun ABS -physical_printer = -print = 0.15mm QUALITY @MK3 -printer = Original Prusa i3 MK3S & MK3S+ -sla_material = -sla_print = - -[vendor:PrusaResearch] -model:MK3S = 0.4 - diff --git a/resources/homeprinter.ini b/resources/homeprinter.ini deleted file mode 100644 index ff31398..0000000 --- a/resources/homeprinter.ini +++ /dev/null @@ -1,13 +0,0 @@ -# generated by PrusaSlicer 2.6.1 on 2023-11-01 at 15:05:41 UTC -host_type = octoprint -preset_name = Original Prusa i3 MK3S & MK3S+ -preset_names = "Original Prusa i3 MK3S & MK3S+" -print_host = printer.heili.eu -printer_technology = FFF -printhost_apikey = -printhost_authorization_type = key -printhost_cafile = -printhost_password = -printhost_port = -printhost_ssl_ignore_revoke = 0 -printhost_user =