From d79c0383dfaec18bc498343a0d95b4ffeab42817 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Fri, 29 Nov 2024 23:34:38 +1000 Subject: [PATCH] tidied core and home --- core/modules/desktop.nix | 20 +++++++++----------- home/programs/default.nix | 30 ++++++++++++++---------------- home/programs/firefox/default.nix | 13 +++++++++++++ home/programs/nheko/default.nix | 19 +++++++++++++++++++ home/programs/obs/default.nix | 18 ++++++++++++++++++ 5 files changed, 73 insertions(+), 27 deletions(-) create mode 100755 home/programs/firefox/default.nix create mode 100755 home/programs/nheko/default.nix create mode 100755 home/programs/obs/default.nix diff --git a/core/modules/desktop.nix b/core/modules/desktop.nix index 2e77771..d7481d1 100755 --- a/core/modules/desktop.nix +++ b/core/modules/desktop.nix @@ -15,16 +15,6 @@ seahorse.enable = true; ## Use android device as a webcam droidcam.enable = true; - ## Apparently nm-applet has a programs option - #nm-applet = { - #enable = true; - #indicator = false; - #}; - ## idk something for nautilus - #nautilus-open-any-terminal = { - #enable = true; - #terminal = "kitty"; - #}; obs-studio = { enable = true; enableVirtualCamera = true; @@ -33,17 +23,25 @@ ]; }; - dconf.enable = true; + #dconf.enable = true; + }; services = { + ## dont think i NEED this tbh libinput.enable = true; ## Virtual filesystem, needed this for something i think ? gvfs.enable = true; + ## Dbus is for ... dbus.enable = true; + ## no clue upower.enable = true; + ## for managing disks udisks2.enable = true; + ## dont think this works power-profiles-daemon.enable = true; + ## ideally we're getting rid of most of this + ## half of it doesn't even work lol gnome = { ## File previewer for nautilus sushi.enable = true; diff --git a/home/programs/default.nix b/home/programs/default.nix index 2abcdc0..3f54378 100755 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -1,25 +1,23 @@ -{ pkgs, ... }: +{ pkgs, ... }: { imports = [ ## Import program configs + ./firefox + ./nheko ./fetch ./kitty ./btop ./yazi ./nvim ./fish - ./git + ./obs + ./git ]; - programs = { - nheko.enable = true; - firefox.enable = true; - }; - home.packages = with pkgs; [ ## Games @@ -34,19 +32,19 @@ tor # The Onion Router ## Media - #lollypop # GTK music player + #lollypop # GTK music player spotify # Corpo music streaming - #pragha # Music player - #tauon # Music player + #pragha # Music player + #tauon # Music player transmission_4-gtk # Torrent client nicotine-plus # P2P Media sharing - #jellyfin # Self-Hosted media streaming + #jellyfin # Self-Hosted media streaming syncplay # Synchronise local playback with friends vlc # Multimedia player ## Productivity - #thunderbird # Email client - commented out due to network issues trying to build it ? - obsidian # Note-taking + #thunderbird # Email client - commented out due to network issues trying to build it ? + obsidian # Note-taking ## Audio playback and production neural-amp-modeler-lv2 # Guitar amp emulator @@ -54,16 +52,16 @@ easyeffects # EQ and audio effects metronome # A metronome vcv-rack # Analogue-Synth emulator - #cardinal # VCV Rack but open source and as a plugin + #cardinal # VCV Rack but open source and as a plugin audacity # Audio editing helvum # GTK patchbay ardour # Digital Audio Workstation ## Image and Video playback and production - #obs-studio # Screen sharing + #obs-studio # Screen sharing inkscape # Vector image editing shotcut # Video editing - #blender # 3D modelling + #blender # 3D modelling gimp # Digital image editing ]; diff --git a/home/programs/firefox/default.nix b/home/programs/firefox/default.nix new file mode 100755 index 0000000..d705a76 --- /dev/null +++ b/home/programs/firefox/default.nix @@ -0,0 +1,13 @@ +{ + + programs = { + + firefox = { + + enable = true; + + }; + + }; + +} diff --git a/home/programs/nheko/default.nix b/home/programs/nheko/default.nix new file mode 100755 index 0000000..4b98f2f --- /dev/null +++ b/home/programs/nheko/default.nix @@ -0,0 +1,19 @@ +##https://mynixos.com/home-manager/option/programs.nheko.settings + +{ + + programs = { + + nheko = { + + enable = true; + + settings = { + + }; + + }; + + }; + +} diff --git a/home/programs/obs/default.nix b/home/programs/obs/default.nix new file mode 100755 index 0000000..e5cadd2 --- /dev/null +++ b/home/programs/obs/default.nix @@ -0,0 +1,18 @@ +{ pkgs }: + +{ + + programs = { + + obs-studio = { + + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + droidcam-obs + ]; + }; + + }; + +}