byteio/nixos-config
1
0
Fork 0
mirror of https://github.com/librephoenix/nixos-config synced 2025-01-19 07:05:51 +05:30
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: byteio:5b80e2c4971c95e03fd3389de3e3c8a87a1c342f
Branches Tags
byteio:main
..
compare: byteio:e298eee2a1788e9ec00f71dc95dcff099468572f
Branches Tags
byteio:main

No commits in common. "5b80e2c4971c95e03fd3389de3e3c8a87a1c342f" and "e298eee2a1788e9ec00f71dc95dcff099468572f" have entirely different histories.
5b80e2c497 ... e298eee2a1

12 changed files with 93 additions and 135 deletions
Show stats Expand all files Collapse all files

95
flake.lock
View file

@ -150,11 +150,11 @@
"blocklist-hosts": { "blocklist-hosts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1712248646, "lastModified": 1712150903,
"narHash": "sha256-pEiprVaO6CmIJ1qJMQn/y8vHvRQwiQq7CwbhzlneCOA=", "narHash": "sha256-mXtiXj+4Sm8nfHYI/cNItG/tOLeP1Rs9LEEgxYxY8rc=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "a340ebf0b8e9f81476c0ec0b6a9767858aea325c", "rev": "4d96abf2bc07773124ebc348a347254ba0601179",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -475,6 +475,27 @@
} }
}, },
"home-manager": { "home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1712093955,
"narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "80546b220e95a575c66c213af1b09fe255299438",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"stylix", "stylix",
@ -495,45 +516,19 @@
"type": "github" "type": "github"
} }
}, },
"home-manager-stable": { "hyprland-plugins": {
"inputs": { "flake": false,
"nixpkgs": [
"nixpkgs-stable"
]
},
"locked": { "locked": {
"lastModified": 1712386041, "lastModified": 1712142571,
"narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", "narHash": "sha256-cwe70xoqlBqTNiZltjMMx3CLahiAnaPBkysUmSCpkdk=",
"owner": "nix-community", "owner": "hyprwm",
"repo": "home-manager", "repo": "hyprland-plugins",
"rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", "rev": "4334510363a8420f17d88505d13405d5126eabf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "hyprwm",
"ref": "release-23.11", "repo": "hyprland-plugins",
"repo": "home-manager",
"type": "github"
}
},
"home-manager-unstable": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1712390667,
"narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b787726a8413e11b074cde42704b4af32d95545c",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
@ -633,11 +628,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712163089, "lastModified": 1712122226,
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -648,11 +643,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1712310679, "lastModified": 1711668574,
"narHash": "sha256-XgC/a/giEeNkhme/AV1ToipoZ/IVm1MV2ntiK4Tm+pw=", "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "72da83d9515b43550436891f538ff41d68eecc7f", "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -907,8 +902,8 @@
"eaf": "eaf", "eaf": "eaf",
"eaf-browser": "eaf-browser", "eaf-browser": "eaf-browser",
"emacs-pin-nixpkgs": "emacs-pin-nixpkgs", "emacs-pin-nixpkgs": "emacs-pin-nixpkgs",
"home-manager-stable": "home-manager-stable", "home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable", "hyprland-plugins": "hyprland-plugins",
"kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs", "kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs",
"mini-frame": "mini-frame", "mini-frame": "mini-frame",
"nix-doom-emacs": "nix-doom-emacs", "nix-doom-emacs": "nix-doom-emacs",
@ -947,11 +942,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1712369449, "lastModified": 1712110341,
"narHash": "sha256-tbWug3uXPlSm1j0xD80Y3xbP+otT6gLnQo1e/vQat48=", "narHash": "sha256-8LU2IM4ctHz043hlzoFUwQS1QIdhiMGEH/oIfPCxoWU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "41b3b080cc3e4b3a48e933b87fc15a05f1870779", "rev": "74deb67494783168f5b6d2071d73177e6bccab65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -989,7 +984,7 @@
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {

27
flake.nix
View file

@ -1,9 +1,9 @@
{ {
description = "Flake of LibrePhoenix"; description = "Flake of LibrePhoenix";
outputs = inputs@{ self, nixpkgs, nixpkgs-stable, emacs-pin-nixpkgs, kdenlive-pin-nixpkgs, outputs = inputs@{ self, nixpkgs, nixpkgs-stable, emacs-pin-nixpkgs,
home-manager-unstable, home-manager-stable, nix-doom-emacs, kdenlive-pin-nixpkgs, home-manager, nix-doom-emacs, nix-straight, stylix,
nix-straight, stylix, blocklist-hosts, rust-overlay, org-nursery, org-yaap, blocklist-hosts, hyprland-plugins, rust-overlay, org-nursery, org-yaap,
org-side-tree, org-timeblock, org-krita, phscroll, mini-frame, ... }: org-side-tree, org-timeblock, org-krita, phscroll, mini-frame, ... }:
let let
# ---- SYSTEM SETTINGS ---- # # ---- SYSTEM SETTINGS ---- #
@ -98,14 +98,6 @@
else else
nixpkgs.lib); nixpkgs.lib);
# use home-manager-stable if running a server (homelab or worklab profile)
# otherwise use home-manager-unstable
home-manager = (if ((systemSettings.profile == "homelab") || (systemSettings.profile == "worklab"))
then
home-manager-stable
else
home-manager-unstable);
# Systems that can run tests: # Systems that can run tests:
supportedSystems = [ "aarch64-linux" "i686-linux" "x86_64-linux" ]; supportedSystems = [ "aarch64-linux" "i686-linux" "x86_64-linux" ];
@ -142,6 +134,7 @@
inherit (inputs) mini-frame; inherit (inputs) mini-frame;
#inherit (inputs) nix-flatpak; #inherit (inputs) nix-flatpak;
inherit (inputs) stylix; inherit (inputs) stylix;
inherit (inputs) hyprland-plugins;
}; };
}; };
}; };
@ -191,11 +184,8 @@
emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6"; emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6";
kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94"; kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94";
home-manager-unstable.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager-stable.url = "github:nix-community/home-manager/release-23.11";
home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable";
nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; nix-doom-emacs.url = "github:nix-community/nix-doom-emacs";
nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs"; nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs";
@ -249,5 +239,10 @@
url = "github:StevenBlack/hosts"; url = "github:StevenBlack/hosts";
flake = false; flake = false;
}; };
hyprland-plugins = {
url = "github:hyprwm/hyprland-plugins";
flake = false;
};
}; };
} }

