Compare commits
16 Commits
fix-odysse
...
65a55e1695
Author | SHA1 | Date | |
---|---|---|---|
65a55e1695
|
|||
ecef5d13a7
|
|||
9794d5eb0c
|
|||
8562ccd5fc
|
|||
b3ef72d975
|
|||
cf40b4d4d3
|
|||
f64ed2bb24
|
|||
f9b577f559
|
|||
b3882912ec
|
|||
d78db40991
|
|||
07362a0c81
|
|||
7865add65e
|
|||
9471a92387
|
|||
a4f0cabeda
|
|||
f581772723
|
|||
357c3e8c10
|
22
flake.lock
generated
22
flake.lock
generated
@@ -3,11 +3,11 @@
|
|||||||
"firefox-gnome-theme": {
|
"firefox-gnome-theme": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699621711,
|
"lastModified": 1701359680,
|
||||||
"narHash": "sha256-GUvBQbagF/7W1AriPVvJYA1cmk9Y/iWXghj3cIFYQzU=",
|
"narHash": "sha256-wyxQPiyg5GB9NEzeA/YCpsX47UCqCDw1Beg+0tKmdJs=",
|
||||||
"owner": "rafaelmardojai",
|
"owner": "rafaelmardojai",
|
||||||
"repo": "firefox-gnome-theme",
|
"repo": "firefox-gnome-theme",
|
||||||
"rev": "1c32013cdbe17406de496cdf5f6899b84c4bbfed",
|
"rev": "538698cc08dc031facc7983ded3f1d76e658e702",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -23,32 +23,32 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699748081,
|
"lastModified": 1700814205,
|
||||||
"narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=",
|
"narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "04bac349d585c9df38d78e0285b780a140dc74a4",
|
"rev": "aeb2232d7a32530d3448318790534d196bf9427a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-23.05",
|
"ref": "release-23.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700097215,
|
"lastModified": 1701263465,
|
||||||
"narHash": "sha256-ODQ3gBTv1iHd7lG21H+ErVISB5wVeOhd/dEogOqHs/I=",
|
"narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9fb122519e9cd465d532f736a98c1e1eb541ef6f",
|
"rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"id": "nixpkgs",
|
||||||
"ref": "nixos-23.05",
|
"ref": "nixos-23.11",
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@@ -2,9 +2,9 @@
|
|||||||
description = "NixOS/Darwin system configuration";
|
description = "NixOS/Darwin system configuration";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-23.05";
|
nixpkgs.url = "nixpkgs/nixos-23.11";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-23.05";
|
url = "github:nix-community/home-manager/release-23.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
firefox-gnome-theme = {
|
firefox-gnome-theme = {
|
||||||
|
@@ -46,20 +46,27 @@ with lib.my;
|
|||||||
neovim
|
neovim
|
||||||
];
|
];
|
||||||
|
|
||||||
nix.settings = {
|
nix = {
|
||||||
connect-timeout = 5;
|
settings = {
|
||||||
log-lines = 25;
|
connect-timeout = 5;
|
||||||
min-free = 128000000;
|
log-lines = 25;
|
||||||
max-free = 1000000000;
|
min-free = 128000000;
|
||||||
fallback = true;
|
max-free = 1000000000;
|
||||||
auto-optimise-store = true;
|
fallback = true;
|
||||||
substituters = [
|
auto-optimise-store = true;
|
||||||
"http://odyssey.mesh.vimium.net"
|
substituters = [
|
||||||
"https://cache.nixos.org"
|
"http://odyssey.mesh.vimium.net"
|
||||||
];
|
"https://cache.nixos.org"
|
||||||
trusted-public-keys = [
|
];
|
||||||
"odyssey.mesh.vimium.net:ZhQhjscPWjoN4rlZwoMELznEiBnZ9O26iyGA27ibilQ="
|
trusted-public-keys = [
|
||||||
];
|
"odyssey.mesh.vimium.net:ZhQhjscPWjoN4rlZwoMELznEiBnZ9O26iyGA27ibilQ="
|
||||||
|
];
|
||||||
|
};
|
||||||
|
gc = {
|
||||||
|
automatic = true;
|
||||||
|
dates = "weekly";
|
||||||
|
options = "-d --delete-older-than 7d";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
modules.desktop.gnome.enable = true;
|
modules.desktop.gnome.enable = true;
|
||||||
|
@@ -48,6 +48,7 @@ with lib.my;
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
virtualisation.libvirtd.enable = true;
|
virtualisation.libvirtd.enable = true;
|
||||||
|
virtualisation.lxd.enable = true;
|
||||||
|
|
||||||
users.defaultUserShell = pkgs.zsh;
|
users.defaultUserShell = pkgs.zsh;
|
||||||
|
|
||||||
|
@@ -25,6 +25,7 @@ in {
|
|||||||
|
|
||||||
hardware.nvidia = {
|
hardware.nvidia = {
|
||||||
modesetting.enable = true;
|
modesetting.enable = true;
|
||||||
|
open = true;
|
||||||
powerManagement.enable = true;
|
powerManagement.enable = true;
|
||||||
};
|
};
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
@@ -44,11 +45,6 @@ in {
|
|||||||
fsType = "zfs";
|
fsType = "zfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/nix" =
|
|
||||||
{ device = "rpool/local/nix";
|
|
||||||
fsType = "zfs";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/tmp" =
|
fileSystems."/tmp" =
|
||||||
{ device = "rpool/local/tmp";
|
{ device = "rpool/local/tmp";
|
||||||
fsType = "zfs";
|
fsType = "zfs";
|
||||||
|
@@ -34,6 +34,17 @@ with lib.my;
|
|||||||
neovim
|
neovim
|
||||||
];
|
];
|
||||||
|
|
||||||
|
nix = {
|
||||||
|
settings = {
|
||||||
|
auto-optimise-store = true;
|
||||||
|
};
|
||||||
|
gc = {
|
||||||
|
automatic = true;
|
||||||
|
dates = "weekly";
|
||||||
|
options = "-d --delete-older-than 7d";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
modules.networking.tailscale = {
|
modules.networking.tailscale = {
|
||||||
enable = true;
|
enable = true;
|
||||||
restrictSSH = false;
|
restrictSSH = false;
|
||||||
|
@@ -26,10 +26,11 @@ in {
|
|||||||
'';
|
'';
|
||||||
settings = {
|
settings = {
|
||||||
## GNOME theme
|
## GNOME theme
|
||||||
"toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Enable customChrome.cs
|
"toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Enable customChrome.css
|
||||||
"browser.uidensity" = 0; # Set UI density to normal
|
"browser.uidensity" = 0; # Set UI density to normal
|
||||||
"svg.context-properties.content.enabled" = true; # Enable SVG context-propertes
|
"svg.context-properties.content.enabled" = true; # Enable SVG context-propertes
|
||||||
"browser.theme.dark-private-windows" = false; # Disable private window dark theme
|
"browser.theme.dark-private-windows" = false; # Disable private window dark theme
|
||||||
|
"widget.gtk.rounded-bottom-corners.enabled" = true; # Enable rounded bottom window corners
|
||||||
|
|
||||||
## Preferences
|
## Preferences
|
||||||
"browser.ctrlTab.sortByRecentlyUsed" = true;
|
"browser.ctrlTab.sortByRecentlyUsed" = true;
|
||||||
|
@@ -33,13 +33,14 @@ in {
|
|||||||
# "desktop-cube@schneegans.github.com"
|
# "desktop-cube@schneegans.github.com"
|
||||||
# "desktop-zoom@colin.kinlo.ch"
|
# "desktop-zoom@colin.kinlo.ch"
|
||||||
"espresso@coadmunkee.github.com"
|
"espresso@coadmunkee.github.com"
|
||||||
"flypie@schneegans.github.com"
|
# "flypie@schneegans.github.com"
|
||||||
# "forge@jmmaranan.com"
|
# "forge@jmmaranan.com"
|
||||||
"hue-lights@chlumskyvaclav@gmail.com"
|
"hue-lights@chlumskyvaclav@gmail.com"
|
||||||
"just-perfection-desktop@just-perfection"
|
"just-perfection-desktop@just-perfection"
|
||||||
"paperwm@hedning:matrix.org"
|
# "pano@elhan.io"
|
||||||
|
# "paperwm@hedning:matrix.org"
|
||||||
# "search-light@icedman.github.com"
|
# "search-light@icedman.github.com"
|
||||||
# "space-bar@luchrioh"
|
"space-bar@luchrioh"
|
||||||
# "smart-auto-move@khimaros.com"
|
# "smart-auto-move@khimaros.com"
|
||||||
# "systemd-manager@hardpixel.eu"
|
# "systemd-manager@hardpixel.eu"
|
||||||
# "tailscale-status@maxgallup.github.com"
|
# "tailscale-status@maxgallup.github.com"
|
||||||
@@ -103,8 +104,8 @@ in {
|
|||||||
window-gap = 8;
|
window-gap = 8;
|
||||||
};
|
};
|
||||||
"org/gnome/desktop/background" = {
|
"org/gnome/desktop/background" = {
|
||||||
picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-l.webp";
|
picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-l.jpg";
|
||||||
picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-d.webp";
|
picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-d.jpg";
|
||||||
};
|
};
|
||||||
"org/gtk/settings/file-chooser" = {
|
"org/gtk/settings/file-chooser" = {
|
||||||
show-hidden = true;
|
show-hidden = true;
|
||||||
@@ -123,9 +124,6 @@ in {
|
|||||||
"<Shift>F11"
|
"<Shift>F11"
|
||||||
"XF86AudioLowerVolume"
|
"XF86AudioLowerVolume"
|
||||||
];
|
];
|
||||||
screensaver = [
|
|
||||||
"<Shift><Super>l"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
"org/gnome/gnome-session" = {
|
"org/gnome/gnome-session" = {
|
||||||
auto-save-session = true;
|
auto-save-session = true;
|
||||||
@@ -154,7 +152,7 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
fonts.fonts = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
noto-fonts
|
noto-fonts
|
||||||
ubuntu_font_family
|
ubuntu_font_family
|
||||||
];
|
];
|
||||||
@@ -169,6 +167,7 @@ in {
|
|||||||
bmon
|
bmon
|
||||||
fd
|
fd
|
||||||
ffmpeg
|
ffmpeg
|
||||||
|
fragments
|
||||||
gnome.gnome-boxes
|
gnome.gnome-boxes
|
||||||
gnomeExtensions.another-window-session-manager
|
gnomeExtensions.another-window-session-manager
|
||||||
# gnomeExtensions.bifocals
|
# gnomeExtensions.bifocals
|
||||||
@@ -184,6 +183,7 @@ in {
|
|||||||
gnomeExtensions.hue-lights
|
gnomeExtensions.hue-lights
|
||||||
gnomeExtensions.just-perfection
|
gnomeExtensions.just-perfection
|
||||||
# gnomeExtensions.mutter-primary-gpu
|
# gnomeExtensions.mutter-primary-gpu
|
||||||
|
gnomeExtensions.pano
|
||||||
gnomeExtensions.paperwm
|
gnomeExtensions.paperwm
|
||||||
# gnomeExtensions.pip-on-top
|
# gnomeExtensions.pip-on-top
|
||||||
gnomeExtensions.search-light
|
gnomeExtensions.search-light
|
||||||
@@ -198,6 +198,7 @@ in {
|
|||||||
# gnomeExtensions.worksets
|
# gnomeExtensions.worksets
|
||||||
# gnomeExtensions.workspace-matrix
|
# gnomeExtensions.workspace-matrix
|
||||||
iotop
|
iotop
|
||||||
|
mission-center
|
||||||
ripgrep
|
ripgrep
|
||||||
rsync
|
rsync
|
||||||
tcpdump
|
tcpdump
|
||||||
|
@@ -36,7 +36,7 @@ with lib.my;
|
|||||||
in {
|
in {
|
||||||
inherit name;
|
inherit name;
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "networkmanager" "wheel" ];
|
extraGroups = [ "networkmanager" "wheel" "lxd" ];
|
||||||
description = "Jordan Holt";
|
description = "Jordan Holt";
|
||||||
useDefaultShell = true;
|
useDefaultShell = true;
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
|
@@ -3,8 +3,8 @@ self: super:
|
|||||||
gnome = super.gnome.overrideScope' (gself: gsuper: {
|
gnome = super.gnome.overrideScope' (gself: gsuper: {
|
||||||
mutter = gsuper.mutter.overrideAttrs (oldAttrs: {
|
mutter = gsuper.mutter.overrideAttrs (oldAttrs: {
|
||||||
src = super.fetchurl {
|
src = super.fetchurl {
|
||||||
url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-44/mutter-triple-buffering-v4-44.tar.gz";
|
url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-45/mutter-triple-buffering-v4-45.tar.gz";
|
||||||
sha256 = "UhCbdAh5AtYWTi0GX8RmexUAS0nbvISPuErX/8NTdoA=";
|
sha256 = "E+AdsQdotqlH/kYskl+Fwv0i+UTK7mfdkJ+zlfLdU9o=";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
Reference in New Issue
Block a user