tstarr/dotfiles
1
0
Fork 0
mirror of https://github.com/starr-dusT/dotfiles.git synced 2025-05-23 04:46:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: tstarr:9399b584f8538141d77aa3f6edc83d8111b7b57d
Branches Tags
tstarr:master
tstarr:v23.05
..
compare: tstarr:3beb73443154631398e1ab737a5f7790863a4478
Branches Tags
tstarr:master
tstarr:v23.05

No commits in common. "9399b584f8538141d77aa3f6edc83d8111b7b57d" and "3beb73443154631398e1ab737a5f7790863a4478" have entirely different histories.
9399b584f8 ... 3beb734431

12 changed files with 50 additions and 85 deletions
Show Stats Expand all files Collapse all files

2
provision/hosts/bulwark/configuration.nix
View File

@ -18,7 +18,7 @@
# Modules
modules = {
desktop = {
enable = true;
browser.enable = true;
gnome.enable = true;
};
devel = {

2
provision/hosts/kestrel/configuration.nix
View File

@ -34,7 +34,7 @@
# Modules
modules = {
desktop = {
enable = true;
browser.enable = true;
gnome.enable = true;
};
devel = {

3
provision/hosts/osprey/configuration.nix
View File

@ -25,13 +25,12 @@
docker-compose
podman-tui
dive
appgate-sdp
];
# Modules
modules = {
desktop = {
enable = true;
browser.enable = true;
gnome.enable = true;
};
devel = {

2
provision/hosts/shivan/configuration.nix
View File

@ -21,7 +21,7 @@
# Modules
modules = {
desktop = {
enable = true;
browser.enable = true;
gnome.enable = true;
};
devel = {

6
provision/modules/programs/chrome/bookmarks.nix → provision/modules/desktop/browser/bookmarks/chrome.nix
View File

@ -36,10 +36,4 @@
{ "url" = "https://old.reddit.com/r/nixos/"; name = "nixos-reddit"; }
{ "url" = "https://nixos.wiki/"; name = "nixos-wiki"; }
]; }
{ "name" = "Work"; "children" = [
{ url = "https://webmail.apps.mil/owa"; name = "WebMail";}
{ url = "https://dod.teams.microsoft.us/"; name = "Teams";}
{ url = "https://usaf-my.dps.mil/"; name = "OneDrive";}
]; }
]

0
provision/modules/programs/firefox/bookmarks.nix → provision/modules/desktop/browser/bookmarks/firefox.nix
View File

15
provision/modules/programs/chrome/default.nix → provision/modules/desktop/browser/chrome.nix
View File

@ -1,16 +1,9 @@
{ config, lib, pkgs, user, ... }:
let cfg1 = config.modules.desktop;
cfg2 = config.modules.programs.chrome;
let cfg = config.modules.desktop.browser;
in {
options.modules.programs.chrome = with lib; {
enable = lib.mkOption {
type = types.bool;
default = true;
};
};
config = lib.mkIf (cfg1.enable && cfg2.enable) {
# Enable option declared in firefox.nix
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
google-chrome # Web browser developed by Google.
];
@ -53,7 +46,7 @@ in {
# Setup bookmarks
"BookmarkBarEnabled" = true;
"ShowAppsShortcutInBookmarkBar" = false;
"ManagedBookmarks" = import ./bookmarks.nix;
"ManagedBookmarks" = import ./bookmarks/chrome.nix;
};
};

4
provision/modules/desktop/browser/default.nix Normal file
View File

@ -0,0 +1,4 @@
{ ... }:
{
imports = [ ./chrome.nix ./firefox.nix ];
}

17
provision/modules/programs/firefox/default.nix → provision/modules/desktop/browser/firefox.nix
View File

@ -1,17 +1,10 @@
{ config, lib, pkgs, user, ... }:
let cfg1 = config.modules.desktop;
cfg2 = config.modules.programs.firefox;
let cfg = config.modules.desktop.browser;
in {
options.modules.programs.firefox = with lib; {
enable = lib.mkOption {
type = types.bool;
default = true;
};
};
config = lib.mkIf (cfg1.enable && cfg2.enable) {
# Applications for CAC usage
options.modules.desktop.browser.enable = lib.mkEnableOption "browser";
config = lib.mkIf cfg.enable {
# Install applications for CAC
environment.systemPackages = with pkgs; [
opensc
pcsc-tools
@ -22,7 +15,7 @@ in {
programs.firefox = {
enable = true;
profiles.default = {
bookmarks = import ./bookmarks.nix;
bookmarks = import ./bookmarks/firefox.nix;
isDefault = true;
name = "default";
settings = {

74
provision/modules/desktop/default.nix
View File

@ -1,47 +1,39 @@
{ config, lib, pkgs, user, inputs, ... }:
{
imports = [ ./browser ./keyd.nix ./gnome.nix ];
let cfg = config.modules.desktop;
in {
imports = [
./keyd.nix
./gnome.nix
environment.systemPackages = with pkgs; [
bc # Arbitrary-precision arithmetic language.
fzf # Command-line fuzzy finder for Unix-like operating systems.
gamemode # Optimizes system performance for gaming by adjusting system settings.
vesktop # Voice, video, and text communication platform for communities and friends.
inkscape # Vector graphics editor for creating illustrations, icons, logos, diagrams, and more.
libreoffice-fresh # Office suite compatible with Microsoft Office.
xournal # Note-taking and sketching application.
mpv # Media player for playing audio and video files.
p7zip # Command-line file archiver with high compression ratio.
gimp # GNU Image Manipulation Program for editing and composing raster images.
];
options.modules.desktop.enable = lib.mkEnableOption "desktop";
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
bc # Arbitrary-precision arithmetic language.
fzf # Command-line fuzzy finder for Unix-like operating systems.
gamemode # Optimizes system performance for gaming by adjusting system settings.
vesktop # Voice, video, and text communication platform for communities and friends.
inkscape # Vector graphics editor for creating illustrations, icons, logos, diagrams, and more.
libreoffice-fresh # Office suite compatible with Microsoft Office.
xournal # Note-taking and sketching application.
mpv # Media player for playing audio and video files.
p7zip # Command-line file archiver with high compression ratio.
gimp # GNU Image Manipulation Program for editing and composing raster images.
];
# xdg-desktop-portal settings
services.dbus.enable = true;
xdg.mime = {
enable = true;
defaultApplications = {
"inode/directory" = [ "pcmanfm.desktop" ];
"text/html" = [ "google-chrome.desktop" ];
"x-scheme-handler/http" = [ "google-chrome.desktop" ];
"x-scheme-handler/https" = [ "google-chrome.desktop" ];
"x-scheme-handler/ftp" = [ "google-chrome.desktop" ];
"x-scheme-handler/chrome" = [ "google-chrome.desktop" ];
"x-scheme-handler/about" = [ "google-chrome.desktop" ];
"x-scheme-handler/unknown" = [ "google-chrome.desktop" ];
"application/x-extension-htm" = [ "google-chrome.desktop" ];
"application/x-extension-html" = [ "google-chrome.desktop" ];
"application/x-extension-shtml" = [ "google-chrome.desktop" ];
"application/xhtml+xml" = [ "google-chrome.desktop" ];
"application/x-extension-xhtml" = [ "google-chrome.desktop" ];
"application/x-extension-xht" = [ "google-chrome.desktop" ];
"application/pdf" = [ "google-chrome.desktop" ]; };
};
# xdg-desktop-portal settings
services.dbus.enable = true;
xdg.mime = {
enable = true;
defaultApplications = {
"inode/directory" = [ "pcmanfm.desktop" ];
"text/html" = [ "google-chrome.desktop" ];
"x-scheme-handler/http" = [ "google-chrome.desktop" ];
"x-scheme-handler/https" = [ "google-chrome.desktop" ];
"x-scheme-handler/ftp" = [ "google-chrome.desktop" ];
"x-scheme-handler/chrome" = [ "google-chrome.desktop" ];
"x-scheme-handler/about" = [ "google-chrome.desktop" ];
"x-scheme-handler/unknown" = [ "google-chrome.desktop" ];
"application/x-extension-htm" = [ "google-chrome.desktop" ];
"application/x-extension-html" = [ "google-chrome.desktop" ];
"application/x-extension-shtml" = [ "google-chrome.desktop" ];
"application/xhtml+xml" = [ "google-chrome.desktop" ];
"application/x-extension-xhtml" = [ "google-chrome.desktop" ];
"application/x-extension-xht" = [ "google-chrome.desktop" ];
"application/pdf" = [ "google-chrome.desktop" ]; };
};
}

2
provision/modules/programs/default.nix
View File

@ -1,8 +1,6 @@
{ ... }:
{
imports = [
./chrome
./firefox
./git.nix
./chezmoi.nix
./kitty.nix

8
provision/overlays/appgate-sdp.nix
View File

@ -1,8 +0,0 @@
self: super: {
appgate-sdp = super.appgate-sdp.overrideAttrs (old: {
src = super.fetchurl {
url = "https://bin.appgate-sdp.com/6.4/client/appgate-sdp_6.4.0_amd64.deb";
sha256 = "sha256-0h6Mz3B7fADGL5tGbrKNYpVIAvRu7Xx0n9OvjOeVCds=";
};
});
}