3
harden.sh
View file

@ -27,8 +27,5 @@ chown 0:0 flake.lock;
chown 0:0 flake.nix chown 0:0 flake.nix
chown 0:0 profiles/*/configuration.nix; chown 0:0 profiles/*/configuration.nix;
chown 0:0 harden.sh; chown 0:0 harden.sh;
chown 0:0 soften.sh;
chown 0:0 install.sh;
chown 0:0 update.sh;
chown 1000:users **/README.org; chown 1000:users **/README.org;
popd &> /dev/null; popd &> /dev/null;

5
install.sh
View file

@ -28,12 +28,11 @@ if [ -z "$EDITOR" ]; then
fi fi
$EDITOR ~/.dotfiles/flake.nix; $EDITOR ~/.dotfiles/flake.nix;
# Permissions for files that should be owned by root
sudo ~/.dotfiles/harden.sh ~/.dotfiles;
# Rebuild system # Rebuild system
sudo nixos-rebuild switch --flake ~/.dotfiles#system; sudo nixos-rebuild switch --flake ~/.dotfiles#system;
# Install and build home-manager configuration # Install and build home-manager configuration
nix run home-manager/master --extra-experimental-features nix-command --extra-experimental-features flakes -- switch --flake ~/.dotfiles#user; nix run home-manager/master --extra-experimental-features nix-command --extra-experimental-features flakes -- switch --flake ~/.dotfiles#user;
# Permissions for files that should be owned by root
sudo ~/.dotfiles/harden.sh ~/.dotfiles;

6
profiles/homelab/base.nix
View file

