From 75b69aada88bd8993a05f8dea2b575dc963dc7f5 Mon Sep 17 00:00:00 2001 From: 4Lost Date: Mon, 17 Jun 2024 17:26:25 +0200 Subject: [PATCH] cura --- configuration.nix | 3 +++ home/default-laptop.nix | 6 +++++- home/programs/cura/default.nix | 5 +++++ home/programs/default.nix | 2 +- home/programs/neovim/default.nix | 1 - home/programs/zlib/default.nix | 5 ----- home/services/default-laptop.nix | 5 +++++ home/services/default.nix | 2 +- machines/configuration-laptop.nix | 11 +---------- 9 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 home/programs/cura/default.nix delete mode 100644 home/programs/zlib/default.nix create mode 100644 home/services/default-laptop.nix diff --git a/configuration.nix b/configuration.nix index deccb95..55f8339 100644 --- a/configuration.nix +++ b/configuration.nix @@ -103,6 +103,9 @@ #gnome.nautilus lxqt.lxqt-policykit # provides a default authentication client for policykit + + # for Haskell project + haskellPackages.zlib ]; hardware.pulseaudio.extraConfig = '' diff --git a/home/default-laptop.nix b/home/default-laptop.nix index 6764293..65aa8a3 100644 --- a/home/default-laptop.nix +++ b/home/default-laptop.nix @@ -1,7 +1,11 @@ { config, pkgs, ... }: { - imports = [ ./programs/default-laptop.nix ./services ./default.nix ]; + imports = [ + ./programs/default-laptop.nix + ./services/default-laptop.nix + ./default.nix + ]; home.file."minlog".source = config.lib.file.mkOutOfStoreSymlink "${pkgs.minlog}/share/minlog"; diff --git a/home/programs/cura/default.nix b/home/programs/cura/default.nix new file mode 100644 index 0000000..3e45ea9 --- /dev/null +++ b/home/programs/cura/default.nix @@ -0,0 +1,5 @@ +{ pkgs, config, ... }: + +{ + home.packages = with pkgs; [ cura ]; +} diff --git a/home/programs/default.nix b/home/programs/default.nix index d60cceb..90ad25a 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -2,6 +2,7 @@ imports = [ ./alacritty ./anki + ./cura ./discord ./dolphin ./dunst @@ -28,7 +29,6 @@ ./wallpaper ./xmonad ./zoom - ./zlib ./zsh ./zulip ]; diff --git a/home/programs/neovim/default.nix b/home/programs/neovim/default.nix index b244a9e..2cce167 100644 --- a/home/programs/neovim/default.nix +++ b/home/programs/neovim/default.nix @@ -27,7 +27,6 @@ in { bufferline-nvim catppuccin-nvim cmp-buffer - coc-nvim cmp-conjure cmp-nvim-lua cmp-nvim-lsp diff --git a/home/programs/zlib/default.nix b/home/programs/zlib/default.nix deleted file mode 100644 index 4826542..0000000 --- a/home/programs/zlib/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, config, ... }: - -{ - home.packages = with pkgs; [ zlib ]; -} diff --git a/home/services/default-laptop.nix b/home/services/default-laptop.nix new file mode 100644 index 0000000..22014ae --- /dev/null +++ b/home/services/default-laptop.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: + +{ + imports = [ ./default.nix ./betterlockscreen ]; +} diff --git a/home/services/default.nix b/home/services/default.nix index 48bc445..cacee4e 100644 --- a/home/services/default.nix +++ b/home/services/default.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - imports = [ ./ssh-agent ./gpg-agent ./betterlockscreen ]; + imports = [ ./ssh-agent ./gpg-agent ]; } diff --git a/machines/configuration-laptop.nix b/machines/configuration-laptop.nix index 74352e2..7cb32a0 100644 --- a/machines/configuration-laptop.nix +++ b/machines/configuration-laptop.nix @@ -9,22 +9,13 @@ hardware.pulseaudio.enable = true; hardware.bluetooth = { enable = true; - powerOnBoot = true; - settings.General = { - Enable = "Source,Sink,Media,Socket"; - Experimental = true; - }; + powerOnBoot = false; }; environment.systemPackages = with pkgs; [ bluez - bluez-alsa bluez-tools gnome.networkmanager-vpnc networkmanagerapplet ]; - hardware.pulseaudio.extraConfig = '' - load-module module-bluetooth-policy - load-module module-bluetooth-discover - ''; services.blueman.enable = true; }