From 76aa7f0624e6e0862745c8932a8ac4111e813b1d Mon Sep 17 00:00:00 2001 From: ooks-io Date: Mon, 31 Jul 2023 17:32:13 +1200 Subject: [PATCH] desktop/cleanup --- .../programs/resource-monitor/default.nix | 8 --- home/ooks/modules/programs/search/default.nix | 14 ---- home/ooks/ooksx1.nix | 69 +++---------------- home/ooks/opt/desktop/hyprland/home.nix | 0 home/ooks/opt/desktop/standard/default.nix | 10 +++ .../desktop/standard/imv.nix} | 0 home/ooks/opt/desktop/standard/playerctl.nix | 7 ++ .../opt/desktop/standard/wayland/default.nix | 2 - home/ooks/opt/shell/default.nix | 1 + 9 files changed, 27 insertions(+), 84 deletions(-) delete mode 100644 home/ooks/modules/programs/resource-monitor/default.nix delete mode 100644 home/ooks/modules/programs/search/default.nix delete mode 100644 home/ooks/opt/desktop/hyprland/home.nix create mode 100644 home/ooks/opt/desktop/standard/default.nix rename home/ooks/{modules/programs/imgview/default.nix => opt/desktop/standard/imv.nix} (100%) create mode 100644 home/ooks/opt/desktop/standard/playerctl.nix diff --git a/home/ooks/modules/programs/resource-monitor/default.nix b/home/ooks/modules/programs/resource-monitor/default.nix deleted file mode 100644 index ffb4f9e..0000000 --- a/home/ooks/modules/programs/resource-monitor/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, pkgs, ... }: -{ - programs = { - btop = { - enable = true; - }; - }; -} diff --git a/home/ooks/modules/programs/search/default.nix b/home/ooks/modules/programs/search/default.nix deleted file mode 100644 index 36a85d8..0000000 --- a/home/ooks/modules/programs/search/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, pkgs, ... }: - -{ - home = { - packages = with pkgs; [ - fd - bat - ripgrep - ]; - }; - programs = { - fzf.enable = true; - }; -} diff --git a/home/ooks/ooksx1.nix b/home/ooks/ooksx1.nix index 835ec37..d92ba61 100644 --- a/home/ooks/ooksx1.nix +++ b/home/ooks/ooksx1.nix @@ -1,70 +1,19 @@ { config, pkgs, ... }: { - # Home Manager needs a bit of information about you and the paths it should - # manage. + imports = [ + ./opt/nvim + ./opt/shell + ./opt/desktop/hyprland + ./standard + ]; + + colorscheme = inputs.nix-colors.colorSchemes.everforest; + home.username = "ooks"; home.homeDirectory = "/home/ooks"; - # This value determines the Home Manager release that your configuration is - # compatible with. This helps avoid breakage when a new Home Manager release - # introduces backwards incompatible changes. - # - # You should not change this value, even if you update Home Manager. If you do - # want to update the value, then make sure to first check the Home Manager - # release notes. home.stateVersion = "23.05"; # Please read the comment before changing. - # The home.packages option allows you to install Nix packages into your - # environment. - home.packages = [ - # # Adds the 'hello' command to your environment. It prints a friendly - # # "Hello, world!" when run. - # pkgs.hello - - # # It is sometimes useful to fine-tune packages, for example, by applying - # # overrides. You can do that directly here, just don't forget the - # # parentheses. Maybe you want to install Nerd Fonts with a limited number of - # # fonts? - # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) - - # # You can also create simple shell scripts directly inside your - # # configuration. For example, this adds a command 'my-hello' to your - # # environment: - # (pkgs.writeShellScriptBin "my-hello" '' - # echo "Hello, ${config.home.username}!" - # '') - ]; - - # Home Manager is pretty good at managing dotfiles. The primary way to manage - # plain files is through 'home.file'. - home.file = { - # # Building this configuration will create a copy of 'dotfiles/screenrc' in - # # the Nix store. Activating the configuration will then make '~/.screenrc' a - # # symlink to the Nix store copy. - # ".screenrc".source = dotfiles/screenrc; - - # # You can also set the file content immediately. - # ".gradle/gradle.properties".text = '' - # org.gradle.console=verbose - # org.gradle.daemon.idletimeout=3600000 - # ''; - }; - - # You can also manage environment variables but you will have to manually - # source - # - # ~/.nix-profile/etc/profile.d/hm-session-vars.sh - # - # or - # - # /etc/profiles/per-user/ooks/etc/profile.d/hm-session-vars.sh - # - # if you don't want to manage your shell through Home Manager. - home.sessionVariables = { - # EDITOR = "emacs"; - }; - - # Let Home Manager install and manage itself. programs.home-manager.enable = true; } diff --git a/home/ooks/opt/desktop/hyprland/home.nix b/home/ooks/opt/desktop/hyprland/home.nix deleted file mode 100644 index e69de29..0000000 diff --git a/home/ooks/opt/desktop/standard/default.nix b/home/ooks/opt/desktop/standard/default.nix new file mode 100644 index 0000000..fb7c663 --- /dev/null +++ b/home/ooks/opt/desktop/standard/default.nix @@ -0,0 +1,10 @@ +{ + imports = [ + ./qt.nix + ./gtk.nix + ./imv.nix + ./fonts.nix + ./playerctl.nix + ./pavucontrol.nix + ]; +} diff --git a/home/ooks/modules/programs/imgview/default.nix b/home/ooks/opt/desktop/standard/imv.nix similarity index 100% rename from home/ooks/modules/programs/imgview/default.nix rename to home/ooks/opt/desktop/standard/imv.nix diff --git a/home/ooks/opt/desktop/standard/playerctl.nix b/home/ooks/opt/desktop/standard/playerctl.nix new file mode 100644 index 0000000..8126526 --- /dev/null +++ b/home/ooks/opt/desktop/standard/playerctl.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ playerctl ]; + services.playerctld = { + enable = true; + }; +} diff --git a/home/ooks/opt/desktop/standard/wayland/default.nix b/home/ooks/opt/desktop/standard/wayland/default.nix index 1e45633..167d827 100644 --- a/home/ooks/opt/desktop/standard/wayland/default.nix +++ b/home/ooks/opt/desktop/standard/wayland/default.nix @@ -27,8 +27,6 @@ MOZ_ENABLE_WAYLAND = 1; QT_QPA_PLATFORM = "wayland"; LIBSEAT_BACKEND = "logind"; - EDITOR = "nvim"; - BROWSER = "firefox"; }; diff --git a/home/ooks/opt/shell/default.nix b/home/ooks/opt/shell/default.nix index 7c369a3..84d7cef 100644 --- a/home/ooks/opt/shell/default.nix +++ b/home/ooks/opt/shell/default.nix @@ -19,6 +19,7 @@ jq # JSON pretty printer and manipulator nix-inspect # See which pkgs are in your PATH comma # Install and run with "," + btop ]; programs = {