@ -4,7 +4,6 @@
imports = imports =
[ ../../system/hardware-configuration.nix [ ../../system/hardware-configuration.nix
../../system/hardware/time.nix # Network time sync ../../system/hardware/time.nix # Network time sync
../../system/security/firewall.nix
../../system/security/doas.nix ../../system/security/doas.nix
../../system/security/gpg.nix ../../system/security/gpg.nix
( import ../../system/app/docker.nix {storageDriver = null; inherit pkgs userSettings lib;} ) ( import ../../system/app/docker.nix {storageDriver = null; inherit pkgs userSettings lib;} )
@ -72,15 +71,10 @@
git git
rclone rclone
rdiff-backup rdiff-backup
rsnapshot
cryptsetup cryptsetup
gocryptfs gocryptfs
]; ];
programs.fuse.userAllowOther = true;
services.haveged.enable = true;
# I use zsh btw # I use zsh btw
environment.shells = with pkgs; [ zsh ]; environment.shells = with pkgs; [ zsh ];
users.defaultUserShell = pkgs.zsh; users.defaultUserShell = pkgs.zsh;

27
soften.sh
View file

@ -1,27 +0,0 @@
#!/bin/sh
# This will soften the security of these dotfiles, allowing
# the default unpriveleged user with UID/GID of 1000 to edit ALL FILES
# in the dotfiles directory
# This mainly is just here to be used by some scripts
# Run this inside of ~/.dotfiles (or whatever directory you installed
# the dotfiles to)
# Run this as root!
# BTW, this assumes your user account has a UID/GID of 1000
# After running this, YOUR UNPRIVELEGED USER CAN MAKE EDITS TO
# IMPORTANT SYSTEM FILES WHICH MAY COMPROMISE THE SYSTEM AFTER
# RUNNING nixos-rebuild switch!
if [ "$#" = 1 ]; then
dotfilesDir=$1;
else
dotfilesDir=$(pwd);
fi
pushd $dotfilesDir &> /dev/null;
chown -R 1000:users .;
popd &> /dev/null;

1
system/app/docker.nix
View file

@ -19,7 +19,6 @@ assert lib.asserts.assertOneOf "storageDriver" storageDriver [
}; };
users.users.${userSettings.username}.extraGroups = [ "docker" ]; users.users.${userSettings.username}.extraGroups = [ "docker" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
docker
docker-compose docker-compose
lazydocker lazydocker
]; ];

23
update.sh
View file

@ -1,23 +0,0 @@
#!/bin/sh
# Automated script to update my non-primary systems
# to be in sync with upstream git repo while
# preserving local edits to dotfiles via git stash
# Relax permissions temporarily so git can work
sudo ~/.dotfiles/soften.sh ~/.dotfiles;
# Stash local edits, pull changes, and re-apply local edits
git stash
git pull
git stash apply
# Permissions for files that should be owned by root
sudo ~/.dotfiles/harden.sh ~/.dotfiles;
# Rebuild system
sudo nixos-rebuild switch --flake ~/.dotfiles#system;
# Install and build home-manager configuration
home-manager --extra-experimental-features nix-command --extra-experimental-features flakes -- switch --flake ~/.dotfiles#user;

2
user/shell/sh.nix
View file

