Zonsopkomst
/
flake
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

File Cleanup

This commit is contained in:
Zonsopkomst 2024-03-12 13:30:55 -05:00 committed by Zonsopkomst
parent e09fa8c718
commit 234d8b9533
11 changed files with 56 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
overrideAttrs/gnucash-5.4.nix → Gnucash Notes/gnucash-5.4.nix
View File

@ -79,4 +79,15 @@
sha256 = "sha256-d0EWXW1lLqe0oehJjPQ5pWuBpcyLZTKRpZBU8jYqv8w=";
};
});
}
}
# 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=";
};
}))

30
common/waydroid.nix
View File

@ -7,26 +7,11 @@
};
}
## Original Instructions I Followed:
## Instructions (verified)
# Run
# 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
# sudo rm -rf /var/lib/waydroid /home/.waydroid ~/waydroid ~/.share/waydroid ~/.local/share/applications/*aydroid* ~/.local/share/waydroid
## Actual Instructions that Worked:
# 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
# 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
# [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
@ -34,13 +19,10 @@
# [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
# 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.
# 08:47 PM zonsopkomst@weda $
# (~)>>>waydroid session start
# waydroid session start
# [20:48:04] Android with user 0 is ready

5
common/x11.nix
View File

@ -4,11 +4,6 @@
# Enable the X11 windowing system.
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 = {
layout = "us";
variant = "";

3
display/gdm.nix
View File

@ -2,6 +2,5 @@
{
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
View File

@ -8,6 +8,9 @@
hyprland.url = "github:hyprwm/Hyprland";
#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
# 03/12/2024 Gnucash Attempt:
legacypkgs.url = "github.com/Gnucash/gnucash/releases/download/5.4/gnucash-5.4-1.tar.gz";
};
outputs = inputs@{
@ -79,8 +82,7 @@
home-manager.users.aspire = import ./hosts/local/frija/home.nix;
}
nix-flatpak.nixosModules.nix-flatpak
{
nix-flatpak.nixosModules.nix-flatpak{
}
#hyprland.nixosModules.default
@ -210,8 +212,7 @@
home-manager.users.leeuwarden = import ./hosts/local/tyr/home.nix;
}
nix-flatpak.nixosModules.nix-flatpak
{
nix-flatpak.nixosModules.nix-flatpak{
}
#hyprland.nixosModules.default
@ -222,6 +223,10 @@
weda = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
# 03/12/2024 Gnucash Attempt:
extraSpecialArgs = {inherit inputs;};
modules = [
# Common Resources
@ -280,8 +285,7 @@
home-manager.users.zonsopkomst = import ./hosts/local/weda/home.nix;
}
nix-flatpak.nixosModules.nix-flatpak
{
nix-flatpak.nixosModules.nix-flatpak{
}
hyprland.nixosModules.default
@ -349,8 +353,7 @@
home-manager.users.annette = import ./hosts/remote/sintanne/home.nix;
}
nix-flatpak.nixosModules.nix-flatpak
{
nix-flatpak.nixosModules.nix-flatpak{
}
#hyprland.nixosModules.default
@ -414,8 +417,7 @@
home-manager.users.coleman = import ./hosts/remote/tii/home.nix;
}
nix-flatpak.nixosModules.nix-flatpak
{
nix-flatpak.nixosModules.nix-flatpak{
}
#hyprland.nixosModules.default
@ -479,8 +481,7 @@
home-manager.users.admin = import ./hosts/remote/tuisto/home.nix;
}
nix-flatpak.nixosModules.nix-flatpak
{
nix-flatpak.nixosModules.nix-flatpak{
}
#hyprland.nixosModules.default

27
users/admin/flatpak.nix
View File

@ -2,19 +2,18 @@
{
services.flatpak.packages = [
#"com.brave.Browser" # Brave Browser
"io.github.giantpinkrobots.flatsweep" # flatsweep
"com.github.tchx84.Flatseal" # Flatseal Flatpak Manager
"org.gtk.Gtk3theme.adw-gtk3" # Gnome Theme
"org.gtk.Gtk3theme.adw-gtk3-dark" # Gnome Theme
"org.localsend.localsend_app" # File/Message Send
"io.missioncenter.MissionCenter" # Mission Center
"com.github.dynobo.normcap" # NormCap
"com.heroicgameslauncher.hgl" # Heroic Games Launcher
"org.libretro.RetroArch" # RetroArch
"net.sourceforge.Ri-li" # Rili Children's Train Game
"net.nokyan.Resources" # System Resource Monitor
"com.github.zocker_160.SyncThingy" # SyncThingy
"io.github.flattool.Warehouse" # Flatpak Warehouse
"io.github.giantpinkrobots.flatsweep" # Flatsweep
"com.github.tchx84.Flatseal" # Flatseal Flatpak Manager
"org.gtk.Gtk3theme.adw-gtk3" # Gnome Theme
"org.gtk.Gtk3theme.adw-gtk3-dark" # Gnome Theme
"org.localsend.localsend_app" # File/Message Send
"io.missioncenter.MissionCenter" # Mission Center
"com.github.dynobo.normcap" # NormCap
"com.heroicgameslauncher.hgl" # Heroic Games Launcher
"org.libretro.RetroArch" # RetroArch
"net.sourceforge.Ri-li" # Rili Children's Train Game
"net.nokyan.Resources" # System Resource Monitor
"com.github.zocker_160.SyncThingy" # SyncThingy
"io.github.flattool.Warehouse" # Flatpak Warehouse
];
}

1
users/admin/home-manager.nix
View File

@ -10,7 +10,6 @@
calibre # eBook Library
crow-translate # Language Translator
dino # XMPP Client
#duplicati # Backup Data
easytag # Music Tag Editor
firefox # Browser
freetube # YouTube Front-End

1
users/annette/home-manager.nix
View File

@ -6,7 +6,6 @@
borgbackup # Deduplicating archiver with compression and encryption
bleachbit # PC Cleaner
brave # Browser
#duplicati # Backup Data
easytag # Music Tag Editor
firefox # Browser
libsForQt5.kolourpaint # Painting Application

2
users/aspire/home-manager.nix
View File

@ -6,14 +6,12 @@
borgbackup # Deduplicating archiver with compression and encryption
czkawka # Duplicate file finder
dupeguru # Duplicate file finder
#duplicati # Backup Data
kitty # Terminal Emulator
kitty-themes # Kitty Themes
librewolf # Firefox Web Browser Fork
tor-browser-bundle-bin # Privacy Web Browser
nomacs # Qt-based image viewer
mpv # Media Player
#veracrypt # Filesystem Encryption
];
imports = [

21
users/coleman/flatpak.nix
View File

@ -2,16 +2,15 @@
{
services.flatpak.packages = [
#"com.brave.Browser" # Brave Browser
"io.github.giantpinkrobots.flatsweep" # flatsweep
"com.github.tchx84.Flatseal" # Flatseal Flatpak Manager
"org.gtk.Gtk3theme.adw-gtk3" # Gnome Theme
"org.gtk.Gtk3theme.adw-gtk3-dark" # Gnome Theme
"org.localsend.localsend_app" # File/Message Send
"io.missioncenter.MissionCenter" # Mission Center
"com.github.dynobo.normcap" # NormCap
"net.nokyan.Resources" # System Resource Monitor
"com.github.zocker_160.SyncThingy" # SyncThingy
"io.github.flattool.Warehouse" # Flatpak Warehouse
"io.github.giantpinkrobots.flatsweep" # flatsweep
"com.github.tchx84.Flatseal" # Flatseal Flatpak Manager
"org.gtk.Gtk3theme.adw-gtk3" # Gnome Theme
"org.gtk.Gtk3theme.adw-gtk3-dark" # Gnome Theme
"org.localsend.localsend_app" # File/Message Send
"io.missioncenter.MissionCenter" # Mission Center
"com.github.dynobo.normcap" # NormCap
"net.nokyan.Resources" # System Resource Monitor
"com.github.zocker_160.SyncThingy" # SyncThingy
"io.github.flattool.Warehouse" # Flatpak Warehouse
];
}

13
users/zonsopkomst/home-manager.nix
View File

@ -17,18 +17,7 @@
easytag # Music Tag Editor
freetube # YouTube Front-End
gajim # XMPP Client
#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=";
};
}))
gnucash # Double Entry Accounting Software
gpodder # Podcast Manager
gretl # Econometric Analysis
gzdoom # Doom Clone based on ZDoom