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

Merge branch 'working'

This commit is contained in:
Zonsopkomst 2024-02-28 07:58:10 -06:00
parent 93cd6065f7 206bd174c9
commit 49631b7570
61 changed files with 4151 additions and 773 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
README.md
View File

@ -1,66 +0,0 @@
---
#+title: Flake Readme
#+author: Zonsopkomst
#+date: 2022-11-30
---
# My NixOS Configuraton File
This is my NixOS setup to manage multiple computers with a home-manager config structure using nix flakes.
# Current Desktop Screenshot
![Gnome](https://git.disroot.org/Zonsopkomst/flake/raw/branch/working/reference/assets/2023-09-21_09-18.png)
*Gnome*
## Highlights:
* Multiple NixOS configurations: desktop, laptop, and hopefully a test server and eventually a full transition over from my Ubuntu server.
## How to
![Process](https://git.disroot.org/Zonsopkomst/flake/raw/branch/working/reference/assets/underpants-gnomes.png)
*Source: South Park*
1. NixOS Installation
1. Install NixOS on a computer using the default Gnome installer from https://nixos.org/download.html.
1. Clone this repository [zonsopkomst](https://git.disroot.org/zonsopkomst) in the `/home/<username>/ directory.
1. Update the subdirectories in `hosts` and `users`.
1. Copy the `configuration.nix` and `hardware-configuration.nix` files from the `/etc/nixos` directory and move them to `hosts/PLACE(local OR remote)/NEW_PC_NAME`.
1. Rename `configuration.nix` to `default.nix` and, update `flake.nix` located in the top directory, link the appropriate modules to be used.
1. Make sure the correct version of NixOS is listed in the appropriate files.
1. `flake.nix` is where `.nix` files are imported with further instructions on declared packages and modules.
1. Declare packages either globally under `/hosts/<location>/hostname/packages.nix` or `/users/<username>/home-manager.nix`.
1. Rebuild NixOS *(<hostname> must be include the first time rebuilding, after the first rebuild, .# can be used and the system will know which hostname is to be used)*
1. nix-channel --update
1. nixos-rebuild switch --flake .#<hostname>
1. Push the updated git files to the repository so that they can be pulled and the system rebuilt during the next update.
### Maintenance
1. See `/config/.bashrc` for `alias` using `nixos-rebuild --flake .#<hostname>` commands and other useful items
### Sources
[nix flakes]()
[home-manager](https://github.com/nix-community/home-manager)
1. Added as unstable channel
1. sudo nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
1. sudo nix-channel --update
## Structure
Directory | What is it for?
-----------------------|-------------------------------------------------------------
common | Shared configurations and modules
config | Config files that are managed by NixOS
desktop | Shared desktop configs
display | Login Display managers
hosts | The PCs deployed
reference | Package list, git assets, notes, etc.
users | Individual User configs
flake.nix & flake.lock | Declared configuration using the above directories & configs
## Hosts
Hostname | Model | Type | RAM | Processor | Main Use
---------|---------------------|---------|------|---------------------------|------------
weda | Dell Inspiron 15 | Laptop | 16GB | AMD Ryzen 5 (Cezanne) | Business
frija | Acer Aspire 3 | Laptop | 4GB | AMD A9 | Testing
tyr | Intel i5 | Desktop | 16GB | Intel i5 | Media
tii | Dell Lattitude 5511 | Laptop | 16GB | Intel i5 Quad (i5-10400H) | Remote
tuisto | AMD Ryzen 5 | Desktop | 16GB | AMD Ryzen 5 (Renoir) | Remote
sintanne | Intel i5 | Desktop | 16GB | Intel i5-11320H | Remote
TODO | AMD Ryzen 5 | Server | ??GB | AMD 2200G | Test Server
TODO | AMD Ryzen 5 | Server | ??GB | AMD 2200G | Main Server

69
README.org Normal file
View File

@ -0,0 +1,69 @@
#+title: Flake Readme
#+author: Zonsopkomst
#+date: 2022-11-30
* My NixOS Configuraton File
This is my NixOS setup to manage multiple computers with a home-manager config structure using nix flakes.
** Current Desktop Screenshots:
*** Gnome
#+caption: Gnome
#+attr_org: :width 200
[[Gnome][https://git.disroot.org/Zonsopkomst/flake/raw/branch/working/reference/assets/20231102NixOSTyr3.png]]
** Emacs
#+caption: Emacs
#+attr_org: :width 200
[[Gnome][https://git.disroot.org/Zonsopkomst/flake/raw/branch/working/reference/assets/20231102NixOSTyr.png]]
** Highlights:
*** Multiple NixOS configurations: desktop, laptop, and hopefully a test server and eventually a full transition over from my Ubuntu server.
** How to:
#+caption: South Park
#+attr_org: :width 500
[[Process][https://git.disroot.org/Zonsopkomst/flake/raw/branch/working/reference/assets/underpants-gnomes.png]]
1. NixOS Installation
1. Install NixOS on a computer using the default Gnome installer from [https://nixos.org/download.html].
1. Clone this repository [https://git.disroot.org/zonsopkomst] in the `/home/<username>/ directory.
1. Update the subdirectories in `hosts` and `users`.
1. Copy the `configuration.nix` and `hardware-configuration.nix` files from the `/etc/nixos` directory and move them to `hosts/PLACE(local OR remote)/NEW_PC_NAME`.
1. Rename `configuration.nix` to `default.nix` and, update `flake.nix` located in the top directory, link the appropriate modules to be used.
2. Segment out items from new `default.nix` to appropriate `.nix` files.
3. Make sure the correct version of NixOS is listed in the appropriate files.
2. `flake.nix` is where `.nix` files are imported with further instructions on declared packages and modules.
1. Declare packages either globally under `/hosts/<location>/hostname/packages.nix` or `/users/<username>/home-manager.nix`.
3. Rebuild NixOS *(<hostname> must be include the first time rebuilding, after the first rebuild, .# can be used and the system will know which hostname is to be used)*
1. `nix flake --update && nixos-rebuild switch --flake .#<hostname>`
4. Push the updated git files to the repository so that they can be pulled, and the system rebuilt during the next update.
*** Maintenance
1. See `/config/.bashrc` for `alias`: `flkup` using `sudo nixos-rebuild switch --flake .#<hostname>` commands and other useful items
*** Sources
**** Nix Flakes: [https://nixos.wiki/wiki/Flakes]
**** home-manager: [https://github.com/nix-community/home-manager]
***** Home Manager as a NixOS Module: [https://nix-community.github.io/home-manager/index.html#sec-flakes-nixos-module]
** Structure
| Directory | What is it for? |
| common | Shared configurations and modules |
| config | Config files that are managed by NixOS |
| desktop | Shared desktop configs |
| display | Login Display managers |
| hosts | The PCs deployed |
| reference | Package list, git assets, notes, etc. |
| users | Individual User configs |
| flake.nix & flake.lock | Declared configuration using the above directories & configs |
** Hosts
| Hostname | Model | Type | RAM | Processor | Main Use |
| weda | Dell Inspiron 15 | Laptop | 16GB | AMD Ryzen 5 (Cezanne) | Business |
| frija | Acer Aspire 3 | Laptop | 4GB | AMD A9 | Testing |
| tyr | Intel i5 | Desktop | 16GB | Intel i5 | Media |
| tii | Dell Lattitude 5511 | Laptop | 16GB | Intel i5 Quad (i5-10400H) | Remote |
| tuisto | AMD Ryzen 5 | Desktop | 16GB | AMD Ryzen 5 (Renoir) | Remote |
| sintanne | Intel i5 | Desktop | 16GB | Intel i5-11320H | Remote |
| thuner | AMD Ryzen 5 | Server | ??GB | AMD 2200G | Test Server |
| fryslan (Ubuntu) | AMD Ryzen 5 | Server | ??GB | AMD 2200G | Main Server |

6
common/CUPS.nix
View File

@ -7,10 +7,4 @@
# Enable support for SANE scanners.
# Add "scanner" & "lp" to users `extraGroups` for access to printer & scanner.
hardware.sane.enable = true;
# Enable HP printing drivers & scanner backend
services.printing.drivers = [ pkgs.hplip ];
hardware.sane.extraBackends = [ pkgs.hplipWithPlugin ];
}

5
common/amd.nix
View File

@ -16,7 +16,10 @@
# Enable HIP
systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.hip}"
## Replaced `hip` in favor of `rocmPackages.clr`
##"L+ /opt/rocm/hip - - - - ${pkgs.hip}"
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
];
}

8
common/drivers-hp.nix Normal file
View File

@ -0,0 +1,8 @@
{ config, pkgs, ... }:
{
# Enable HP printing drivers & scanner backend
services.printing.drivers = [ pkgs.hplip ];
hardware.sane.extraBackends = [ pkgs.hplipWithPlugin ];
}

10
common/duplicati.nix Normal file
View File

@ -0,0 +1,10 @@
{ config, pkgs, ... }:
# Enable and configure duplicati as a service
{
services.duplicati = {
enable = true;
interface = "any";
};
}

6
common/flatpak.nix
View File

@ -4,6 +4,12 @@
# Enable Flatpak
services.flatpak.enable = true;
system.activationScripts = {
flathub = ''
/run/current-system/sw/bin/flatpak remote-add --system --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
'';
};
# Flatpak can't access system fonts & icons
# Source:
# https://github.com/NixOS/nixpkgs/issues/119433

13
common/fonts.nix
View File

@ -4,11 +4,12 @@
fonts.fontDir.enable = true;
fonts.packages = with pkgs; [
comfortaa # Clean and modern font
corefonts # Microsoft Core Fonts
roboto # Android Family of Fonts
noto-fonts-cjk-sans # CJK Family of Fonts
noto-fonts-cjk-serif # CJK Family of Fonts
(nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" "SpaceMono" ]; })
comfortaa # Clean and modern font
corefonts # Microsoft Core Fonts
emacs-all-the-icons-fonts # Emacs all-the-icons-fonts
roboto # Android Family of Fonts
noto-fonts-cjk-sans # CJK Family of Fonts
noto-fonts-cjk-serif # CJK Family of Fonts
(nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" "SpaceMono" "DaddyTimeMono" ]; })
];
}

5
common/gaming.nix
View File

@ -18,9 +18,8 @@
# Enable Gamemode
programs.gamemode.enable = true;
# Enable Epic Games Store in Lutris
# TODO: This caused errors, using Flatpak until I can figure out a NixOS method
# hardware.opengl.driSupport32Bit = true
# TODO Enable Gamescope
programs.steam.gamescopeSession.enable = true;
# Enable Steam
programs.steam = {

2
common/insecure.nix
View File

@ -4,6 +4,8 @@
# Enable Insecure Packages
nixpkgs.config.permittedInsecurePackages = [
"electron-11.5.0"
"electron-22.3.27"
"adobe-reader-9.5.5"
"armcord-3.2.4"
];
}

22
common/starship.nix
View File

@ -1,22 +0,0 @@
# Declarative, single user, via home-manager(opens new window)
# Enable the `programs.starship` module in your `home.nix` file, and add your settings
# Add the following to the end of ~/.bashrc:
# eval "$(starship init bash)"
{
programs.starship = {
enable = true;
# Configuration written to ~/.config/starship.toml
settings = {
# add_newline = false;
# character = {
# success_symbol = "[➜](bold green)";
# error_symbol = "[➜](bold red)";
# };
# package.disabled = true;
};
};
}

7
common/systemd.nix Normal file
View File

@ -0,0 +1,7 @@
{ config, lib, pkgs, modulesPath, ... }:
{
systemd.extraConfig = ''
DefaultTimeoutStopSec=10s
'';
}

13
common/terminal.nix
View File

@ -9,7 +9,9 @@
bottom # System Monitor
broot # Directory Navigator
btop # Resource Monitor
carapace # Argument Completer
cbonsai # Terminal Bonsai Tree
delta # syntax-highlighting pager for git
difftastic # diff replacement
du-dust # du command replacement
eza # ls like list command
@ -20,23 +22,30 @@
genact # Nonsense Activity Generator
hollywood # Hollywood Melodrama Technobabble
jq # filter data command
krabby # Terminal Pokemon
lavat # Terminal Lavalamp
monolith # Single HTML Saver
neo # Matrix Digital Rain
neofetch # System Information
nitch # Nim System Fetch
nix-bash-completions # Bash Autocomplete
nms # Effect from 1992 Movie Sneakers
nyancat # Terminal Nyancat
ocrmypdf # OCR Text Layer to Scanned PDFs
ouch # Obvious Unified Compression Helper
pandoc # Markup Converter
pipes # Animated Pipes Terminal Screensaver
procs # Processes, `ps` replacement
ranger # File Manager
ripgrep-all # search command; NOTE: Failed to build, temp removing
ripgrep # Temporarily using ripgrip until ripgrep-all is available again
#ripgrep-all # search command; NOTE: Failed to build, temp removing
sd # find & replace command
shell-genie # Natural Language Shell Command AI
#shell-genie # Natural Language Shell Command AI
skim # Fuzzy Finder
starship # Shell Prompt
tealdeer # tldr command
tokei # Code Statistics
ugrep # Grep Replacement
xcowsay # Graphical Cowsay
xorg.xkill # Kill Windows w/ Mouse
zoxide # fast cd directory command

8
common/x11.nix
View File

@ -5,9 +5,13 @@
services.xserver.enable = true;
# Configure keymap in X11
services.xserver = {
# 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";
xkbVariant = "";
variant = "";
};
}

26
config/.bashrc
View File

@ -1,5 +1,5 @@
# Bash Prompt
PS1='\n\[\e[0m\]\@ \[\e[0;1;38;5;45m\]\u\[\e[0m\]@\[\e[0;1;38;5;98m\]\h \[\e[0m\]\$\n\[\e[0m\](\[\e[0;2;38;5;231m\]\w\[\e[0m\])\[\e[0;5;96m\]>\[\e[0;5;36m\]>\[\e[0;5;35m\]>\[\e[0m\]'
# Custom Bash Prompt (use in case you decide to stop using starship)
#PS1='\n\[\e[0m\]\@ \[\e[0;1;38;5;45m\]\u\[\e[0m\]@\[\e[0;1;38;5;98m\]\h \[\e[0m\]\$\n\[\e[0m\](\[\e[0;2;38;5;231m\]\w\[\e[0m\])\[\e[0;5;96m\]>\[\e[0;5;36m\]>\[\e[0;5;35m\]>\[\e[0m\]'
# Alias Commands
@ -7,7 +7,7 @@ alias clean="sudo nix-collect-garbage -d && sudo nix-store --optimise"
alias opt="sudo nix-store optimise"
alias bash="sudo nano .bashrc"
alias sn="sudo nano "
alias flkup="cd flake && sudo nix-channel --update && sudo nix flake update && sudo nixos-rebuild switch --flake .# && sudo flatpak update && sudo flatpak uninstall --unused"
alias flkup="cd flake && nix flake update && sudo nixos-rebuild switch --flake .# && sleep 10 && flatpak update && flatpak uninstall --unused"
# Gnome Menu: Alphabetize
@ -23,6 +23,22 @@ alias obb2="cd /home/$USER/Software/OpenBB && docker compose run openbb"
alias pipes="pipes.sh"
alias starwars="telnet towel.blinkenlights.nl"
alias wttr="curl wttr.in"
alias fxf="feh -YFZzrxD .02 "
alias fxs="feh -YFZzrxD 3"
alias fxr="feh -YFZzrx "
# TODO Starship
# eval "$(starship init bash)"
# Starship
eval "$(starship init bash)"
# Enable Carapace
source <(carapace _carapace)
# Nitch Fetch
#nitch
# Pokemon
krabby random 1 -i

2
config/config.nix
View File

@ -31,7 +31,7 @@
".config/rofi/config".source = ./rofi;
# TODO Starship
#".config/starship".source = ./config/tokyo-night.toml;
".config/starship.toml".source = ./starship/starship.toml;
# VSCodium
".config/VSCodium/User/snippets/Header.code-snippets".source = ./vscodium/snippets/global/header.conf;

7
config/emacs/.stignore Normal file
View File

@ -0,0 +1,7 @@
!init.el
!emacs.png
!/00 assets
!/00 reference
!/.stignore
// Ignore everything else:
*

BIN
config/emacs/00 assets/ac273182b3bbd00f9e72223861d3938b.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
config/emacs/00 assets/emacs.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 51 KiB

BIN
config/emacs/00 assets/emacs.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
config/emacs/00 assets/stpauls.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
config/emacs/00 reference/cheat_sheet_emacs.pdf Normal file
View File

Binary file not shown.

1418
config/emacs/00 reference/initOLD.el Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
config/emacs/00 reference/treemacs.pdf Normal file
View File

Binary file not shown.

140
config/emacs/config.org
View File

@ -1,140 +0,0 @@
#+TITLE: GNU Emacs Config
#+AUTHOR: zonsopkomst
#+DESCRIPTION: Emacs config.
#+STARTUP: showeverything
#+OPTIONS: toc:2
* TABLE OF CONTENTS :toc:
* IMPORTANT PROGRAMS TO LOAD FIRST
** Elpaca Package Manager
#+begin_src emacs-lisp
;;; Source for Initial Section https://medium.com/@zac.wood9/a-beginners-emacs-config-44400bcf54a1
;;; Package config -- see https://melpa.org/#/getting-started
(require 'package)
(let* ((no-ssl (and (memq system-type '(windows-nt ms-dos))
(not (gnutls-available-p))))
(proto (if no-ssl "http" "https")))
;; Comment/uncomment these two lines to enable/disable MELPA and MELPA Stable as desired
(add-to-list 'package-archives (cons "melpa" (concat proto "://melpa.org/packages/")) t)
;;(add-to-list 'package-archives (cons "melpa-stable" (concat proto "://stable.melpa.org/packages/")) t)
(when (< emacs-major-version 24)
;; For important compatibility libraries like cl-lib
(add-to-list 'package-archives '("gnu" . (concat proto "://elpa.gnu.org/packages/")))))
(package-initialize)
(unless (package-installed-p 'use-package)
(package-refresh-contents)
(package-install 'use-package))
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(package-selected-packages
'(org-roam org-bullets company exec-path-from-shell use-package)))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
)
(use-package exec-path-from-shell
:if (memq window-system '(mac ns x))
:ensure t
:config
(exec-path-from-shell-initialize))
(use-package company
:ensure t
:init
(add-hook 'after-init-hook 'global-company-mode)
:config
(setq company-dabbrev-downcase 0)
(setq company-idle-delay 0.1)
(setq company-minimum-prefix-length 1)
(setq company-tooltip-align-annotations t))
;; (use-package helm
;; :ensure t
;; :init
;; (require 'helm-config)
;; :config
;; (global-set-key (kbd "M-x") #'helm-M-x)
;; (global-set-key (kbd "C-x r b") #'helm-filtered-bookmarks)
;; (global-set-key (kbd "C-x C-f") #'helm-find-files)
;; (helm-mode 1))
(use-package projectile
:ensure t
:config
(projectile-mode))
(use-package helm-projectile
:ensure t
:config
(helm-projectile-on))
(use-package magit
:ensure t)
(use-package which-key
:ensure t
:config
(which-key-mode))
(use-package prettier-js
:ensure t
:config
(setq prettier-js-args '(
"--trailing-comma" "es5"
"--single-quote" "true"
"--print-width" "120"
"--tab-width" "4"
"--use-tabs" "false"
"--jsx-bracket-same-line" "false"
"--stylelint-integration" "true"
)))
(use-package smartparens
:ensure t
:init
(smartparens-global-mode))
(use-package json-mode
:ensure t)
(use-package doom-themes
:ensure t
:preface (defvar region-fg nil) ; this prevents a weird bug with doom themes
:init (load-theme 'doom-one t))
;; set font JetBrains Mono 13 pt
(set-face-attribute 'default nil
:family "JetBrains Mono"
:height 150)
(use-package org-bullets
:ensure t)
(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
;; always show line numbers
(global-linum-mode 1)
;; insert a space if running in text mode
(if window-system
(progn)
(setq linum-format "%d "))
(setq column-number-mode t)
(eval-after-load "linum"
'(set-face-attribute 'linum nil :height 90))
(use-package org-roam
:ensure t)
#+end_src emacs-lisp

1725
config/emacs/init.el
View File

File diff suppressed because it is too large Load Diff

126
config/emacs/org-bullets.el
View File

@ -1,126 +0,0 @@
;;; org-bullets.el --- Show bullets in org-mode as UTF-8 characters
;;; Version: 0.2.4
;;; Author: sabof
;;; URL: https://github.com/sabof/org-bullets
;; This file is NOT part of GNU Emacs.
;;
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
;; published by the Free Software Foundation; either version 3, or (at
;; your option) any later version.
;;
;; This program is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;; General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
;; along with this program ; see the file COPYING. If not, write to
;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
;;; Commentary:
;; The project is hosted at https://github.com/sabof/org-bullets
;; The latest version, and all the relevant information can be found there.
;;; Code:
(eval-when-compile (require 'cl))
(defgroup org-bullets nil
"Display bullets as UTF-8 characters"
:group 'org-appearance)
;; A nice collection of unicode bullets:
;; http://nadeausoftware.com/articles/2007/11/latency_friendly_customized_bullets_using_unicode_characters
(defcustom org-bullets-bullet-list
'(;;; Large
"◉"
"○"
"✸"
"✿"
;; ♥ ● ◇ ✚ ✜ ☯ ◆ ♠ ♣ ♦ ☢ ❀ ◆ ◖ ▶
;;; Small
;; ► • ★ ▸
)
"This variable contains the list of bullets.
It can contain any number of symbols, which will be repeated."
:group 'org-bullets
:type '(repeat (string :tag "Bullet character")))
(defcustom org-bullets-face-name nil
"This variable allows the org-mode bullets face to be
overridden. If set to a name of a face, that face will be
used. Otherwise the face of the heading level will be used."
:group 'org-bullets
:type 'symbol)
(defvar org-bullets-bullet-map
'(keymap
(mouse-1 . org-cycle)
(mouse-2
. (lambda (e)
(interactive "e")
(mouse-set-point e)
(org-cycle))))
"Mouse events for bullets.
Should this be undesirable, one can remove them with
\(setcdr org-bullets-bullet-map nil\)")
(defun org-bullets-level-char (level)
(string-to-char
(nth (mod (1- level)
(length org-bullets-bullet-list))
org-bullets-bullet-list)))
;;;###autoload
(define-minor-mode org-bullets-mode
"UTF8 Bullets for org-mode"
nil nil nil
(let* (( keyword
`(("^\\*+ "
(0 (let* (( level (- (match-end 0) (match-beginning 0) 1))
( is-inline-task
(and (boundp 'org-inlinetask-min-level)
(>= level org-inlinetask-min-level))))
(compose-region (- (match-end 0) 2)
(- (match-end 0) 1)
(org-bullets-level-char level))
(when is-inline-task
(compose-region (- (match-end 0) 3)
(- (match-end 0) 2)
(org-bullets-level-char level)))
(when (facep org-bullets-face-name)
(put-text-property (- (match-end 0)
(if is-inline-task 3 2))
(- (match-end 0) 1)
'face
org-bullets-face-name))
(put-text-property (match-beginning 0)
(- (match-end 0) 2)
'face (list :foreground
(face-attribute
'default :background)))
(put-text-property (match-beginning 0)
(match-end 0)
'keymap
org-bullets-bullet-map)
nil))))))
(if org-bullets-mode
(progn
(font-lock-add-keywords nil keyword)
(font-lock-fontify-buffer))
(save-excursion
(goto-char (point-min))
(font-lock-remove-keywords nil keyword)
(while (re-search-forward "^\\*+ " nil t)
(decompose-region (match-beginning 0) (match-end 0)))
(font-lock-fontify-buffer))
)))
(provide 'org-bullets)
;;; org-bullets.el ends here

144
config/starship/pastel-powerline.toml Normal file
View File

@ -0,0 +1,144 @@
format = """
[](#9A348E)\
$os\
$username\
[](bg:#DA627D fg:#9A348E)\
$directory\
[](fg:#DA627D bg:#FCA17D)\
$git_branch\
$git_status\
[](fg:#FCA17D bg:#86BBD8)\
$c\
$elixir\
$elm\
$golang\
$gradle\
$haskell\
$java\
$julia\
$nodejs\
$nim\
$rust\
$scala\
[](fg:#86BBD8 bg:#06969A)\
$docker_context\
[](fg:#06969A bg:#33658A)\
$time\
[ ](fg:#33658A)\
"""
# Disable the blank line at the start of the prompt
# add_newline = false
# You can also replace your username with a neat symbol like  or disable this
# and use the os module below
[username]
show_always = true
style_user = "bg:#9A348E"
style_root = "bg:#9A348E"
format = '[$user ]($style)'
disabled = false
# An alternative to the username module which displays a symbol that
# represents the current operating system
[os]
style = "bg:#9A348E"
disabled = true # Disabled by default
[directory]
style = "bg:#DA627D"
format = "[ $path ]($style)"
truncation_length = 3
truncation_symbol = "…/"
# Here is how you can shorten some long paths by text replacement
# similar to mapped_locations in Oh My Posh:
[directory.substitutions]
"Documents" = "󰈙 "
"Downloads" = " "
"Music" = " "
"Pictures" = " "
# Keep in mind that the order matters. For example:
# "Important Documents" = " 󰈙 "
# will not be replaced, because "Documents" was already substituted before.
# So either put "Important Documents" before "Documents" or use the substituted version:
# "Important 󰈙 " = " 󰈙 "
[c]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[docker_context]
symbol = " "
style = "bg:#06969A"
format = '[ $symbol $context ]($style) $path'
[elixir]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[elm]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[git_branch]
symbol = ""
style = "bg:#FCA17D"
format = '[ $symbol $branch ]($style)'
[git_status]
style = "bg:#FCA17D"
format = '[$all_status$ahead_behind ]($style)'
[golang]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[gradle]
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[haskell]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[java]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[julia]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[nodejs]
symbol = ""
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[nim]
symbol = "󰆥 "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[rust]
symbol = ""
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[scala]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[time]
disabled = false
time_format = "%R" # Hour:Minute Format
style = "bg:#33658A"
format = '[ ♥ $time ]($style)'

147
config/starship/starship.toml Normal file
View File

@ -0,0 +1,147 @@
# Paste .toml config below
# Using pastel-powerline.toml example
format = """
[](#9A348E)\
$os\
$username\
[](bg:#DA627D fg:#9A348E)\
$directory\
[](fg:#DA627D bg:#FCA17D)\
$git_branch\
$git_status\
[](fg:#FCA17D bg:#86BBD8)\
$c\
$elixir\
$elm\
$golang\
$gradle\
$haskell\
$java\
$julia\
$nodejs\
$nim\
$rust\
$scala\
[](fg:#86BBD8 bg:#06969A)\
$docker_context\
[](fg:#06969A bg:#33658A)\
$time\
[ ](fg:#33658A)\
"""
# Disable the blank line at the start of the prompt
# add_newline = false
# You can also replace your username with a neat symbol like  or disable this
# and use the os module below
[username]
show_always = true
style_user = "bg:#9A348E"
style_root = "bg:#9A348E"
format = '[$user ]($style)'
disabled = false
# An alternative to the username module which displays a symbol that
# represents the current operating system
[os]
style = "bg:#9A348E"
disabled = true # Disabled by default
[directory]
style = "bg:#DA627D"
format = "[ $path ]($style)"
truncation_length = 3
truncation_symbol = "…/"
# Here is how you can shorten some long paths by text replacement
# similar to mapped_locations in Oh My Posh:
[directory.substitutions]
"Documents" = "󰈙 "
"Downloads" = " "
"Music" = " "
"Pictures" = " "
# Keep in mind that the order matters. For example:
# "Important Documents" = " 󰈙 "
# will not be replaced, because "Documents" was already substituted before.
# So either put "Important Documents" before "Documents" or use the substituted version:
# "Important 󰈙 " = " 󰈙 "
[c]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[docker_context]
symbol = " "
style = "bg:#06969A"
format = '[ $symbol $context ]($style) $path'
[elixir]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[elm]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[git_branch]
symbol = ""
style = "bg:#FCA17D"
format = '[ $symbol $branch ]($style)'
[git_status]
style = "bg:#FCA17D"
format = '[$all_status$ahead_behind ]($style)'
[golang]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[gradle]
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[haskell]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[java]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[julia]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[nodejs]
symbol = ""
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[nim]
symbol = "󰆥 "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[rust]
symbol = ""
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[scala]
symbol = " "
style = "bg:#86BBD8"
format = '[ $symbol ($version) ]($style)'
[time]
disabled = false
time_format = "%R" # Hour:Minute Format
style = "bg:#33658A"
format = '[ ♥ $time ]($style)'

18
desktop/gnome.nix
View File

@ -20,18 +20,20 @@
];
environment.gnome.excludePackages = (with pkgs; [
gnome-photos
gnome-tour
gedit # text editor
gnome-photos # photos
gnome-tour # gnome tour
loupe # image viewer
]) ++ (with pkgs.gnome; [
#cheese # webcam tool
#cheese # webcam tool
gnome-calculator # calculator
gnome-music # music player
gnome-software # software manager
gnome-terminal # terminal
gedit # text editor
epiphany # web browser
geary # email reader
#evince # document viewer
epiphany # web browser
geary # email reader
#evince # document viewer
#gnome-characters
totem # video player
totem # video player
]);
}

4
desktop/hyprland.nix
View File

@ -5,6 +5,4 @@
hyprland.nixosModules.default
{programs.hyprland.enable = true;}
];
}
# This can be removed, something about modules too deep. If removed, also remove the associated lines in flake.nix.
}

2
display/gdm.nix
View File

@ -2,4 +2,6 @@
{
services.xserver.displayManager.gdm.enable = true;
security.pam.services.gdm.enableGnomeKeyring = true; # Added 11/02/23
}

84
flake.lock
View File

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1696145345,
"narHash": "sha256-3dM7I/d4751SLPJah0to1WBlWiyzIiuCEUwJqwBdmr4=",
"lastModified": 1708806879,
"narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30",
"rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
"type": "github"
},
"original": {
@ -23,17 +23,18 @@
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang",
"nixpkgs": "nixpkgs",
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1696165790,
"narHash": "sha256-18Yt3o3sjieqgOSjUXW8Apn6JuHLTKEJDt5k40sAf2A=",
"lastModified": 1708906756,
"narHash": "sha256-mKksRwLcI+j6cCG7eSkIf0JzsXumlUMpssZKZZHiXrE=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "9ec656a37df103edc111e8e48cdfe89528dfe92e",
"rev": "dfcfb92ec611345848f3840d34d66b8501e6367c",
"type": "github"
},
"original": {
@ -67,13 +68,53 @@
"type": "github"
}
},
"hyprlang": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1708787654,
"narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "0fce791ba2334aca183f2ed42399518947550d0d",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"nix-flatpak": {
"locked": {
"lastModified": 1708781964,
"narHash": "sha256-qbEZgB1mNuMADLmM64EtcRjDHXR3UFL4xVmoanv9wZU=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "09d07c73b4d9771f527a168e0b1b6d8a1f39de28",
"type": "github"
},
"original": {
"owner": "gmodena",
"repo": "nix-flatpak",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1694767346,
"narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
"lastModified": 1708807242,
"narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
"rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
"type": "github"
},
"original": {
@ -85,11 +126,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1696019113,
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
"lastModified": 1708807242,
"narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
"rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
"type": "github"
},
"original": {
@ -103,6 +144,7 @@
"inputs": {
"home-manager": "home-manager",
"hyprland": "hyprland",
"nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs_2"
}
},
@ -125,18 +167,18 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1695919988,
"narHash": "sha256-4RBgIZHaVqH0m1POnfzYRzwCWxifIKH4xQ0kCn2LGkA=",
"lastModified": 1708558866,
"narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "c2aa7fd965cb7ee8bed24f4122b720aca8f0fc1e",
"rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "c2aa7fd965cb7ee8bed24f4122b720aca8f0fc1e",
"rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
"type": "gitlab"
}
},
@ -146,6 +188,10 @@
"hyprland",
"hyprland-protocols"
],
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
@ -156,11 +202,11 @@
]
},
"locked": {
"lastModified": 1694628480,
"narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=",
"lastModified": 1708696469,
"narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2",
"rev": "1b713911c2f12b96c2574474686e4027ac4bf826",
"type": "github"
},
"original": {

144
flake.nix
View File

@ -6,12 +6,15 @@
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
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
};
outputs = inputs@{
home-manager,
hyprland,
nixpkgs,
nix-flatpak,
...
}: {
@ -36,12 +39,14 @@
# Kernels & RAM
#./common/kernel.zen.nix
#./commmon/swappiness
#./commmon/swappiness.nix
# Common
./common/amd.nix
#./common/bluetooth.nix
./common/CUPS.nix
#./common/CUPS.nix
#./common/drivers-hp.nix
./common/duplicati.nix
#./common/hyprland.nix
./common/pipewire.nix
./common/time.nix
@ -51,6 +56,7 @@
#./common/gaming.nix
#./common/insecure.nix
./common/networking.nix
./common/systemd.nix
./common/terminal.nix
./common/unfree.nix
#./common/waydroid.nix
@ -62,6 +68,7 @@
./hosts/local/frija/packages.nix
# User Specific
#./users/aspire/flatpak.nix
./users/aspire/home-manager.nix
#./users/aspire/syncthing.nix
@ -71,9 +78,83 @@
home-manager.useUserPackages = true;
home-manager.users.aspire = import ./hosts/local/frija/home.nix;
}
nix-flatpak.nixosModules.nix-flatpak
{
}
#hyprland.nixosModules.default
#{programs.hyprland.enable = true;}
];
};
thuner = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
# Common Resources
# Desktop
#./desktop/gnome.nix
#./display/gdm.nix
#./desktop/kde.nix
#./display/sddm.nix
#./desktop/hyprland.nix
# Kernels & RAM
#./common/kernel.zen.nix
#./commmon/swappiness.nix
# Common
#./common/amd.nix
#./common/bluetooth.nix
#./common/CUPS.nix
#./common/drivers-hp.nix
#./common/duplicati.nix
#./common/hyprland.nix
#./common/pipewire.nix
#./common/time.nix
#./common/docker.nix
#./common/flakeinit.nix
#./common/flatpak.nix
#./common/gaming.nix
#./common/insecure.nix
#./common/networking.nix
#./common/systemd.nix
#./common/terminal.nix
#./common/unfree.nix
#./common/waydroid.nix
#./common/x11.nix
# Host Specific
./hosts/local/thuner/default.nix
./hosts/local/thuner/hardware-configuration.nix
#./hosts/local/thuner/packages.nix
# User Specific
#./users/thuner/flatpak.nix
#./users/thuner/home-manager.nix
#./users/thuner/syncthing.nix
#home-manager.nixosModules.home-manager
#{
# home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
# home-manager.users.thuner = import ./hosts/local/tyr/home.nix;
#}
#nix-flatpak.nixosModules.nix-flatpak
#{
#}
#hyprland.nixosModules.default
#{programs.hyprland.enable = true;}
];
};
tyr = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
@ -89,12 +170,14 @@
# Kernels & RAM
./common/kernel.zen.nix
#./commmon/swappiness
#./commmon/swappiness.nix
# Common
#./common/amd.nix
#./common/bluetooth.nix
./common/CUPS.nix
#./common/drivers-hp.nix
./common/duplicati.nix
#./common/hyprland.nix
./common/pipewire.nix
./common/time.nix
@ -104,6 +187,7 @@
./common/gaming.nix
./common/insecure.nix
./common/networking.nix
./common/systemd.nix
./common/terminal.nix
./common/unfree.nix
#./common/waydroid.nix
@ -115,7 +199,7 @@
./hosts/local/tyr/packages.nix
# User Specific
./users/leeuwarden/gnomekeyring.nix
./users/leeuwarden/flatpak.nix
./users/leeuwarden/home-manager.nix
./users/leeuwarden/syncthing.nix
@ -125,6 +209,14 @@
home-manager.useUserPackages = true;
home-manager.users.leeuwarden = import ./hosts/local/tyr/home.nix;
}
nix-flatpak.nixosModules.nix-flatpak
{
}
#hyprland.nixosModules.default
#{programs.hyprland.enable = true;}
];
};
@ -143,12 +235,14 @@
# Kernels & RAM
#./common/kernel.zen.nix
#./commmon/swappiness
#./commmon/swappiness.nix
# Common
./common/amd.nix
./common/bluetooth.nix
./common/duplicati.nix
./common/CUPS.nix
./common/drivers-hp.nix
#./common/hyprland.nix
./common/pipewire.nix
./common/time.nix
@ -158,6 +252,8 @@
./common/gaming.nix
./common/insecure.nix
./common/networking.nix
./common/systemd.nix
#./common/starship.nix
./common/terminal.nix
./common/unfree.nix
./common/waydroid.nix
@ -169,6 +265,8 @@
./hosts/local/weda/packages.nix
# User Specific
#./users/zonsopkomst/appimage.nix # 02/07/2024 Attempting to wrap appimages, staring with colorpicker
./users/zonsopkomst/flatpak.nix
./users/zonsopkomst/home-manager.nix
./users/zonsopkomst/syncthing.nix
@ -179,6 +277,10 @@
home-manager.users.zonsopkomst = import ./hosts/local/weda/home.nix;
}
nix-flatpak.nixosModules.nix-flatpak
{
}
hyprland.nixosModules.default
{programs.hyprland.enable = true;}
];
@ -203,12 +305,14 @@
# Kernels & RAM
#./common/kernel.zen.nix
#./commmon/swappiness
#./commmon/swappiness.nix
# Common
#./common/amd.nix
#./common/bluetooth.nix
./common/CUPS.nix
#./common/drivers-hp.nix
./common/duplicati.nix
#./common/hyprland.nix
./common/pipewire.nix
./common/time.nix
@ -218,6 +322,7 @@
#./common/gaming.nix
./common/insecure.nix
./common/networking.nix
./common/systemd.nix
./common/terminal.nix
./common/unfree.nix
#./common/waydroid.nix
@ -229,6 +334,7 @@
./hosts/remote/sintanne/packages.nix
# User Specific
./users/annette/flatpak.nix
./users/annette/home-manager.nix
#./users/annette/hd.nix
#./users/annette/syncthing.nix
@ -240,6 +346,10 @@
home-manager.users.annette = import ./hosts/remote/sintanne/home.nix;
}
nix-flatpak.nixosModules.nix-flatpak
{
}
#hyprland.nixosModules.default
#{programs.hyprland.enable = true;}
];
@ -260,12 +370,14 @@
# Kernels & RAM
#./common/kernel.zen.nix
#./commmon/swappiness
#./commmon/swappiness.nix
# Common
#./common/amd.nix
./common/bluetooth.nix
./common/CUPS.nix
./common/drivers-hp.nix
./common/duplicati.nix
#./common/hyprland.nix
./common/pipewire.nix
./common/time.nix
@ -275,6 +387,7 @@
#./common/gaming.nix
./common/insecure.nix
./common/networking.nix
./common/systemd.nix
./common/terminal.nix
./common/unfree.nix
./common/waydroid.nix
@ -286,6 +399,7 @@
./hosts/remote/tii/packages.nix
# User Specific
./users/coleman/flatpak.nix
./users/coleman/home-manager.nix
#./users/coleman/hd.nix
./users/coleman/syncthing.nix
@ -297,6 +411,10 @@
home-manager.users.coleman = import ./hosts/remote/tii/home.nix;
}
nix-flatpak.nixosModules.nix-flatpak
{
}
#hyprland.nixosModules.default
#{programs.hyprland.enable = true;}
];
@ -316,13 +434,15 @@
#./desktop/hyprland.nix
# Kernels & RAM
#./common/kernel.zen.nix
#./commmon/swappiness
./common/kernel.zen.nix
#./commmon/swappiness.nix
# Common
./common/amd.nix
#./common/bluetooth.nix
./common/CUPS.nix
./common/drivers-hp.nix
./common/duplicati.nix
#./common/hyprland.nix
./common/pipewire.nix
./common/time.nix
@ -332,6 +452,7 @@
./common/gaming.nix
./common/insecure.nix
./common/networking.nix
./common/systemd.nix
./common/terminal.nix
./common/unfree.nix
./common/waydroid.nix
@ -343,6 +464,7 @@
./hosts/remote/tuisto/packages.nix
# User Specific
./users/admin/flatpak.nix
./users/admin/home-manager.nix
#./users/admin/hd.nix
./users/admin/syncthing.nix
@ -354,6 +476,10 @@
home-manager.users.admin = import ./hosts/remote/tuisto/home.nix;
}
nix-flatpak.nixosModules.nix-flatpak
{
}
#hyprland.nixosModules.default
#{programs.hyprland.enable = true;}
];

76
hosts/local/thuner/default.nix Normal file
View File

@ -0,0 +1,76 @@
Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
# Bootloader.
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/sda";
boot.loader.grub.useOSProber = true;
networking.hostName = "thuner"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Configure keymap in X11
services.xserver = {
layout = "us";
xkbVariant = "";
};
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.thuner = {
isNormalUser = true;
description = "thuner";
extraGroups = [ "networkmanager" "wheel" ];
packages = with pkgs; [];
};
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
# List services that you want to enable:
# Enable the OpenSSH daemon.
services.openssh.enable = true;
# Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 22 ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.05"; # Did you read the comment?
}

34
hosts/local/thuner/hardware-configuration.nix Normal file
View File

@ -0,0 +1,34 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/19e5dddb-936e-4257-9ae0-12ac960ae263";
fsType = "ext4";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/32365aea-be53-41f0-a943-e49983b2b803"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

2
hosts/local/tyr/default.nix
View File

@ -29,6 +29,8 @@
services.xserver.displayManager.autoLogin.user = "leeuwarden";
# Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229
# Discourse: https://discourse.nixos.org/t/unlocking-gnome-keyring-automatically-upon-login-with-kde-sddm/6966
# Still not fixed: https://github.com/NixOS/nixpkgs/issues/86884#issuecomment-1134787613
systemd.services."getty@tty1".enable = false;
systemd.services."autovt@tty1".enable = false;

2
hosts/local/tyr/packages.nix
View File

@ -10,7 +10,9 @@
cpu-x # PC Information
dconf # Gnome Configuration
gamemode # Optimse Linux System Performance
gcc # GNU Compiler Collection
gnome.gnome-tweaks # Gnome Customization Tool
gramps # Genealogy Software
gsmartcontrol # Disk Health Inspection Tool
i2c-tools # Network Utilities
inetutils # Network Utilities

1
hosts/local/weda/packages.nix
View File

@ -7,6 +7,7 @@
adw-gtk3 # GTK3 libadwaita Theme ported to GTK-3
cpu-x # PC Information
dconf # Gnome Configuration
gcc # GNU Compiler Collection
gnome.gnome-tweaks # Gnome Customization Tool
gramps # Genealogy Software
gsmartcontrol # Disk Health Inspection Tool

6
hosts/remote/tuisto/packages.nix
View File

@ -20,6 +20,12 @@
powertop # Power Manager
protonup # Proton Installer
steam # Steam Game Launcher
steam-run-native # TODO steam-run (nixos native); can also try the following (https://linuxhint.com/how-to-instal-steam-on-nixos/ also see https://nixos.wiki/wiki/Steam):
#(steam.override { extraPkgs = pkgs: [ mono gtk3 gtk3-x11 libgdiplus zlib ];
# nativeOnly = true; }).run
#(steam.override { withPrimus = true; extraPkgs = pkgs: [ bumblebee glxinfo ];
# nativeOnly = true; }).run
#(steam.override { withJava = true; })
syncthing # File Synchronization
waydroid # Android Emulator
];

7
overlays/gnucash-5.4.nix Normal file
View File

@ -0,0 +1,7 @@
{ pkgs ? import <nixpkgs> {} }:
pkgs.haskellPackages.override {
gnucash = pkgs.gnucash.override {
version = "5.4";
};
}

6
reference/.TODO.org.~undo-tree~ Normal file
View File

@ -0,0 +1,6 @@
(undo-tree-save-format-version . 1)
"ce84fec6b6b522cc1fc419d748b65927e7084f26"
[nil nil nil nil (25892 23504 664205 0) 0 nil]
([nil nil ((74 . 75) (t 25892 23418 0 0)) nil (25892 23504 664203 0) 0 nil])
([nil current ((nil rear-nonsticky nil 93 . 94) (nil fontified nil 93 . 94) (nil fontified nil 74 . 93) (74 . 94)) nil (25892 23504 664197 0) 0 nil])
nil

10
reference/Packages/appimage.md
View File

@ -1,10 +0,0 @@
---
title: Appimage
type: Instructions
author: Zonsopkomst
created: 2023-9-13
---
# Flatpak Instructions
[[flatpak]] [[2023]]
## Install Packages

42
reference/Packages/flatpak.md
View File

@ -1,42 +0,0 @@
---
title: Flatpak
type: Instructions
author: Zonsopkomst
created: 2023
---
# Flatpak Instructions
[[flatpak]] [[2023]]
## Install Packages
```flatpak install NAME```
Name | Description
-------------------------|-------------------------------------
AppImagePool | io.github.prateekmedia.appimagepool
Betterbird Email Client | eu.betterbird.Betterbird
Beyond All Reason Game | info.beyondallreason.bar
Brave Web Browser | com.brave.Browser
Caligraphy ASCII Art | io.gitlab.gregorni.Calligraphy
Clairvoyant Magic 8 Ball | com.github.cassidyjames.clairvoyant
flatsweep | io.github.giantpinkrobots.flatsweep
Flatseal Flatpak Manager | github.tchx84.Flatseal
Gnome Theme | org.gtk.Gtk3theme.adw-gtk3
Gnome Theme | org.gtk.Gtk3theme.adw-gtk3-dark
Heroic Games Launcher | com.heroicgameslauncher.hgl
KDE Labplot | org.kde.labplot2
Lunacy | com.icons8.Lunacy
Mission Center | io.missioncenter.MissionCenter
NormCap | com.github.dynobo.normcap
OpenFodder | org.openfodder.OpenFodder
Space Cadet Pinball Game | com.github.k4zmu2a.spacecadetpinball
Speech Note | net.mkiol.SpeechNote
SyncThingy | com.github.zocker_160.SyncThingy
TD Ameritrade Platform | com.tdameritrade.ThinkOrSwim
## Install all above applications using the following command:
```flatpak install flathub eu.betterbird.Betterbird info.beyondallreason.bar com.brave.Browser com.github.cassidyjames.clairvoyant com.github.dynobo.normcap io.github.giantpinkrobots.flatsweep github.tchx84.Flatseal io.github.prateekmedia.appimagepool io.gitlab.gregorni.Calligraphy org.gtk.Gtk3theme.adw-gtk3 org.gtk.Gtk3theme.adw-gtk3-dark com.heroicgameslauncher.hgl org.kde.labplot2 com.icons8.Lunacy org.openfodder.OpenFodder io.missioncenter.MissionCenter com.github.k4zmu2a.spacecadetpinball com.github.zocker_160.SyncThingy com.tdameritrade.ThinkOrSwim net.mkiol.SpeechNote```
## Update Packages
`flatpak update`

38
reference/Packages/flatpak.org Normal file
View File

@ -0,0 +1,38 @@
#+title: Flatpak
#+type: Instructions
#+author: Zonsopkomst
#+created: 2023
#+filetags: flatpak:2023
* Flatpak Instructions
** Install Packages
*** `flatpak install NAME`
*** `flatpak update`
*** Or nixify by declaring under `/flake/users/$USERNAME/flatpak.nix`
| Link | Name (Alphabetical) |
| io.github.prateekmedia.appimagepool | AppImagePool |
| io.github.Bavarder.Bavarder | Bavarder |
| eu.betterbird.Betterbird | Betterbird Email Client |
| info.beyondallreason.bar | Beyond All Reason Game |
| com.brave.Browser | Brave Web Browser |
| io.gitlab.gregorni.Calligraphy | Caligraphy ASCII Art |
| com.github.cassidyjames.clairvoyant | Clairvoyant Magic 8 Ball |
| net.fasterland.converseen | Converseen |
| 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 |
| com.heroicgameslauncher.hgl | Heroic Games Launcher |
| org.kde.labplot2 | KDE Labplot |
| com.icons8.Lunacy | Lunacy |
| io.missioncenter.MissionCenter | Mission Center |
| com.github.dynobo.normcap | NormCap |
| org.js.nuclear.Nuclear | Nuclear Music Streamer |
| org.openfodder.OpenFodder | OpenFodder |
| flathub org.libretro.RetroArch | RetroArch |
| com.github.k4zmu2a.spacecadetpinball | Space Cadet Pinball Game |
| net.mkiol.SpeechNote | Speech Note |
| com.github.zocker_160.SyncThingy | SyncThingy |
| com.tdameritrade.ThinkOrSwim | TD Ameritrade Platform |
| io.github.flattool.Warehouse | Flatpak Warehouse |

21
reference/Packages/packages.nix
View File

@ -114,8 +114,10 @@
# NOTE: Issues with authenticating, package out of date, using Flatpak
itch # itch.io Games Launcher
legendary-gl # Epic Games Launcher Alternative
ludusavi # Backup tool for PC game saves
lutris # Issues with Origin installation,
# using Flatpak
mangohud # Gaming Stat HUD
mumble # Low-latency, high quality voice chat software
steam # Steam Game Launcher, using xxx
@ -154,24 +156,29 @@
hypnotix # IPTV streaming application
inkscape # Vector Graphics Editor
libsForQt5.kolourpaint # Painting Application
llpp # PDF Viewer
jellyfin-media-player # Jellyfin Desktop Client based on Plex Media Player
krita # Painting Application
libsForQt5.k3b # Disk Burning Application
makemkv # Blu-Ray and DVD to MKV Converter
mpv # Media Player
mupdf # PDF Viewer
noisetorch # Microphone Noise Supression for PulseAudio
nuclear # Music Player
# Package not updated
nomacs # Qt-based image viewer
nuclear # Music Streamer
ocrmypdf # OCR Text Layer to Scanned PDFs
obs-studio # Recording/Streaming Application
libsForQt5.okular # Document Viewer
qview # Minimal Image Viewer
scrcpy # Display and control Android devices over USB or TCP/IP
shortwave # Internet Radio
shutter encoder # A/V Converter; Use appimage
soundconverter # GTK Audio file converter
smplayer # Media Player
strawberry # Media Player
stremio # Media Streaming Center
xiphos # Bible Study Tool
zathura # PDF Viewer
zotero # Research Sourcer
# Office
@ -210,12 +217,16 @@
alacritty # Terminal Emulator
appimage-run # Appimage Runner
bleachbit # PC Cleaner
borgbackup # Deduplicating archiver with compression and encryption
bottles # Wineprefix Manager
cmatrix # Matrix Movie Terminal Theme
czkawka # Duplicate file finder
btop # Resource Monitor
cpu-x # PC Information
crow-translate # Language Translator
dupeguru # Duplicate file finder
etcher # Flash OS images to SD cards and USB drives, safely and easily
gcc # GNU Compiler Collection
genymotion # NOTE: Issues with loading
git # Distributed Version Control System
gsmartcontrol # Disk Health Inspection Tool
@ -225,6 +236,7 @@
keepassxc # GUI Password Manager with Cryptography
kitty # Terminal Emulator
kitty-themes # Kitty Themes
localsend # Send Files/Text Over Wifi
openrgb # RGB Manager
neofetch # System Information
nitch # Nim System Fetch
@ -263,10 +275,13 @@
bottom # System Monitor
broot # Directory Navigator
btop # Resource Monitor
cava # Console-based Audio Visualizer for Alsa
carapace # Argument Completer
du-dust # du command replacement
nix-bash-completions # Bash Autocomplete
cmatrix # Matrix Digital Rain
cbonsai # Terminal Bonsai Tree
delta # syntax-highlighting pager for git
difftastic # diff replacement
eza # ls like list command
fd # find command
@ -276,11 +291,13 @@
jq # filter data command
kitty # Terminal
kitty-themes # Kitty Terminal Themes
lavat # Terminal Lavalamp
monolith # Single HTML Saver
neo # Matrix Digital Rain
nix-bash-completions # Bash Autocomplete
nitch # Nim System Fetch
nms # Effect from 1992 Movie Sneakers
nyancat # Terminal Nyancat
ouch # Obvious Unified Compression Helper
pandoc # Markup Converter
pipes # Animated Pipes Terminal Screensaver

279
reference/TODO.org
View File

@ -1,279 +0,0 @@
#+title: NixOS TODO List
#+author: Zonsopkomst
#+date: 2022-11-30
* TODO Add Packages
** TODO [[starship][https://starship.rs/guide/#%F0%9F%9A%80-installation]]
** TODO Try new shells
- [[switch shells][https://linuxhandbook.com/change-shell-linux/]]
** TODO [[https://github.com/AbdelrhmanNile/UnderTaker141][UnderTaker141 ??]]
** TODO E-Pub Reader
** TODO NightPDF?
- flatpak install flathub io.github.lunarequest.NightPDF
** TODO OpenBB Update
*** DONE Remove old OpenBB Docker image
*** DONE Update or add new OpenBB Docker image
*** HOLD Manage using nixos?
*** TODO Remote client of some sort
**** HOLD nomachine
** HOLD direnv
- [[direnv][https://www.tecmint.com/direnv-manage-environment-variables-in-linux/]]
** DONE [[Bavarder][flatpak install flathub io.github.Bavarder.Bavarder]]
** DONE FOSS Discord?
** DONE Outputs Command
You can explore all outputs from this configuration by using:
$ nix flake show
* TODO Hyprland
What is the bare minimum to do in order to get hyprland working so I can use it and learn as I go?
Some package ideas as follows:
** TODO hyprland + swayidle + swaylock
*** [[Link][https://github.com/swaywm/sway/wiki/Useful-add-ons-for-sway]]
** TODO eww or waybar or [[nwg-panel][https://github.com/nwg-piotr/nwg-panel]]
** TODO neomutt + mbsync (email)
** TODO gpg + pass
** TODO sops-nix to manage secrets
** TODO podman
** TODO zathura
** TODO rofi / wofi
** TODO bat + fd + rg
** TODO nix-colors
** TODO sops-nix
** TODO Learn impermanence
** TODO deploy-rs
** DONE bash w/ starship
** DONE Improve kitty config
* TODO Headless Server
- Would like to transition from Ubuntu starting with my test server and eventually fully replacing with NixOS
** TODO Ability to SSH into Server using terminal / VSCodium
** TODO FreshRSS container
** TODO Guacamole or alternate remote client
** TODO Bookmark container
** TODO Jellyfin
** TODO Image Viewer
** TODO Questions for HuggingGPT
1. Question: Please show me detailed steps on how to set up a headless NixOS server that I can SSH into from another computer. It will need to use duckdns.org with NPM so that I can access it from a web browser. I would like NixOS to manage my containers directly instead of using Docker, but if there is no alternative, Docker or Podman are acceptable. I would also like to use an SSD drive for the main operating system, with two additional 18 TB hard drives, in which one will store container application's data, and the other will be used as a backup for the stated data on a regular basis.
2. I would like to run the following containers:
* Freshrss
* Guacamole
*
1. Question: Please provide specific steps in order to better optimize the flake located at https://git.disroot.org/Zonsopkomst/flake/src/branch/working.
1. Question: Can a package list for NixOS be added as a table instead of a list? If so, how would one go about implementing that? Please provide specific instructions and examples.
1. Question: How can I make Hyprland on NixOS do xxxx
Update
* TODO RPI4
Not sure if I want to go there, but maybe for a dedicated website?
** TODO Install on RPI4 [[RPI4][https://nix.dev/tutorials/installing-nixos-on-a-raspberry-pi]]
* DONE Setup New PCs
** DONE Add `default.nix` and `hardware.nix` to each new machine
* DONE optionsDocBook deprecated :issue:
Wait until 24.05, should be corrected
[[Solution][https://discourse.nixos.org/t/warning-optionsdocbook-is-deprecated-since-23-11-and-will-be-removed-in-24-05/31353]]
Nothing to do at this time. Waiting for fix.
Receive the following output upon rebuild:
```
unpacking channels...
building the system configuration...
trace: warning: optionsDocBook is deprecated since 23.11 and will be removed in 24.05
trace: warning: optionsDocBook is deprecated since 23.11 and will be removed in 24.05
trace: warning: optionsDocBook is deprecated since 23.11 and will be removed in 24.05
trace: warning: The option `fonts.enableDefaultFonts' defined in `/nix/store/s4jqyj35hii03rs7j5n6vn7gpgp6ja81-source/flake.nix' has been renamed to `fonts.enableDefaultPackages'.
trace: warning: The `waybar-hyprland` package is now in Nixpkgs
activating the configuration...
setting up /etc...
reloading user units for zonsopkomst...
setting up tmpfiles
Looking for updates…
Nothing to do.
These runtimes in installation 'system' are pinned and won't be removed; see flatpak-pin(1):
runtime/org.gtk.Gtk3theme.adw-gtk3-dark/x86_64/3.22
runtime/org.gtk.Gtk3theme.adw-gtk3/x86_64/3.22
Nothing unused to uninstall
```
* DONE Add Packages
** DONE Starship to starship.nix
** DONE Pandoc to terminal.nix & package references
** DONE Try to use magit through emacs
* DONE Add Emacs & init.el
Using init.el instead of org-mode for now.
Issue with reading the init file using NixOS to manage configs
[[https://github.com/emacs-tw/awesome-emacs#linux][awesome emacs github]]
* DONE VSCodium
** FAIL Add Snippets Configs
{
// Place your global snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
// Placeholders with the same ids are connected.
// Example:
// "Print to console": {
// "scope": "javascript,typescript",
// "prefix": "log",
// "body": [
// "console.log('$1');",
// "$2"
// ],
// "description": "Log output to console"
// }
"Console Log": {
"prefix": "hd",
"body": [
"---",
"title: TITLE",
"type: TYPE",
"author: Zonsopkomst",
"created: \"$CURRENT_YEAR-$CURRENT_MONTH-$CURRENT_DATE\"",
"---",
],
"scope": "markdown",
"description": "Create a header for markdown documents"
}
}
*** DONE File & Folder Added [2023-6-20 Tue]
*** TODO Need to double check paths and implement
** DONE Extension
- usernamehw.find-jump
* DONE Clean up / maintenance on users and hosts
* DONE Declare Configuration Files for:
** DONE Xiphos on all PCs
** DONE VSCodium on all PCs
- First check your NixOS config files to make sure you don't overwrite
- This is the settings.json from your Windows Work machine:
{
"org.todoKeywords": [
"TODO",
"DONE",
"HOLD",
"SCHD",
"FAIL",
],
"workbench.iconTheme": "file-icons",
"markdown-preview-enhanced.previewTheme": "github-dark.css",
"editor.wordWrap": "on",
"explorer.compactFolders": false,
"explorer.autoReveal": false,
"[markdown]": {
"editor.defaultFormatter": "darkriszty.markdown-table-prettify"
},
"todomd.defaultFile": "c:\\Users\\Church\\Documents\\Syncthing\\Church-Notes\\00 org\\todo.md",
"todohighlight.isEnable": true,
"todohighlight.include": [
"**/*.js",
"**/*.jsx",
"**/*.ts",
"**/*.tsx",
"**/*.html",
"**/*.css",
"**/*.scss",
"**/*.php",
"**/*.rb",
"**/*.txt",
"**/*.mdown",
"**/*.md",
"**/*.nix"
],
"editor.fontFamily": "JetBrainsMono Nerd Font, 'Courier New', monospace"
"editor.fontSize": 13,
"nix.serverSettings": {
},
}
* DONE VS Codium
** DONE Switch all extensions to be written by nixos config
** DONE Add Lisp-Syntax
* DONE Switch appropriate apps over to home-manager
* DONE Clean up Flake
* FAIL Fonts?
- [[Last Entry][https://github.com/NixOS/nixpkgs/issues/30085]]
- Fixed issue on remote pc about blurred fonts, but cannot seem to crisp them up
- Was trying to go for clarity like on a mac
- May revisit in the future

BIN
reference/assets/20231102NixOSTyr.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 853 KiB

BIN
reference/assets/20231102NixOSTyr3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 942 KiB

20
users/admin/flatpak.nix Normal file
View File

@ -0,0 +1,20 @@
{ config, pkgs, ... }:
{
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
];
}

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

@ -3,35 +3,45 @@
{
home-manager.users.admin = { pkgs, ... }: {
home.packages = with pkgs; [
borgbackup # Deduplicating archiver with compression and encryption
bleachbit # PC Cleaner
bristol # A range of synthesiser, electric piano and organ emulations
calibre # eBook Library
crow-translate # Language Translator
dino # XMPP Client
#duplicati # Backup Data
easytag # Music Tag Editor
firefox # Browser
freetube # YouTube Front-End
gImageReader # Tesseract-OCR Front-End
gnome-frog # Text extraction tool (OCR)
gpodder # Podcast Manager
libsForQt5.kolourpaint # Painting Application
localsend # Send Files/Text Over Wifi
keepassxc # GUI Password Manager with Cryptography
kitty # Terminal Emulator
mpv # Media Player
mumble # Low-Latency, High Quality Voice Chat
nomachine-client # NoMachine remote desktop client (nxplayer)
nomacs # Qt-based image viewer
nuclear # Music Streamer
onlyoffice-bin # Office Suite
pdfarranger # PDF Arranger
retroarchFull # Multi-Platform Emulator
pianobooster # A MIDI file player that teaches you how to play the piano
qsynth # Fluidsynth GUI
#retroarchFull # Multi-Platform Emulator
#rili # Children's Train Game
rustdesk # Remote Desktop Software
smplayer # Media Player
solaar # Logitech Unifying Receiver
speedcrunch # Calculator
strawberry # Media Player
synthesia # A fun way to learn how to play the piano
ventoy # USB Boot App
veracrypt # Filesystem Encryption
vscodium # Code Editor
xiphos # Bible Study Tool
xournalpp # PDF Annotation
vmpk # Virtual MIDI Piano Keyboard
];
imports = [

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

@ -3,8 +3,10 @@
{
home-manager.users.annette = { pkgs, ... }: {
home.packages = with pkgs; [
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

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

@ -3,10 +3,15 @@
{
home-manager.users.aspire = { pkgs, ... }: {
home.packages = with pkgs; [
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
];

17
users/coleman/flatpak.nix Normal file
View File

@ -0,0 +1,17 @@
{ config, pkgs, ... }:
{
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
];
}

8
users/coleman/home-manager.nix
View File

@ -4,26 +4,28 @@
home-manager.users.coleman = { pkgs, ... }: {
home.packages = with pkgs; [
bleachbit # PC Cleaner
brave # Browser
borgbackup # Deduplicating archiver with compression and encryption
calibre # eBook Library
crow-translate # Language Translator
dino # XMPP Client
#duplicati # Backup Data
easytag # Music Tag Editor
freetube # YouTube Front-End
gImageReader # Tesseract-OCR Front-End
gnome-frog # Text extraction tool (OCR)
gpodder # Podcast Manager
keepassxc # GUI Password Manager with Cryptography
kitty # Terminal Emulator
librewolf # Firefox Web Browser Fork
libsForQt5.kolourpaint # Painting Application
localsend # Send Files/Text Over Wifi
mpv # Media Player
mumble # Low-Latency, High Quality Voice Chat
nomachine-client # NoMachine remote desktop client (nxplayer)
nomacs # Qt-based image viewer
onlyoffice-bin # Office Suite
p7zip # File Archiver
pdfarranger # PDF Arranger
retroarchFull # Multi-Platform Emulator
#retroarchFull # Multi-Platform Emulator
rustdesk # Remote Desktop Software
smplayer # Media Player
solaar # Logitech Unifying Receiver

26
users/leeuwarden/flatpak.nix Normal file
View File

@ -0,0 +1,26 @@
# Added 10/25
{ config, pkgs, ... }:
{
services.flatpak.packages = [
# { appId = "com.brave.Browser"; origin = "flathub"; } or as follows:
"io.github.Foldex.AdwSteamGtk" # ADW Steam GTK Skin
"io.github.Bavarder.Bavarder" # Bavarder
"eu.betterbird.Betterbird" # Betterbird Email Client
"com.brave.Browser" # Brave Browser
"com.github.cassidyjames.clairvoyant" # Clairvoyant Magic 8 Ball
"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
"com.github.k4zmu2a.spacecadetpinball" # Space Cadet Pinball Game
"net.nokyan.Resources" # System Resource Monitor
"com.github.zocker_160.SyncThingy" # SyncThingy
"io.github.flattool.Warehouse" # Flatpak Warehouse
];
}

0
users/leeuwarden/gnomekeyring.nix → users/leeuwarden/gnomekeyring.nix.del
View File

14
users/leeuwarden/home-manager.nix
View File

@ -5,13 +5,14 @@
home.packages = with pkgs; [
armcord # Discord Client
ardour # DAW
borgbackup # Deduplicating archiver with compression and encryption
calibre # eBook Library
crow-translate # Language Translator
dino # XMPP Client
#duplicati # Backup Data
easytag # Music Tag Editor
element-desktop # Matrix Client
freetube # YouTube Front-End
gImageReader # Tesseract-OCR Front-End
gimp # GNU Image Manipulation Program
gnucash # Double Entry Accounting Software
gpodder # Podcast Manager
@ -23,20 +24,30 @@
krita # Painting Application
librewolf # Firefox Web Browser Fork
libsForQt5.kolourpaint # Painting Application
llpp # PDF Viewer
#localsend # Send Files/Text Over Wifi
ludusavi # Backup tool for PC game saves
makemkv # Blu-Ray and DVD to MKV Converter
mangohud # Gaming Stat HUD
mpv # Media Player
mumble # Low-Latency, High Quality Voice Chat
mupdf # PDF Viewer
nomacs # Qt-based image viewer
nomachine-client # NoMachine remote desktop client (nxplayer)
nuclear # Music Streamer
obs-studio # Recording/Streaming Application
onlyoffice-bin # Office Suite
openrgb # RGB Manager
p7zip # File Archiver
pdfarranger # PDF Arranger
python3 # python langugage
qbittorrent # Torrent Application
#retroarchFull # Multi-Platform Emulator
rustdesk # Remote Desktop Software
shattered-pixel-dungeon # Roguelike Dungeon Crawl
smplayer # Media Player
solaar # Logitech Unifying Receiver
soundconverter # GTK Audio file converter
speedcrunch # Calculator
tenacity # Sound Editor
tor-browser-bundle-bin # Privacy Web Browser
@ -45,6 +56,7 @@
vscodium # Code Editor
xiphos # Bible Study Tool
xournalpp # PDF Annotation
zathura # PDF Viewer
];
imports = [

8
users/zonsopkomst/appimage.nix Normal file
View File

@ -0,0 +1,8 @@
appimageTools.wrapType2 { # or wrapType1
name = "colorpicker";
src = fetchurl {
url = "https://github.com/Toinane/colorpicker/releases/download/2.2.0/Colorpicker-2.2.0.AppImage"
hash = "0000000000000000000000000000000000000000000000000000";
};
extraPkgs = pkgs: with pkgs; [ ];
}

26
users/zonsopkomst/flatpak.nix Normal file
View File

@ -0,0 +1,26 @@
{ config, pkgs, ... }:
{
services.flatpak.packages = [
# { appId = "com.brave.Browser"; origin = "flathub"; }
# "com.obsproject.Studio"
# "im.riot.Riot"
"io.github.Bavarder.Bavarder" # Bavarder
#"eu.betterbird.Betterbird" # Betterbird Email Client
#"com.brave.Browser" # Brave Browser
"com.github.cassidyjames.clairvoyant" # Clairvoyant Magic 8 Ball
"net.fasterland.converseen" # Converseen
"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
"org.libretro.RetroArch" # RetroArch
"com.github.k4zmu2a.spacecadetpinball" # Space Cadet Pinball Game
"net.nokyan.Resources" # System Resource Monitor
"com.github.zocker_160.SyncThingy" # SyncThingy
"io.github.flattool.Warehouse" # Flatpak Warehouse
];
}

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

@ -4,54 +4,65 @@
home-manager.users.zonsopkomst = { pkgs, ... }: {
home.packages = with pkgs; [
armcord # Discord Client
#betterbird # Betterbird Email Client
bleachbit # PC Cleaner
borgbackup # Deduplicating archiver with compression and encryption
brave # Brave Browser
calibre # eBook Library
crow-translate # Language Translator
dconf2nix # Nixify Gnome Config File
dino # XMPP Client
#duplicati # Backup Data
element-desktop # Matrix Client
easytag # Music Tag Editor
freetube # YouTube Front-End
gImageReader # Tesseract-OCR Front-End
gnucash # Double Entry Accounting Software
gnome-frog # Text extraction tool (OCR)
gpodder # Podcast Manager
gretl # Econometric Analysis
gzdoom # Doom Clone based on ZDoom
josm # Extensible editor for OpenStreetMap
keepassxc # GUI Password Manager with Cryptography
kitty # Terminal Emulator
kitty-themes # Kitty Themes
keepassxc # GUI Password Manager with Cryptography
librewolf # Firefox Web Browser Fork
libsForQt5.kolourpaint # Painting Application
libsForQt5.k3b # Disk Burning Application
mpv # Media Player
localsend # Send Files/Text Over Wifi
llpp # PDF Viewer
mpv # Media Player
mupdf # PDF Viewer
nomachine-client # NoMachine remote desktop client (nxplayer)
nomacs # Qt-based image viewer
nuclear # Music Streamer
onlyoffice-bin # Office Suite
p7zip # File Archiver
pdfarranger # PDF Arranger
python3 # python langugage
qbittorrent # Torrent Application
qgis # A Free and Open Source Geographic Information System
retroarchFull # Multi-Platform Emulator
smplayer # Media Player
solaar # Logitech Unifying Receiver
strawberry # Media Player
#qgis # A Free and Open Source Geographic Information System
#retroarchFull # Multi-Platform Emulator
rustdesk # Remote Desktop Software
rstudioWrapper # Integrated Tools for the R Language
smplayer # Media Player
solaar # Logitech Unifying Receiver
soundconverter # GTK Audio file converter
strawberry # Media Player
speedcrunch # Calculator
thunderbird # Thunderbird Email Client
tor-browser-bundle-bin # Privacy Web Browser
ventoy # USB Boot App
veracrypt # Filesystem Encryption
xiphos # Bible Study Tool
xournalpp # PDF Annotation
zathura # PDF Viewer
];
imports = [
../../config/config.nix
../../common/emacs.nix
../../common/git.nix
# TODO ../../common/starship.nix
../../common/vscodium.nix
../../common/vscodium.nix
#../../users/zonsopkomst/gnucash-5.4.nix
];
home.stateVersion = "22.11";