try gnome out for a bit; use a bunch of flatpaks instead of nix pkgs
This commit is contained in:
parent
46c1efe082
commit
36e4d70eec
5 changed files with 58 additions and 59 deletions
|
|
@ -19,55 +19,29 @@ in
|
||||||
aspellDicts.pt_BR
|
aspellDicts.pt_BR
|
||||||
bat
|
bat
|
||||||
clonehero
|
clonehero
|
||||||
creality-print
|
|
||||||
deploy-rs
|
deploy-rs
|
||||||
distrobox
|
distrobox
|
||||||
exhibit
|
|
||||||
fd
|
fd
|
||||||
filelight
|
|
||||||
firefox
|
|
||||||
fzf
|
fzf
|
||||||
gimp
|
ghostty
|
||||||
heroic
|
gnome-tweaks
|
||||||
itch
|
|
||||||
inkscape
|
|
||||||
junction
|
|
||||||
kde-rounded-corners
|
|
||||||
krita
|
|
||||||
libfido2
|
libfido2
|
||||||
libreoffice-qt
|
|
||||||
# lilipod BROKEN
|
# lilipod BROKEN
|
||||||
mangohud
|
mangohud
|
||||||
microsoft-edge
|
|
||||||
mission-center
|
mission-center
|
||||||
mpv
|
|
||||||
nextcloud-client
|
|
||||||
nixfmt-rfc-style
|
nixfmt-rfc-style
|
||||||
nix-init
|
nix-init
|
||||||
nix-output-monitor
|
nix-output-monitor
|
||||||
obsidian
|
|
||||||
obs-studio
|
|
||||||
ocs-url
|
ocs-url
|
||||||
orca-slicer
|
# orca-slicer BROKEN
|
||||||
openscad
|
|
||||||
p7zip
|
p7zip
|
||||||
plasticity
|
plasticity
|
||||||
prismlauncher
|
|
||||||
protonup
|
protonup
|
||||||
# quickgui
|
# quickgui BROKEN
|
||||||
qbittorrent
|
|
||||||
qview
|
|
||||||
ripgrep
|
ripgrep
|
||||||
rnote
|
|
||||||
solvespace
|
|
||||||
space-cadet-pinball
|
|
||||||
sparrow
|
sparrow
|
||||||
steam-run
|
|
||||||
tor-browser
|
|
||||||
ungoogled-chromium
|
|
||||||
unrar
|
unrar
|
||||||
ventoy
|
ventoy
|
||||||
vesktop
|
|
||||||
wezterm
|
wezterm
|
||||||
]
|
]
|
||||||
++ kdepkgs;
|
++ kdepkgs;
|
||||||
|
|
@ -75,9 +49,29 @@ in
|
||||||
services.flatpak = {
|
services.flatpak = {
|
||||||
enable = true;
|
enable = true;
|
||||||
packages = [
|
packages = [
|
||||||
|
"com.github.flxzt.rnote"
|
||||||
|
"com.github.k4zmu2a.spacecadetpinball"
|
||||||
|
"com.heroicgameslauncher.hgl"
|
||||||
|
"com.mattjakeman.ExtensionManager"
|
||||||
|
"com.microsoft.Edge"
|
||||||
|
"com.modrinth.ModrinthApp"
|
||||||
|
"com.nextcloud.desktopclient.nextcloud"
|
||||||
|
"com.obsproject.Studio"
|
||||||
"com.steamgriddb.SGDBoop"
|
"com.steamgriddb.SGDBoop"
|
||||||
|
"dev.vencord.Vesktop"
|
||||||
|
"io.github.giantpinkrobots.varia"
|
||||||
|
"io.github.ungoogled_software.ungoogled_chromium"
|
||||||
"io.github.zen_browser.zen"
|
"io.github.zen_browser.zen"
|
||||||
"org.gtk.Gtk3theme.adw-gtk3-dark"
|
"io.itch.itch"
|
||||||
|
"md.obsidian.Obsidian"
|
||||||
|
"org.gimp.GIMP"
|
||||||
|
"org.gnome.Showtime"
|
||||||
|
"org.inkscape.Inkscape"
|
||||||
|
"org.kde.krita"
|
||||||
|
"org.libreoffice.LibreOffice"
|
||||||
|
"org.mozilla.firefox"
|
||||||
|
"org.torproject.torbrowser-launcher"
|
||||||
|
"re.sonny.Junction"
|
||||||
];
|
];
|
||||||
uninstallUnmanaged = true;
|
uninstallUnmanaged = true;
|
||||||
update.auto.enable = true;
|
update.auto.enable = true;
|
||||||
|
|
@ -117,7 +111,6 @@ in
|
||||||
elisa
|
elisa
|
||||||
gwenview
|
gwenview
|
||||||
khelpcenter
|
khelpcenter
|
||||||
konsole
|
|
||||||
oxygen
|
oxygen
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,11 @@
|
||||||
services = {
|
services = {
|
||||||
printing.enable = true;
|
printing.enable = true;
|
||||||
udev.packages = with pkgs; [ yubikey-personalization ];
|
udev.packages = with pkgs; [ yubikey-personalization ];
|
||||||
desktopManager.plasma6.enable = true;
|
xserver = {
|
||||||
|
enable = true;
|
||||||
|
displayManager.gdm.enable = true;
|
||||||
|
desktopManager.gnome.enable = true;
|
||||||
|
};
|
||||||
tailscale.useRoutingFeatures = "client";
|
tailscale.useRoutingFeatures = "client";
|
||||||
nginx = {
|
nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -23,30 +27,30 @@
|
||||||
jack.enable = true;
|
jack.enable = true;
|
||||||
wireplumber.enable = true;
|
wireplumber.enable = true;
|
||||||
};
|
};
|
||||||
greetd = {
|
# greetd = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
settings = {
|
# settings = {
|
||||||
default_session.command =
|
# default_session.command =
|
||||||
let
|
# let
|
||||||
xSessions = "${config.services.displayManager.sessionData.desktops}/share/xsessions";
|
# xSessions = "${config.services.displayManager.sessionData.desktops}/share/xsessions";
|
||||||
wlSessions = "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions";
|
# wlSessions = "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions";
|
||||||
in
|
# in
|
||||||
''
|
# ''
|
||||||
${pkgs.greetd.tuigreet}/bin/tuigreet \
|
# ${pkgs.greetd.tuigreet}/bin/tuigreet \
|
||||||
--remember \
|
# --remember \
|
||||||
--asterisks \
|
# --asterisks \
|
||||||
--time \
|
# --time \
|
||||||
--greeting "NixOS" \
|
# --greeting "NixOS" \
|
||||||
--sessions ${xSessions}:${wlSessions}
|
# --sessions ${xSessions}:${wlSessions}
|
||||||
'';
|
# '';
|
||||||
initial_session = {
|
# initial_session = {
|
||||||
command = ''
|
# command = ''
|
||||||
${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland &> /dev/null
|
# ${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland &> /dev/null
|
||||||
'';
|
# '';
|
||||||
user = "user";
|
# user = "user";
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
|
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
|
||||||
cursor = {
|
cursor = {
|
||||||
package = pkgs.kdePackages.breeze-icons;
|
package = pkgs.kdePackages.breeze-icons;
|
||||||
name = "Breeze_Light";
|
name = "Breeze_Snow";
|
||||||
size = 24;
|
size = 24;
|
||||||
};
|
};
|
||||||
opacity = {
|
opacity = {
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@ in
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [ reboot-into-qubes ];
|
environment.systemPackages = with pkgs; [ reboot-into-qubes ];
|
||||||
|
|
||||||
hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd ];
|
# hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd ];
|
||||||
|
|
||||||
systemd.targets.hibernate.enable = false; # disable non-functional hibernate
|
systemd.targets.hibernate.enable = false; # disable non-functional hibernate
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,4 +7,6 @@
|
||||||
# Desktop-common imports
|
# Desktop-common imports
|
||||||
./common
|
./common
|
||||||
];
|
];
|
||||||
|
|
||||||
|
stylix.targets.gtk.flatpakSupport.enable = false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue