Compare commits
29 Commits
165646b395
...
7f87156a58
| Author | SHA1 | Date | |
|---|---|---|---|
| 7f87156a58 | |||
| 8a7cec11cf | |||
| da865671ad | |||
| 3004f57c1a | |||
| f82c4fb659 | |||
| a4d6664b77 | |||
| dd256a24f4 | |||
| 03829b74ce | |||
| 29e68d1714 | |||
| c0c51f571d | |||
| 9c54be10e1 | |||
| eb69712a7c | |||
| b86cce1c12 | |||
| 1b44c66902 | |||
| b54cb9fceb | |||
| 5fae69b391 | |||
| b8d4cf59b8 | |||
| 9ab7b41780 | |||
| 4f37050c1c | |||
| 49d98cbca1 | |||
| 47ecc2a0c4 | |||
| 149de8faae | |||
| 487aae9a58 | |||
| fde42131d2 | |||
| ddbe91c669 | |||
| 74a6e98e90 | |||
| 1aaeeaedf0 | |||
| e66a48a311 | |||
| ce1ba6dd90 |
@ -226,12 +226,14 @@ main = do
|
||||
, startWidgets = [myWorkspaces, myLayout]
|
||||
}
|
||||
)
|
||||
, ( "strixi-minaj"
|
||||
, baseConfig { endWidgets = laptopEndWidgets }
|
||||
)
|
||||
, ( "jay-lenovo"
|
||||
, baseConfig { endWidgets = laptopEndWidgets }
|
||||
),
|
||||
( "nixquick"
|
||||
, baseConfig { endWidgets = [ myTray , myMpris ]
|
||||
}
|
||||
)
|
||||
, ( "nixquick"
|
||||
, baseConfig { endWidgets = [ myTray , myMpris ] }
|
||||
)
|
||||
|
||||
]
|
||||
|
||||
@ -54,12 +54,14 @@
|
||||
sp-remove-active-pair-overlay
|
||||
sp-splice-sexp
|
||||
sp-splice-sexp-killing-backward
|
||||
string-inflection-all-cycle
|
||||
string-inflection-toggle
|
||||
tern-ac-dot-complete
|
||||
transpose-sexps
|
||||
transpose-words
|
||||
undo-redo
|
||||
universal-argument-minus
|
||||
upcase-region
|
||||
wdired-finish-edit
|
||||
yaml-electric-backspace
|
||||
yaml-electric-dash-and-dot
|
||||
|
||||
@ -157,3 +157,9 @@ This makes evil-mode play nice with org-fc
|
||||
(setf (alist-get 'python-ts-mode apheleia-mode-alist)
|
||||
(alist-get 'python-mode apheleia-mode-alist))))
|
||||
#+end_src
|
||||
|
||||
* Packages
|
||||
#+begin_src emacs-lisp
|
||||
(use-package org-drill)
|
||||
|
||||
#+end_src
|
||||
|
||||
@ -50,6 +50,7 @@
|
||||
tb = rev-parse --abbrev-ref --symbolic-full-name @{u}
|
||||
untracked = "!u() { git status -s | grep "??" | awk '{print $2}'; }; u"
|
||||
which-branch = "!wb() { b="$(git symbolic-ref HEAD)" && echo ${b#refs/heads/}; }; wb"
|
||||
find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
|
||||
|
||||
[core]
|
||||
# Use custom `.gitignore` and `.gitattributes`
|
||||
|
||||
@ -6,6 +6,12 @@ import sys
|
||||
|
||||
class BrightnessManager(object):
|
||||
|
||||
@classmethod
|
||||
def find_brightness(cls):
|
||||
return cls.from_path(
|
||||
os.path.join("/sys/class/backlight", os.listdir("/sys/class/backlight")[0])
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def from_path(cls, path):
|
||||
return cls(
|
||||
@ -46,11 +52,6 @@ class BrightnessManager(object):
|
||||
return float(self.current_brightness) / self.max_brightness
|
||||
|
||||
|
||||
IntelBrightnessManager = BrightnessManager.from_path(
|
||||
"/sys/class/backlight/intel_backlight",
|
||||
)
|
||||
|
||||
|
||||
def build_parser():
|
||||
parser = argparse.ArgumentParser(
|
||||
description='Interact with macbook brightness',
|
||||
@ -70,6 +71,6 @@ def build_parser():
|
||||
|
||||
if __name__ == '__main__':
|
||||
args = build_parser().parse_args()
|
||||
IntelBrightnessManager.increment_by_proportion(float(args.change) / 100)
|
||||
BrightnessManager.find_brightness().increment_by_proportion(float(args.change) / 100)
|
||||
if args.do_print:
|
||||
print(int(IntelBrightnessManager.current_proportion * 100))
|
||||
|
||||
@ -33,10 +33,6 @@ makeEnable config "modules.base" true {
|
||||
enable = true;
|
||||
enableStrongSwan = true;
|
||||
plugins = [ pkgs.networkmanager-l2tp pkgs.networkmanager-openvpn ];
|
||||
extraConfig = ''
|
||||
[main]
|
||||
rc-manager=resolvconf
|
||||
'';
|
||||
};
|
||||
|
||||
# Audio
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, pkgs, makeEnable, forEachUser, ... }:
|
||||
{ config, pkgs, makeEnable, ... }:
|
||||
makeEnable config "modules.desktop" true {
|
||||
imports = [
|
||||
./fonts.nix
|
||||
@ -62,10 +62,8 @@ makeEnable config "modules.desktop" true {
|
||||
firefox
|
||||
gnome.cheese
|
||||
gnome.gpaste
|
||||
|
||||
kleopatra
|
||||
libnotify
|
||||
# Seems to be broken
|
||||
libreoffice
|
||||
lxappearance
|
||||
lxqt.lxqt-powermanagement
|
||||
@ -88,6 +86,7 @@ makeEnable config "modules.desktop" true {
|
||||
vlc
|
||||
volnoti
|
||||
xfce.thunar
|
||||
zulip
|
||||
|
||||
# Audio
|
||||
picard
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ pkgs, config, makeEnable, forEachUser, ... }:
|
||||
makeEnable config "modules.electron" false {
|
||||
environment.systemPackages = with pkgs; [
|
||||
# element-desktop
|
||||
element-desktop
|
||||
# bitwarden
|
||||
discord
|
||||
# etcher
|
||||
|
||||
@ -27,6 +27,7 @@ with lib;
|
||||
do
|
||||
autoload "''${file##*/}"
|
||||
done
|
||||
fpath+="${pkgs.python-with-my-packages}/lib/python3.11/site-packages/argcomplete/bash_completion.d"
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -1,19 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
my-python-packages = python-packages: with python-packages; [
|
||||
appdirs
|
||||
ipdb
|
||||
ipython
|
||||
numpy
|
||||
openpyxl
|
||||
pip
|
||||
requests
|
||||
tox
|
||||
virtualenv
|
||||
virtualenvwrapper
|
||||
];
|
||||
python-with-my-packages = pkgs.python311.withPackages my-python-packages;
|
||||
in
|
||||
{
|
||||
nixpkgs.config.allowBroken = true;
|
||||
|
||||
@ -31,6 +16,7 @@ in
|
||||
emacs
|
||||
fd
|
||||
ffmpeg
|
||||
bento4
|
||||
file
|
||||
gawk
|
||||
gcc
|
||||
|
||||
170
nixos/flake.lock
170
nixos/flake.lock
@ -8,11 +8,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707830867,
|
||||
"narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
|
||||
"lastModified": 1715290355,
|
||||
"narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
|
||||
"rev": "8d37c5bdeade12b6479c85acd133063ab53187a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -108,6 +108,27 @@
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712014858,
|
||||
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixified-ai",
|
||||
@ -128,7 +149,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"flake-parts_3": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixified-ai",
|
||||
@ -170,15 +191,12 @@
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1705309234,
|
||||
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -188,6 +206,24 @@
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_4": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
},
|
||||
@ -205,7 +241,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_4": {
|
||||
"flake-utils_5": {
|
||||
"inputs": {
|
||||
"systems": "systems_5"
|
||||
},
|
||||
@ -223,7 +259,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_5": {
|
||||
"flake-utils_6": {
|
||||
"inputs": {
|
||||
"systems": "systems_6"
|
||||
},
|
||||
@ -465,7 +501,7 @@
|
||||
"haskell-language-server": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"fourmolu-011": "fourmolu-011",
|
||||
"fourmolu-012": "fourmolu-012",
|
||||
"gitignore": "gitignore",
|
||||
@ -500,7 +536,7 @@
|
||||
"haskell-language-server_2": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"flake-utils": "flake-utils_5",
|
||||
"fourmolu-011": "fourmolu-011_2",
|
||||
"fourmolu-012": "fourmolu-012_2",
|
||||
"gitignore": "gitignore_2",
|
||||
@ -534,7 +570,7 @@
|
||||
},
|
||||
"hercules-ci-effects": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"flake-parts": "flake-parts_3",
|
||||
"nixpkgs": [
|
||||
"nixified-ai",
|
||||
"nixpkgs"
|
||||
@ -664,11 +700,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710452332,
|
||||
"narHash": "sha256-+lKOoQ89fD6iz6Ro7Adml4Sx6SqQcTWII4t1rvVtdjs=",
|
||||
"lastModified": 1715380449,
|
||||
"narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "096d9c04b3e9438855aa65e24129b97a998bd3d9",
|
||||
"rev": "d7682620185f213df384c363288093b486b2883f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -694,7 +730,7 @@
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1,
|
||||
"narHash": "sha256-/j8RpaKS3M26QXE61bqjZPBiaPwEiO5P9pJ2imA1bD4=",
|
||||
"narHash": "sha256-o42629VeuDMu2N76vrw2L8CIawLK3RP10W+M4e8qCCA=",
|
||||
"path": "../dotfiles/config/taffybar",
|
||||
"type": "path"
|
||||
},
|
||||
@ -811,16 +847,18 @@
|
||||
"nix": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"libgit2": "libgit2",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-regression": "nixpkgs-regression"
|
||||
"nixpkgs-regression": "nixpkgs-regression",
|
||||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710366336,
|
||||
"narHash": "sha256-eJeZ3vMbuC351B6CH4mqcpuZJ9RgtdRcxvhd7X2++Nk=",
|
||||
"lastModified": 1715361977,
|
||||
"narHash": "sha256-j/PLYYGs+Gjge4JGYxMjOhWQEp+GB4Fdicetbpmp6n0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nix",
|
||||
"rev": "c152c2767a262b772c912287e1c2d85173b4781c",
|
||||
"rev": "87ab3c0ea4e6f85e7b902050365bb75cf2836fbb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -830,7 +868,7 @@
|
||||
},
|
||||
"nixified-ai": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"hercules-ci-effects": "hercules-ci-effects",
|
||||
"invokeai-src": "invokeai-src",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
@ -868,15 +906,15 @@
|
||||
"nixos-wsl": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709980437,
|
||||
"narHash": "sha256-rp1MwfRaZl7TPM4E5i1HxQGJCCfMcIa7dOzTX3SW7ro=",
|
||||
"lastModified": 1715237610,
|
||||
"narHash": "sha256-/ZeWQ4mL3DfHsbTZYc80qMrL4vBfENP0RiGv2KrCrEo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "e0b9e6c8ff35c7a28cb6baa02d85a9737a2ee4e9",
|
||||
"rev": "61fe33f4194bbbc48c090a2e79f4eb61b47c9b75",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -919,11 +957,11 @@
|
||||
},
|
||||
"nixpkgs-regression_2": {
|
||||
"locked": {
|
||||
"lastModified": 1710455890,
|
||||
"narHash": "sha256-Ecfz+YhCEtj0KZhI90fiW21QqneOd5HpvMeJGzlN72Y=",
|
||||
"lastModified": 1715484633,
|
||||
"narHash": "sha256-Es5etYksi9VsAZSBKZe4rdyi9L000MEx9lFb3TF6Eo8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "30ccdc28ecb2060cfe01d679aa8a4304631a41b5",
|
||||
"rev": "25e9a6d07dd142bafd94603208a59c107e8f2905",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -966,11 +1004,11 @@
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1707514827,
|
||||
"narHash": "sha256-Y+wqFkvikpE1epCx57PsGw+M1hX5aY5q/xgk+ebDwxI=",
|
||||
"lastModified": 1714782413,
|
||||
"narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "20f65b86b6485decb43c5498780c223571dd56ef",
|
||||
"rev": "651b4702e27a388f0f18e1b970534162dec09aff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -982,11 +1020,11 @@
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1710272261,
|
||||
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
|
||||
"lastModified": 1715266358,
|
||||
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
|
||||
"rev": "f1010e0469db743d14519a1efd37e23f8513d714",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1117,6 +1155,38 @@
|
||||
"url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"nix"
|
||||
],
|
||||
"flake-utils": "flake-utils_2",
|
||||
"gitignore": [
|
||||
"nix"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": [
|
||||
"nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712897695,
|
||||
"narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
@ -1334,11 +1404,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1706639324,
|
||||
"narHash": "sha256-O5T4/1+dERQitmA6pwcP67/tREcJQ7KuATD8kGiB2Es=",
|
||||
"lastModified": 1714656757,
|
||||
"narHash": "sha256-OZNPY2LNBm+NkIHqo8SX2f/BfuwqkQIGYePkiAmz2YA=",
|
||||
"owner": "taffybar",
|
||||
"repo": "taffybar",
|
||||
"rev": "9c8540a56432db6555755a9a649b4874833520ed",
|
||||
"rev": "a82a8a0cffb34b5eae38e46d88f02641bf8a8fe5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1366,11 +1436,11 @@
|
||||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1710272261,
|
||||
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
|
||||
"lastModified": 1715266358,
|
||||
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
|
||||
"rev": "f1010e0469db743d14519a1efd37e23f8513d714",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1382,15 +1452,15 @@
|
||||
},
|
||||
"vscode-server": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_5",
|
||||
"flake-utils": "flake-utils_6",
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709622318,
|
||||
"narHash": "sha256-bTscF0366xtoIXgH7Zq+Mn0mpX3w4h/2xKpHiYMyLNc=",
|
||||
"lastModified": 1713958148,
|
||||
"narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-vscode-server",
|
||||
"rev": "d0ed9b8cf1f0a71f110df9119489ab047e0726bd",
|
||||
"rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1413,11 +1483,11 @@
|
||||
"unstable": "unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710184205,
|
||||
"narHash": "sha256-vcDr/l0dohzk1ZtWdMGK9j7QUNS7RpdwmA1Mku/r6CY=",
|
||||
"lastModified": 1714229485,
|
||||
"narHash": "sha256-AOy87dJL0T9wSe1kM0tTzFlV++JwmoGW4BfBXzIUbsI=",
|
||||
"owner": "xmonad",
|
||||
"repo": "xmonad",
|
||||
"rev": "746880e9b9bb4eecc6e89e26f760cfbdf1464fed",
|
||||
"rev": "cde1a25bca9b7aeeb24af73588221f5f54ae770b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@ -171,7 +171,6 @@
|
||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
];
|
||||
extra-substituters = [
|
||||
"http://1896Folsom.duckdns.org"
|
||||
"http://192.168.1.26:5050"
|
||||
];
|
||||
extra-trusted-public-keys = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ config, makeEnable, ... }:
|
||||
makeEnable config "modules.gnome" false {
|
||||
services.xserver = {
|
||||
desktopManager.gnome3.enable = true;
|
||||
desktopManager.gnome.enable = true;
|
||||
displayManager.gdm.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
rec {
|
||||
giteaSecret = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHRNHlKPGVnOATsbnkPccyK+C15TWGKbBwqNKt0UcQ81 imalison@adele";
|
||||
hostKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG3UqIYs/NY0okKuiIO+dU2OM7A8vv3b6//GedagvLoX ryzen-shine.local"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINFbM1sL/vlDhrqPV1OMIGi4dKG0tMKhWSXx95ccbfyM biskcomp.local"
|
||||
@ -21,7 +22,7 @@ rec {
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMCJ08qswd3OoApAIHQwojEUJ4sre89vSngbM3x5pBP2 imalison@jay-lenovo.local" # Kat's Lenovo Legion
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOVGIGnpkU7HNQ/zl/Ffi562M+laWY9/yIjB63BCMiTS kat@nixcomp.local"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO3tlMePru6ZlSuf8yUii3N1dy3WwJnSQAt3EgETkctK kat@jay-lenovo.local"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFrOYD3ReFc2+xFUylBFHREcm1lO7BRJGW5JrOoY3I8s ivanm@strixy-minaj"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFrOYD3ReFc2+xFUylBFHREcm1lO7BRJGW5JrOoY3I8s ivanm@strixi-minaj"
|
||||
];
|
||||
deanKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICDvbEVL+y7eV4+mtxOuHwyomBBQ6uYMesctstua20+e deanwenstrand@deans-mbp-2.lan"
|
||||
|
||||
@ -72,13 +72,13 @@ in
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://192.168.1.26:3090";
|
||||
proxyPass = "http://192.168.1.20:3090";
|
||||
};
|
||||
};
|
||||
"syncthing.railbird.ai" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
root = "/var/lib/syncthing/sync";
|
||||
root = "/var/lib/syncthing/railbird";
|
||||
locations."/" = {
|
||||
extraConfig = ''
|
||||
autoindex on;
|
||||
|
||||
21
nixos/machines/dean-zephyrus.nix
Normal file
21
nixos/machines/dean-zephyrus.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, pkgs, config, inputs, forEachUser, ... }:
|
||||
{
|
||||
imports = [
|
||||
../configuration.nix
|
||||
];
|
||||
services.xserver.enable = true;
|
||||
environment.systemPackages = with pkgs; [sublime];
|
||||
modules.desktop.enable = false;
|
||||
modules.plasma.enable = false;
|
||||
imalison.nixOverlay.enable = false;
|
||||
modules.wsl.enable = true;
|
||||
|
||||
networking.hostName = "dean-zephyrus";
|
||||
|
||||
wsl.defaultUser = "dean";
|
||||
system.stateVersion = "22.05";
|
||||
|
||||
home-manager.users = forEachUser {
|
||||
home.stateVersion = "22.05";
|
||||
};
|
||||
}
|
||||
@ -33,8 +33,6 @@
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
libinput.enable = true;
|
||||
displayManager.sddm.enable = true;
|
||||
desktopManager.plasma5.enable = true;
|
||||
videoDrivers = [ "amdgpu" ];
|
||||
};
|
||||
|
||||
|
||||
@ -5,8 +5,12 @@
|
||||
];
|
||||
|
||||
features.full.enable = true;
|
||||
modules.cache-server.enable = true;
|
||||
modules.cache-server = {
|
||||
enable = true;
|
||||
port = 3090;
|
||||
};
|
||||
modules.gitea-runner.enable = true;
|
||||
modules.vscode.enable = true;
|
||||
|
||||
networking.hostName = "nixquick";
|
||||
|
||||
|
||||
@ -30,29 +30,6 @@
|
||||
|
||||
services.autorandr = {
|
||||
enable = true;
|
||||
profiles = {
|
||||
"1896Office" = {
|
||||
fingerprint = {
|
||||
DP-0 = "00ffffffffffff0010ace4a153364b300c200104b55123783bfce1b04d3bb8250e505421080001010101010101010101010101010101e77c70a0d0a029503020150829623100001a000000ff0023473749594d78677741413052000000fd0001afffff63010a202020202020000000fc0044656c6c20415733343233445702d8020320f12309070183010000654b04000101e305c000e2006ae6060501634b004ed470a0d0a046503020e50c29623100001a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009970127903000f000aa4140e0e07012045000002010d310cdb4dbd13b85b620e01455403013c520101046f0d9f002f801f009f0554004c000400663801046f0d9f002f801f009f0566005e0004008b8101046f0d9f002f801f009f057e007600040000000000000000000000000000000000000000000000000000000000005f90";
|
||||
HDMI-0 = "00ffffffffffff0010ac67d0534d39312d1a0103803c2278ee4455a9554d9d260f5054a54b00b300d100714fa9408180778001010101565e00a0a0a029503020350055502100001a000000ff00483759434336423831394d530a000000fc0044454c4c205532373135480a20000000fd0038561e711e000a202020202020019e020322f14f1005040302071601141f1213202122230907078301000065030c001000023a801871382d40582c250055502100001e011d8018711c1620582c250055502100009e011d007251d01e206e28550055502100001e8c0ad08a20e02d10103e9600555021000018483f00ca808030401a50130055502100001e00000094";
|
||||
};
|
||||
config = {
|
||||
DP-0 = {
|
||||
enable = true;
|
||||
mode = "3440x1440";
|
||||
rate = "143.97";
|
||||
position = "0x1440";
|
||||
primary = true;
|
||||
};
|
||||
HDMI-0 = {
|
||||
enable = true;
|
||||
rate = "59.95";
|
||||
mode = "2560x1440";
|
||||
position = "440x0";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
||||
@ -57,7 +57,7 @@
|
||||
[ { device = "/dev/disk/by-uuid/27f277a0-b552-43a0-904d-625e48922bb9"; }
|
||||
];
|
||||
|
||||
networking.hostName = "strixy-minaj";
|
||||
networking.hostName = "strixi-minaj";
|
||||
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
@ -29,7 +29,6 @@
|
||||
keep-derivations = true;
|
||||
substituters = [
|
||||
"https://cache.nixos.org"
|
||||
"https://cache.railbird.ai?priority=45"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cache.railbird.ai:KhnvcouxtIU2zxUcjJsm4bUK3o1S3p8xMf9qfZGF7/A="
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
final: prev: {
|
||||
rofi-systemd = prev.rofi-systemd.overrideAttrs(_: {
|
||||
rofi-systemd = prev.rofi-systemd.overrideAttrs (_: {
|
||||
src = prev.fetchFromGitHub {
|
||||
repo = "rofi-systemd";
|
||||
owner = "IvanMalison";
|
||||
@ -8,7 +8,7 @@ final: prev: {
|
||||
};
|
||||
});
|
||||
|
||||
git-sync = prev.git-sync.overrideAttrs(_: {
|
||||
git-sync = prev.git-sync.overrideAttrs (_: {
|
||||
src = prev.fetchFromGitHub {
|
||||
repo = "git-sync";
|
||||
owner = "IvanMalison";
|
||||
@ -17,24 +17,24 @@ final: prev: {
|
||||
};
|
||||
});
|
||||
|
||||
picom = prev.picom.overrideAttrs(old: {
|
||||
picom = prev.picom.overrideAttrs (old: {
|
||||
src = prev.fetchFromGitHub {
|
||||
repo = "picom";
|
||||
owner = "dccsillag";
|
||||
rev = "51b21355696add83f39ccdb8dd82ff5009ba0ae5";
|
||||
sha256 = "sha256-crCwRJd859DCIC0pEerpDqdX2j8ZrNAzVaSSB3mTPN8==";
|
||||
};
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [ final.pcre ];
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [final.pcre];
|
||||
});
|
||||
|
||||
expressvpn = prev.expressvpn.overrideAttrs(_: {
|
||||
expressvpn = prev.expressvpn.overrideAttrs (_: {
|
||||
src = prev.fetchurl {
|
||||
url = "https://www.expressvpn.works/clients/linux/expressvpn_3.46.0.7-1_amd64.deb";
|
||||
hash = "sha256-v0rr1s32jj79A8IGfJgSGJVlz7rSnZYn4ealOpqee0w=";
|
||||
};
|
||||
});
|
||||
|
||||
gnupg_2_4_0 = prev.gnupg.overrideAttrs(_: rec {
|
||||
gnupg_2_4_0 = prev.gnupg.overrideAttrs (_: rec {
|
||||
pname = "gnupg";
|
||||
# 2.4.1 breaks emacs
|
||||
version = "2.4.0";
|
||||
@ -49,6 +49,24 @@ final: prev: {
|
||||
withTreeSitter = true;
|
||||
};
|
||||
|
||||
python-with-my-packages = let
|
||||
my-python-packages = python-packages:
|
||||
with python-packages; [
|
||||
argcomplete
|
||||
appdirs
|
||||
ipdb
|
||||
ipython
|
||||
numpy
|
||||
openpyxl
|
||||
pip
|
||||
requests
|
||||
tox
|
||||
virtualenv
|
||||
virtualenvwrapper
|
||||
];
|
||||
in
|
||||
final.python311.withPackages my-python-packages;
|
||||
|
||||
# gitea = prev.gitea.overrideAttrs(_: {
|
||||
# src = prev.fetchFromGitHub {
|
||||
# repo = "gitea";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ config, makeEnable, ... }:
|
||||
makeEnable config "modules.plasma" true {
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.xserver = {
|
||||
desktopManager.plasma5.enable = true;
|
||||
displayManager.sddm.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,8 +15,8 @@ let
|
||||
railbird-sf = { id = "5F4FPJM-KRBFVIH-CTTB2NC-7CPVGAM-CONMH2Q-SQPRODO-CWKRFPF-HVN4AAD"; };
|
||||
dean = { id = "RIVW4FP-NZNGGGD-4ET26IC-R6CZHEU-4EBIDHX-U756VWB-W7EM3LE-3YQ6YA3"; };
|
||||
mixos = { id = "7DMMUDT-CO33EMS-LQW65MX-3BVYDBT-ZZWDJC6-SWEF6SW-ICUMWOE-ZC4IBQK"; };
|
||||
strixi-minaj = { id = "DOAEFFI-W6EZY3K-GDUHDLX-6DQPVFC-XU3G65X-5KX6RKK-EMF7ZT7-YKKKOAM"; };
|
||||
strixi-minaj-wsl = { id = "IF76WOS-WVYFAQG-ZZMIT3R-ZR6EQQH-YQP3FGZ-BJ3LJKO-56FK2XA-UREADQM"; };
|
||||
strixi-minaj-wsl = { id = "DOAEFFI-W6EZY3K-GDUHDLX-6DQPVFC-XU3G65X-5KX6RKK-EMF7ZT7-YKKKOAM"; };
|
||||
strixi-minaj = { id = "IF76WOS-WVYFAQG-ZZMIT3R-ZR6EQQH-YQP3FGZ-BJ3LJKO-56FK2XA-UREADQM"; };
|
||||
};
|
||||
allDevices = builtins.attrNames devices;
|
||||
in
|
||||
@ -29,6 +29,12 @@ makeEnable config "modules.syncthing" true {
|
||||
mkdir -p /var/lib/syncthing/railbird
|
||||
'';
|
||||
};
|
||||
systemd.services.syncthing = {
|
||||
serviceConfig = {
|
||||
AmbientCapabilities = "CAP_CHOWN";
|
||||
CapabilityBoundingSet = "CAP_CHOWN";
|
||||
};
|
||||
};
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
settings = {
|
||||
@ -37,11 +43,13 @@ makeEnable config "modules.syncthing" true {
|
||||
sync = {
|
||||
path = "~/sync";
|
||||
devices = allDevices;
|
||||
ignorePerms = true;
|
||||
copyOwnershipFromParent = true;
|
||||
};
|
||||
railbird = {
|
||||
path = "~/railbird";
|
||||
devices = allDevices;
|
||||
ignorePerms = true;
|
||||
copyOwnershipFromParent = true;
|
||||
};
|
||||
};
|
||||
|
||||
@ -27,6 +27,7 @@ in
|
||||
extraGroups = [ "syncthing" "wheel" ];
|
||||
home = "/var/lib/syncthing";
|
||||
createHome = true;
|
||||
openssh.authorizedKeys.keys = [giteaSecret] ++ kanivanKeys;
|
||||
};
|
||||
ivanm = userDefaults // {
|
||||
extraGroups = extraGroupsWithWheel;
|
||||
@ -78,6 +79,11 @@ in
|
||||
name = "micah";
|
||||
openssh.authorizedKeys.keys = kanivanKeys ++ micahKeys;
|
||||
};
|
||||
unprivileged = userDefaults // {
|
||||
extraGroups = ["syncthing"];
|
||||
name = "unprivileged";
|
||||
openssh.authorizedKeys.keys = [giteaSecret] ++ kanivanKeys;
|
||||
};
|
||||
};
|
||||
|
||||
nix.sshServe = {
|
||||
|
||||
@ -16,6 +16,5 @@ makeEnable config "modules.wsl" false {
|
||||
automountPath = "/mnt";
|
||||
startMenuLaunchers = true;
|
||||
nativeSystemd = true;
|
||||
docker-native.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, pkgs, options, inputs, forEachUser, makeEnable, ... }:
|
||||
{ config, pkgs, inputs, forEachUser, makeEnable, ... }:
|
||||
makeEnable config "modules.xmonad" true {
|
||||
nixpkgs.overlays = with inputs; [
|
||||
xmonad.overlay
|
||||
@ -104,7 +104,6 @@ makeEnable config "modules.xmonad" true {
|
||||
};
|
||||
|
||||
settings = {
|
||||
inactive-dim = 0.2;
|
||||
focus-exclude = ["class_g ?= 'rofi'" "class_g ?= 'Steam'"];
|
||||
rounded-corners-exclude = [
|
||||
"! name~=''" # Qtile == empty wm_class..
|
||||
|
||||
Loading…
Reference in New Issue
Block a user