Compare commits
7 commits
1f5a5ae43a
...
f1ee732c7c
| Author | SHA1 | Date | |
|---|---|---|---|
| f1ee732c7c | |||
| 1bf32e0177 | |||
| c69c54d0f9 | |||
| 483552d217 | |||
| ca8707f116 | |||
| 0ec34b24a0 | |||
| 2a4ffdf9a5 |
9 changed files with 28 additions and 46 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,5 +1,4 @@
|
||||||
private/
|
private/
|
||||||
home.nix
|
|
||||||
*.swp
|
*.swp
|
||||||
result
|
result
|
||||||
*.zip
|
*.zip
|
||||||
|
|
|
||||||
30
flake.lock
generated
30
flake.lock
generated
|
|
@ -89,11 +89,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756115622,
|
"lastModified": 1758287904,
|
||||||
"narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=",
|
"narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "bafad29f89e83b2d861b493aa23034ea16595560",
|
"rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -204,11 +204,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756496801,
|
"lastModified": 1759853171,
|
||||||
"narHash": "sha256-IYIsnPy+cJxe8RbDHBrCtfJY0ry2bG2H7WvMcewiGS8=",
|
"narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "77a71380c38fb2a440b4b5881bbc839f6230e1cb",
|
"rev": "1a09eb84fa9e33748432a5253102d01251f72d6d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -295,11 +295,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756245047,
|
"lastModified": 1759582739,
|
||||||
"narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=",
|
"narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7",
|
"rev": "3441b5242af7577230a78ffb03542add264179ab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -311,11 +311,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756386758,
|
"lastModified": 1759733170,
|
||||||
"narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=",
|
"narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dfb2f12e899db4876308eba6d93455ab7da304cd",
|
"rev": "8913c168d1c56dc49a7718685968f38752171c3b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -462,11 +462,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755934250,
|
"lastModified": 1758728421,
|
||||||
"narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=",
|
"narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5",
|
"rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@ let
|
||||||
"gpg"
|
"gpg"
|
||||||
#"gtk"
|
#"gtk"
|
||||||
#"keyring"
|
#"keyring"
|
||||||
"syncthing"
|
|
||||||
"tmux"
|
"tmux"
|
||||||
"xdg"
|
"xdg"
|
||||||
"zsh"
|
"zsh"
|
||||||
|
|
@ -433,7 +432,7 @@ in
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
#services.poweralertd.enable = true;
|
services.syncthing.enable = true;
|
||||||
|
|
||||||
# Let Home Manager install and manage itself.
|
# Let Home Manager install and manage itself.
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
cfg = config.dadada.home.syncthing;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.dadada.home.syncthing = {
|
|
||||||
enable = mkEnableOption "Enable Syncthing config";
|
|
||||||
};
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
services.syncthing = {
|
|
||||||
enable = true;
|
|
||||||
tray = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -35,7 +35,6 @@ in
|
||||||
plugins = [
|
plugins = [
|
||||||
];
|
];
|
||||||
initContent = ''
|
initContent = ''
|
||||||
source ${pkgs.zsh-git-prompt}/share/zsh-git-prompt/zshrc.sh
|
|
||||||
source ${pkgs.fzf}/share/fzf/key-bindings.zsh
|
source ${pkgs.fzf}/share/fzf/key-bindings.zsh
|
||||||
source ${pkgs.fzf}/share/fzf/completion.zsh
|
source ${pkgs.fzf}/share/fzf/completion.zsh
|
||||||
eval "$(repo setup --root ~/src)"
|
eval "$(repo setup --root ~/src)"
|
||||||
|
|
@ -76,7 +75,6 @@ in
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
fzf
|
fzf
|
||||||
eza
|
eza
|
||||||
zsh-git-prompt
|
|
||||||
tmux
|
tmux
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,8 @@ with pkgs;
|
||||||
krita
|
krita
|
||||||
ldns
|
ldns
|
||||||
liboping # oping, ping multiple hosts at once
|
liboping # oping, ping multiple hosts at once
|
||||||
libreoffice
|
# FIXME: broken in nixpkgs
|
||||||
|
#libreoffice
|
||||||
libvirt
|
libvirt
|
||||||
lsof
|
lsof
|
||||||
lynis
|
lynis
|
||||||
|
|
@ -92,6 +93,7 @@ with pkgs;
|
||||||
nodePackages.prettier
|
nodePackages.prettier
|
||||||
map-cmd
|
map-cmd
|
||||||
obs-studio
|
obs-studio
|
||||||
|
obsidian
|
||||||
offlineimap
|
offlineimap
|
||||||
openscad
|
openscad
|
||||||
openssl
|
openssl
|
||||||
|
|
@ -121,7 +123,8 @@ with pkgs;
|
||||||
skim # fzf in Rust
|
skim # fzf in Rust
|
||||||
slurp
|
slurp
|
||||||
socat
|
socat
|
||||||
solvespace
|
# FIXME: broken in nixpkgs
|
||||||
|
#solvespace
|
||||||
spotify
|
spotify
|
||||||
sqlite
|
sqlite
|
||||||
sshfs-fuse
|
sshfs-fuse
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ let
|
||||||
builtins.elem (nixpkgs.lib.getName pkg) [
|
builtins.elem (nixpkgs.lib.getName pkg) [
|
||||||
"aspell-dict-en-science"
|
"aspell-dict-en-science"
|
||||||
"brgenml1lpr"
|
"brgenml1lpr"
|
||||||
|
"obsidian"
|
||||||
"saleae-logic-2"
|
"saleae-logic-2"
|
||||||
"spotify"
|
"spotify"
|
||||||
"steam"
|
"steam"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
{ pkgs, inputs, ... }:
|
{ pkgs, inputs, ... }:
|
||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.sharedModules = pkgs.lib.attrValues inputs.self.hmModules;
|
home-manager.sharedModules = pkgs.lib.attrValues inputs.self.hmModules;
|
||||||
home-manager.users.dadada = inputs.self.hmConfigurations.dadada;
|
home-manager.users.dadada = inputs.self.hmConfigurations.dadada;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -45,9 +45,12 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
|
config.dadada.pkgs.repo-rs
|
||||||
# For debugging and troubleshooting Secure Boot.
|
# For debugging and troubleshooting Secure Boot.
|
||||||
pkgs.sbctl
|
pkgs.sbctl
|
||||||
config.dadada.pkgs.repo-rs
|
# Framework embedded controller interface
|
||||||
|
# FIXME: build broken in nixpkgs
|
||||||
|
#pkgs.fw-ectool
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware = {
|
hardware = {
|
||||||
|
|
@ -60,7 +63,8 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
vaapiVdpau
|
vaapiVdpau
|
||||||
libvdpau-va-gl
|
# FIXME: broken in nixpkgs
|
||||||
|
# libvdpau-va-gl
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue