dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: switch to sway, qt theme, hydrus

Browse Source
This commit is contained in:
dusk 2021-03-26 21:03:40 +03:00
parent bad4c70d05
commit 4a8e7928aa
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
8 changed files with 99 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock
View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"cachix": { "cachix": {
"locked": { "locked": {
"lastModified": 1616195052, "lastModified": 1616305499,
"narHash": "sha256-NEPifITZU/xgUbUCA+rD7TgYstLYY6cT+XXW2Kez5Po=", "narHash": "sha256-WArUDrAuqq9jNLNJI0hBClleALaCysA40WBbQHQlqLg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "941664919391c66997c08ee58a98af55eee32d50", "rev": "9b8530e3721fc008bacac61b6c50a29712ee2f2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +23,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1616106770, "lastModified": 1616724076,
"narHash": "sha256-Is3w00c8NM8q/AReQI5l4AN3mn9mcTYEEU/CeG1tmZU=", "narHash": "sha256-SwbPXLjN2sLy4NL/GhodiJrdkIVZwGGTGiCN3JxH1cU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f30b62a74d05e055208bea448442b9fc483e9fa5", "rev": "fedfd430f96695997b3eaf8d7e82ca79406afa23",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -74,11 +74,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1616174264, "lastModified": 1616527350,
"narHash": "sha256-88Pu2xh1p2tixNxdijfqoCqq9ymkEx0d6jc7ycWavLo=", "narHash": "sha256-VkMevY2WLU+K7T/P4wVj18Ms8zyeRfp05ILf556m5Y8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f5e8bdd07d1afaabf6b37afc5497b1e498b8046f", "rev": "d3f7e969b9860fb80750147aeb56dab1c730e756",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -99,11 +99,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1616249271, "lastModified": 1616432821,
"narHash": "sha256-KB0VogS1tn0lPiRxVqhIANwhlJ29RH7XqDDUWjQUAbA=", "narHash": "sha256-dOUdRvpiMZ5rEmvcOzymhKJ73n6dJ/W02zuiM3SpK1U=",
"owner": "colemickens", "owner": "colemickens",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "6309b395adf59d4827545b66a4aadae33174a96e", "rev": "af1894dceaf8ba472750a37cb601a9d935b1ae9c",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
hosts/lungmen.nix
View File

@ -42,7 +42,7 @@ in
nixosPersistence nixosPersistence
]; ];
systemd.additionalUpstreamSystemUnits = [ "tmp.mount" ]; #systemd.additionalUpstreamSystemUnits = [ "tmp.mount" ];
boot = { boot = {
loader = { loader = {
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
@ -195,7 +195,10 @@ in
''; '';
}; };
}; };
virtualisation.podman.enable = true; virtualisation = {
podman.enable = true;
libvirtd.enable = true;
};
system.stateVersion = "20.09"; system.stateVersion = "20.09";
} }

2
local/locale.nix
View File

@ -1,6 +1,6 @@
{ ... }: { { ... }: {
console.keyMap = "trq"; console.keyMap = "trq";
i18n.defaultLocale = "tr_TR.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
time.timeZone = "Turkey"; time.timeZone = "Turkey";
services.xserver.layout = "tr"; services.xserver.layout = "tr";
} }

2
overlays/hikari.nix
View File

@ -2,7 +2,7 @@ final: prev: {
hikari = prev.hikari.overrideAttrs (old: rec { hikari = prev.hikari.overrideAttrs (old: rec {
src = prev.fetchzip { src = prev.fetchzip {
url = "https://hub.darcs.net/raichoo/hikari/dist/hikari.zip"; url = "https://hub.darcs.net/raichoo/hikari/dist/hikari.zip";
sha256 = "sha256-oVqn8rd9ajF0eS1D+L2Fw9n1MGuRzQbyWPYFueWF+hk="; sha256 = "sha256-c7i/lekoS8FcsAHwXUw5IojC1xWS+sNeLVOzMf+dA5Q=";
}; };
buildInputs = old.buildInputs ++ [ prev.pandoc ]; buildInputs = old.buildInputs ++ [ prev.pandoc ];
}); });

12
overlays/hydrus.nix Normal file
View File

@ -0,0 +1,12 @@
final: prev: {
hydrus = prev.hydrus.overrideAttrs (old: rec {
pname = "hydrus";
version = "433";
src = prev.fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "v433";
sha256 = "sha256-RZKmtVSCkMuJxuGGgk92J0Y71aHRZYsaBmUZy/gC9Ms=";
};
});
}

25
overlays/phantom.nix Normal file
View File

@ -0,0 +1,25 @@
final: prev: {
phantomstyle = prev.stdenv.mkDerivation {
pname = "phantomstyle";
version = "6e9580b";
src = builtins.fetchGit {
url = "https://github.com/randrew/phantomstyle.git";
rev = "6e9580b72e372b5acecd616434eaf441bf73bcf4";
};
dontWrapQtApps = true;
buildInputs = [ prev.libsForQt5.qt5.qtbase ];
buildPhase = ''
cd src/styleplugin
qmake && make
'';
installPhase = ''
mkdir -p $out/$qtPluginPrefix/styles
mv libphantomstyleplugin.so $out/$qtPluginPrefix/styles
'';
};
}