@ -11,6 +11,8 @@ let
neofetch = "disfetch"; neofetch = "disfetch";
fetch = "disfetch"; fetch = "disfetch";
gitfetch = "onefetch"; gitfetch = "onefetch";
nixos-rebuild = "systemd-run --no-ask-password --uid=0 --system --scope -p MemoryLimit=16000M -p CPUQuota=60% nixos-rebuild";
home-manager = "systemd-run --no-ask-password --uid=1000 --user --scope -p MemoryLimit=16000M -p CPUQuota=60% home-manager";
}; };
in in
{ {

11
user/style/oomox-current.conf.mustache
View file

@ -1,5 +1,10 @@
# FG BTN_BG bright less brdark less da txt fg br text btn fg txt bg bg shadow sel bg sel fg link visited alt bg default tooltip bg tooltip_fg # FG BTN_BG bright less brdark less da txt fg br text btn fg txt bg bg shadow sel bg sel fg link visited alt bg default tooltip bg tooltip_fg
[ColorScheme] [ColorScheme]
active_colors=#{{base07-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base07-hex}}, #{{base07-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base01-hex}}, #{{base00-hex}}, #{{base01-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base07-hex}} active_colors=#{{base07-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base0F-hex}}, #{{base07-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base01-hex}}, #{{base00-hex}}, #{{base01-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base07-hex}}, 181b24, #{{base07-hex}}
disabled_colors=#767081, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #767081, #767081, #767081, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base01-hex}}, #{{base00-hex}}, #{{base01-hex}}, #767081, #{{base00-hex}}, #767081, #{{base00-hex}}, #767081 disabled_colors=#767081, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #767081, #767081, #767081, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base01-hex}}, #{{base00-hex}}, #{{base01-hex}}, #767081, #{{base00-hex}}, #767081, #{{base00-hex}}, #767081
inactive_colors=#{{base07-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base07-hex}}, #{{base07-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base01-hex}}, #{{base00-hex}}, #{{base01-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base07-hex}} inactive_colors=#{{base07-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base07-hex}}, #{{base07-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base00-hex}}, #{{base01-hex}}, #{{base00-hex}}, #{{base01-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base07-hex}}
# FG BTN_BG bright less br dark less da txt fg br text btn fg txt bg bg shadow sel bg sel fg link visite alt bg default tooltip bg tooltip_fg
# active_colors=#{{base07-hex}}, #{{base02-hex}}, #{{base00-hex}}, #cbc7c4, #9f9d9a, #b8b5b2, #{{base07-hex}}, #ff0000, #{{base07-hex}}, #{{base00-hex}}, #{{base00-hex}}, #767472, #{{base01-hex}}, #{{base00-hex}}, #{{base01-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base07-hex}}, 181b24, #{{base07-hex}}
#disabled_colors=#767081, #{{base02-hex}}, #{{base00-hex}}, #cbc7c4, #9f9d9a, #b8b5b2, #767081, #ffec17, #{{base07-hex}}, #{{base00-hex}}, #{{base00-hex}}, #767472, #{{base01-hex}}, #{{base00-hex}}, #{{base01-hex}}, #767081, #{{base00-hex}}, #767081, #{{base00-hex}}, #767081
#inactive_colors=#{{base07-hex}}, #{{base02-hex}}, #{{base00-hex}}, #cbc7c4, #9f9d9a, #b8b5b2, #{{base07-hex}}, #ff9040, #{{base07-hex}}, #{{base00-hex}}, #{{base00-hex}}, #767472, #{{base01-hex}}, #{{base00-hex}}, #{{base01-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base07-hex}}, #{{base00-hex}}, #{{base07-hex}}

13
user/style/stylix.nix
View file

@ -70,7 +70,6 @@ in
}; };
font.size = config.stylix.fonts.sizes.terminal; font.size = config.stylix.fonts.sizes.terminal;
}; };
stylix.targets.kde.enable = true;
stylix.targets.kitty.enable = true; stylix.targets.kitty.enable = true;
stylix.targets.gtk.enable = true; stylix.targets.gtk.enable = true;
stylix.targets.rofi.enable = if (userSettings.wmType == "x11") then true else false; stylix.targets.rofi.enable = if (userSettings.wmType == "x11") then true else false;
@ -120,12 +119,20 @@ in
wallpaper = DP-1,''+config.stylix.image+'' wallpaper = DP-1,''+config.stylix.image+''
''; '';
home.packages = with pkgs; [ home.packages = with pkgs; [
libsForQt5.qt5ct pkgs.libsForQt5.breeze-qt5 libsForQt5.breeze-icons qt5ct pkgs.libsForQt5.breeze-qt5
]; ];
home.sessionVariables = {
QT_QPA_PLATFORMTHEME="qt5ct";
};
programs.zsh.sessionVariables = {
QT_QPA_PLATFORMTHEME="qt5ct";
};
programs.bash.sessionVariables = {
QT_QPA_PLATFORMTHEME="qt5ct";
};
qt = { qt = {
enable = true; enable = true;
style.package = pkgs.libsForQt5.breeze-qt5; style.package = pkgs.libsForQt5.breeze-qt5;
style.name = "breeze-dark"; style.name = "breeze-dark";
platformTheme = "kde";
}; };
} }

15
user/wm/hyprland/hyprbars.nix Normal file
View file

@ -0,0 +1,15 @@
{ config, lib, stdenv, pkgs, hyprland-plugins, ... }:
stdenv.mkDerivation rec {
pname = "hyprbars";
version = "unstable";
src = "${hyprland-plugins}/hyprbars";
nativeBuildInputs = [ pkgs.hyprland.nativeBuildInputs ];
buildInputs = [ pkgs.hyprland pkgs.hyprland.buildInputs ];
meta = {
homepage = "https://gitlab.com/phoneybadger/pokemon-colorscripts";
description = "CLI utility to print out images of pokemon to terminal";
license = lib.licenses.mit;
maintainers = [];
};
}