tdpeuter/sisyphus
tdpeuter/sisyphus
1
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Update to 23.05

Browse source
This commit is contained in:
Tibo De Peuter 2023-06-17 10:01:00 +02:00
parent eb33decd87
commit b46612d8fd
7 changed files with 86 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
nixos/flake.lock
View file

@ -43,53 +43,50 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1685325875,
"narHash": "sha256-tevlLIMPeVNNYPd9UgjHApAUoFAnw9iohqUyj+LPp88=",
"lastModified": 1686693375,
"narHash": "sha256-1Smjo0E8WI9PeVGmmCjpQWRX04aQvz5gAGXfdanIjgw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b372d7f8d5518aaba8a4058a453957460481afbc",
"rev": "61e5d1c38ef04ba30a9119825b159bce9c6010be",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-22.11",
"ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1686476475,
"narHash": "sha256-W9yUePvCSDghn+YUXewuodyPxt+kJl/a7zdY4Q6r4MU=",
"lastModified": 1686736559,
"narHash": "sha256-YyUSVoOKIDAscTx7IZhF9x3qgZ9dPNF19fKk+4c5irc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "eef86b8a942913a828b9ef13722835f359deef29",
"rev": "ddf4688dc7aeb14e8a3c549cb6aa6337f187a884",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-22.11",
"ref": "nixos-23.05",
"type": "indirect"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1686392259,
"narHash": "sha256-hqSS9hKhWldIZr1bBp9xKhIznnGPICGKzuehd2LH0UA=",
"lastModified": 1686885751,
"narHash": "sha256-KcbYp2KuKbXgNaYVziwKUc6AKRhgJ1G8Qq5gjAbQ3uw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ef24b2fa0c5f290a35064b847bc211f25cb85c88",
"rev": "aa4b53f79d961a7cbba0b24f791401a34c18011a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-22.11",
"ref": "release-23.05",
"repo": "nixpkgs",
"type": "github"
}
@ -112,11 +109,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1686453485,
"narHash": "sha256-75iPAcS6xuw4SNfqLmFCi9wWG1JmDNKaC8l3WJUkmDk=",
"lastModified": 1686902322,
"narHash": "sha256-Vogj2MsipA+Uzr0M3d8300JeKQDHhPy6NEuTQXVdWu0=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "cb85e297937af1bd1434cf5f85a3f86a21dc8207",
"rev": "1e2bae54870a06aa9364f8d33a5b9a0869d792fc",
"type": "github"
},
"original": {

4
nixos/flake.nix
View file

@ -2,7 +2,7 @@
description = "System configuration of my machines using flakes";
inputs = {
nixpkgs.url = "nixpkgs/nixos-22.11";
nixpkgs.url = "nixpkgs/nixos-23.05";
devshell = {
url = "github:numtide/devshell";
@ -13,7 +13,7 @@
};
flake-utils.url = "github:numtide/flake-utils";
home-manager = {
url = "github:nix-community/home-manager/release-22.11";
url = "github:nix-community/home-manager/release-23.05";
inputs = {
nixpkgs.follows = "nixpkgs";
utils.follows = "flake-utils";

8
nixos/hosts/Tibo-NixDesk/default.nix
View file

@ -68,11 +68,5 @@
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.11"; # Did you read the comment?
system.stateVersion = "23.05";
}

2
nixos/modules/apps/default.nix
View file

@ -13,7 +13,7 @@
caprine-bin
discord
jellyfin-media-player
libreoffice-fresh-unwrapped
libreoffice-fresh
mattermost-desktop
nextcloud-client
obsidian

3
nixos/modules/default.nix
View file

@ -23,7 +23,6 @@
packages = with pkgs; [
home-manager
];
shell = pkgs.zsh;
};
home-manager.useGlobalPkgs = true;
@ -32,7 +31,7 @@
home = {
username = "tdpeuter";
homeDirectory = "/home/tdpeuter";
stateVersion = "22.11";
stateVersion = "23.05";
packages = with pkgs; [
gnupg

127
nixos/modules/shells/zsh/default.nix
View file

@ -1,67 +1,70 @@
{ config, lib, pkgs, ... }:
{
home-manager.users.tdpeuter = { pkgs, ... }: {
home = {
packages = with pkgs; [
font-awesome
];
file = {
".oh-my-zsh".source = ../../../../stow/zsh/.oh-my-zsh;
};
};
programs.zsh = {
enable = true;
enableAutosuggestions = true;
enableSyntaxHighlighting = true;
history = {
expireDuplicatesFirst = true;
extended = true;
};
initExtra = ''
eval "$(direnv hook zsh)"
'';
oh-my-zsh = {
enable = true;
custom = "$HOME/.oh-my-zsh";
plugins = [
"dirhistory"
"git"
"screen"
];
theme = "mrfortem";
};
plugins = [
{
name = "cmdtime";
src = pkgs.fetchFromGitHub {
owner = "tom-auger";
repo = "cmdtime";
rev = "ffc72641dcfa0ee6666ceb1dc712b61be30a1e8b";
hash = "sha256-v6wCfNoPXDD3sS6yUYE6lre8Ir1yJcLGoAW3O8sUOCg=";
};
}
];
shellAliases = {
cp = "cp -i"; # Confirm before overwriting something
df = "df -h";
free = "free -m";
ll = "ls -la";
np = "nano -w PKGBUILD";
more = "less";
hgrep = "history | grep";
gs = "git status";
update = ''
pushd ~/projects/sisyphus/nixos
nix flake update
sudo nixos-rebuild switch --flake .# --show-trace
popd
'';
};
};
programs.zsh.enable = true;
users.users.tdpeuter.shell = pkgs.zsh;
home-manager.users.tdpeuter = { pkgs, ... }: {
home = {
packages = with pkgs; [
font-awesome
];
file = {
".oh-my-zsh".source = ../../../../stow/zsh/.oh-my-zsh;
};
};
programs.zsh = {
enable = true;
enableAutosuggestions = true;
enableSyntaxHighlighting = true;
history = {
expireDuplicatesFirst = true;
extended = true;
};
initExtra = ''
eval "$(direnv hook zsh)"
'';
oh-my-zsh = {
enable = true;
custom = "$HOME/.oh-my-zsh";
plugins = [
"dirhistory"
"git"
"screen"
];
theme = "mrfortem";
};
plugins = [
{
name = "cmdtime";
src = pkgs.fetchFromGitHub {
owner = "tom-auger";
repo = "cmdtime";
rev = "ffc72641dcfa0ee6666ceb1dc712b61be30a1e8b";
hash = "sha256-v6wCfNoPXDD3sS6yUYE6lre8Ir1yJcLGoAW3O8sUOCg=";
};
}
];
shellAliases = {
cp = "cp -i"; # Confirm before overwriting something
df = "df -h";
free = "free -m";
ll = "ls -la";
np = "nano -w PKGBUILD";
more = "less";
hgrep = "history | grep";
gs = "git status";
update = ''
pushd ~/projects/sisyphus/nixos
nix flake update
sudo nixos-rebuild switch --flake .# --show-trace
popd
'';
};
};
};
}

2
stow/alacritty/.config/alacritty/alacritty.yml
View file

@ -91,7 +91,7 @@ window:
#
# Override the variant of the GTK theme. Commonly supported values are `dark`
# and `light`. Set this to `None` to use the default theme variant.
decorations_theme_variant: dark
decorations_theme_variant: Dark
#scrolling:
# Maximum number of lines in the scrollback buffer.