File Cleanup
This commit is contained in:
parent
e09fa8c718
commit
234d8b9533
|
@ -80,3 +80,14 @@
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Latest Attempt:
|
||||||
|
(gnucash.overrideAttrs (old: rec {
|
||||||
|
name = "gnucash-${version}";
|
||||||
|
version = "5.4";
|
||||||
|
src = requireFile {
|
||||||
|
name = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}-1.tar.bz2";
|
||||||
|
#sha256 = "0000000000000000000000000000000000000000000000000000";
|
||||||
|
sha256 = "sha256-d0EWXW1lLqe0oehJjPQ5pWuBpcyLZTKRpZBU8jYqv8w=";
|
||||||
|
};
|
||||||
|
}))
|
|
@ -7,26 +7,11 @@
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
## Original Instructions I Followed:
|
## Instructions (verified)
|
||||||
|
|
||||||
# Run
|
# sudo rm -rf /var/lib/waydroid /home/.waydroid ~/waydroid ~/.share/waydroid ~/.local/share/applications/*aydroid* ~/.local/share/waydroid
|
||||||
# sudo waydroid init -c https://waydroid.bardia.tech/OTA/system -v https://wadroid.bardia.tech/OTA/vendor -s GAPPS -f
|
|
||||||
# sudo nano /var/lib/waydroid/waydroid_base.prop
|
|
||||||
# Change the following two lines:
|
|
||||||
# ro.hardware.gralloc=default
|
|
||||||
# ro.hardware.egl=swiftshader
|
|
||||||
# sudo systemctl start waydroid-container
|
|
||||||
# sudo journalctl -u waydroid-container
|
|
||||||
# waydroid session start
|
|
||||||
# waydroid show-full-ui
|
|
||||||
|
|
||||||
## Actual Instructions that Worked:
|
# sudo waydroid init -s GAPPS -f
|
||||||
|
|
||||||
# 08:43 PM zonsopkomst@weda $
|
|
||||||
# (~)>>>sudo rm -rf /var/lib/waydroid /home/.waydroid ~/waydroid ~/.share/waydroid ~/.local/share/applications/*aydroid* ~/.local/share/waydroid
|
|
||||||
|
|
||||||
# 08:43 PM zonsopkomst@weda $
|
|
||||||
# (~)>>>sudo waydroid init -s GAPPS -f
|
|
||||||
# [20:44:33] Downloading https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-18.1-20230318-GAPPS-waydroid_x86_64-system.zip/download
|
# [20:44:33] Downloading https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-18.1-20230318-GAPPS-waydroid_x86_64-system.zip/download
|
||||||
# [Downloading] 858.39 MB/858.44 MB 12783.91 kbps(approx.)[20:46:00] Validating system image
|
# [Downloading] 858.39 MB/858.44 MB 12783.91 kbps(approx.)[20:46:00] Validating system image
|
||||||
# [20:46:01] Extracting to /var/lib/waydroid/images
|
# [20:46:01] Extracting to /var/lib/waydroid/images
|
||||||
|
@ -34,13 +19,10 @@
|
||||||
# [Downloading] 165.74 MB/165.89 MB 12864.75 kbps(approx.)[20:46:40] Validating vendor image
|
# [Downloading] 165.74 MB/165.89 MB 12864.75 kbps(approx.)[20:46:40] Validating vendor image
|
||||||
# [Downloading] 165.89 MB/165.89 MB 12696.42 kbps(approx.)[20:46:40] Extracting to /var/lib/waydroid/images
|
# [Downloading] 165.89 MB/165.89 MB 12696.42 kbps(approx.)[20:46:40] Extracting to /var/lib/waydroid/images
|
||||||
|
|
||||||
# 08:46 PM zonsopkomst@weda $
|
# sudo systemctl start waydroid-container
|
||||||
# (~)>>>sudo systemctl start waydroid-container
|
|
||||||
|
|
||||||
# 08:46 PM zonsopkomst@weda $
|
# sudo journalctl -u waydroid-container
|
||||||
# (~)>>>sudo journalctl -u waydroid-container
|
|
||||||
# Jan 22 18:04:52 nixos systemd[1]: Started Waydroid Container.
|
# Jan 22 18:04:52 nixos systemd[1]: Started Waydroid Container.
|
||||||
|
|
||||||
# 08:47 PM zonsopkomst@weda $
|
# waydroid session start
|
||||||
# (~)>>>waydroid session start
|
|
||||||
# [20:48:04] Android with user 0 is ready
|
# [20:48:04] Android with user 0 is ready
|
|
@ -4,11 +4,6 @@
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
|
|
||||||
# Configure keymap in X11
|
|
||||||
# 02/04/2024 Changed from xkbVariant to xkb.Variant 02/04/2024
|
|
||||||
# trace: warning: `overrideScope'` (from `lib.makeScope`) has been renamed to `overrideScope`.
|
|
||||||
# trace: warning: The option `services.xserver.xkbVariant' defined in `/nix/store/cxklafxzjc4pgv3wj7kiz2ygj5jqy2rm-source/common/x11.nix' has been renamed to `services.xserver.xkb.variant'.
|
|
||||||
# trace: warning: The option `services.xserver.layout' defined in `/nix/store/cxklafxzjc4pgv3wj7kiz2ygj5jqy2rm-source/common/x11.nix' has been renamed to `services.xserver.xkb.layout'.
|
|
||||||
services.xserver.xkb = {
|
services.xserver.xkb = {
|
||||||
layout = "us";
|
layout = "us";
|
||||||
variant = "";
|
variant = "";
|
||||||
|
|
|
@ -2,6 +2,5 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
services.xserver.displayManager.gdm.enable = true;
|
services.xserver.displayManager.gdm.enable = true;
|
||||||
security.pam.services.gdm.enableGnomeKeyring = true; # Added 11/02/23
|
security.pam.services.gdm.enableGnomeKeyring = true;
|
||||||
|
|
||||||
}
|
}
|
25
flake.nix
25
flake.nix
|
@ -8,6 +8,9 @@
|
||||||
hyprland.url = "github:hyprwm/Hyprland";
|
hyprland.url = "github:hyprwm/Hyprland";
|
||||||
#nix-flatpak.url = "github:gmodena/nix-flatpak/main";
|
#nix-flatpak.url = "github:gmodena/nix-flatpak/main";
|
||||||
nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch. Use github:gmodena/nix-flatpak/?ref=<tag> to pin releases
|
nix-flatpak.url = "github:gmodena/nix-flatpak"; # unstable branch. Use github:gmodena/nix-flatpak/?ref=<tag> to pin releases
|
||||||
|
|
||||||
|
# 03/12/2024 Gnucash Attempt:
|
||||||
|
legacypkgs.url = "github.com/Gnucash/gnucash/releases/download/5.4/gnucash-5.4-1.tar.gz";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{
|
outputs = inputs@{
|
||||||
|
@ -79,8 +82,7 @@
|
||||||
home-manager.users.aspire = import ./hosts/local/frija/home.nix;
|
home-manager.users.aspire = import ./hosts/local/frija/home.nix;
|
||||||
}
|
}
|
||||||
|
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
nix-flatpak.nixosModules.nix-flatpak{
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#hyprland.nixosModules.default
|
#hyprland.nixosModules.default
|
||||||
|
@ -210,8 +212,7 @@
|
||||||
home-manager.users.leeuwarden = import ./hosts/local/tyr/home.nix;
|
home-manager.users.leeuwarden = import ./hosts/local/tyr/home.nix;
|
||||||
}
|
}
|
||||||
|
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
nix-flatpak.nixosModules.nix-flatpak{
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#hyprland.nixosModules.default
|
#hyprland.nixosModules.default
|
||||||
|
@ -222,6 +223,10 @@
|
||||||
|
|
||||||
weda = nixpkgs.lib.nixosSystem {
|
weda = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
|
||||||
|
# 03/12/2024 Gnucash Attempt:
|
||||||
|
extraSpecialArgs = {inherit inputs;};
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
|
|
||||||
# Common Resources
|
# Common Resources
|
||||||
|
@ -280,8 +285,7 @@
|
||||||
home-manager.users.zonsopkomst = import ./hosts/local/weda/home.nix;
|
home-manager.users.zonsopkomst = import ./hosts/local/weda/home.nix;
|
||||||
}
|
}
|
||||||
|
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
nix-flatpak.nixosModules.nix-flatpak{
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
hyprland.nixosModules.default
|
hyprland.nixosModules.default
|
||||||
|
@ -349,8 +353,7 @@
|
||||||
home-manager.users.annette = import ./hosts/remote/sintanne/home.nix;
|
home-manager.users.annette = import ./hosts/remote/sintanne/home.nix;
|
||||||
}
|
}
|
||||||
|
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
nix-flatpak.nixosModules.nix-flatpak{
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#hyprland.nixosModules.default
|
#hyprland.nixosModules.default
|
||||||
|
@ -414,8 +417,7 @@
|
||||||
home-manager.users.coleman = import ./hosts/remote/tii/home.nix;
|
home-manager.users.coleman = import ./hosts/remote/tii/home.nix;
|
||||||
}
|
}
|
||||||
|
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
nix-flatpak.nixosModules.nix-flatpak{
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#hyprland.nixosModules.default
|
#hyprland.nixosModules.default
|
||||||
|
@ -479,8 +481,7 @@
|
||||||
home-manager.users.admin = import ./hosts/remote/tuisto/home.nix;
|
home-manager.users.admin = import ./hosts/remote/tuisto/home.nix;
|
||||||
}
|
}
|
||||||
|
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
nix-flatpak.nixosModules.nix-flatpak{
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#hyprland.nixosModules.default
|
#hyprland.nixosModules.default
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
services.flatpak.packages = [
|
services.flatpak.packages = [
|
||||||
#"com.brave.Browser" # Brave Browser
|
"io.github.giantpinkrobots.flatsweep" # Flatsweep
|
||||||
"io.github.giantpinkrobots.flatsweep" # flatsweep
|
|
||||||
"com.github.tchx84.Flatseal" # Flatseal Flatpak Manager
|
"com.github.tchx84.Flatseal" # Flatseal Flatpak Manager
|
||||||
"org.gtk.Gtk3theme.adw-gtk3" # Gnome Theme
|
"org.gtk.Gtk3theme.adw-gtk3" # Gnome Theme
|
||||||
"org.gtk.Gtk3theme.adw-gtk3-dark" # Gnome Theme
|
"org.gtk.Gtk3theme.adw-gtk3-dark" # Gnome Theme
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
calibre # eBook Library
|
calibre # eBook Library
|
||||||
crow-translate # Language Translator
|
crow-translate # Language Translator
|
||||||
dino # XMPP Client
|
dino # XMPP Client
|
||||||
#duplicati # Backup Data
|
|
||||||
easytag # Music Tag Editor
|
easytag # Music Tag Editor
|
||||||
firefox # Browser
|
firefox # Browser
|
||||||
freetube # YouTube Front-End
|
freetube # YouTube Front-End
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
borgbackup # Deduplicating archiver with compression and encryption
|
borgbackup # Deduplicating archiver with compression and encryption
|
||||||
bleachbit # PC Cleaner
|
bleachbit # PC Cleaner
|
||||||
brave # Browser
|
brave # Browser
|
||||||
#duplicati # Backup Data
|
|
||||||
easytag # Music Tag Editor
|
easytag # Music Tag Editor
|
||||||
firefox # Browser
|
firefox # Browser
|
||||||
libsForQt5.kolourpaint # Painting Application
|
libsForQt5.kolourpaint # Painting Application
|
||||||
|
|
|
@ -6,14 +6,12 @@
|
||||||
borgbackup # Deduplicating archiver with compression and encryption
|
borgbackup # Deduplicating archiver with compression and encryption
|
||||||
czkawka # Duplicate file finder
|
czkawka # Duplicate file finder
|
||||||
dupeguru # Duplicate file finder
|
dupeguru # Duplicate file finder
|
||||||
#duplicati # Backup Data
|
|
||||||
kitty # Terminal Emulator
|
kitty # Terminal Emulator
|
||||||
kitty-themes # Kitty Themes
|
kitty-themes # Kitty Themes
|
||||||
librewolf # Firefox Web Browser Fork
|
librewolf # Firefox Web Browser Fork
|
||||||
tor-browser-bundle-bin # Privacy Web Browser
|
tor-browser-bundle-bin # Privacy Web Browser
|
||||||
nomacs # Qt-based image viewer
|
nomacs # Qt-based image viewer
|
||||||
mpv # Media Player
|
mpv # Media Player
|
||||||
#veracrypt # Filesystem Encryption
|
|
||||||
];
|
];
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
services.flatpak.packages = [
|
services.flatpak.packages = [
|
||||||
#"com.brave.Browser" # Brave Browser
|
|
||||||
"io.github.giantpinkrobots.flatsweep" # flatsweep
|
"io.github.giantpinkrobots.flatsweep" # flatsweep
|
||||||
"com.github.tchx84.Flatseal" # Flatseal Flatpak Manager
|
"com.github.tchx84.Flatseal" # Flatseal Flatpak Manager
|
||||||
"org.gtk.Gtk3theme.adw-gtk3" # Gnome Theme
|
"org.gtk.Gtk3theme.adw-gtk3" # Gnome Theme
|
||||||
|
|
|
@ -17,18 +17,7 @@
|
||||||
easytag # Music Tag Editor
|
easytag # Music Tag Editor
|
||||||
freetube # YouTube Front-End
|
freetube # YouTube Front-End
|
||||||
gajim # XMPP Client
|
gajim # XMPP Client
|
||||||
#gnucash # Double Entry Accounting Software
|
gnucash # Double Entry Accounting Software
|
||||||
|
|
||||||
(gnucash.overrideAttrs (old: rec {
|
|
||||||
name = "gnucash-${version}";
|
|
||||||
version = "5.4";
|
|
||||||
src = requireFile {
|
|
||||||
name = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}-1.tar.bz2";
|
|
||||||
#sha256 = "0000000000000000000000000000000000000000000000000000";
|
|
||||||
sha256 = "sha256-d0EWXW1lLqe0oehJjPQ5pWuBpcyLZTKRpZBU8jYqv8w=";
|
|
||||||
};
|
|
||||||
}))
|
|
||||||
|
|
||||||
gpodder # Podcast Manager
|
gpodder # Podcast Manager
|
||||||
gretl # Econometric Analysis
|
gretl # Econometric Analysis
|
||||||
gzdoom # Doom Clone based on ZDoom
|
gzdoom # Doom Clone based on ZDoom
|
||||||
|
|
Loading…
Reference in a new issue