Compare commits

...

3 Commits

Author SHA1 Message Date
b9abdfce4a nix-on-droid test update 2025-01-01 10:20:27 +01:00
4f9eb34a55 refinements and fixes, firefox clipboard rofi 2024-12-31 19:49:54 +01:00
5bef57fb16 bootloader module added 2024-12-31 19:31:09 +01:00
10 changed files with 438 additions and 179 deletions

View File

@ -3,8 +3,14 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-droid = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
home-manager-droid = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs-droid";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -54,6 +60,12 @@
ghostty = { ghostty = {
url = "github:ghostty-org/ghostty"; url = "github:ghostty-org/ghostty";
}; };
nix-on-droid = {
url = "github:nix-community/nix-on-droid/release-24.05";
inputs.nixpkgs.follows = "nixpkgs-droid";
inputs.home-manager.follows = "home-manager-droid";
};
}; };
outputs = { outputs = {
@ -127,5 +139,13 @@
]; ];
}; };
}; };
nixOnDroidConfigurations = {
tsunemori = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
pkgs = import inputs.nixpkgs-droid {system = "aarch64-linux";};
modules = [
./tsunemori/configuration.nix
];
};
};
}; };
} }

View File

@ -23,12 +23,10 @@
}; };
}; };
# Bootloader
boot.loader.systemd-boot.enable = true;
# System level configuration # System level configuration
sys = { sys = {
audio.enable = true; audio.enable = true;
bootloader.systemd-boot.enable = true;
desktop = { desktop = {
plasma.enable = false; plasma.enable = false;
gnome.enable = true; gnome.enable = true;

View File

@ -29,12 +29,10 @@
]; ];
}; };
# Bootloader
boot.loader.systemd-boot.enable = true;
# System level configuration # System level configuration
sys = { sys = {
audio.enable = true; audio.enable = true;
bootloader.systemd-boot.enable = true;
desktop = { desktop = {
steamdeck.enable = true; steamdeck.enable = true;
}; };

View File

@ -3,15 +3,144 @@
config, config,
pkgs, pkgs,
... ...
}: }: {
{
options = { options = {
desktop.hyprland.rofi.clipboard.enable = lib.mkEnableOption "rofi-clipboard"; desktop.hyprland.rofi.clipboard.enable = lib.mkEnableOption "rofi-clipboard";
}; };
config = lib.mkIf config.desktop.hyprland.rofi.clipboard.enable { config = lib.mkIf config.desktop.hyprland.rofi.clipboard.enable {
home.file = { home.file = {
".config/rofi/cliboard.rasi".source = ../../../../config/clipboard.rasi; ".config/rofi/cliboard.rasi".text = let
main-bg = config.lib.stylix.colors.base01;
main-fg = config.lib.stylix.colors.base02;
main-br = config.lib.stylix.colors.base05;
main-ex = config.lib.stylix.colors.base09;
select-bg = config.lib.stylix.colors.base05; # Selected background color
select-fg = config.lib.stylix.colors.base11; # Selected text color
separatorcolor = "transparent";
border-color = "transparent";
in ''
// Config //
configuration {
modi: "drun";
show-icons: false;
}
* {
main-bg : #${main-bg};
main-fg : #${main-fg};
main-br : #${main-br};
main-ex : #${main-ex};
select-bg : #${select-bg};
select-fg : #${select-fg};
separatorcolor : ${separatorcolor};
border-color : ${border-color};
}
// Main //
window {
width: 23em;
height: 30em;
transparency: "real";
fullscreen: false;
enabled: true;
cursor: "default";
spacing: 0em;
padding: 0em;
border-color: @main-br;
background-color: @main-bg;
}
mainbox {
enabled: true;
spacing: 0em;
padding: 0.5em;
orientation: vertical;
children: [ "wallbox" , "listbox" ];
background-color: transparent;
}
wallbox {
spacing: 0em;
padding: 0em;
expand: false;
orientation: horizontal;
background-color: transparent;
background-image: url("~/.dotfiles/config/backgrounds/aurora_borealis.png", width);
children: [ "wallframe" , "inputbar" ];
}
wallframe {
width: 5em;
spacing: 0em;
padding: 0em;
expand: false;
background-color: @main-bg;
background-image: url("~/.dotfiles/config/backgrounds/aurora_borealis.png", height);
}
// Inputs //
inputbar {
enabled: true;
padding: 0em;
children: [ "entry" ];
background-color: @main-bg;
expand: true;
}
entry {
enabled: true;
padding: 1.8em;
text-color: @main-fg;
background-color: transparent;
}
// Lists //
listbox {
spacing: 0em;
padding: 0em;
orientation: vertical;
children: [ "dummy" , "listview" , "dummy" ];
background-color: transparent;
}
listview {
enabled: true;
padding: 0.5em;
columns: 1;
lines: 11;
cycle: true;
fixed-height: true;
fixed-columns: false;
expand: false;
cursor: "default";
background-color: transparent;
text-color: @main-fg;
}
dummy {
spacing: 0em;
padding: 0em;
background-color: transparent;
}
// Elements //
element {
enabled: true;
padding: 0.5em;
cursor: pointer;
background-color: transparent;
text-color: @main-fg;
}
element selected.normal {
background-color: @select-bg;
text-color: @select-fg;
}
element-text {
vertical-align: 0.0;
horizontal-align: 0.0;
cursor: inherit;
background-color: transparent;
text-color: inherit;
}
'';
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [

View File

@ -136,14 +136,17 @@
extensions = with inputs.firefox-addons.packages."x86_64-linux"; extensions = with inputs.firefox-addons.packages."x86_64-linux";
[ [
ublock-origin ublock-origin
# Lists all possible extensions $ nix-env -f '<nixpkgs>' -qaP -A nur.repos.rycee.firefox-addons
] ]
++ ( ++ (
if (userSettings.username == "shinya") if (userSettings.username == "shinya")
then [ then
inputs.firefox-addons.packages."x86_64-linux".simple-translate with inputs.firefox-addons.packages."x86_64-linux"; [
inputs.firefox-addons.packages."x86_64-linux".duckduckgo-privacy-essentials #enhancer-for-youtube
inputs.firefox-addons.packages."x86_64-linux".return-youtube-dislikes simple-translate
inputs.firefox-addons.packages."x86_64-linux".user-agent-string-switcher duckduckgo-privacy-essentials
return-youtube-dislikes
user-agent-string-switcher
] ]
else [] else []
); );

View File

@ -1,7 +1,6 @@
{ {
pkgs, pkgs,
lib, lib,
config,
userSettings, userSettings,
... ...
}: { }: {

View File

@ -0,0 +1,12 @@
{
lib,
config,
}: {
options = {
sys.bootloader.systemd.enable = lib.mkEnableOption "Enable systemd-boot as the bootloader";
};
config = lib.mkIf config.sys.bootloader.systemd.enable {
boot.loader.systemd-boot.enable = true;
};
}

View File

@ -15,12 +15,14 @@
./settings/loginManager.nix ./settings/loginManager.nix
./settings/style.nix ./settings/style.nix
./settings/default-applications.nix ./settings/default-applications.nix
./settings/bootloader.nix
./settings/user.nix ./settings/user.nix
]; ];
sys = { sys = {
audio.enable = lib.mkDefault true; audio.enable = lib.mkDefault true;
bootloader.systemd-boot.enable = lib.mkDefault true;
desktop = { desktop = {
plasma.enable = plasma.enable =
if userSettings.plasma == true if userSettings.plasma == true

View File

@ -0,0 +1,87 @@
{pkgs, ...}: {
imports = [
../nixos/system/packages.nix
../nixos/system/system.nix
];
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
home-manager = {
config = ./home.nix;
backupFileExtension = "hm-bak";
useGlobalPkgs = true;
};
sys = {
audio.enable = false;
bootloader.systemd-boot.enable = false;
desktop = {
steamdeck.enable = false;
};
fonts.packages = false;
locales.enable = true;
network.enable = false;
bluetooth = {
enable = false;
blueman.enable = false;
};
nvidia = {
enable = false;
mode = "none";
};
printing.enable = false;
login = {
sddm.enable = false;
gdm.enable = false;
};
style.enable = false;
};
program = {
docker.enable = true;
podman.enable = false;
steam.enable = false;
proxychains.enable = false;
tor.enable = false;
virt-manager.enable = false;
virtualbox.enable = false;
yubikey = {
enable = false;
lock-on-remove = false;
notify = false;
};
ssh.client.enable = false;
};
nixpkgs.config.allowUnfree = true;
# Simply install just the packages
environment.packages = with pkgs; [
# User-facing stuff that you really really want to have
vim # or some other editor, e.g. nano or neovim
# Some common stuff that people expect to have
#procps
#killall
#diffutils
#findutils
#utillinux
#tzdata
#hostname
#man
#gnugrep
#gnupg
#gnused
#gnutar
#bzip2
#gzip
#xz
#zip
#unzip
];
environment.etcBackupExtension = ".bak";
system.stateVersion = "24.05";
}

11
tsunemori/home.nix Normal file
View File

@ -0,0 +1,11 @@
{
config,
lib,
pkgs,
...
}: {
# Read the changelog before changing this value
home.stateVersion = "24.05";
# insert home-manager config
}