Compare commits
2 commits
5426a7c526
...
41106623e8
Author | SHA1 | Date | |
---|---|---|---|
Natsu Kagami | 41106623e8 | ||
Natsu Kagami | 47b96aee71 |
20
flake.lock
20
flake.lock
|
@ -235,11 +235,11 @@
|
|||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716076912,
|
||||
"narHash": "sha256-QyHUMRe+VACVzNJF+LTqUoDoKyjWz7NVr+55swFQVL4=",
|
||||
"lastModified": 1719154855,
|
||||
"narHash": "sha256-uLV3PAVG+eZVnfVkRmHABGi7vRW/q8qvDafw3VzmFgk=",
|
||||
"ref": "refs/heads/dtth-fork",
|
||||
"rev": "7fa08d4b6d1cd7f988fcac367a73947e31bdb714",
|
||||
"revCount": 2710,
|
||||
"rev": "97978f4a6556e69b826e15f7d2c3c4079a1c1c47",
|
||||
"revCount": 2662,
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@git.dtth.ch/nki/phanpy?branch=dtth-fork"
|
||||
},
|
||||
|
@ -521,11 +521,11 @@
|
|||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1694529238,
|
||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1123,11 +1123,11 @@
|
|||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1711703276,
|
||||
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
|
||||
"lastModified": 1719075281,
|
||||
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
|
||||
"owner": "nixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
|
||||
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -37,6 +37,7 @@
|
|||
# Enable X11 configuration
|
||||
linux.graphical.type = "wayland";
|
||||
linux.graphical.wallpaper = ./images/pixiv_18776904.png;
|
||||
linux.graphical.defaults.webBrowser = "librewolf.desktop";
|
||||
programs.my-sway.enable = true;
|
||||
programs.my-sway.fontSize = 15.0;
|
||||
programs.my-sway.enableLaptopBars = false;
|
||||
|
|
|
@ -33,11 +33,16 @@ in
|
|||
startup = mkOption {
|
||||
type = types.listOf types.package;
|
||||
description = "List of packages to include in ~/.config/autostart";
|
||||
default = [ ];
|
||||
default = with pkgs; [
|
||||
librewolf
|
||||
thunderbird
|
||||
vesktop
|
||||
premid
|
||||
];
|
||||
};
|
||||
defaults.webBrowser = mkOption {
|
||||
type = types.str;
|
||||
default = "firefox.desktop";
|
||||
default = "librewolf.desktop";
|
||||
description = "Desktop file of the default web browser";
|
||||
};
|
||||
};
|
||||
|
@ -52,7 +57,6 @@ in
|
|||
feh # For images?
|
||||
deluge # Torrent client
|
||||
pavucontrol # PulseAudio control panel
|
||||
firefox
|
||||
cinnamon.nemo # File manager
|
||||
thunderbird # Email
|
||||
sublime-music # For navidrome
|
||||
|
@ -72,9 +76,7 @@ in
|
|||
whatsapp-for-linux
|
||||
obs-studio
|
||||
|
||||
(librewolf.override {
|
||||
nativeMessagingHosts = with pkgs; [ kdePackages.plasma-browser-integration ];
|
||||
})
|
||||
librewolf
|
||||
|
||||
## CLI stuff
|
||||
dex # .desktop file management, startup
|
||||
|
@ -88,12 +90,7 @@ in
|
|||
]));
|
||||
|
||||
nki.programs.discord.enable = pkgs.stdenv.isx86_64;
|
||||
nki.programs.discord.package = pkgs.vesktop.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.nss_latest pkgs.makeWrapper ];
|
||||
postFixup = (attrs.postFixup or "") + ''
|
||||
ln -s $out/bin/vesktop $out/bin/discord
|
||||
'';
|
||||
});
|
||||
nki.programs.discord.package = pkgs.vesktop;
|
||||
|
||||
# Yellow light!
|
||||
services.wlsunset = {
|
||||
|
@ -223,10 +220,8 @@ in
|
|||
source =
|
||||
let
|
||||
srcFile = pkgs.runCommand "${pkg.name}-startup" { } ''
|
||||
mkdir - p $out
|
||||
cp $
|
||||
(ls - d ${
|
||||
pkg}/share/applications/*.desktop | head -n 1) $out/${pkg.name}.desktop
|
||||
mkdir -p $out
|
||||
cp $(ls -d ${pkg}/share/applications/*.desktop | head -n 1) $out/${pkg.name}.desktop
|
||||
'';
|
||||
in
|
||||
"${srcFile}/${pkg.name}.desktop";
|
||||
|
|
|
@ -78,11 +78,6 @@ in
|
|||
description = "The command for the browser";
|
||||
default = "${pkgs.firefox-wayland}/bin/firefox";
|
||||
};
|
||||
discord = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
description = "The command for discord";
|
||||
default = "${config.nki.programs.discord.package}/bin/discord";
|
||||
};
|
||||
|
||||
lockCmd = mkOption {
|
||||
type = types.str;
|
||||
|
@ -164,18 +159,9 @@ in
|
|||
{ command = "${pkgs.dex}/bin/dex -ae sway"; }
|
||||
# Waybar
|
||||
{ command = "systemctl --user restart waybar"; always = true; }
|
||||
# Startup programs
|
||||
{ command = "${cfg.browser}"; }
|
||||
{ command = "thunderbird"; }
|
||||
# IME
|
||||
{ command = "fcitx5"; }
|
||||
] ++ (if cfg.discord != null then [
|
||||
{ command = "${cfg.discord}"; }
|
||||
] ++ lib.lists.optional
|
||||
(!pkgs.stdenv.isAarch64)
|
||||
(
|
||||
{ command = "${pkgs.premid}/bin/premid"; }
|
||||
) else [ ]);
|
||||
];
|
||||
|
||||
### Keybindings
|
||||
#
|
||||
|
|
20
overlay.nix
20
overlay.nix
|
@ -68,10 +68,28 @@ let
|
|||
})
|
||||
];
|
||||
});
|
||||
|
||||
librewolf = (prev.librewolf.override {
|
||||
nativeMessagingHosts = with final; [ kdePackages.plasma-browser-integration ];
|
||||
});
|
||||
|
||||
# Add desktop file to premid
|
||||
premid = final.symlinkJoin {
|
||||
name = prev.premid.name;
|
||||
paths = [
|
||||
prev.premid
|
||||
(final.makeDesktopItem {
|
||||
name = prev.premid.name;
|
||||
desktopName = "PreMID";
|
||||
exec = final.lib.getExe prev.premid;
|
||||
icon = "premid";
|
||||
})
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
overlay-libs = final: prev: {
|
||||
libs.crane = inputs.crane.lib.${prev.system};
|
||||
libs.crane = inputs.crane.mkLib final;
|
||||
};
|
||||
|
||||
overlay-packages = final: prev: {
|
||||
|
|
Loading…
Reference in a new issue