Minimal changes to make 24.05 compile on framework
This commit is contained in:
parent
7d19c95472
commit
1cba13a2e8
GPG key ID:
55A032EB38B49ADB
78
flake.lock
78
flake.lock
|
|
@ -392,22 +392,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_7": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1673956053,
|
||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
|
|
@ -800,16 +784,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710888565,
|
||||
"narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
|
||||
"lastModified": 1716736833,
|
||||
"narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
|
||||
"rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-23.11",
|
||||
"ref": "release-24.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -1087,21 +1071,37 @@
|
|||
},
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1716218643,
|
||||
"narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=",
|
||||
"lastModified": 1716755743,
|
||||
"narHash": "sha256-IwLq4CTHXkEeBUQeVWhmKsX0pZ8snSQi0uPo6JGeQkA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee",
|
||||
"rev": "baf5166949ef8cb8e85e3f940eec53b9c916db64",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-23.11",
|
||||
"ref": "release-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_12": {
|
||||
"locked": {
|
||||
"lastModified": 1713128889,
|
||||
"narHash": "sha256-aB90ZqzosyRDpBh+rILIcyP5lao8SKz8Sr2PSWvZrzk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2748d22b45a99fb2deafa5f11c7531c212b2cefa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_13": {
|
||||
"locked": {
|
||||
"lastModified": 1708118438,
|
||||
"narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
|
||||
|
|
@ -1416,6 +1416,24 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"scenefx": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_12"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715160751,
|
||||
"narHash": "sha256-S8m7phTU7QYgAq4B0hjH5WdtTjHDcNVhYfPFdhbty+A=",
|
||||
"owner": "wlrfx",
|
||||
"repo": "scenefx",
|
||||
"rev": "2ec3505248e819191c37cb831197629f373326fb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "wlrfx",
|
||||
"repo": "scenefx",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"secrets": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_10"
|
||||
|
|
@ -1459,17 +1477,17 @@
|
|||
},
|
||||
"swayfx": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_7",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
],
|
||||
"scenefx": "scenefx"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1704454987,
|
||||
"narHash": "sha256-vGc23vf8C1WIdaUgEs3XqvCU1ag5soQKZnytUsCRpEw=",
|
||||
"lastModified": 1715273144,
|
||||
"narHash": "sha256-x8z/sjtJPojvaXiOUDvADiSU/QmSo8cqKQ1X4g+5dw4=",
|
||||
"owner": "WillPower3309",
|
||||
"repo": "swayfx",
|
||||
"rev": "f0ecffe593574593ec99c104fa12e4bfd593b0f2",
|
||||
"rev": "3c621dec7d653231f960d377fcb3ceeed55953e2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1635,7 +1653,7 @@
|
|||
"inputs": {
|
||||
"crane": "crane_5",
|
||||
"flake-utils": "flake-utils_11",
|
||||
"nixpkgs": "nixpkgs_12"
|
||||
"nixpkgs": "nixpkgs_13"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714147448,
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
description = "nki's systems";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/release-24.05";
|
||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
darwin.url = "github:lnl7/nix-darwin/master";
|
||||
darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
home-manager.url = "github:nix-community/home-manager/release-23.11";
|
||||
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ with lib; {
|
|||
file # Query file type
|
||||
nix-output-monitor
|
||||
|
||||
pinentry-gnome
|
||||
pinentry-gnome3
|
||||
|
||||
# Java stuff
|
||||
jdk21
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ in
|
|||
|
||||
eza = {
|
||||
enable = true;
|
||||
enableAliases = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
|
||||
fzf = {
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ in
|
|||
|
||||
home.file.".gnupg/gpg-agent.conf" = {
|
||||
text = ''
|
||||
pinentry-program ${pkgs.pinentry-gnome}/bin/pinentry-gnome3
|
||||
pinentry-program ${pkgs.pinentry-gnome3}/bin/pinentry-gnome3
|
||||
'';
|
||||
onChange = ''
|
||||
echo "Reloading gpg-agent"
|
||||
|
|
|
|||
|
|
@ -125,6 +125,7 @@ in
|
|||
enable = true;
|
||||
systemd.enable = true;
|
||||
|
||||
checkConfig = false; # Not working atm
|
||||
config = {
|
||||
### Inputs
|
||||
#
|
||||
|
|
@ -349,8 +350,10 @@ in
|
|||
|
||||
'' + (if config.services.gnome-keyring.enable then ''
|
||||
# gnome-keyring
|
||||
eval `gnome-keyring-daemon`
|
||||
export SSH_AUTH_SOCK
|
||||
if type gnome-keyring-daemon >/dev/null; then
|
||||
eval `gnome-keyring-daemon`
|
||||
export SSH_AUTH_SOCK
|
||||
fi
|
||||
'' else "");
|
||||
# Extra
|
||||
wrapperFeatures.base = true;
|
||||
|
|
@ -459,8 +462,9 @@ in
|
|||
spacing = 10;
|
||||
};
|
||||
"clock" = {
|
||||
format = "{:📅 %Y-%m-%d | 🕰️ %H:%M [%Z]}";
|
||||
tooltip-format = "\n<span size='9pt' font='Noto Sans Mono CJK JP'>{calendar}</span>";
|
||||
# format = "{:📅 %Y-%m-%d | 🕰️ %H:%M [%Z]}";
|
||||
format = "📅 {0:%Y-%m-%d} |️ 🕰️ {0:%H:%M [%Z]}";
|
||||
tooltip-format = "\n<span size='9pt' font_family='Noto Sans Mono CJK JP'>{calendar}</span>";
|
||||
timezones = [
|
||||
"Europe/Zurich"
|
||||
"America/Toronto"
|
||||
|
|
@ -477,7 +481,7 @@ in
|
|||
months = "<span color='#ffead3'><b>{}</b></span>";
|
||||
days = "<span color='#ecc6d9'><b>{}</b></span>";
|
||||
weeks = "<span color='#99ffdd'><b>W{}</b></span>";
|
||||
weekdays = "<span color='#ffcc66'><b>{}</b></span>";
|
||||
weekdays = "<span color='#ffcc66'><b>日 月 火 水 木 金 土</b></span>"; # See https://github.com/Alexays/Waybar/issues/3132
|
||||
today = "<span color='#ff6699'><b><u>{}</u></b></span>";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -65,13 +65,13 @@ let
|
|||
};
|
||||
|
||||
rt-audio = { pkgs, ... }: mkIf cfg.enable {
|
||||
services.pipewire.lowLatency = {
|
||||
# enable this module
|
||||
enable = true;
|
||||
# defaults (no need to be set unless modified)
|
||||
quantum = 32;
|
||||
rate = 48000;
|
||||
};
|
||||
# services.pipewire.lowLatency = {
|
||||
# # enable this module
|
||||
# enable = true;
|
||||
# # defaults (no need to be set unless modified)
|
||||
# quantum = 32;
|
||||
# rate = 48000;
|
||||
# };
|
||||
security.rtkit.enable = true;
|
||||
|
||||
# Real time configurations
|
||||
|
|
@ -305,11 +305,11 @@ in
|
|||
xdg.portal = {
|
||||
enable = true;
|
||||
wlr.enable = true;
|
||||
xdgOpenUsePortal = true;
|
||||
# gtk portal needed to make gtk apps happy
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||
|
||||
config.common.default = [ "gtk" ];
|
||||
config.common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
|
||||
config.sway."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
|
||||
config.sway.default = [ "wlr" "gtk" ];
|
||||
};
|
||||
# D-Bus
|
||||
|
|
|
|||
|
|
@ -15,7 +15,10 @@
|
|||
../modules/services/edns
|
||||
];
|
||||
|
||||
services.xserver.desktopManager.plasma5.enable = true;
|
||||
# services.xserver.enable = true;
|
||||
# services.xserver.displayManager.sddm.enable = true;
|
||||
# services.xserver.displayManager.sddm.wayland.enable = true;
|
||||
services.xserver.desktopManager.plasma6.enable = true;
|
||||
|
||||
# Power Management
|
||||
services.upower = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue