yes
This commit is contained in:
parent
0eb34021ac
commit
91b17f861a
@ -3,11 +3,12 @@
|
|||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
nixpkgs-2405.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
|
|
||||||
home.url = "github:nix-community/home-manager";
|
home.url = "github:nix-community/home-manager";
|
||||||
home.inputs.nixpkgs.follows = "nixpkgs";
|
home.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme"; flake = false; };
|
firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme/v133"; flake = false; };
|
||||||
firefox-macos-theme = {url = "github:AdamXweb/WhiteSurFirefoxThemeMacOS"; flake = false; };
|
firefox-macos-theme = {url = "github:AdamXweb/WhiteSurFirefoxThemeMacOS"; flake = false; };
|
||||||
firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; };
|
firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||||
|
|
||||||
@ -15,7 +16,7 @@
|
|||||||
mac-app-util.url = "github:hraban/mac-app-util";
|
mac-app-util.url = "github:hraban/mac-app-util";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, home, firefox-gnome-theme, firefox-addons, nur, nix-darwin, firefox-macos-theme, mac-app-util }@inputs: {
|
outputs = { self, nixpkgs, home, firefox-gnome-theme, firefox-addons, nur, nix-darwin, firefox-macos-theme, mac-app-util, nixpkgs-2405 }@inputs: {
|
||||||
nixosConfigurations.iota = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.iota = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
|
8
home.nix
8
home.nix
@ -45,9 +45,15 @@
|
|||||||
zip
|
zip
|
||||||
coreutils
|
coreutils
|
||||||
zotero
|
zotero
|
||||||
|
ollama
|
||||||
|
inputs.nixpkgs-2405.legacyPackages.${system}.signal-desktop-beta
|
||||||
|
|
||||||
|
|
||||||
# fonts
|
# fonts
|
||||||
(nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
|
nerd-fonts.fira-code
|
||||||
|
nerd-fonts.fira-mono
|
||||||
|
nerd-fonts.droid-sans-mono
|
||||||
|
borg-sans-mono
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk-sans
|
||||||
noto-fonts-emoji
|
noto-fonts-emoji
|
||||||
|
10
nixos.nix
10
nixos.nix
@ -7,7 +7,7 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
package = pkgs.nixFlakes;
|
package = pkgs.nixVersions.stable;
|
||||||
extraOptions = ''
|
extraOptions = ''
|
||||||
experimental-features = nix-command flakes
|
experimental-features = nix-command flakes
|
||||||
'';
|
'';
|
||||||
@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
|
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
services.wg-netmanager.enable = true;
|
||||||
|
|
||||||
time.timeZone = "Europe/Amsterdam";
|
time.timeZone = "Europe/Amsterdam";
|
||||||
|
|
||||||
@ -47,7 +48,6 @@
|
|||||||
|
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
|
||||||
sound.enable = true;
|
|
||||||
hardware.pulseaudio.enable = false;
|
hardware.pulseaudio.enable = false;
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
@ -91,7 +91,7 @@
|
|||||||
udev
|
udev
|
||||||
usbutils
|
usbutils
|
||||||
|
|
||||||
gnome.gnome-tweaks
|
gnome-tweaks
|
||||||
gnomeExtensions.tray-icons-reloaded
|
gnomeExtensions.tray-icons-reloaded
|
||||||
|
|
||||||
gnomeExtensions.clipboard-history
|
gnomeExtensions.clipboard-history
|
||||||
@ -101,11 +101,11 @@
|
|||||||
aspell
|
aspell
|
||||||
aspellDicts.en
|
aspellDicts.en
|
||||||
aspellDicts.nl
|
aspellDicts.nl
|
||||||
gnome.networkmanager-openvpn
|
networkmanager-openvpn
|
||||||
];
|
];
|
||||||
|
|
||||||
services.udev.packages = with pkgs; [
|
services.udev.packages = with pkgs; [
|
||||||
gnome.gnome-settings-daemon
|
gnome-settings-daemon
|
||||||
android-udev-rules
|
android-udev-rules
|
||||||
];
|
];
|
||||||
services.fprintd.enable = true;
|
services.fprintd.enable = true;
|
||||||
|
@ -85,4 +85,4 @@
|
|||||||
"picture-uri" = "${config.home.homeDirectory}/.background-image";
|
"picture-uri" = "${config.home.homeDirectory}/.background-image";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -44,13 +44,20 @@
|
|||||||
free = "free -h";
|
free = "free -h";
|
||||||
toupper = "tr [:lower:] [:upper:]";
|
toupper = "tr [:lower:] [:upper:]";
|
||||||
tolower = "tr [:upper:] [:lower:]";
|
tolower = "tr [:upper:] [:lower:]";
|
||||||
rebuild = if (os == "linux") then ''
|
rebuild = if (os == "linux") then ''
|
||||||
nixos-rebuild switch --flake "path:$HOME/.local/os#" --use-remote-sudo
|
cd $HOME/.local/os &&
|
||||||
|
nix flake update --commit-lock-file
|
||||||
|
nixos-rebuild switch --flake "path:$HOME/.local/os#" --use-remote-sudo &&
|
||||||
|
cd -
|
||||||
'' else ''
|
'' else ''
|
||||||
home-manager switch
|
cd $HOME/.local/os &&
|
||||||
|
nix flake update --commit-lock-file
|
||||||
|
home-manager switch &&
|
||||||
|
cd -
|
||||||
'';
|
'';
|
||||||
":r" = "!!";
|
":r" = "!!";
|
||||||
":wq" = "exit";
|
":wq" = "exit";
|
||||||
|
vim = "hx";
|
||||||
};
|
};
|
||||||
programs.bash.sessionVariables = {
|
programs.bash.sessionVariables = {
|
||||||
NIX_SHELL_PRESERVE_PROMPT = 1;
|
NIX_SHELL_PRESERVE_PROMPT = 1;
|
||||||
|
@ -48,6 +48,7 @@
|
|||||||
consent-o-matic
|
consent-o-matic
|
||||||
sponsorblock
|
sponsorblock
|
||||||
multi-account-containers
|
multi-account-containers
|
||||||
|
privacy-redirect
|
||||||
] ++ (if (os == "darwin") then [
|
] ++ (if (os == "darwin") then [
|
||||||
onepassword-password-manager
|
onepassword-password-manager
|
||||||
] else [
|
] else [
|
||||||
@ -55,6 +56,7 @@
|
|||||||
h264ify
|
h264ify
|
||||||
fediact
|
fediact
|
||||||
tampermonkey
|
tampermonkey
|
||||||
|
laboratory-by-mozilla
|
||||||
]);
|
]);
|
||||||
search = {
|
search = {
|
||||||
default = "DuckDuckGo";
|
default = "DuckDuckGo";
|
||||||
@ -92,4 +94,4 @@
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
Loading…
Reference in New Issue
Block a user