8
users/patriot/default.nix
View File

@ -41,13 +41,13 @@
xserver = { xserver = {
enable = true; enable = true;
desktopManager = { desktopManager = {
plasma5.enable = true; plasma5.enable = false;
gnome3.enable = false; gnome3.enable = false;
xterm.enable = false; xterm.enable = false;
}; };
displayManager = { displayManager = {
autoLogin = { autoLogin = {
enable = true; enable = false;
user = "patriot"; user = "patriot";
}; };
lightdm.enable = false; lightdm.enable = false;
@ -55,8 +55,8 @@
enable = false; enable = false;
wayland = true; wayland = true;
}; };
sddm.enable = true; sddm.enable = false;
startx.enable = false; startx.enable = true;
}; };
}; };
}; };

70
users/patriot/home.nix
View File

@ -180,26 +180,29 @@ in
home-manager.users.patriot = { config, pkgs, ... }: { home-manager.users.patriot = { config, pkgs, ... }: {
imports = [ ../profiles/hikari.nix ]; imports = [ ../profiles/hikari.nix ];
# gtk = { /*gtk = {
# # enable = true; enable = false;
# font = { font = {
# package = pkgs.dejavu_fonts; package = pkgs.dejavu_fonts;
# name = "DejaVu Sans 12"; name = "DejaVu Sans 12";
# }; };
# iconTheme = { iconTheme = {
# package = pkgs.papirus-icon-theme; package = pkgs.papirus-icon-theme;
# name = "Papirus Dark"; name = "Papirus Dark";
# }; };
# theme = { theme = {
# package = pkgs.numix-gtk-theme; package = pkgs.numix-gtk-theme;
# name = "Numix Dark"; name = "Numix Dark";
# }; };
# }; };
# qt = { qt = {
# # enable = true; enable = false;
# platformTheme = "gtk"; style = {
# }; package = pkgs.adwaita-qt;
name = "adwaita-dark";
};
};*/
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home = { home = {
@ -215,7 +218,9 @@ in
# Programs # Programs
audacity audacity
krita krita
kdenlive
gnome3.seahorse gnome3.seahorse
gnome3.gnome-boxes
wine-staging wine-staging
cachix cachix
chromiumWaylandPkg chromiumWaylandPkg
@ -236,6 +241,10 @@ in
tagref tagref
libreoffice-fresh libreoffice-fresh
mako mako
hydrus
musikcube
qt5ct
phantomstyle
] ++ kideDeps; ] ++ kideDeps;
}; };
@ -245,7 +254,7 @@ in
inherit font; inherit font;
}; };
sway = { sway = {
enable = false; enable = true;
extraSessionCommands = '' extraSessionCommands = ''
export SDL_VIDEODRIVER=wayland export SDL_VIDEODRIVER=wayland
# needs qt5.qtwayland in systemPackages # needs qt5.qtwayland in systemPackages
@ -254,6 +263,7 @@ in
# Fix for some Java AWT applications (e.g. Android Studio), # Fix for some Java AWT applications (e.g. Android Studio),
# use this if they aren't displayed properly: # use this if they aren't displayed properly:
export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_AWT_WM_NONREPARENTING=1
export QT_QPA_PLATFORMTHEME=qt5ct
''; '';
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
config = { config = {
@ -472,16 +482,14 @@ in
# Fix for some Java AWT applications (e.g. Android Studio), # Fix for some Java AWT applications (e.g. Android Studio),
# use this if they aren't displayed properly: # use this if they aren't displayed properly:
export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_AWT_WM_NONREPARENTING=1
export QT_QPA_PLATFORMTHEME=qt5ct
'';
loginExtra =
''
if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
exec sway
fi
''; '';
# loginExtra =
# let
# deCmd = if config.wayland.windowManager.sway.enable then "sway" else (if config.wayland.windowManager.hikari.enable then "hikari" else throw "Need a window manager to start!");
# in
# ''
# if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
# exec ${deCmd}
# fi
# '';
initExtra = '' initExtra = ''
bindkey "$terminfo[kRIT5]" forward-word bindkey "$terminfo[kRIT5]" forward-word
bindkey "$terminfo[kLFT5]" backward-word bindkey "$terminfo[kLFT5]" backward-word
@ -518,7 +526,7 @@ in
acc = "#${acColor}"; acc = "#${acColor}";
in in
{ {
enable = false; enable = true;
colors = { colors = {
window = { window = {
background = bgc; background = bgc;
@ -546,7 +554,7 @@ in
swayEnabled = config.wayland.windowManager.sway.enable; swayEnabled = config.wayland.windowManager.sway.enable;
in in
{ {
enable = config.wayland.windowManager.sway.enable || config.wayland.windowManager.hikari.enable; enable = swayEnabled || config.wayland.windowManager.hikari.enable;
settings = [{ settings = [{
layer = "top"; layer = "top";
position = "top"; position = "top";