From 42d65bae995c5b1ea882f69b1902e70baa91e2b1 Mon Sep 17 00:00:00 2001 From: joy Date: Mon, 1 Jul 2024 07:50:23 +0200 Subject: [PATCH] lol --- flake.lock | 13 ++++++------- flake.nix | 2 +- home/hyprland/default.nix | 28 +++++++++++----------------- modules/default.nix | 1 - modules/misc/default.nix | 3 ++- modules/packages/default.nix | 9 +++++---- modules/retro/default.nix | 13 ------------- 7 files changed, 25 insertions(+), 44 deletions(-) delete mode 100644 modules/retro/default.nix diff --git a/flake.lock b/flake.lock index 6269796..eaabe22 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1719180626, - "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", + "lastModified": 1719418488, + "narHash": "sha256-Hu75KIbGLJA8qe42rO5WkRQ+E+BuzjS42bNEZcy9zT8=", "owner": "nix-community", "repo": "home-manager", - "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", + "rev": "607f969f5dca2dc100cbc53e24ab49ac24ef8987", "type": "github" }, "original": { @@ -57,16 +57,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1719434778, + "narHash": "sha256-NY8fignXmx/2sq4FTpXxT/ae5ZPhhe+HhSNFVeI5q60=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "2a7a89b98262acbcde7810ce15c17433239367cc", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 8244faf..23124ad 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Nixos config flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs"; nix-colors.url = "github:misterio77/nix-colors"; home-manager = { diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index daf2565..dc17815 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -28,8 +28,6 @@ monitor = "DP-1,2560x1440@165.00Hz,0x0,1,bitdepth,10"; env = [ - # "XCURSOR_THEME = Bibata-Modern-Ice " - # "XCURSOR_SIZE = 24 " "HYPRCURSOR_THEME = Bibata-Modern-Ice" "HYPRCURSOR_SIZE = 24" ]; @@ -41,6 +39,7 @@ "waybar &" "wl-paste --type text --watch cliphist store" "wl-paste --type image --watch cliphist store" + "cmus-remote -s" ]; @@ -54,11 +53,11 @@ "$mod, F, exec, freetube" "$mod, C, exec, hyprpicker -a" "$mod, A, exec, rofi -show drun" - "$mod, D, exec, prismlauncher -l minecraft" "$mod+Shift, Z, exec, grim - | swappy -f -" + "$mod, Z, exec, sh ~/nix/home/hyprland/screen.sh" "$mod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy" - # contoles + # controles "$mod, Q, killactive" "$mod, W, togglefloating" "$mod, R, togglesplit" @@ -68,15 +67,10 @@ "$mod+shift, M, exit, hyprland" # mocp - "$mod, P, exec, mocp -f" - "$mod, O, exec, mocp -r" - "$mod, I, exec, mocp --volume +5" - "$mod, U, exec, mocp --volume -5" - "$mod, N, exec, alacritty -e mocp" - - # Scripts - "$mod, J, exec, sh ~/nix/home/hyprland/pause.sh" - "$mod, Z, exec, sh ~/nix/home/hyprland/screen.sh" + "$mod, O, exec, cmus-remote --next" + "$mod, P, exec, cmus-remote --pause" + "$mod, I, exec, cmus-remote -v +5%" + "$mod, U, exec, cmus-remote -v -5%" # Move focus with mainMod + arrow keys "$mod, Return, fullscreen" @@ -116,9 +110,9 @@ ]; general = { - gaps_in = 3; - gaps_out = 5; - border_size = 0; + gaps_in = 1; + gaps_out = 1; + border_size = 2; allow_tearing = false; layout = "dwindle"; }; @@ -129,7 +123,7 @@ }; decoration = { - rounding = 5; + rounding = 0; }; input = { diff --git a/modules/default.nix b/modules/default.nix index d8f0715..e75efa1 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -8,6 +8,5 @@ ./misc ./gdm ./ssh - #./retro ]; } diff --git a/modules/misc/default.nix b/modules/misc/default.nix index dbcbff4..1dc19dd 100644 --- a/modules/misc/default.nix +++ b/modules/misc/default.nix @@ -24,12 +24,13 @@ time.timeZone = "Europe/Zurich"; - programs.thunar.enable = true; virtualisation.docker.enable = true; services.devmon.enable = true; services.udisks2.enable = true; services.gvfs.enable = true; + programs.nix-ld.enable = true; + boot.binfmt.registrations.appimage = { wrapInterpreterInShell = false; interpreter = "${pkgs.appimage-run}/bin/appimage-run"; diff --git a/modules/packages/default.nix b/modules/packages/default.nix index 1b9f8d6..798b718 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -12,7 +12,7 @@ syncthing = { enable = true; user = "joy"; - dataDir = "/home/joy/sync"; + dataDir = "/home/joy/"; configDir = "/home/joy/.config/syncthing"; }; }; @@ -42,14 +42,13 @@ #image/video/music/recording imv mpv - moc - obs-studio cmus + obs-studio #gui stuff ark keepassxc signal-desktop - transmission-gtk + transmission_3-gtk upscayl cinnamon.nemo firefox @@ -59,6 +58,8 @@ gnome.gnome-calculator gnome.gnome-disk-utility #random utils + ffmpeg + python3 rofi-wayland screen git diff --git a/modules/retro/default.nix b/modules/retro/default.nix deleted file mode 100644 index 2a93d47..0000000 --- a/modules/retro/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, config, ...}: - -{ - environment.systemPackages = with pkgs; [ - emulationstation-de - retroarchFull - dolphin-emu - ]; - - nixpkgs.config.permittedInsecurePackages = [ - "freeimage-unstable-2021-11-01" - ]; -}