Skip to content

Commit

Permalink
feat(qtile): replaced openbox by qtile
Browse files Browse the repository at this point in the history
  • Loading branch information
Wittano committed Dec 1, 2024
1 parent 9f94494 commit 649c7b4
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
activate:
nh os switch -H pc .
nh os switch -H pc . -- --show-trace

clean:
ifeq (,$(windcard result))
Expand Down
11 changes: 11 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]

[dev-packages]

[requires]
python_version = "3.12"
20 changes: 20 additions & 0 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion home-manager/autostart.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ in
};
};

config = {
config = mkIf cfg.enable {
home.file = mkIf (cfg.scriptPath != null) {
"${cfg.scriptPath}".source = mkAutostartScript cfg.desktopName cfg.programs;
};
Expand Down
21 changes: 6 additions & 15 deletions hosts/pc/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -297,16 +297,7 @@ rec {
};
};

desktop.autostart = {
enable = false;
programs = [
"vivaldi"
"spotify"
"vesktop"
"thunderbird"
"signal-desktop --use-tray-icon --no-sandbox"
];
};
desktop.autostart.enable = true;

gtk.gtk3.bookmarks = [
"file://${environment.variables.NIX_DOTFILES} Nix configuration"
Expand All @@ -330,12 +321,12 @@ rec {
gnome.pomodoro

# Social media
telegram-desktop
# telegram-desktop
# unstable.freetube # Youtube desktop
fixedSignal # Signal desktop
# fixedSignal # Signal desktop
# element-desktop # matrix communicator
vesktop
# irssi # IRC chat
# vesktop
irssi # IRC chat
# unstable.streamlink-twitch-gui-bin
];
}
Expand All @@ -348,7 +339,7 @@ rec {
interval = "21:37";
};

desktop.openbox = {
desktop.qtile = {
enable = true;
users = [ "wittano" ];
};
Expand Down
2 changes: 1 addition & 1 deletion nixos/desktop/openbox/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ config, pkgs, lib, home-manager, ... }:
{ config, pkgs, lib, ... }:
with lib;
with lib.my;
let
Expand Down
18 changes: 17 additions & 1 deletion nixos/desktop/qtile/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
{ config, pkgs, lib, ... }:
with lib;
with lib.my;
let
cfg = config.desktop.qtile;
in
{
options.desktop.qtile.enable = mkEnableOption "qtile desktop";
options.desktop.qtile = {
enable = mkEnableOption "qtile desktop";
users = mkOption {
description = "List of users that use desktop configuration";
type = with types; listOf str;
};
};

config = mkIf config.desktop.qtile.enable {
fonts.packages = with pkgs; [ nerdfonts jetbrains-mono ];


home-manager.users = desktop.mkMultiUserHomeManager cfg.users {
desktop.autostart.desktopName = "qtile";

xdg.configFile."qtile".source = ./.;
};
services.xserver = {
enable = true;
windowManager.qtile.enable = true;
Expand Down
2 changes: 1 addition & 1 deletion nixos/desktop/xmonad/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ config, lib, pkgs, unstable, home-manager, ... }:
{ config, lib, pkgs, unstable, ... }:
with lib;
with lib.my;
let
Expand Down
4 changes: 2 additions & 2 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ mkShell {
testSddmTheme

# Python
# python3
# pipenv
python3
pipenv

# Haskell deps
# haskell-language-server
Expand Down

0 comments on commit 649c7b4

Please sign in to comment.